influxer 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 34d7516d9e613074dcc24cf1c401bf69af544fa8
-  data.tar.gz: ea286c505a09b55058dc00fa05bebd1786c2de20
+SHA256:
+  metadata.gz: 7088f24ca98f504a152e38aff5f5ccc895eef65f1916aa5986bc425d9ef2d532
+  data.tar.gz: 733e79c1bc8f7023fcb23032f519b7cfe5b7a61e373b1e7b213a821adcb29c43
 SHA512:
-  metadata.gz: 96fbc0c09e0127c7be545ffab4e0108a9ea26c7d471678c74095d35ce55827103357ce584b371e86cdd82200ff0ea86a63fb1f4ff61890e6d841b59de1618d35
-  data.tar.gz: 5e580bcbfebb8ca2d731cd658e81d7cd418dc90a4e423aac8ea47d5cb06ccdd409b4e938d6752be4f9b5955bbcede839a004c3ee77dd7fd103c01471a51e1a22
+  metadata.gz: 9f4217519c7c72281f1ed91fe9a22134a89be30f1e473f1ac06fc227599403d0b0d0938da7ebbbcc5f3e1c98f13916c560fb6692edbf59360d883be92766e65e
+  data.tar.gz: 9e88838a7c84d1ac73be7a583e4bebcc73c48ef22f3bdab12eab0adce32350bb694094c6833a2c38089524d7c88dc58fb8917ba35a74c9e353a7c2a809ab2bfc

data/.travis.yml

@@ -4,7 +4,7 @@ matrix:
   include:
     - rvm: 2.2.1
       gemfile: gemfiles/rails32.gemfile
-    - rvm: 2.3.0
+    - rvm: 2.4.3
       gemfile: gemfiles/rails42.gemfile
-    - rvm: 2.3.1
+    - rvm: 2.5.0
       gemfile: gemfiles/rails5.gemfile

data/Changelog.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 1.1.5
+
+- [Fixes [#37](https://github.com/palkan/influxer/issues/37)] Timestamp ranges are quoted again. ([@jklimke][])
+
 ## 1.1.4
 
 - [Fixes [#35](https://github.com/palkan/influxer/issues/35)] Support time duration suffix and handle `'s'` and `'ms'` precisions. ([@palkan][])
@@ -109,3 +113,4 @@ end
 
 [@palkan]: https://github.com/palkan
 [@MPursche]: https://github.com/MPursche
+[@jklimke]: https://github.com/jklimke

data/README.md

@@ -3,48 +3,48 @@
 
 **NOTE**: Version 0.3.x supports InfluxDB >= 0.9.0. For InfluxDB 0.8.x use [version 0.2.5](https://github.com/palkan/influxer/tree/0.2.5).
 
-**NOTE**: Influxer is Rails 3, 4, 5 compatible!
+**NOTE**: Influxer is Rails 4+ compatible!
 
 Influxer provides an ActiveRecord-style way to work with [InfluxDB](https://influxdb.com/) with many useful features, such as:
 - Familar query language (use `select`, `where`, `not`, `group` etc).
 - Support for Regex conditions: `where(page_id: /^home\/.*/) #=> select * ... where page_id=~/^home\/.*/`.
 - Special query methods for InfluxDB: 
-    - `time` - group by time (e.g. `Metrics.time(:hour) => # select * ... group by time(1h)`);
-    - `past` - get only points for last hour/minute/whatever (e.g. `Metrics.past(:day) => # select * ... where time > now() - 1d`);
-    - `since` - get only points since date (e.g. `Metrics.since(Time.utc(2014,12,31)) => # select * ... where time > 1419984000s`);
-    - `merge` - merge series.
+  - `time` - group by time (e.g. `Metrics.time(:hour) => # select * ... group by time(1h)`);
+  - `past` - get only points for last hour/minute/whatever (e.g. `Metrics.past(:day) => # select * ... where time > now() - 1d`);
+  - `since` - get only points since date (e.g. `Metrics.since(Time.utc(2014,12,31)) => # select * ... where time > 1419984000s`);
+  - `merge` - merge series.
 - Scopes support
-    ```ruby
-    class Metrics < Influxer::Metrics
-        default_scope -> { time(:hour).limit(1000) }
-        tags :account_id
-        attributes :value
-        scope :unlimited, -> { limit(nil) }
-        scope :by_account, -> (id) { where(account_id: id) if id.present? }
-    end
-
-    Metrics.by_account(1)
-    # => select * from "metrics" group by time(1h) where account_id=1 limit 1000
-
-    Metrics.unlimited.by_account(1).time(:week)
-    # => select * from "metrics" group by time(1w) where account_id=1
-
-    ```
+  ```ruby
+  class Metrics < Influxer::Metrics
+    default_scope -> { time(:hour).limit(1000) }
+    tags :account_id
+    attributes :value
+    scope :unlimited, -> { limit(nil) }
+    scope :by_account, -> (id) { where(account_id: id) if id.present? }
+  end
+
+  Metrics.by_account(1)
+  # => select * from "metrics" group by time(1h) where account_id=1 limit 1000
+
+  Metrics.unlimited.by_account(1).time(:week)
+  # => select * from "metrics" group by time(1w) where account_id=1
+
+  ```
 - Integrate with your model:
-    ```ruby
-    class UserVisits < Influxer::Metrics
-    end
-    
-    class User < ActiveRecord::Base
-        has_metrics :visits
-    end
+  ```ruby
+  class UserVisits < Influxer::Metrics
+  end
+
+  class User < ActiveRecord::Base
+    has_metrics :visits
+  end
 
-    user = User.find(1)
-    user.visits.write(page_id: 'home')
-    #=> < creates point {user_id: 1, page_id: 'home'} in 'user_visits' series >
+  user = User.find(1)
+  user.visits.write(page_id: 'home')
+  #=> < creates point {user_id: 1, page_id: 'home'} in 'user_visits' series >
 
-    user.visits.where(page_id: 'home')
-    #=> select * from user_visits where page_id='home'
-    ```
+  user.visits.where(page_id: 'home')
+  #=> select * from user_visits where page_id='home'
+  ```
     
 Find more on [Wiki](https://github.com/palkan/influxer/wiki).

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

@@ -83,16 +83,16 @@ module Influxer
       if val.exclude_end?
         # begin...end range
         if negate
-          "#{key} < #{quoted(val.begin)} or #{key} >= #{quoted(val.end)}"
+          "#{key} < #{quoted(val.begin, key)} or #{key} >= #{quoted(val.end, key)}"
         else
-          "#{key} >= #{quoted(val.begin)} and #{key} < #{quoted(val.end)}"
+          "#{key} >= #{quoted(val.begin, key)} and #{key} < #{quoted(val.end, key)}"
         end
       else
         # begin..end range
         if negate
-          "#{key} < #{quoted(val.begin)} or #{key} > #{quoted(val.end)}"
+          "#{key} < #{quoted(val.begin, key)} or #{key} > #{quoted(val.end, key)}"
         else
-          "#{key} >= #{quoted(val.begin)} and #{key} <= #{quoted(val.end)}"
+          "#{key} >= #{quoted(val.begin, key)} and #{key} <= #{quoted(val.end, key)}"
         end
       end
     end

data/lib/influxer/version.rb

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

data/spec/metrics/relation_spec.rb

@@ -88,6 +88,14 @@ describe Influxer::Relation, :query 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})"
       end
 
+      it "handle date ranges" do
+        expect(rel.where(time: Date.new(2015)..Date.new(2016)).to_sql).to eq "select * from \"dummy\" where (time >= #{(Date.new(2015).to_time.to_r * 1_000_000_000).to_i} and time <= #{(Date.new(2016).to_time.to_r * 1_000_000_000).to_i})"
+      end
+
+      it "handle date time ranges" do
+        expect(rel.where(time: DateTime.new(2015)..DateTime.new(2016)).to_sql).to eq "select * from \"dummy\" where (time >= #{(DateTime.new(2015).to_time.to_r * 1_000_000_000).to_i} and time <= #{(DateTime.new(2016).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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: InfluxDB for Rails