forest_liana 1.3.38 → 1.3.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cde4bb3429644d835f65734a4f348c33b967208
-  data.tar.gz: f20804881cbec36f1f5f0df3b492d0428a7cb344
+  metadata.gz: 208db14b90ae794308c7e3ef5621a8bbaf62a0d5
+  data.tar.gz: 1a3ba573ecb160e624a7fc6ba5f8af2017f129bc
 SHA512:
-  metadata.gz: 93673accf3fd1303ea835adaca35f3134d40cdac0dc2701ba50220e825e3a97083f7bb46ba1e11c566f1ecc1aa752dcc2bb285b46ef790dfe52b1923a2b5fe08
-  data.tar.gz: 70e8d8ceafbfef83d6a1cca8c5618a1a1f54814d728acc82dd6ba2b7ac54dbf19535164fec6ee1700227048f4a75d7e9068969b8c5eb262d862a59e40f448064
+  metadata.gz: 26a1cd352db2173795d39cfa4f809be5377ba45ff09b2e6899b82dc510f269dabe23083a8e3d19250defe991f87cb3f15b7c9ef9472d38e0d6f1d2b4f78dea27
+  data.tar.gz: 25ef2a597b669de7251b048c53a0743a17ec5eb2e69fdcca3b97adb5ee4bb3fc60d782daa0925e3fcac794c0e9ac7f6ec86c0aa8b6d966efa7191057f0ed7e0b

data/app/services/forest_liana/operator_date_interval_parser.rb

@@ -9,6 +9,8 @@ module ForestLiana
       lastYear: { duration: 1, period: 'year' }
     }
 
+    PERIODS_FROM_NOW = 'fromNow'
+    PERIODS_TODAY = 'today'
     PERIODS_LAST_X_DAYS = /^last(\d+)days$/
 
     def initialize(value)
@@ -18,6 +20,18 @@ module ForestLiana
     def is_interval_date_value
       return false if @value.nil?
       return true if PERIODS[@value.to_sym]
+      return true if [PERIODS_FROM_NOW, PERIODS_TODAY].include? @value
+
+      match = PERIODS_LAST_X_DAYS.match(@value)
+      return true if match && match[1]
+
+      false
+    end
+
+    def has_previous_interval
+      return false if @value.nil?
+      return true if PERIODS[@value.to_sym]
+      return true if PERIODS_TODAY == @value
 
       match = PERIODS_LAST_X_DAYS.match(@value)
       return true if match && match[1]
@@ -28,8 +42,18 @@ module ForestLiana
     def get_interval_date_filter
       return nil unless is_interval_date_value()
 
+      return ">= '#{Time.now}'" if @value == PERIODS_FROM_NOW
+
+      if @value == PERIODS_TODAY
+        return "BETWEEN '#{Time.now.beginning_of_day}' AND " +
+          "'#{Time.now.end_of_day}'"
+      end
+
       match = PERIODS_LAST_X_DAYS.match(@value)
-      return ">= '#{Integer(match[1]).day.ago}'" if match && match[1]
+      if match && match[1]
+        return "BETWEEN '#{Integer(match[1]).day.ago.beginning_of_day}'" +
+          " AND '#{1.day.ago.end_of_day}'"
+      end
 
       duration = PERIODS[@value.to_sym][:duration]
       period = PERIODS[@value.to_sym][:period]
@@ -40,12 +64,17 @@ module ForestLiana
     end
 
     def get_interval_date_filter_for_previous_interval
-      return nil unless is_interval_date_value()
+      return nil unless has_previous_interval()
+
+      if @value == PERIODS_TODAY
+        return "BETWEEN '#{1.day.ago.beginning_of_day}' AND " +
+          "'#{1.day.ago.end_of_day}'"
+      end
 
       match = PERIODS_LAST_X_DAYS.match(@value)
       if match && match[1]
-        return "BETWEEN #{Integer(match[1] * 2).day.ago}" +
-          " AND #{Integer(match[1]).day.ago}"
+        return "BETWEEN '#{Integer(match[1] * 2).day.ago.beginning_of_day}'" +
+          " AND '#{Integer(match[1]).day.ago.end_of_day}'"
       end
 
       duration = PERIODS[@value.to_sym][:duration]

data/app/services/forest_liana/value_stat_getter.rb

@@ -22,7 +22,7 @@ module ForestLiana
       @params[:filters].try(:each) do |filter|
         operator, filter_value = OperatorValueParser.parse(filter[:value])
         operator_date_interval_parser = OperatorDateIntervalParser.new(filter_value)
-        if operator_date_interval_parser.is_interval_date_value()
+        if operator_date_interval_parser.has_previous_interval()
           field_name = OperatorValueParser.get_field_name(filter[:field], @resource)
           filter = operator_date_interval_parser
             .get_interval_date_filter_for_previous_interval()

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "1.3.38"
+  VERSION = "1.3.39"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 1.3.38
+  version: 1.3.39
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails