fixed gem bundler stuff etc. - reportable - Fork of reportable required by WarVox, from hdm/reportable.
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
---
(DIR) commit d5fc613563ebfa6835d3683bc338ff753737ff61
(DIR) parent f45a902f1ed3558f7ef955d6685efb9c599bcea4
(HTM) Author: Marco Otte-Witte <marco.otte-witte@simplabs.com>
Date: Thu, 13 May 2010 12:15:21 +0200
fixed gem bundler stuff etc.
Diffstat:
M Gemfile | 7 +++++++
M generators/reportable_migration/te… | 2 +-
M rails/init.rb | 1 +
M spec/boot.rb | 5 ++++-
M spec/spec_helper.rb | 2 +-
5 files changed, 14 insertions(+), 3 deletions(-)
---
(DIR) diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,15 @@
+source :gemcutter
+
gem 'rails', '>= 2.2.0'
gem 'activerecord', '>= 2.2.0', :require => 'active_record'
gem 'activesupport', '>= 2.2.0', :require => 'active_support'
gem 'actionpack', '>= 2.2.0', :require => 'action_pack'
+gem 'sqlite3-ruby', '>= 1.2.0'
+gem 'mysql', '>= 2.8.0'
+gem 'pg', '>= 0.9.0'
+gem 'tzinfo', '>= 0.3.0'
+
gem 'rake', '>= 0.8.7'
gem 'rspec', '>= 1.2.0'
gem 'rcov', '>= 0.8.1'
(DIR) diff --git a/generators/reportable_migration/templates/migration.rb b/generators/reportable_migration/templates/migration.rb
@@ -7,7 +7,7 @@ class CreateReportableCache < ActiveRecord::Migration
t.string :grouping, :null => false, :limit => 10
t.string :aggregation, :null => false, :limit => 10
t.string :conditions, :null => false, :limit => 100
- t.float :value, :null => false, :default => 0
+ t.float :value, :null => false, :default => 0
t.datetime :reporting_period, :null => false
t.timestamps
(DIR) diff --git a/rails/init.rb b/rails/init.rb
@@ -1,3 +1,4 @@
+require 'action_view'
require 'saulabs/reportable'
require 'saulabs/reportable/report_tag_helper'
(DIR) diff --git a/spec/boot.rb b/spec/boot.rb
@@ -2,7 +2,10 @@ plugin_root = File.join(File.dirname(__FILE__), '..')
$:.unshift "#{plugin_root}/lib"
-RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
+Bundler.require
+require 'initializer'
+
+RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../') unless defined?(RAILS_ROOT)
Rails::Initializer.run(:set_load_path)
Rails::Initializer.run(:set_autoload_paths)
Rails::Initializer.run(:initialize_time_zone) do |config|
(DIR) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -4,7 +4,7 @@ require 'rubygems'
require 'bundler'
Bundler.setup
-require File.join(File.dirname(__FILE__), 'boot') unless defined?(ActiveRecord)
+require File.join(File.dirname(__FILE__), 'boot')
class User < ActiveRecord::Base; end