forest_liana 1.1.18 → 1.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e22e189367e907e3b452f1d5c4f5ffc1f54b179
-  data.tar.gz: c91be57e8914ac133079130e336551b4e55f1913
+  metadata.gz: 4979fab7ab55ec7b11e81b79b0684e9e89f86bfe
+  data.tar.gz: ddb3f9b8c52eec22e1020e0f50a1c58070085bd6
 SHA512:
-  metadata.gz: f04aed6be6d7753bb81004998ca1b51b00cc0946968ce540dcdf963baa06bb3e2f37ef66394ec74847a0aac4ae3b1db2a417206d0c2e4e2027280666f6fe97a6
-  data.tar.gz: a34f7eb84e788b1db2337726444557806dbd111a54eb094cbde69ffa1a63e364d8d629c6d8be78c3aba1e173de7d466bffd417c9a82d4294a4ad1335eb392728
+  metadata.gz: b84b6f850a0f3d5c95e73c022bcadf511abaa3f4232d519c67c71874e878c6f5e6648b5a48c632946e0416322d2d20b17d617d865d8bd7532ce69d66ba53279d
+  data.tar.gz: 2f012f0fed3c22701fd53d22c131585abae3aca7a0fabcebb40bb77b982e412a6c6f8c57b74f15ea8ccf178e9897e060f776940967871516274eeec5324eded1

data/app/services/forest_liana/line_stat_getter.rb

@@ -13,7 +13,8 @@ module ForestLiana
 
       @params[:filters].try(:each) do |filter|
         operator, filter_value = OperatorValueParser.parse(filter[:value])
-        value = value.where("#{filter[:field]} #{operator} '#{filter_value}'")
+        value = OperatorValueParser.add_where(value, filter[:field], operator,
+                                              filter_value)
       end
 
       value = value.send(time_range, @params[:group_by_date_field])

data/app/services/forest_liana/operator_value_parser.rb

@@ -26,22 +26,34 @@ module ForestLiana
         operator = '='
       end
 
+      [operator, value]
+    end
+
+    def self.add_where(query, field, operator, value)
       case value
       when 'yesterday'
-        value = 1.day.ago
+        range = 1.day.ago.beginning_of_day..1.day.ago.end_of_day
+        query = query.where(created_at: range)
       when 'lastWeek'
-        value = 1.week.ago
+        range = 1.week.ago.beginning_of_week..1.week.ago.end_of_week
+        query = query.where(created_at: range)
       when 'last2Weeks'
-        value = 2.week.ago
+        range = 2.week.ago.beginning_of_week..1.week.ago.end_of_week
+        query = query.where(created_at: range)
       when 'lastMonth'
-        value = 1.month.ago
+        range = 1.month.ago.beginning_of_month..1.month.ago.end_of_month
+        query = query.where(created_at: range)
       when 'last3Months'
-        value = 3.month.ago
+        range = 3.month.ago.beginning_of_month..1.month.ago.end_of_month
+        query = query.where(created_at: range)
       when 'lastYear'
-        value = 1.year.ago
+        range = 1.year.ago.beginning_of_year..1.year.ago.end_of_year
+        query = query.where(created_at: range)
+      else
+        where = "#{field} #{operator}"
+        where += " '#{value}'" if value
+        query = query.where(where)
       end
-
-      [operator, value]
     end
 
   end

data/app/services/forest_liana/pie_stat_getter.rb

@@ -13,7 +13,8 @@ module ForestLiana
 
         @params[:filters].try(:each) do |filter|
           operator, filter_value = OperatorValueParser.parse(filter[:value])
-          value = value.where("#{filter[:field]} #{operator} '#{filter_value}'")
+          value = OperatorValueParser.add_where(value, filter[:field], operator,
+                                                filter_value)
         end
 
 

data/app/services/forest_liana/search_query_builder.rb

@@ -39,11 +39,9 @@ module ForestLiana
       if @params[:filter]
         @params[:filter].each do |field, value|
           next if association?(field)
-
           operator, value = OperatorValueParser.parse(value)
-          where = "#{field} #{operator}"
-          where += " '#{value}'" if value
-          @records = @resource.where(where)
+          @records = OperatorValueParser.add_where(@records, field, operator,
+                                                   value)
         end
       end
 

data/app/services/forest_liana/value_stat_getter.rb

@@ -13,7 +13,8 @@ module ForestLiana
 
       @params[:filters].try(:each) do |filter|
         operator, filter_value = OperatorValueParser.parse(filter[:value])
-        value = value.where("#{filter[:field]} #{operator} '#{filter_value}'")
+        value = OperatorValueParser.add_where(value, filter[:field], operator,
+                                              filter_value)
       end
 
       @record = Stat.new(value: count(value))

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.1.18"
+  VERSION = "1.1.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.1.18
+  version: 1.1.19
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails