influxer 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36dc815f87b5baba491093838e46cf60537af9eb
-  data.tar.gz: 3149c0e7950e1986bfefeb78cec5bf8e3b334596
+  metadata.gz: 34d7516d9e613074dcc24cf1c401bf69af544fa8
+  data.tar.gz: ea286c505a09b55058dc00fa05bebd1786c2de20
 SHA512:
-  metadata.gz: 9555072584dbcb205fafdf5f82615430d729a8e7b56962bda588c1b8319b3c5e2b6a07c238705bb1bec8737b39d85852e63d8dd3bdbd0a7483ba441bb512e806
-  data.tar.gz: b2b26a45612366170dba61278e5fb3fbeb0ae56b802bf652b8db90fcf4b63372eb3a33386d791fb605c3668a27b3e399001a608df4a156e4755fb15dbfb36f96
+  metadata.gz: 96fbc0c09e0127c7be545ffab4e0108a9ea26c7d471678c74095d35ce55827103357ce584b371e86cdd82200ff0ea86a63fb1f4ff61890e6d841b59de1618d35
+  data.tar.gz: 5e580bcbfebb8ca2d731cd658e81d7cd418dc90a4e423aac8ea47d5cb06ccdd409b4e938d6752be4f9b5955bbcede839a004c3ee77dd7fd103c01471a51e1a22

data/Changelog.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 1.1.4
+
+- [Fixes [#35](https://github.com/palkan/influxer/issues/35)] Support time duration suffix and handle `'s'` and `'ms'` precisions. ([@palkan][])
+
+  [PR](https://github.com/palkan/influxer/pull/36)
+
+  **BREAKING:** `Time`-like value are only typecasted for `time` key.
+
 ## 1.1.2
 
 - Support exclusive ranges as `where` arguments. ([@MPursche][])

data/lib/influxer/config.rb

@@ -30,7 +30,8 @@ module Influxer
                 :async,
                 database: 'db',
                 time_precision: 'ns',
-                cache: false
+                cache: false,
+                time_duration_suffix_enabled: false
 
     def load(*)
       super

data/lib/influxer/metrics/quoting/timestamp.rb

@@ -2,24 +2,55 @@
 
 module Influxer
   module TimestampQuoting #:nodoc:
-    TIME_FACTOR = 1_000_000_000
+    TIME_FACTORS = {
+      'ns' => 1_000_000_000,
+      'ms' => 1_000,
+      's' => 1
+    }.freeze
 
-    # Quote timestamp as ns
-    # rubocop: disable Metrics/AbcSize, Metrics/MethodLength
+    DEFAULT_PRECISION = 'ns'
+
+    # Quote timestamp
+    # rubocop: disable Metrics/MethodLength, Metrics/AbcSize
     def quote_timestamp(val, client)
-      return val unless client.time_precision == 'ns'
+      if Influxer.config.time_duration_suffix_enabled
+        precision = if TIME_FACTORS.keys.include?(client.time_precision)
+                      client.time_precision
+                    else
+                      DEFAULT_PRECISION
+                    end
+        return quote_timestamp_with_suffix(val, precision)
+      end
+
+      if !TIME_FACTORS.keys.include?(client.time_precision) &&
+         !val.is_a?(Numeric)
+        warn(
+          "Influxer doesn't automatically cast Time and String values " \
+          "to '#{client.time_precision}' precision. " \
+          "Please, convert to numeric value yourself"
+        )
+        return val
+      end
+
+      factorize_timestamp(val, TIME_FACTORS.fetch(client.time_precision))
+    end
+    # rubocop: enable Metrics/MethodLength, Metrics/AbcSize
+
+    def quote_timestamp_with_suffix(val, precision)
+      "#{factorize_timestamp(val, TIME_FACTORS.fetch(precision))}#{precision}"
+    end
 
+    def factorize_timestamp(val, factor)
       case val
       when Numeric
-        val.to_i.to_s.ljust(19, '0').to_i
+        (val.to_f * factor).to_i
       when String
-        (Time.parse(val).to_r * TIME_FACTOR).to_i
+        (Time.parse(val).to_r * factor).to_i
       when Date, DateTime
-        (val.to_time.to_r * TIME_FACTOR).to_i
+        (val.to_time.to_r * factor).to_i
       when Time
-        (val.to_r * TIME_FACTOR).to_i
+        (val.to_r * factor).to_i
       end
     end
-    # rubocop: enable Metrics/AbcSize, Metrics/MethodLength
   end
 end

data/lib/influxer/metrics/relation.rb

@@ -268,17 +268,15 @@ module Influxer
       self
     end
 
-    # rubocop: disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def quoted(val, key = nil)
       if val.is_a?(String) || val.is_a?(Symbol) || @klass.tag?(key)
         "'#{val}'"
-      elsif val.is_a?(Time) || val.is_a?(Date) || val.is_a?(DateTime)
+      elsif key.to_s == "time"
         quote_timestamp val, @instance.client
       else
         val.to_s
       end
     end
-    # rubocop: enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     def get_points(list)
       return list if normalized?

data/lib/influxer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Influxer # :nodoc:
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/spec/metrics/relation_spec.rb

@@ -69,7 +69,7 @@ describe Influxer::Relation, :query do
     describe "#where" do
       it "generate valid conditions from hash" do
         Timecop.freeze(Time.now)
-        expect(rel.where(user_id: 1, dummy: 'q', timer: Time.now).to_sql).to eq "select * from \"dummy\" where (user_id = 1) and (dummy = 'q') and (timer = #{(Time.now.to_r * 1_000_000_000).to_i})"
+        expect(rel.where(user_id: 1, dummy: 'q', time: Time.now).to_sql).to eq "select * from \"dummy\" where (user_id = 1) and (dummy = 'q') and (time = #{(Time.now.to_r * 1_000_000_000).to_i})"
       end
 
       it "generate valid conditions from strings" do
@@ -81,11 +81,11 @@ describe Influxer::Relation, :query do
       end
 
       it "handle dates" do
-        expect(rel.where(timer: Date.new(2015)).to_sql).to eq "select * from \"dummy\" where (timer = #{(Date.new(2015).to_time.to_r * 1_000_000_000).to_i})"
+        expect(rel.where(time: Date.new(2015)).to_sql).to eq "select * from \"dummy\" where (time = #{(Date.new(2015).to_time.to_r * 1_000_000_000).to_i})"
       end
 
       it "handle date times" do
-        expect(rel.where(timer: DateTime.new(2015)).to_sql).to eq "select * from \"dummy\" where (timer = #{(DateTime.new(2015).to_time.to_r * 1_000_000_000).to_i})"
+        expect(rel.where(time: DateTime.new(2015)).to_sql).to eq "select * from \"dummy\" where (time = #{(DateTime.new(2015).to_time.to_r * 1_000_000_000).to_i})"
       end
 
       it "handle inclusive ranges" do
@@ -105,6 +105,58 @@ describe Influxer::Relation, :query do
         expect(rel.to_a).to eq []
       end
 
+      context "with timestamp duration" do
+        around do |ex|
+          old_duration = Influxer.config.time_duration_suffix_enabled
+          Influxer.config.time_duration_suffix_enabled = true
+          ex.run
+          Influxer.config.time_duration_suffix_enabled = old_duration
+        end
+
+        it "adds ns suffix to times" do
+          expect(rel.where(time: DateTime.new(2015)).to_sql).to eq "select * from \"dummy\" where (time = #{(DateTime.new(2015).to_time.to_r * 1_000_000_000).to_i}ns)"
+        end
+
+        context "with different time_precision" do
+          around do |ex|
+            old_precision = Influxer.config.time_precision
+            Influxer.config.time_precision = 's'
+            ex.run
+            Influxer.config.time_precision = old_precision
+          end
+
+          it "adds s suffix to times" do
+            expect(rel.where(time: DateTime.new(2015)).to_sql).to eq "select * from \"dummy\" where (time = #{DateTime.new(2015).to_time.to_i}s)"
+          end
+        end
+
+        context "with unsupported time_precision" do
+          around do |ex|
+            old_precision = Influxer.config.time_precision
+            Influxer.config.time_precision = 'h'
+            ex.run
+            Influxer.config.time_precision = old_precision
+          end
+
+          it "casts to ns with suffix" do
+            expect(rel.where(time: DateTime.new(2015)).to_sql).to eq "select * from \"dummy\" where (time = #{(DateTime.new(2015).to_time.to_r * 1_000_000_000).to_i}ns)"
+          end
+        end
+      end
+
+      context "with different time_precision" do
+        around do |ex|
+          old_precision = Influxer.config.time_precision
+          Influxer.config.time_precision = 's'
+          ex.run
+          Influxer.config.time_precision = old_precision
+        end
+
+        it "casts to correct numeric representation" do
+          expect(rel.where(time: DateTime.new(2015)).to_sql).to eq "select * from \"dummy\" where (time = #{DateTime.new(2015).to_time.to_i})"
+        end
+      end
+
       context "with tags" do
         it "integer tag values" do
           expect(rel.where(dummy_id: 10).to_sql).to eq "select * from \"dummy\" where (dummy_id = '10')"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel