influxer 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d8a3e1c19312557c99b513a074c2a1ca38fcb7
-  data.tar.gz: 9efb4e5a5ee1a3fa9f6aa7fef3d4f594266f67d1
+  metadata.gz: b97291ee91b0d574373b50fac3a33d6627b57091
+  data.tar.gz: c01bf416f9c8764c509d9e24498b3db71150db2a
 SHA512:
-  metadata.gz: 1aca8b3b8005ece22d5b37bd93c4fb4bee7a8ea6ca37609141292fc055c08576c0cb7b405072392fdcbccdd72181093b42dfbe569355c20f566dacd31f47d573
-  data.tar.gz: 5c4bcb485f464da23f9868c2042856e8f99fb7ea3c0f5d71eff590a2b5604940e8c74f25294ff685aa6748f37cac2040e6bc2cfb2957f01eb5cc4b73f61aff50
+  metadata.gz: 2eb6a6dc65620c2dd6ef6d6cff8ad25d524244b6b115e06ed3c689d55726dc10649f15b9054b429d4a96ac4f3a8dfa7cdd394479fd1bf008b1b0f27e19384a34
+  data.tar.gz: 6eb53b3436dba96464bb6d8ff06c48f424a38f6576ef596d6ff5a37a6ce1dbedf27b72df3d0d28c8f42cff2a8858335c1516447bed6df93796e997581f512cb2

data/Changelog.md

@@ -1,5 +1,11 @@
 # Change log
 
+## 1.1.1
+
+- [Fixes [#31](https://github.com/palkan/influxer/issues/31)] Fix bug with empty arrays in `where` clause
+
+- Introduce `Relation#none` method
+
 ## 1.1.0
 
 ### Features
@@ -18,7 +24,7 @@ end
 
 ### Fixes
 
-- [Fixes #30] Fix writing points with custom retention policy
+- [Fixes [#30](https://github.com/palkan/influxer/issues/30)] Fix writing points with custom retention policy
 
 ### Misc
 

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

@@ -13,6 +13,25 @@ module Influxer
       self
     end
 
+    def none
+      where_values << "(#{build_none})"
+      self
+    end
+
+    def loaded?
+      @null_relation || super
+    end
+
+    def reset
+      super
+      @null_relation = false
+    end
+
+    def load
+      return if @null_relation
+      super
+    end
+
     protected
 
     def build_where(args, hargs, negate)
@@ -40,6 +59,7 @@ module Influxer
       when Regexp
         "#{key}#{negate ? ' !~ ' : ' =~ '}#{val.inspect}"
       when Array
+        return build_none if val.empty?
         build_in(key, val, negate)
       when Range
         build_range(key, val, negate)
@@ -65,5 +85,10 @@ module Influxer
         "#{key} > #{quoted(val.begin)} and #{key} < #{quoted(val.end)}"
       end
     end
+
+    def build_none
+      @null_relation = true
+      build_eql(1, 0, false)
+    end
   end
 end

data/lib/influxer/metrics/relation.rb

@@ -11,7 +11,7 @@ module Influxer
   class Relation
     include Influxer::TimeQuery
     include Influxer::Calculations
-    include Influxer::WhereClause
+    prepend Influxer::WhereClause
 
     attr_reader :values
 
@@ -256,7 +256,7 @@ module Influxer
 
     def reset
       @values = {}
-      @records = nil
+      @records = []
       @loaded = false
       self
     end

data/lib/influxer/version.rb

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

data/spec/metrics/relation_spec.rb

@@ -88,6 +88,11 @@ describe Influxer::Relation, :query do
         expect(rel.where(user_id: [1, 2, 3]).to_sql).to eq "select * from \"dummy\" where (user_id = 1 or user_id = 2 or user_id = 3)"
       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.to_a).to eq []
+      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')"
@@ -120,6 +125,11 @@ describe Influxer::Relation, :query do
         expect(rel.where.not(user_id: [1, 2, 3]).to_sql).to eq "select * from \"dummy\" where (user_id <> 1 and user_id <> 2 and user_id <> 3)"
       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 []
+      end
+
       context "with tags" do
         it "nil value" do
           expect(rel.not(dummy_id: nil).to_sql).to eq "select * from \"dummy\" where (dummy_id =~ /.*/)"
@@ -127,6 +137,19 @@ describe Influxer::Relation, :query do
       end
     end
 
+    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.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')"
+        expect(rel.to_a).to eq []
+      end
+    end
+
     describe "#past" do
       it "work with predefined symbols" do
         expect(rel.past(:hour).to_sql).to eq "select * from \"dummy\" where (time > now() - 1h)"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-29 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel