influxer 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a98e49b2f7085c5e01dcdfa21cc136a6f7907ee6
-  data.tar.gz: 86846f099e3a62cb83804fc1ea362c185add8992
+  metadata.gz: 36dc815f87b5baba491093838e46cf60537af9eb
+  data.tar.gz: 3149c0e7950e1986bfefeb78cec5bf8e3b334596
 SHA512:
-  metadata.gz: ce0f7ee3f32f256bc425cad1109333d27d52b7155e19f2dd8b92ba7cef8fb2496ad82ea292ac65cf9487402c7c580e4b734d151ca05f06e8c5cc4de9fa815f01
-  data.tar.gz: cf48787c5ee242c0c35413e92bcad1f4b74a8f9f974b5041f54872db0d21cd56e7d0ef42cb6ab9964ca7fcaad4bf06f69f0d45af37e1a3877f9141bb049794de
+  metadata.gz: 9555072584dbcb205fafdf5f82615430d729a8e7b56962bda588c1b8319b3c5e2b6a07c238705bb1bec8737b39d85852e63d8dd3bdbd0a7483ba441bb512e806
+  data.tar.gz: b2b26a45612366170dba61278e5fb3fbeb0ae56b802bf652b8db90fcf4b63372eb3a33386d791fb605c3668a27b3e399001a608df4a156e4755fb15dbfb36f96

data/.rubocop.yml

@@ -37,6 +37,10 @@ Style/Documentation:
 Style/StringLiterals: 
   Enabled: false
 
+Style/DateTime:
+  Exclude:
+    - 'spec/**/*.rb'
+
 Naming/SpaceInsideStringInterpolation:
   EnforcedStyle: no_space
 

data/Changelog.md

@@ -1,5 +1,21 @@
 # Change log
 
+## master
+
+## 1.1.2
+
+- Support exclusive ranges as `where` arguments. ([@MPursche][])
+
+```ruby
+# range including the end
+where(a: 1..4)
+#=> ... WHERE a >= 1 AND a <= 4
+
+#range excluding the end
+where(a: 1...4)
+#=> ... WHERE a >= 1 AND a < 4
+```
+
 ## 1.1.1
 
 - [Fixes [#31](https://github.com/palkan/influxer/issues/31)] Fix bug with empty arrays in `where` clause
@@ -81,4 +97,7 @@ end
 - Add `delete_all` support
 - Add cache support (using `Rails.cache`)
 - Scopes (default and named)
-- Support for fanout series
+- Support for fanout series
+
+[@palkan]: https://github.com/palkan
+[@MPursche]: https://github.com/MPursche

data/lib/influxer/metrics/metrics.rb

@@ -2,6 +2,7 @@
 
 require 'influxer/metrics/relation'
 require 'influxer/metrics/scoping'
+require 'influxer/metrics/quoting/timestamp'
 require 'influxer/metrics/active_model3/model'
 
 module Influxer
@@ -12,8 +13,6 @@ module Influxer
   # rubocop:disable Metrics/ClassLength
   class Metrics
     TIME_FACTOR = 1_000_000_000
-
-    # rubocop:disable Style/MixinUsage
     if Influxer.active_model3?
       include Influxer::ActiveModel3::Model
     else
@@ -25,6 +24,7 @@ module Influxer
     extend ActiveModel::Callbacks
 
     include Influxer::Scoping
+    include Influxer::TimestampQuoting
 
     define_model_callbacks :write
 
@@ -224,21 +224,8 @@ module Influxer
                          self.class.database)
     end
 
-    # rubocop:disable Metrics/MethodLength
-    # rubocop:disable Metrics/AbcSize
     def parsed_timestamp
-      return @timestamp unless client.time_precision == 'ns'
-
-      case @timestamp
-      when Numeric
-        @timestamp.to_i.to_s.ljust(19, '0').to_i
-      when String
-        (Time.parse(@timestamp).to_r * TIME_FACTOR).to_i
-      when Date
-        (@timestamp.to_time.to_r * TIME_FACTOR).to_i
-      when Time
-        (@timestamp.to_r * TIME_FACTOR).to_i
-      end
+      quote_timestamp @timestamp, client
     end
     # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/AbcSize

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Influxer
+  module TimestampQuoting #:nodoc:
+    TIME_FACTOR = 1_000_000_000
+
+    # Quote timestamp as ns
+    # rubocop: disable Metrics/AbcSize, Metrics/MethodLength
+    def quote_timestamp(val, client)
+      return val unless client.time_precision == 'ns'
+
+      case val
+      when Numeric
+        val.to_i.to_s.ljust(19, '0').to_i
+      when String
+        (Time.parse(val).to_r * TIME_FACTOR).to_i
+      when Date, DateTime
+        (val.to_time.to_r * TIME_FACTOR).to_i
+      when Time
+        (val.to_r * TIME_FACTOR).to_i
+      end
+    end
+    # rubocop: enable Metrics/AbcSize, Metrics/MethodLength
+  end
+end

data/lib/influxer/metrics/relation.rb

@@ -4,6 +4,7 @@ require 'active_support/core_ext/module/delegation'
 require 'influxer/metrics/relation/time_query'
 require 'influxer/metrics/relation/calculations'
 require 'influxer/metrics/relation/where_clause'
+require 'influxer/metrics/quoting/timestamp'
 
 module Influxer
   # Relation is used to build queries
@@ -11,6 +12,7 @@ module Influxer
   class Relation
     include Influxer::TimeQuery
     include Influxer::Calculations
+    include Influxer::TimestampQuoting
     prepend Influxer::WhereClause
 
     attr_reader :values
@@ -266,15 +268,17 @@ 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?(DateTime)
-        "#{val.to_i}s"
+      elsif val.is_a?(Time) || val.is_a?(Date) || val.is_a?(DateTime)
+        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/metrics/relation/where_clause.rb

@@ -78,13 +78,25 @@ module Influxer
       buf.join(negate ? ' and ' : ' or ').to_s
     end
 
+    # rubocop: disable Metrics/AbcSize, Metrics/MethodLength, Style/IfInsideElse
     def build_range(key, val, negate)
-      if negate
-        "#{key} < #{quoted(val.begin)} or #{key} > #{quoted(val.end)}"
+      if val.exclude_end?
+        # begin...end range
+        if negate
+          "#{key} < #{quoted(val.begin)} or #{key} >= #{quoted(val.end)}"
+        else
+          "#{key} >= #{quoted(val.begin)} and #{key} < #{quoted(val.end)}"
+        end
       else
-        "#{key} > #{quoted(val.begin)} and #{key} < #{quoted(val.end)}"
+        # begin..end range
+        if negate
+          "#{key} < #{quoted(val.begin)} or #{key} > #{quoted(val.end)}"
+        else
+          "#{key} >= #{quoted(val.begin)} and #{key} <= #{quoted(val.end)}"
+        end
       end
     end
+    # rubocop: enable Metrics/AbcSize, Metrics/MethodLength, Style/IfInsideElse
 
     def build_none
       @null_relation = true

data/lib/influxer/version.rb

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

data/spec/metrics/relation_spec.rb

@@ -67,9 +67,9 @@ describe Influxer::Relation, :query do
     end
 
     describe "#where" do
-      it "sgenerate valid conditions from hash" 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_i}s)"
+        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})"
       end
 
       it "generate valid conditions from strings" do
@@ -80,8 +80,20 @@ describe Influxer::Relation, :query do
         expect(rel.where(user_id: 1, dummy: /^du.*/).to_sql).to eq "select * from \"dummy\" where (user_id = 1) and (dummy =~ /^du.*/)"
       end
 
-      it "handle ranges" do
-        expect(rel.where(user_id: 1..4).to_sql).to eq "select * from \"dummy\" where (user_id > 1 and user_id < 4)"
+      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})"
+      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})"
+      end
+
+      it "handle inclusive ranges" do
+        expect(rel.where(user_id: 1..4).to_sql).to eq "select * from \"dummy\" where (user_id >= 1 and user_id <= 4)"
+      end
+
+      it "handle exclusive range" do
+        expect(rel.where(user_id: 1...4).to_sql).to eq "select * from \"dummy\" where (user_id >= 1 and user_id < 4)"
       end
 
       it "handle arrays" do
@@ -117,10 +129,14 @@ describe Influxer::Relation, :query do
         expect(rel.where.not(user_id: 1, dummy: /^du.*/).to_sql).to eq "select * from \"dummy\" where (user_id <> 1) and (dummy !~ /^du.*/)"
       end
 
-      it "handle ranges" do
+      it "handle inclusive ranges" do
         expect(rel.where.not(user_id: 1..4).to_sql).to eq "select * from \"dummy\" where (user_id < 1 or user_id > 4)"
       end
 
+      it "handle exclusive ranges" do
+        expect(rel.where.not(user_id: 1...4).to_sql).to eq "select * from \"dummy\" where (user_id < 1 or user_id >= 4)"
+      end
+
       it "handle arrays" 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-25 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -204,6 +204,7 @@ files:
 - lib/influxer/engine.rb
 - lib/influxer/metrics/active_model3/model.rb
 - lib/influxer/metrics/metrics.rb
+- lib/influxer/metrics/quoting/timestamp.rb
 - lib/influxer/metrics/relation.rb
 - lib/influxer/metrics/relation/calculations.rb
 - lib/influxer/metrics/relation/time_query.rb