reportable 1.1.2 → 1.2.0

data/README.md

@@ -60,27 +60,9 @@ To install the Reportable gem, simply run
 
     [sudo] gem install reportable
 
-### Rails 2.x
+### Rails 3.x
 
-To install Reportable for Rails 2.x, add it to your application's dependencies in your `environment.rb`:
-
-    config.gem 'reportable', :lib => 'saulabs/reportable'
-
-and generate the migration that create reportable's cache table:
-
-    ./script/generate reportable_migration
-
-If you want to use reportable's JavaScript graph output format, you also have to generate the JavaScript files:
-
-		./script/generate reportable_raphael_assets
-
-if you want to use [Raphael](http://raphaeljs.com/) or if you want to use [jQuery](http://jquery.com/) and [flot](http://code.google.com/p/flot/):
-
-		./script/generate reportable_jquery_flot_assets
-
-### Rails 3.0
-
-To install Reportable for Rails 3.0, add it to your application's Gemfile:
+To install Reportable for Rails 3.x, add it to your application's Gemfile:
 
     gem 'reportable', :require => 'saulabs/reportable'
 
@@ -109,7 +91,7 @@ Plans
 Authors
 -------
 
-© 2008-2010 Marco Otte-Witte (<http://simplabs.com>) and Martin Kavalar (<http://www.sauspiel.de>)
+© 2008-2012 Marco Otte-Witte (<http://simplabs.com>) and Martin Kavalar (<http://www.sauspiel.de>)
 
 Released under the MIT license
 

data/Rakefile

@@ -12,9 +12,6 @@ task :default => :spec
 
 desc 'Run the specs'
 Spec::Rake::SpecTask.new(:spec) do |t|
-  t.rcov_opts  << '--exclude "gems/*,spec/*,init.rb"'
-  t.rcov       = true
-  t.rcov_dir   = 'doc/coverage'
   t.spec_files = FileList['spec/**/*_spec.rb']
 end
 

data/generators/reportable_jquery_flot_assets/reportable_jquery_flot_assets_generator.rb

@@ -1,37 +1,18 @@
-if Saulabs::Reportable::RailsAdapter::IS_RAILS3
-
-  class ReportableJqueryFlotAssetsGenerator < Rails::Generators::Base
-
-    include Rails::Generators::Actions
-
-    def create_jquery_flot_file
-      empty_directory('public/javascripts')
-      copy_file(
-        File.join(File.dirname(__FILE__), 'templates', 'jquery.flot.min.js'),
-        'public/javascripts/jquery.flot.min.js'
-      )
-      copy_file(
-        File.join(File.dirname(__FILE__), 'templates', 'excanvas.min.js'),
-        'public/javascripts/excanvas.min.js'
-      )
-      readme(File.join(File.dirname(__FILE__), 'templates', 'NOTES'))
-    end
-
-  end
-
-else
-
-  class ReportableJqueryFlotAssetsGenerator < Rails::Generator::Base
-
-    def manifest
-      record do |m|
-        m.directory('public/javascripts')
-        m.file('jquery.flot.min.js', 'public/javascripts/jquery.flot.min.js')
-        m.file('excanvas.min.js', 'public/javascripts/excanvas.min.js')
-        m.readme('NOTES')
-      end
-    end
-
+class ReportableJqueryFlotAssetsGenerator < Rails::Generators::Base
+
+  include Rails::Generators::Actions
+
+  def create_jquery_flot_file
+    empty_directory('public/javascripts')
+    copy_file(
+      File.join(File.dirname(__FILE__), 'templates', 'jquery.flot.min.js'),
+      'public/javascripts/jquery.flot.min.js'
+    )
+    copy_file(
+      File.join(File.dirname(__FILE__), 'templates', 'excanvas.min.js'),
+      'public/javascripts/excanvas.min.js'
+    )
+    readme(File.join(File.dirname(__FILE__), 'templates', 'NOTES'))
   end
 
 end

data/generators/reportable_migration/reportable_migration_generator.rb

@@ -1,40 +1,20 @@
-if Saulabs::Reportable::RailsAdapter::IS_RAILS3
+class ReportableMigrationGenerator < Rails::Generators::Base
 
-  class ReportableMigrationGenerator < Rails::Generators::Base
-
-    include Rails::Generators::Migration
-
-    def create_migration
-      migration_template(
-        File.join(File.dirname(__FILE__), 'templates', 'migration.rb'),
-        'db/migrate/create_reportable_cache.rb'
-      )
-    end
-
-    def self.next_migration_number(dirname)
-      if ActiveRecord::Base.timestamped_migrations
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
-      else
-        "%.3d" % (current_migration_number(dirname) + 1)
-      end
-    end
+  include Rails::Generators::Migration
 
+  def create_migration
+    migration_template(
+      File.join(File.dirname(__FILE__), 'templates', 'migration.rb'),
+      'db/migrate/create_reportable_cache.rb'
+    )
   end
 
-else
-
-  class ReportableMigrationGenerator < Rails::Generator::Base
-
-    def manifest
-      record do |m|
-        m.migration_template('migration.rb', 'db/migrate')
-      end
+  def self.next_migration_number(dirname)
+    if ActiveRecord::Base.timestamped_migrations
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
+    else
+      "%.3d" % (current_migration_number(dirname) + 1)
     end
-
-    def file_name
-      'create_reportable_cache'
-    end
-
   end
 
 end

data/generators/reportable_raphael_assets/reportable_raphael_assets_generator.rb

@@ -1,42 +1,22 @@
-if Saulabs::Reportable::RailsAdapter::IS_RAILS3
-
-  class ReportableRaphaelAssetsGenerator < Rails::Generators::Base
-
-    include Rails::Generators::Actions
-
-    def create_raphael_file
-      empty_directory('public/javascripts')
-      copy_file(
-        File.join(File.dirname(__FILE__), 'templates', 'raphael.min.js'),
-        'public/javascripts/raphael.min.js'
-      )
-      copy_file(
-        File.join(File.dirname(__FILE__), 'templates', 'g.raphael.min.js'),
-        'public/javascripts/g.raphael.min.js'
-      )
-      copy_file(
-        File.join(File.dirname(__FILE__), 'templates', 'g.line.min.js'),
-        'public/javascripts/g.line.min.js'
-      )
-      readme(File.join(File.dirname(__FILE__), 'templates', 'NOTES'))
-    end
-
-  end
-
-else
-
-  class ReportableRaphaelAssetsGenerator < Rails::Generator::Base
-
-    def manifest
-      record do |m|
-        m.directory('public/javascripts')
-        m.file('raphael.min.js', 'public/javascripts/raphael.min.js')
-        m.file('g.raphael.min.js', 'public/javascripts/g.raphael.min.js')
-        m.file('g.line.min.js', 'public/javascripts/g.line.min.js')
-        m.readme('NOTES')
-      end
-    end
-
+class ReportableRaphaelAssetsGenerator < Rails::Generators::Base
+
+  include Rails::Generators::Actions
+
+  def create_raphael_file
+    empty_directory('public/javascripts')
+    copy_file(
+      File.join(File.dirname(__FILE__), 'templates', 'raphael.min.js'),
+      'public/javascripts/raphael.min.js'
+    )
+    copy_file(
+      File.join(File.dirname(__FILE__), 'templates', 'g.raphael.min.js'),
+      'public/javascripts/g.raphael.min.js'
+    )
+    copy_file(
+      File.join(File.dirname(__FILE__), 'templates', 'g.line.min.js'),
+      'public/javascripts/g.line.min.js'
+    )
+    readme(File.join(File.dirname(__FILE__), 'templates', 'NOTES'))
   end
 
 end

data/lib/saulabs/reportable.rb

@@ -1,5 +1,7 @@
+
 require 'saulabs/reportable/report'
 require 'saulabs/reportable/cumulated_report'
+require 'saulabs/reportable/railtie'
 
 module Saulabs
 
@@ -9,10 +11,6 @@ module Saulabs
     #
     module RailsAdapter
 
-      IS_RAILS3 = defined?(Rails) && Rails::VERSION::MAJOR >= 3
-
-      require 'saulabs/reportable/railtie' if IS_RAILS3
-
       # Extends the {Saulabs::Reportable::ClassMethods#reportable} method into +base+.
       #
       def self.included(base)

data/lib/saulabs/reportable/cumulated_report.rb

@@ -25,7 +25,7 @@ module Saulabs
           first_reporting_period = ReportingPeriod.first(options[:grouping], options[:limit], options[:end_date])
           acc = initial_cumulative_value(first_reporting_period.date_time, options)
           result = []
-          data.each do |element|
+          data.to_a.each do |element|
             acc += element[1].to_f
             result << [element[0], acc]
           end

data/lib/saulabs/reportable/railtie.rb

@@ -1,4 +1,5 @@
 require 'saulabs/reportable'
+require 'saulabs/reportable/report_tag_helper'
 require 'rails'
 
 module Saulabs
@@ -10,7 +11,17 @@ module Saulabs
       GEM_ROOT = File.join(File.dirname(__FILE__), '..', '..', '..')
 
       initializer 'saulabs.reportable.initialization' do
-        require File.join(GEM_ROOT, 'rails', 'init')
+        ActiveSupport.on_load :active_record do
+          ActiveRecord::Base.class_eval do
+            include Saulabs::Reportable::RailsAdapter
+          end
+        end
+        ActiveSupport.on_load :action_view do
+          ActionView::Base.class_eval do
+            include Saulabs::Reportable::ReportTagHelper
+          end
+        end
+
       end
 
       generators do

data/lib/saulabs/reportable/report_cache.rb

@@ -1,5 +1,6 @@
 require 'saulabs/reportable/reporting_period'
 require 'saulabs/reportable/result_set'
+require 'active_record'
 
 module Saulabs
 
@@ -10,7 +11,7 @@ module Saulabs
     #
     class ReportCache < ActiveRecord::Base
 
-      set_table_name :reportable_cache
+      self.table_name = :reportable_cache
 
       validates_presence_of :model_name
       validates_presence_of :report_name
@@ -63,7 +64,7 @@ module Saulabs
       # @option options [DateTime, Boolean] :end_date (false)
       #   when specified, the report will only include data for the +:limit+ reporting periods until this date.
       #
-      # @return [Array<Array<DateTime, Float>>]
+      # @return [ResultSet<Array<DateTime, Float>>]
       #   the result of the report as pairs of {DateTime}s and {Float}s
       #
       def self.process(report, options, &block)
@@ -110,13 +111,24 @@ module Saulabs
             :report_name      => report.name.to_s,
             :grouping         => grouping.identifier.to_s,
             :aggregation      => report.aggregation.to_s,
-            :conditions       => conditions.to_s,
+            :conditions       => serialize_conditions(conditions),
             :reporting_period => reporting_period.date_time,
             :value            => value
           )
         end
 
+        def self.serialize_conditions(conditions)
+          if conditions.is_a?(Array) && conditions.any?
+            conditions.join
+          elsif conditions.is_a?(Hash) && conditions.any?
+            conditions.map.sort{|x,y|x.to_s<=>y.to_s}.flatten.join
+          else
+            conditions.empty? ? '' : conditions.to_s
+          end
+        end
+
         def self.read_cached_data(report, options)
+          options[:conditions] ||= []
           conditions = [
             %w(model_name report_name grouping aggregation conditions).map do |column_name|
               "#{self.connection.quote_column_name(column_name)} = ?"
@@ -125,7 +137,7 @@ module Saulabs
             report.name.to_s,
             options[:grouping].identifier.to_s,
             report.aggregation.to_s,
-            options[:conditions].to_s
+            serialize_conditions(options[:conditions])
           ]
           first_reporting_period = get_first_reporting_period(options)
           last_reporting_period = get_last_reporting_period(options)

data/lib/saulabs/reportable/report_tag_helper.rb

@@ -37,7 +37,7 @@ module Saulabs
       #
       def google_report_tag(data, options = {})
         options.reverse_merge!(Config.google_options)
-        data = data.collect { |d| d[1] }
+        data = data.to_a.collect { |d| d[1] }
         labels = ''
         unless options[:labels].empty?
           chxr = {}
@@ -93,8 +93,8 @@ module Saulabs
           var graph = Raphael('#{options[:dom_id]}');
           graph.g.linechart(
             -10, 4, #{options[:width]}, #{options[:height]},
-            #{(0..data.size).to_a.to_json},
-            #{data.map { |d| eval options[:format], d[1].send(:binding) }.to_json},
+            #{(0..data.to_a.size).to_a.to_json},
+            #{data.to_a.map { |d| d[1].send(:eval, options[:format]) }.to_json},
             #{raphael_options.to_json}
           ).hover(function() {
             this.disc = graph.g.disc(this.x, this.y, 3).attr({fill: "#{options[:hover_fill_color]}", stroke: '#{options[:hover_line_color]}' }).insertBefore(this);
@@ -146,7 +146,7 @@ module Saulabs
         %Q{<div id="#{options[:dom_id]}" style="width:#{options[:width]}px;height:#{options[:height]}px;"></div>
         <script type="text\/javascript" charset="utf-8">
         $(function() {
-          var set = #{data.map{|d| d[1] }.to_json},
+          var set = #{data.to_a.map{|d| d[1] }.to_json},
           data = [];
           for (var i = 0; i < set.length; i++) {
             data.push([i, set[i]]);

data/lib/saulabs/reportable/reporting_period.rb

@@ -70,7 +70,8 @@ module Saulabs
       #   the reporting period for the {Saulabs::Reportable::Grouping} as parsed from the db string
       #
       def self.from_db_string(grouping, db_string)
-        parts = grouping.date_parts_from_db_string(db_string)
+        return self.new(grouping, db_string) if db_string.is_a?(Date)
+        parts = grouping.date_parts_from_db_string(db_string.to_s)
         case grouping.identifier
           when :hour
             self.new(grouping, DateTime.new(parts[0], parts[1], parts[2], parts[3], 0, 0))

data/lib/saulabs/reportable/result_set.rb

@@ -8,7 +8,7 @@ module Saulabs
     # the name of the model and the report the result set
     # was generated from.
     #
-    class ResultSet < ::Array
+    class ResultSet
 
       # the name of the model the result set is based on
       #
@@ -18,6 +18,12 @@ module Saulabs
       #
       attr_reader :report_name
 
+      # array representation of the result
+      #
+      def to_a
+        @results
+      end
+
       # Initializes a new result set.
       #
       # @param [Array] array
@@ -28,7 +34,7 @@ module Saulabs
       #   the name of the report the result is based on
       #
       def initialize(array, model_name, report_name)
-        super(array)
+        @results = array
         @model_name  = model_name
         @report_name = report_name.to_s
       end

data/spec/classes/cumulated_report_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))),'spec_helper')
 
 describe Saulabs::Reportable::CumulatedReport do
 

data/spec/classes/grouping_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))),'spec_helper')
 
 describe Saulabs::Reportable::Grouping do
 

data/spec/classes/report_cache_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))),'spec_helper')
 
 describe Saulabs::Reportable::ReportCache do
 
@@ -214,7 +214,7 @@ describe Saulabs::Reportable::ReportCache do
           @report.name.to_s,
           @report.options[:grouping].identifier.to_s,
           @report.aggregation.to_s,
-          @report.options[:conditions].to_s,
+          '',
           Saulabs::Reportable::ReportingPeriod.first(@report.options[:grouping], 10).date_time
         ],
         :limit => 10,
@@ -235,7 +235,7 @@ describe Saulabs::Reportable::ReportCache do
           @report.name.to_s,
           @report.options[:grouping].identifier.to_s,
           @report.aggregation.to_s,
-          @report.options[:conditions].to_s,
+          '',
           Saulabs::Reportable::ReportingPeriod.first(@report.options[:grouping], 9).date_time,
           Saulabs::Reportable::ReportingPeriod.new(@report.options[:grouping], end_date).date_time
         ],
@@ -248,8 +248,7 @@ describe Saulabs::Reportable::ReportCache do
 
     it "should read existing data from the cache for the correct grouping if one other than the report's default grouping is specified" do
       grouping = Saulabs::Reportable::Grouping.new(:month)
-      Saulabs::Reportable::ReportCache.should_receive(:find).once.with(
-        :all,
+      Saulabs::Reportable::ReportCache.should_receive(:all).once.with(
         :conditions => [
           %w(model_name report_name grouping aggregation conditions).map do |column_name|
             "#{Saulabs::Reportable::ReportCache.connection.quote_column_name(column_name)} = ?"
@@ -258,7 +257,7 @@ describe Saulabs::Reportable::ReportCache do
           @report.name.to_s,
           grouping.identifier.to_s,
           @report.aggregation.to_s,
-          @report.options[:conditions].to_s,
+          '',
           Saulabs::Reportable::ReportingPeriod.first(grouping, 10).date_time
         ],
         :limit => 10,
@@ -276,6 +275,25 @@ describe Saulabs::Reportable::ReportCache do
       end
     end
   end
+  
+  describe '.serialize_conditions' do
+    
+    it 'should serialize empty conditions correctly' do
+      result = Saulabs::Reportable::ReportCache.send(:serialize_conditions, [])
+      result.should eql('')
+    end
+    
+    it 'should serialize a conditions array correctly' do
+      result = Saulabs::Reportable::ReportCache.send(:serialize_conditions, ['active = ? AND gender = ?', true, 'male'])
+      result.should eql('active = ? AND gender = ?truemale')
+    end
+    
+    it 'should serialize a conditions hash correctly' do
+      result = Saulabs::Reportable::ReportCache.send(:serialize_conditions, { :gender => 'male', :active => true })
+      result.should eql('activetruegendermale')
+    end
+    
+  end
 
   describe '.prepare_result' do
 
@@ -320,7 +338,7 @@ describe Saulabs::Reportable::ReportCache do
     end
 
     it 'should save the created Saulabs::Reportable::ReportCache' do
-      @cached.should_receive(:save!).once
+      @cached.should_receive(:save!)
 
       Saulabs::Reportable::ReportCache.send(:prepare_result, @new_data, [], @report, @report.options)
     end
@@ -328,16 +346,17 @@ describe Saulabs::Reportable::ReportCache do
     it 'should return an array of arrays of Dates and Floats' do
       result = Saulabs::Reportable::ReportCache.send(:prepare_result, @new_data, [], @report, @report.options)
 
-      result.should be_kind_of(Array)
-      result[0].should be_kind_of(Array)
-      result[0][0].should be_kind_of(Date)
-      result[0][1].should be_kind_of(Float)
+      result.should be_kind_of(Saulabs::Reportable::ResultSet)
+      result.to_a.should be_kind_of(Array)
+      result.to_a[0].should be_kind_of(Array)
+      result.to_a[0][0].should be_kind_of(Date)
+      result.to_a[0][1].should be_kind_of(Float)
     end
 
     describe 'with :live_data = false' do
 
       before do
-        @result = Saulabs::Reportable::ReportCache.send(:prepare_result, @new_data, [], @report, @report.options)
+        @result = Saulabs::Reportable::ReportCache.send(:prepare_result, @new_data, [], @report, @report.options).to_a
       end
 
       it 'should return an array of length :limit' do
@@ -354,7 +373,7 @@ describe Saulabs::Reportable::ReportCache do
 
       before do
         options = @report.options.merge(:live_data => true)
-        @result = Saulabs::Reportable::ReportCache.send(:prepare_result, @new_data, [], @report, options)
+        @result = Saulabs::Reportable::ReportCache.send(:prepare_result, @new_data, [], @report, options).to_a
       end
 
       it 'should return an array of length (:limit + 1)' do

data/spec/classes/report_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))),'spec_helper')
 
 describe Saulabs::Reportable::Report do
 
@@ -56,13 +56,13 @@ describe Saulabs::Reportable::Report do
     it 'should return an array of the same length as the specified limit when :live_data is false' do
       @report = Saulabs::Reportable::Report.new(User, :cumulated_registrations, :limit => 10, :live_data => false)
 
-      @report.run.length.should == 10
+      @report.run.to_a.length.should == 10
     end
 
     it 'should return an array of the same length as the specified limit + 1 when :live_data is true' do
       @report = Saulabs::Reportable::Report.new(User, :cumulated_registrations, :limit => 10, :live_data => true)
 
-      @report.run.length.should == 11
+      @report.run.to_a.length.should == 11
     end
 
     for grouping in [:hour, :day, :week, :month] do
@@ -98,7 +98,7 @@ describe Saulabs::Reportable::Report do
                 :limit    => 10,
                 :end_date => @end_date
               )
-              @result = @report.run
+              @result = @report.run.to_a
             end
 
             it "should start with the reporting period (end_date - limit.#{grouping.to_s})" do
@@ -127,7 +127,7 @@ describe Saulabs::Reportable::Report do
                   :limit     => 10,
                   :live_data => live_data
                 )
-                @result = @report.run
+                @result = @report.run.to_a
               end
 
               it "should be an array starting reporting period (Time.now - limit.#{grouping.to_s})" do

data/spec/classes/reporting_period_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))),'spec_helper')
 
 describe Saulabs::Reportable::ReportingPeriod do
 
@@ -138,6 +138,16 @@ describe Saulabs::Reportable::ReportingPeriod do
 
       Saulabs::Reportable::ReportingPeriod.from_db_string(grouping, '').date_time.should == Date.new(2008, 1, 1)
     end
+    
+    it "should return a reporting period with the correct date when a Date object is passed" do
+      grouping = Saulabs::Reportable::Grouping.new(:day)
+      Saulabs::Reportable::ReportingPeriod.from_db_string(grouping, Date.new(2008, 1, 1)).date_time.should == Date.new(2008, 1, 1)
+    end
+    
+    it "should return a reporting period with the correct date when a DateTime object is passed" do
+      grouping = Saulabs::Reportable::Grouping.new(:hour)
+      Saulabs::Reportable::ReportingPeriod.from_db_string(grouping, DateTime.new(2008, 1, 1, 12, 0, 0)).date_time.should == DateTime.new(2008, 1, 1, 12, 0, 0)
+    end
 
   end
 

data/spec/db/database.yml

@@ -1,6 +1,6 @@
 sqlite3:
   adapter:  sqlite3
-  database: spec/db/reportable.sqlite3.db
+  database: ":memory:"
 mysql:
   adapter:  mysql
   database: reportable_test
@@ -12,4 +12,4 @@ postgresql:
   database: reportable_test
   username: reportable
   password: reportable
-  host:     localhost
+  host:     localhost

data/spec/other/report_method_spec.rb

@@ -1,7 +1,17 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))),'spec_helper')
 
 describe Saulabs::Reportable do
+  
+  ActiveRecord::Base.class_eval do
+    include Saulabs::Reportable::RailsAdapter
+  end
+  
+  class User < ActiveRecord::Base
+    reportable :registrations, :limit => 10
+  end
 
+  class SpecialUser < User; end
+  
   before(:all) do
     User.create!(:login => 'test 1', :created_at => Time.now - 1.days,  :profile_visits => 1)
     User.create!(:login => 'test 2', :created_at => Time.now - 2.days, :profile_visits => 2)
@@ -59,10 +69,3 @@ describe Saulabs::Reportable do
 
 end
 
-class User < ActiveRecord::Base
-
-  reportable :registrations, :limit => 10
-
-end
-
-class SpecialUser < User; end

data/spec/other/report_tag_helper_spec.rb

@@ -1,4 +1,6 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.dirname(File.dirname(File.expand_path(__FILE__))),'spec_helper')
+
+require 'reportable/report_tag_helper'
 
 describe Saulabs::Reportable::ReportTagHelper do
 
@@ -30,6 +32,10 @@ describe Saulabs::Reportable::ReportTagHelper do
       @helper.raphael_report_tag(data_set).should =~ /^<div id="#{data_set.model_name.downcase}_#{data_set.report_name}".*<\/div>/
       @helper.raphael_report_tag(data_set).should =~ /^<div id="#{data_set.model_name.downcase}_#{data_set.report_name}1".*<\/div>/
     end
+    
+    it 'should include the data [1,3]' do
+      @helper.raphael_report_tag(data_set).should =~ /\[1,3\]/
+    end
 
   end
   

data/spec/spec_helper.rb

@@ -1,19 +1,39 @@
 ENV['RAILS_ENV'] = 'test'
 
 require 'rubygems'
-require 'bundler'
-Bundler.setup
-
-require File.join(File.dirname(__FILE__), 'boot')
-
-class User < ActiveRecord::Base; end
-
-class YieldMatchException < Exception; end
+require 'bundler/setup'
+require 'active_record'
+require 'active_record/version'
+require 'active_support'
 
 begin
   require 'ruby-debug'
-  Debugger.start
-  Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
+  # Debugger.start
+  # Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
 rescue LoadError
   # ruby-debug wasn't available so neither can the debugging be
-end
+end
+
+ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), '..')))
+
+$LOAD_PATH << File.join(ROOT, 'lib')
+$LOAD_PATH << File.join(ROOT, 'lib/saulabs')
+
+require File.join(ROOT, 'lib', 'saulabs', 'reportable.rb')
+
+# Rails::Initializer.run(:set_load_path)
+# Rails::Initializer.run(:set_autoload_paths)
+# Rails::Initializer.run(:initialize_time_zone) do |config|
+#   config.time_zone = 'Pacific Time (US & Canada)'
+# end
+
+FileUtils.mkdir_p File.join(File.dirname(__FILE__), 'log')
+ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FILE__) + "/log/spec.log")
+
+databases = YAML::load(IO.read(File.join(File.dirname(__FILE__), 'db', 'database.yml')))
+ActiveRecord::Base.establish_connection(databases[ENV['DB'] || 'sqlite3'])
+load(File.join(File.dirname(__FILE__), 'db', 'schema.rb'))
+
+class User < ActiveRecord::Base; end
+
+class YieldMatchException < Exception; end

metadata

@@ -1,79 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: reportable
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Marco Otte-Witte
 - Martin Kavalar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-06-28 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70168900389180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70168900389180
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70168900388200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
-  version_requirements: *id002
-description: Reportable allows for easy report generation from ActiveRecord models by the addition of the reportable method.
+  prerelease: false
+  version_requirements: *70168900388200
+description: Reportable allows for easy report generation from ActiveRecord models
+  by the addition of the reportable method.
 email: reportable@saulabs.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - HISTORY.md
 - Rakefile
 - MIT-LICENSE
 - generators/reportable_jquery_flot_assets/reportable_jquery_flot_assets_generator.rb
-- generators/reportable_jquery_flot_assets/templates/NOTES
 - generators/reportable_jquery_flot_assets/templates/excanvas.min.js
 - generators/reportable_jquery_flot_assets/templates/jquery.flot.min.js
+- generators/reportable_jquery_flot_assets/templates/NOTES
 - generators/reportable_migration/reportable_migration_generator.rb
 - generators/reportable_migration/templates/migration.rb
 - generators/reportable_raphael_assets/reportable_raphael_assets_generator.rb
-- generators/reportable_raphael_assets/templates/NOTES
 - generators/reportable_raphael_assets/templates/g.line.min.js
 - generators/reportable_raphael_assets/templates/g.raphael.min.js
+- generators/reportable_raphael_assets/templates/NOTES
 - generators/reportable_raphael_assets/templates/raphael.min.js
 - lib/saulabs/reportable/config.rb
 - lib/saulabs/reportable/cumulated_report.rb
@@ -85,8 +66,6 @@ files:
 - lib/saulabs/reportable/reporting_period.rb
 - lib/saulabs/reportable/result_set.rb
 - lib/saulabs/reportable.rb
-- rails/init.rb
-- spec/boot.rb
 - spec/classes/cumulated_report_spec.rb
 - spec/classes/grouping_spec.rb
 - spec/classes/report_cache_spec.rb
@@ -98,39 +77,29 @@ files:
 - spec/spec_helper.rb
 - spec/db/database.yml
 - spec/spec.opts
-has_rdoc: true
 homepage: http://github.com/saulabs/reportable
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Easy report generation for Ruby on Rails
 test_files: []
-
+has_rdoc: false

data/rails/init.rb

@@ -1,11 +0,0 @@
-require 'action_view'
-require 'saulabs/reportable'
-require 'saulabs/reportable/report_tag_helper'
-
-ActiveRecord::Base.class_eval do
-  include Saulabs::Reportable::RailsAdapter
-end
-
-ActionView::Base.class_eval do
-  include Saulabs::Reportable::ReportTagHelper
-end

data/spec/boot.rb

@@ -1,22 +0,0 @@
-plugin_root = File.join(File.dirname(__FILE__), '..')
-
-$:.unshift "#{plugin_root}/lib"
-
-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|
-  config.time_zone = 'Pacific Time (US & Canada)'
-end
-
-require File.join(File.dirname(__FILE__), '..', 'rails', 'init.rb')
-
-FileUtils.mkdir_p File.join(File.dirname(__FILE__), 'log')
-ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), 'log', 'spec.log'))
-
-databases = YAML::load(IO.read(File.join(File.dirname(__FILE__), 'db', 'database.yml')))
-ActiveRecord::Base.establish_connection(databases[ENV['DB'] || 'sqlite3'])
-load(File.join(File.dirname(__FILE__), 'db', 'schema.rb'))