trifle-stats 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7f3833c65dc5e0a762b93c6489280be068ed5d8e5309860ec8a5827018e287b
-  data.tar.gz: f019c55266e3b283da326a49861cf51cf1e85f3a7fac287b102dfb8e4eb7f9a2
+  metadata.gz: 574331154d00b65ea5a994f7c7fbc754a1225c39617294acbeed3886c88d5b98
+  data.tar.gz: d4cca3dd912c0642594805395f727fcce350cee4cd6b388ddf09fb3032895317
 SHA512:
-  metadata.gz: c7a67031c4a61531f81bca6bcff2b5726628eb95d8c4ff03ef49721f052cdeaaadd5b438a5670a5c55d070afc7af320597075d511f38d9b4eaa27d33f76b8dda
-  data.tar.gz: 0352b77fd921945ce1bb96d815117fbb838f6aafcdd63405bf9ce3a0afcceaf04753dd42f7a3f93e60052c329a86752fce7688820adc70599006977485f922eb
+  metadata.gz: 423c591af0e2f61178be6553afef6ec4a52ab96268f30b82720e8bf591d079ece3b5b4753766f1ebeecffe442b92162ea89619a4aa7fa58298aee62b226f1cba
+  data.tar.gz: a1fdba88136d21091e95eb59b1b87fab7e917626e40860d5e7128f7771c0428547e2070ba98ae8a9cf5437ee5d61c7671745336226fc25c46492fd6aee1756f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trifle-stats (2.4.0)
+    trifle-stats (2.4.1)
       tzinfo (~> 2.0)
 
 GEM

data/lib/trifle/stats/driver/sqlite.rb

@@ -137,7 +137,7 @@ module Trifle
 
         def get_query(identifiers:)
           conditions = identifiers.map do |identifier|
-            identifier.map { |k, v| "#{k} = #{format_value(v)}" }.join(' AND ')
+            identifier.map { |k, v| build_field_condition(k, v) }.join(' AND ')
           end.join(' OR ')
 
           <<-SQL
@@ -193,6 +193,15 @@ module Trifle
 
         private
 
+        def build_field_condition(key, value)
+          return "#{key} = #{format_value(value)}" unless key == :at
+
+          formatted = format_time_value(value)
+          with_microseconds = formatted.sub('Z', '.000000Z')
+
+          "(at = '#{formatted}' OR at = '#{with_microseconds}')"
+        end
+
         # Batch data operations to avoid SQLite parser stack overflow
         # Splits large data hashes into smaller chunks to prevent too many nested json_set calls
         def batch_data_operations(identifier:, data:, connection:, operation:)
@@ -215,13 +224,13 @@ module Trifle
         def format_time_value(value)
           case value
           when Time
-            value.getutc.iso8601
+            value.getutc.iso8601(0)
           when DateTime
-            value.to_time.getutc.iso8601
+            value.to_time.getutc.iso8601(0)
           when Integer
-            Time.at(value).getutc.iso8601
+            Time.at(value).getutc.iso8601(0)
           else
-            Time.iso8601(value.to_s).getutc.iso8601
+            Time.iso8601(value.to_s).getutc.iso8601(0)
           end
         end
 

data/lib/trifle/stats/operations/timeseries/increment.rb

@@ -21,7 +21,7 @@ module Trifle
 
           def key_for(granularity:)
             pgrn = Nocturnal::Parser.new(granularity)
-            at = Nocturnal.new(@at, config: config).floor(pgrn.offset, pgrn.unit)
+            at = Nocturnal.new(localized_time(@at), config: config).floor(pgrn.offset, pgrn.unit)
             Nocturnal::Key.new(key: key, granularity: granularity, at: at)
           end
 
@@ -41,6 +41,13 @@ module Trifle
           def tracking_key
             @untracked ? '__untracked__' : nil
           end
+
+          private
+
+          def localized_time(time)
+            base_time = time.is_a?(Time) ? time : time.to_time
+            config.tz.utc_to_local(base_time.getutc)
+          end
         end
       end
     end

data/lib/trifle/stats/operations/timeseries/set.rb

@@ -21,7 +21,7 @@ module Trifle
 
           def key_for(granularity:)
             pgrn = Nocturnal::Parser.new(granularity)
-            at = Nocturnal.new(@at, config: config).floor(pgrn.offset, pgrn.unit)
+            at = Nocturnal.new(localized_time(@at), config: config).floor(pgrn.offset, pgrn.unit)
             Nocturnal::Key.new(key: key, granularity: granularity, at: at)
           end
 
@@ -41,6 +41,13 @@ module Trifle
           def tracking_key
             @untracked ? '__untracked__' : nil
           end
+
+          private
+
+          def localized_time(time)
+            base_time = time.is_a?(Time) ? time : time.to_time
+            config.tz.utc_to_local(base_time.getutc)
+          end
         end
       end
     end

data/lib/trifle/stats/operations/timeseries/values.rb

@@ -23,7 +23,13 @@ module Trifle
           def timeline
             @timeline ||= begin
               pgrn = Nocturnal::Parser.new(granularity)
-              Nocturnal.timeline(from: @from, to: @to, offset: pgrn.offset, unit: pgrn.unit)
+              Nocturnal.timeline(
+                from: localized_time(@from),
+                to: localized_time(@to),
+                offset: pgrn.offset,
+                unit: pgrn.unit,
+                config: config
+              )
             end
           end
 
@@ -54,6 +60,13 @@ module Trifle
           def perform
             @skip_blanks ? clean_values : values
           end
+
+          private
+
+          def localized_time(time)
+            base_time = time.is_a?(Time) ? time : time.to_time
+            config.tz.utc_to_local(base_time.getutc)
+          end
         end
       end
     end

data/lib/trifle/stats/version.rb

@@ -2,6 +2,6 @@
 
 module Trifle
   module Stats
-    VERSION = '2.4.0'
+    VERSION = '2.4.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trifle-stats
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Jozef Vaclavik