influxer 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7088f24ca98f504a152e38aff5f5ccc895eef65f1916aa5986bc425d9ef2d532
-  data.tar.gz: 733e79c1bc8f7023fcb23032f519b7cfe5b7a61e373b1e7b213a821adcb29c43
+  metadata.gz: c454bccdf9c3272a5d359f23a8788a77c3b4a8475db929af0958eec10f5ca9b0
+  data.tar.gz: 2251b0e2015c90c1e1dbfd7bb3eb80d1838f4b16f897ebad8ac2b390e2c370fd
 SHA512:
-  metadata.gz: 9f4217519c7c72281f1ed91fe9a22134a89be30f1e473f1ac06fc227599403d0b0d0938da7ebbbcc5f3e1c98f13916c560fb6692edbf59360d883be92766e65e
-  data.tar.gz: 9e88838a7c84d1ac73be7a583e4bebcc73c48ef22f3bdab12eab0adce32350bb694094c6833a2c38089524d7c88dc58fb8917ba35a74c9e353a7c2a809ab2bfc
+  metadata.gz: 7ad48550cca618b24d924856782ab1fe0af754c36e4eb340ccbde6976c467de958e1fa2b85fe040501140e6bf6935358e0bad59f9c202bd94e780c073bc63623
+  data.tar.gz: 7bbb917021cedd9a6e23a9ff635d9fa3b0e93a28cf5c9312806a9d471af6ed342e0424372d8cae843ad6c6c95aeb813f755d54a741d7b2db4d4cbbde3865433b

data/.rubocop.yml

@@ -9,6 +9,7 @@ AllCops:
     - 'spec/dummy/**/*'
     - 'vendor/**/*'
     - 'gemfiles/vendor/**/*'
+    - '**/*.gemfile'
     - Gemfile
     - Rakefile
   DisplayCopNames: true
@@ -18,6 +19,9 @@ AllCops:
 Rails:
   Enabled: false
 
+Bundler/OrderedGems:
+  Enabled: false
+
 Style/SymbolArray:
   Enabled: false
 

data/Changelog.md

@@ -2,6 +2,18 @@
 
 ## master
 
+## 1.1.6
+
+- [Fixes [#41](https://github.com/palkan/influxer/issues/41)] Fix query building with empty arrays in `where` clause ([@dimiii][])
+
+  [PR](https://github.com/palkan/influxer/pull/44)
+   
+  **BREAKING:** `where.not` now returns non-empty result for an empty array.
+
+- Support of year alias in queries ([@dimiii][])
+
+- [Fixes [#40](https://github.com/palkan/influxer/issues/40)] Avoid adding precision suffix to write queries. ([@palkan][])
+
 ## 1.1.5
 
 - [Fixes [#37](https://github.com/palkan/influxer/issues/37)] Timestamp ranges are quoted again. ([@jklimke][])
@@ -113,4 +125,5 @@ end
 
 [@palkan]: https://github.com/palkan
 [@MPursche]: https://github.com/MPursche
-[@jklimke]: https://github.com/jklimke
+[@jklimke]: https://github.com/jklimke
+[@dimiii]: https://github.com/dimiii

data/influxer.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 
 require "influxer/version"
 

data/lib/influxer/metrics/metrics.rb

@@ -18,7 +18,6 @@ module Influxer
     else
       include ActiveModel::Model
     end
-    # rubocop:enable Style/MixinUsage
 
     include ActiveModel::Validations
     extend ActiveModel::Callbacks
@@ -225,10 +224,8 @@ module Influxer
     end
 
     def parsed_timestamp
-      quote_timestamp @timestamp, client
+      quote_timestamp_for_write @timestamp, client
     end
-    # rubocop:enable Metrics/MethodLength
-    # rubocop:enable Metrics/AbcSize
 
     def unquote(name)
       name.gsub(/(\A['"]|['"]\z)/, '')

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

@@ -40,6 +40,18 @@ module Influxer
       "#{factorize_timestamp(val, TIME_FACTORS.fetch(precision))}#{precision}"
     end
 
+    def quote_timestamp_for_write(val, client)
+      if !TIME_FACTORS.keys.include?(client.time_precision) &&
+         !val.is_a?(Numeric)
+        raise ArgumentError,
+              "Influxer doesn't support quoting #{val} " \
+              " with '#{client.time_precision}' precision. " \
+              "Please, convert to numeric value yourself"
+      end
+
+      factorize_timestamp(val, TIME_FACTORS.fetch(client.time_precision))
+    end
+
     def factorize_timestamp(val, factor)
       case val
       when Numeric

data/lib/influxer/metrics/relation/time_query.rb

@@ -10,7 +10,8 @@ module Influxer
       u: '1u',
       week: '1w',
       day: '1d',
-      month: '30d'
+      month: '30d',
+      year: '365d'
     }.freeze
 
     FILL_RESERVED = %i[null previous none].freeze

data/lib/influxer/metrics/relation/where_clause.rb

@@ -59,7 +59,7 @@ module Influxer
       when Regexp
         "#{key}#{negate ? ' !~ ' : ' =~ '}#{val.inspect}"
       when Array
-        return build_none if val.empty?
+        return build_none(negate) if val.empty?
         build_in(key, val, negate)
       when Range
         build_range(key, val, negate)
@@ -98,9 +98,9 @@ module Influxer
     end
     # rubocop: enable Metrics/AbcSize, Metrics/MethodLength, Style/IfInsideElse
 
-    def build_none
-      @null_relation = true
-      build_eql(1, 0, false)
+    def build_none(negate = false)
+      @null_relation = !negate
+      negate ? 'time >= 0' : 'time < 0'
     end
   end
 end

data/lib/influxer/version.rb

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

data/spec/metrics/metrics_spec.rb

@@ -269,6 +269,52 @@ describe Influxer::Metrics, :query do
       expect(point.timestamp).to eq(timestamp_test)
     end
 
+    context "with non-default precision", precision: :s do
+      it "test write timestamp with the specified precision" do
+        base_time = Time.now
+        timestamp_test = base_time.to_s
+        expected_time = base_time.to_i
+
+        expect(client)
+          .to receive(:write_point).with(
+            "dummies",
+            { tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: expected_time },
+            nil,
+            nil,
+            nil
+          )
+
+        point = dummy_metrics.write(user_id: 1, dummy_id: 2, host: 'test', timestamp: timestamp_test)
+        expect(point.persisted?).to be_truthy
+        expect(point.user_id).to eq 1
+        expect(point.dummy_id).to eq 2
+        expect(point.timestamp).to eq(timestamp_test)
+      end
+    end
+
+    context "when duration suffix is enabled", :duration_suffix do
+      it "test write timestamp without suffix" do
+        base_time = Time.now
+        timestamp_test = base_time.to_s
+        expected_time = (base_time.to_i * 1_000_000_000).to_i
+
+        expect(client)
+          .to receive(:write_point).with(
+            "dummies",
+            { tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: expected_time },
+            nil,
+            nil,
+            nil
+          )
+
+        point = dummy_metrics.write(user_id: 1, dummy_id: 2, host: 'test', timestamp: timestamp_test)
+        expect(point.persisted?).to be_truthy
+        expect(point.user_id).to eq 1
+        expect(point.dummy_id).to eq 2
+        expect(point.timestamp).to eq(timestamp_test)
+      end
+    end
+
     it "doesn't write data and return false if invalid" do
       expect(client).not_to receive(:write_point)
       expect(DummyMetrics.write(dummy_id: 2)).to be false

data/spec/metrics/relation_spec.rb

@@ -109,30 +109,16 @@ describe Influxer::Relation, :query do
       end
 
       it "handle empty arrays", :aggregate_failures do
-        expect(rel.where(user_id: []).to_sql).to eq "select * from \"dummy\" where (1 = 0)"
+        expect(rel.where(user_id: []).to_sql).to eq "select * from \"dummy\" where (time < 0)"
         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
-
+      context "with timestamp duration", :duration_suffix do
         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
-
+        context "with different time_precision", precision: :s do
           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
@@ -152,14 +138,7 @@ describe Influxer::Relation, :query do
         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
-
+      context "with different time_precision", precision: :s do
         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
@@ -202,8 +181,7 @@ describe Influxer::Relation, :query do
       end
 
       it "handle empty arrays", :aggregate_failures do
-        expect(rel.where.not(user_id: []).to_sql).to eq "select * from \"dummy\" where (1 = 0)"
-        expect(rel.to_a).to eq []
+        expect(rel.where.not(user_id: []).to_sql).to eq "select * from \"dummy\" where (time >= 0)"
       end
 
       context "with tags" do
@@ -215,13 +193,13 @@ describe Influxer::Relation, :query do
 
     describe "#none" do
       it "returns empty array", :aggregate_failures do
-        expect(rel.none.to_sql).to eq "select * from \"dummy\" where (1 = 0)"
+        expect(rel.none.to_sql).to eq "select * from \"dummy\" where (time < 0)"
         expect(rel.to_a).to eq []
       end
 
       it "works with chaining", :aggregate_failures do
         expect(rel.none.where.not(user_id: 1, dummy: :a).to_sql)
-          .to eq "select * from \"dummy\" where (1 = 0) and (user_id <> 1) and (dummy <> 'a')"
+          .to eq "select * from \"dummy\" where (time < 0) and (user_id <> 1) and (dummy <> 'a')"
         expect(rel.to_a).to eq []
       end
     end
@@ -288,6 +266,10 @@ describe Influxer::Relation, :query do
           expect(rel.time(:month).to_sql).to eq "select * from \"dummy\" group by time(30d)"
         end
 
+        it "group by year" do
+          expect(rel.time(:year).to_sql).to eq "select * from \"dummy\" group by time(365d)"
+        end
+
         it "group by hour and fill" do
           expect(rel.time(:month, fill: 0).to_sql).to eq "select * from \"dummy\" group by time(30d) fill(0)"
         end

data/spec/support/shared_contexts/shared_precision.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+shared_context "precision:seconds", precision: :s do
+  around do |ex|
+    old_precision = Influxer.config.time_precision
+    Influxer.config.time_precision = 's'
+    ex.run
+    Influxer.config.time_precision = old_precision
+  end
+end
+
+shared_context "with_duration_suffix", duration_suffix: true 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
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -232,6 +232,7 @@ files:
 - spec/support/metrics/dummy_metrics.rb
 - spec/support/metrics/user_metrics.rb
 - spec/support/metrics/visits_metrics.rb
+- spec/support/shared_contexts/shared_precision.rb
 - spec/support/shared_contexts/shared_query.rb
 - spec/support/user.rb
 homepage: http://github.com/palkan/influxer