influxer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb2769b10dc827cd4fbf01f688ab5a51dc2c20c2
-  data.tar.gz: 6000427c5b89ce0e298d0eeef6c5d2a98d59976b
+  metadata.gz: c7fc8c72105e35542e5c818fa97fc55b49c6c068
+  data.tar.gz: eb461ecfc644cdf6a34789d940398ceda66c418e
 SHA512:
-  metadata.gz: 5029154e957eaf73936e4891181cc542b18b0982b76cdcb81be9b3a4f9f9b6699c63dcddd6f5dda3541e5c36ac39b965cdbc9fbc47ad0a8599a3435ede15ea1b
-  data.tar.gz: a5f4e65fa1e7a723251437980335b29d8383c079c39a5ea55405325db3fc7b6c27408ac2c1136bafff25cc81792ee8ceb6f0ad209637e94d765777423f2f498f
+  metadata.gz: d470618c9e5f329ba66ba8f1c9da6ba330075c6ee5be825f527c0feab3c3995827b44a5a92fd3f133456896df4b25417b42f2abc2197702117930572d36d8c64
+  data.tar.gz: 425b73368fafb1ff3e82dc6bab1ab005ab14ce9a2e1aac623359feb8eac763660aa13697a7dd3e8e9c018bfb6565b10109c66f7272fd34069ea4e38fdc35a830

data/Changelog.md

@@ -1,3 +1,7 @@
+## 0.5.0
+- Update `timestamp` support
+- Add `epoch` method
+
 ## 0.4.0
 - Rename default `time` attribute to `timestamp`
 

data/influxer.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "activemodel", '>= 4.0'
-  s.add_dependency "influxdb", "~> 0.2.2"
+  s.add_dependency "influxdb", "~> 0.2.3"
   s.add_dependency "anyway_config", "~>0.3.0"
 
   s.add_development_dependency "timecop"

data/lib/influxer/client.rb

@@ -7,9 +7,8 @@ module Influxer
       super Influxer.config.as_json.symbolize_keys!
     end
 
-    # Public #execute
-    def exec(sql)
-      execute(sql)
+    def time_precision
+      @config.time_precision
     end
   end
 end

data/lib/influxer/config.rb

@@ -27,6 +27,7 @@ module Influxer
                 :udp,
                 :async,
                 database: 'db',
+                time_precision: 'ns',
                 cache: false
 
     def load

data/lib/influxer/metrics/metrics.rb

@@ -9,6 +9,7 @@ module Influxer
   # Base class for InfluxDB querying and writing
   # rubocop:disable Metrics/ClassLength
   class Metrics
+    TIME_FACTOR = 1_000_000_000
     include ActiveModel::Model
     include ActiveModel::Validations
     extend ActiveModel::Callbacks
@@ -24,7 +25,7 @@ module Influxer
           [
             :write, :write!, :select, :where,
             :group, :time, :past, :since,
-            :limit, :offset, :fill, :delete_all
+            :limit, :offset, :fill, :delete_all, :epoch
           ] + Influxer::Calculations::CALCULATION_METHODS
         ),
         to: :all
@@ -108,6 +109,7 @@ module Influxer
     end
 
     delegate :tag_names, to: :class
+    attr_accessor :timestamp
 
     def initialize(attributes = {})
       @attributes = {}
@@ -132,7 +134,7 @@ module Influxer
     end
 
     def write_point
-      client.write_point unquote(series), values: values, tags: tags
+      client.write_point unquote(series), values: values, tags: tags, timestamp: parsed_timestamp
       @persisted = true
     end
 
@@ -162,10 +164,23 @@ module Influxer
       @attributes.select { |k, _| tag_names.include?(k.to_s) }
     end
 
-    attributes :timestamp
-
     private
 
+    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
+    end
+
     def unquote(name)
       name.gsub(/(\A['"]|['"]\z)/, '')
     end

data/lib/influxer/metrics/relation.rb

@@ -12,6 +12,8 @@ module Influxer
 
     attr_reader :values
 
+    SUPPORTED_EPOCH_FORMAT = [:h, :m, :s, :ms, :u, :ns]
+
     MULTI_VALUE_METHODS = [:select, :where, :group, :order]
 
     MULTI_KEY_METHODS = [:fanout]
@@ -109,6 +111,13 @@ module Influxer
       @values[:normalized] == true
     end
 
+    def epoch(val)
+      return self unless SUPPORTED_EPOCH_FORMAT.include? val
+
+      @values[:epoch] = val
+      self
+    end
+
     def order(val)
       case val
       when Hash
@@ -180,7 +189,7 @@ module Influxer
     end
 
     def load
-      @records = get_points(@instance.client.query(to_sql, denormalize: !normalized?))
+      @records = get_points(@instance.client.query(to_sql, denormalize: !normalized?, epoch: @values[:epoch]))
       @loaded = true
       @records
     end
@@ -194,7 +203,7 @@ module Influxer
 
       sql = sql.join " "
 
-      @instance.client.exec sql
+      @instance.client.query sql
     end
 
     def scoping

data/lib/influxer/version.rb

@@ -1,3 +1,3 @@
 module Influxer # :nodoc:
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/cases/points_spec.rb

@@ -4,7 +4,7 @@ describe DummyMetrics do
   before do
     stub_request(:get, "http://localhost:8086/query")
       .with(
-        query: { q: 'select * from "dummy"', u: "root", p: "root", precision: 's', db: 'db' }
+        query: { q: 'select * from "dummy"', u: "root", p: "root", precision: 'ns', db: 'db' }
       )
       .to_return(body: fixture_file)
   end

data/spec/metrics/metrics_spec.rb

@@ -61,7 +61,7 @@ describe Influxer::Metrics, :query do
       it "sets current time" do
         Timecop.freeze(Time.local(2015))
         dummy_metrics.write!
-        expect(dummy_metrics.timestamp).to eq Time.local(2015).to_i
+        expect(dummy_metrics.timestamp).to eq Time.local(2015)
       end
     end
   end
@@ -181,7 +181,7 @@ describe Influxer::Metrics, :query do
 
     it "write data and return point" do
       expect(client)
-        .to receive(:write_point).with("dummies", tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 })
+        .to receive(:write_point).with("dummies", tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: nil)
 
       point = dummy_metrics.write(user_id: 1, dummy_id: 2, host: 'test')
       expect(point.persisted?).to be_truthy
@@ -189,6 +189,34 @@ describe Influxer::Metrics, :query do
       expect(point.dummy_id).to eq 2
     end
 
+    it "test write data with time and return point" do
+      timestamp_test = Time.now
+      expected_time = (timestamp_test.to_r * 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)
+
+      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
+
+    it "test write data with string time" do
+      base_time = Time.now
+      timestamp_test = "#{base_time.to_s}"
+
+      expect(client).
+        to receive(:write_point).with("dummies", tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: (base_time.to_i * 1_000_000_000).to_i)
+
+      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
+
     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

@@ -294,6 +294,15 @@ describe Influxer::Relation, :query do
   end
 
   describe "#delete_all" do
+    it "client expects to execute query method" do
+      expected_query = "drop series from \"dummy\""
+
+      expect(client)
+        .to receive(:query).with(expected_query)
+
+      rel.delete_all
+    end
+
     it "without tags" do
       expect(rel.delete_all)
         .to eq "drop series from \"dummy\""
@@ -321,4 +330,41 @@ describe Influxer::Relation, :query do
       expect(rel.inspect).to eq "#<Influxer::Relation [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, ...]>"
     end
   end
+
+  describe "#epoch" do
+    it "format :h" do
+      expect(client).to receive(:query).with('select * from "dummy"', denormalize: true, epoch: :h).and_return []
+      DummyMetrics.epoch(:h).all.to_a
+    end
+
+    it "format :m" do
+      expect(client).to receive(:query).with('select * from "dummy"', denormalize: true, epoch: :m).and_return []
+      DummyMetrics.epoch(:m).all.to_a
+    end
+
+    it "format :s" do
+      expect(client).to receive(:query).with('select * from "dummy"', denormalize: true, epoch: :s).and_return []
+      DummyMetrics.epoch(:s).all.to_a
+    end
+
+    it "format :ms" do
+      expect(client).to receive(:query).with('select * from "dummy"', denormalize: true, epoch: :ms).and_return []
+      DummyMetrics.epoch(:ms).all.to_a
+    end
+
+    it "format :u" do
+      expect(client).to receive(:query).with('select * from "dummy"', denormalize: true, epoch: :u).and_return []
+      DummyMetrics.epoch(:u).all.to_a
+    end
+
+    it "format :ns" do
+      expect(client).to receive(:query).with('select * from "dummy"', denormalize: true, epoch: :ns).and_return []
+      DummyMetrics.epoch(:ns).all.to_a
+    end
+
+    it "invalid epoch format" do
+      expect(client).to receive(:query).with('select * from "dummy"', denormalize: true, epoch: nil).and_return []
+      DummyMetrics.epoch(:invalid).all.to_a
+    end
+  end
 end

data/spec/support/metrics/dummy_metrics.rb

@@ -4,7 +4,7 @@ class DummyMetrics < Influxer::Metrics # :nodoc:
 
   validates_presence_of :dummy_id, :user_id
 
-  before_write -> { self.timestamp = Time.now.to_i }
+  before_write -> { self.timestamp = Time.now }
 
   scope :calc, ->(method, *args) { send(method, *args) }
 end

data/spec/support/shared_contexts/shared_query.rb

@@ -7,9 +7,7 @@ shared_context "stub_query", :query do
       sql
     end
 
-    allow_any_instance_of(Influxer::Client).to receive(:exec) do |_, sql|
-      sql
-    end
+    allow_any_instance_of(InfluxDB::Client).to receive(:time_precision)
 
     allow_any_instance_of(InfluxDB::Client).to receive(:post)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: anyway_config
   requirement: !ruby/object:Gem::Requirement
@@ -238,3 +238,4 @@ signing_key:
 specification_version: 4
 summary: InfluxDB for Rails
 test_files: []
+has_rdoc: