reportable 1.0.0 → 1.0.1

data/HISTORY.md

@@ -1,3 +1,8 @@
+v1.0.1
+------
+
+* Fixed a bug with PostgreSQL
+
 v1.0.0
 ------
 

data/generators/reportable_migration/templates/migration.erb

@@ -6,7 +6,7 @@ class <%= class_name %> < ActiveRecord::Migration
       t.string   :report_name,      :null => false
       t.string   :grouping,         :null => false
       t.string   :aggregation,      :null => false
-      t.string   :condition,        :null => false
+      t.string   :conditions,       :null => false
       t.float    :value,            :null => false, :default => 0
       t.datetime :reporting_period, :null => false
 

data/lib/saulabs/reportable/cumulated_report.rb

@@ -6,8 +6,8 @@ module Saulabs
     #
     # @example Cumulated reports as opposed to regular reports
     #
-    #  [[<DateTime today>, 1], [<DateTime yesterday>, 2], etc.]
-    #  [[<DateTime today>, 3], [<DateTime yesterday>, 2], etc.]
+    #  [[<DateTime today>, 1], [<DateTime yesterday>, 2], [<DateTime two days ago>, 4], etc.] # result of a regular report 
+    #  [[<DateTime today>, 7], [<DateTime yesterday>, 6], [<DateTime two days ago>, 4], etc.] # result of a cumulated report for the same dataset
     #
     class CumulatedReport < Report
 

data/lib/saulabs/reportable/report_cache.rb

@@ -92,13 +92,13 @@ module Saulabs
           data ? data[1] : 0.0
         end
 
-        def self.build_cached_data(report, grouping, condition, reporting_period, value)
+        def self.build_cached_data(report, grouping, conditions, reporting_period, value)
           self.new(
             :model_name       => report.klass.to_s,
             :report_name      => report.name.to_s,
             :grouping         => grouping.identifier.to_s,
             :aggregation      => report.aggregation.to_s,
-            :condition        => condition.to_s,
+            :conditions       => conditions.to_s,
             :reporting_period => reporting_period.date_time,
             :value            => value
           )
@@ -106,7 +106,9 @@ module Saulabs
 
         def self.read_cached_data(report, options)
           conditions = [
-            'model_name = ? AND report_name = ? AND grouping = ? AND aggregation = ? AND `condition` = ?',
+            %w(model_name report_name grouping aggregation conditions).map do |column_name|
+              "#{self.connection.quote_column_name(column_name)} = ?"
+            end.join(' AND '),
             report.klass.to_s,
             report.name.to_s,
             options[:grouping].identifier.to_s,

data/spec/classes/report_cache_spec.rb

@@ -122,7 +122,9 @@ describe Saulabs::Reportable::ReportCache do
     it 'should read existing data from the cache' do
       Saulabs::Reportable::ReportCache.should_receive(:all).once.with(
         :conditions => [
-          'model_name = ? AND report_name = ? AND grouping = ? AND aggregation = ? AND `condition` = ? AND reporting_period >= ?',
+          %w(model_name report_name grouping aggregation conditions).map do |column_name|
+            "#{Saulabs::Reportable::ReportCache.connection.quote_column_name(column_name)} = ?"
+          end.join(' AND ') + ' AND reporting_period >= ?',
           @report.klass.to_s,
           @report.name.to_s,
           @report.options[:grouping].identifier.to_s,
@@ -141,7 +143,9 @@ describe Saulabs::Reportable::ReportCache do
       end_date = Time.now
       Saulabs::Reportable::ReportCache.should_receive(:all).once.with(
         :conditions => [
-          'model_name = ? AND report_name = ? AND grouping = ? AND aggregation = ? AND `condition` = ? AND reporting_period BETWEEN ? AND ?',
+          %w(model_name report_name grouping aggregation conditions).map do |column_name|
+            "#{Saulabs::Reportable::ReportCache.connection.quote_column_name(column_name)} = ?"
+          end.join(' AND ') + ' AND reporting_period BETWEEN ? AND ?',
           @report.klass.to_s,
           @report.name.to_s,
           @report.options[:grouping].identifier.to_s,
@@ -162,7 +166,9 @@ describe Saulabs::Reportable::ReportCache do
       Saulabs::Reportable::ReportCache.should_receive(:find).once.with(
         :all,
         :conditions => [
-          'model_name = ? AND report_name = ? AND grouping = ? AND aggregation = ? AND `condition` = ? AND reporting_period >= ?',
+          %w(model_name report_name grouping aggregation conditions).map do |column_name|
+            "#{Saulabs::Reportable::ReportCache.connection.quote_column_name(column_name)} = ?"
+          end.join(' AND ') + ' AND reporting_period >= ?',
           @report.klass.to_s,
           @report.name.to_s,
           grouping.identifier.to_s,

data/spec/db/schema.rb

@@ -13,7 +13,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string   :report_name,      :null => false
     t.string   :grouping,         :null => false
     t.string   :aggregation,      :null => false
-    t.string   :condition,        :null => false
+    t.string   :conditions,       :null => false
     t.float    :value,            :null => false, :default => 0
     t.datetime :reporting_period, :null => false
 
@@ -24,14 +24,14 @@ ActiveRecord::Schema.define(:version => 1) do
     :report_name,
     :grouping,
     :aggregation,
-    :condition
+    :conditions
   ], :name => :name_model_grouping_agregation
   add_index :reportable_cache, [
     :model_name,
     :report_name,
     :grouping,
     :aggregation,
-    :condition,
+    :conditions,
     :reporting_period
   ], :unique => true, :name => :name_model_grouping_aggregation_period
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: reportable
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Marco Otte-Witte
@@ -15,24 +20,32 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Reportable allows for easy report generation from ActiveRecord and DataMapper models by the addition of the reportable method.
 email: reportable@saulabs.com
 executables: []
@@ -81,18 +94,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Easy report generation for Ruby on Rails