influxer 1.1.6 → 1.2.0

data/spec/cases/write_points_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe "Write points" do
   before do
@@ -22,14 +22,14 @@ describe "Write points" do
 
   let(:point) { 'test,user_id=1 val="2"' }
 
-  subject { metrics_class.write! user_id: 1, val: '2' }
+  subject { metrics_class.write! user_id: 1, val: "2" }
 
   it "calls HTTP with correct params" do
     subject
     expect(
       a_request(:post, "http://localhost:8086/write")
       .with(
-        query: { u: "root", p: "root", precision: 'ns', db: 'db' },
+        query: {u: "root", p: "root", precision: "ns", db: "db"},
         body: point
       )
     ).to have_been_made
@@ -37,14 +37,14 @@ describe "Write points" do
 
   context "with retention policy" do
     it "calls HTTP with correct params" do
-      metrics_class.set_retention_policy 'yearly'
+      metrics_class.set_retention_policy "yearly"
 
       subject
 
       expect(
         a_request(:post, "http://localhost:8086/write")
         .with(
-          query: { u: "root", p: "root", precision: 'ns', db: 'db', rp: 'yearly' },
+          query: {u: "root", p: "root", precision: "ns", db: "db", rp: "yearly"},
           body: point
         )
       ).to have_been_made
@@ -53,14 +53,14 @@ describe "Write points" do
 
   context "with custom db" do
     it "calls HTTP with correct params" do
-      metrics_class.set_database 'another_db'
+      metrics_class.set_database "another_db"
 
       subject
 
       expect(
         a_request(:post, "http://localhost:8086/write")
         .with(
-          query: { u: "root", p: "root", precision: 'ns', db: 'another_db' },
+          query: {u: "root", p: "root", precision: "ns", db: "another_db"},
           body: point
         )
       ).to have_been_made
@@ -69,14 +69,14 @@ describe "Write points" do
 
   context "with custom db" do
     it "calls HTTP with correct params" do
-      metrics_class.set_precision 'ms'
+      metrics_class.set_precision "ms"
 
       subject
 
       expect(
         a_request(:post, "http://localhost:8086/write")
         .with(
-          query: { u: "root", p: "root", precision: 'ms', db: 'db' },
+          query: {u: "root", p: "root", precision: "ms", db: "db"},
           body: point
         )
       ).to have_been_made

data/spec/client_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Influxer::Client do
   let(:conf) { Influxer.config }
@@ -12,9 +12,9 @@ describe Influxer::Client do
     end
 
     it "passes config params" do
-      conf.username = 'admin'
+      conf.username = "admin"
       conf.port = 2222
-      expect(subject.config.username).to eq 'admin'
+      expect(subject.config.username).to eq "admin"
       expect(subject.config.port).to eq 2222
     end
   end
@@ -31,7 +31,7 @@ describe Influxer::Client do
     end
 
     it "should write data to cache with expiration" do
-      conf.cache = { expires_in: 90 }
+      conf.cache = {expires_in: 90}
 
       subject.query(q)
       expect(Rails.cache.exist?("influxer:listseries")).to be_truthy

data/spec/metrics/metrics_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Influxer::Metrics, :query do
   let(:metrics) { described_class.new }
@@ -96,7 +96,7 @@ describe Influxer::Metrics, :query do
 
     let(:dummy_metrics_3) do
       Class.new(described_class) do
-        set_series /^.*$/
+        set_series(/^.*$/)
       end
     end
 
@@ -128,7 +128,7 @@ describe Influxer::Metrics, :query do
     end
 
     it "sets series as regexp" do
-      expect(dummy_metrics_3.new.series).to eq '/^.*$/'
+      expect(dummy_metrics_3.new.series).to eq "/^.*$/"
     end
 
     it "quotes series" do
@@ -181,13 +181,13 @@ describe Influxer::Metrics, :query do
     end
 
     it "inherits tags" do
-      expect(dummy2.tag_names).to include('dummy_id', 'host', 'zone')
+      expect(dummy2.tag_names).to include("dummy_id", "host", "zone")
     end
 
     it "clones tags" do
       dummy1.tags :status
-      expect(dummy1.tag_names).to include('status')
-      expect(dummy2.tag_names).not_to include('status')
+      expect(dummy1.tag_names).to include("status")
+      expect(dummy2.tag_names).not_to include("status")
     end
   end
 
@@ -217,13 +217,13 @@ describe Influxer::Metrics, :query do
       expect(client)
         .to receive(:write_point).with(
           "dummies",
-          { tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: nil },
+          {tags: {dummy_id: 2, host: "test"}, values: {user_id: 1}, timestamp: nil},
           nil,
           nil,
           nil
         )
 
-      point = dummy_metrics.write(user_id: 1, dummy_id: 2, host: 'test')
+      point = dummy_metrics.write(user_id: 1, dummy_id: 2, host: "test")
       expect(point.persisted?).to be_truthy
       expect(point.user_id).to eq 1
       expect(point.dummy_id).to eq 2
@@ -236,13 +236,13 @@ describe Influxer::Metrics, :query do
       expect(client)
         .to receive(:write_point).with(
           "dummies",
-          { tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: expected_time },
+          {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)
+      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
@@ -256,13 +256,13 @@ describe Influxer::Metrics, :query do
       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 },
+          {tags: {dummy_id: 2, host: "test"}, values: {user_id: 1}, timestamp: (base_time.to_i * 1_000_000_000).to_i},
           nil,
           nil,
           nil
         )
 
-      point = dummy_metrics.write(user_id: 1, dummy_id: 2, host: 'test', timestamp: timestamp_test)
+      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
@@ -278,13 +278,13 @@ describe Influxer::Metrics, :query do
         expect(client)
           .to receive(:write_point).with(
             "dummies",
-            { tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: expected_time },
+            {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)
+        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
@@ -301,13 +301,13 @@ describe Influxer::Metrics, :query do
         expect(client)
           .to receive(:write_point).with(
             "dummies",
-            { tags: { dummy_id: 2, host: 'test' }, values: { user_id: 1 }, timestamp: expected_time },
+            {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)
+        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

data/spec/metrics/relation_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Influxer::Relation, :query do
   let(:rel) { Influxer::Relation.new DummyMetrics }
@@ -25,7 +25,7 @@ describe Influxer::Relation, :query do
 
   describe "#merge!" do
     it "merge multi values" do
-      r1 = rel.where(id: [1, 2], dummy: 'qwe').time(:hour)
+      r1 = rel.where(id: [1, 2], dummy: "qwe").time(:hour)
       r2 = Influxer::Relation.new(DummyMetrics).where.not(user_id: 0).group(:user_id).order(user_id: :asc)
       r1.merge!(r2)
       expect(r1.to_sql)
@@ -69,7 +69,7 @@ describe Influxer::Relation, :query do
     describe "#where" do
       it "generate valid conditions from hash" do
         Timecop.freeze(Time.now)
-        expect(rel.where(user_id: 1, dummy: 'q', time: Time.now).to_sql).to eq "select * from \"dummy\" where (user_id = 1) and (dummy = 'q') and (time = #{(Time.now.to_r * 1_000_000_000).to_i})"
+        expect(rel.where(user_id: 1, dummy: "q", time: Time.now).to_sql).to eq "select * from \"dummy\" where (user_id = 1) and (dummy = 'q') and (time = #{(Time.now.to_r * 1_000_000_000).to_i})"
       end
 
       it "generate valid conditions from strings" do
@@ -127,7 +127,7 @@ describe Influxer::Relation, :query do
         context "with unsupported time_precision" do
           around do |ex|
             old_precision = Influxer.config.time_precision
-            Influxer.config.time_precision = 'h'
+            Influxer.config.time_precision = "h"
             ex.run
             Influxer.config.time_precision = old_precision
           end
@@ -150,7 +150,7 @@ describe Influxer::Relation, :query do
         end
 
         it "array tag values" do
-          expect(rel.where(dummy_id: [10, 'some']).to_sql).to eq "select * from \"dummy\" where (dummy_id = '10' or dummy_id = 'some')"
+          expect(rel.where(dummy_id: [10, "some"]).to_sql).to eq "select * from \"dummy\" where (dummy_id = '10' or dummy_id = 'some')"
         end
 
         it "nil value" do
@@ -300,7 +300,7 @@ describe Influxer::Relation, :query do
       end
 
       it "generate order from string" do
-        expect(rel.order('cpu desc, val asc').to_sql).to eq "select * from \"dummy\" order by cpu desc, val asc"
+        expect(rel.order("cpu desc, val asc").to_sql).to eq "select * from \"dummy\" order by cpu desc, val asc"
       end
     end
 
@@ -346,18 +346,18 @@ describe Influxer::Relation, :query do
 
       context "with aliases" do
         it "select count as alias" do
-          expect(rel.count(:val, 'total').to_sql).to eq "select count(val) as total from \"dummy\""
+          expect(rel.count(:val, "total").to_sql).to eq "select count(val) as total from \"dummy\""
         end
 
         it "select percentile as alias" do
-          expect(rel.percentile(:val, 90, 'p1').to_sql).to eq "select percentile(val, 90) as p1 from \"dummy\""
+          expect(rel.percentile(:val, 90, "p1").to_sql).to eq "select percentile(val, 90) as p1 from \"dummy\""
         end
       end
     end
 
     context "complex queries" do
       it "group + where" do
-        expect(rel.count('user_id').group(:traffic_source).fill(0).where(user_id: 123).past('28d').to_sql)
+        expect(rel.count("user_id").group(:traffic_source).fill(0).where(user_id: 123).past("28d").to_sql)
           .to eq "select count(user_id) from \"dummy\" where (user_id = 123) and (time > now() - 28d) " \
                  "group by traffic_source fill(0)"
       end
@@ -378,7 +378,7 @@ describe Influxer::Relation, :query do
 
   describe "#empty?" do
     it "return false if has points" do
-      allow(client).to receive(:query) { [{ "values" => [{ time: 1, id: 2 }] }] }
+      allow(client).to receive(:query) { [{"values" => [{time: 1, id: 2}]}] }
       expect(rel.empty?).to be_falsey
       expect(rel.present?).to be_truthy
     end
@@ -406,7 +406,7 @@ describe Influxer::Relation, :query do
     end
 
     it "with tags" do
-      expect(rel.where(dummy_id: 1, host: 'eu').delete_all)
+      expect(rel.where(dummy_id: 1, host: "eu").delete_all)
         .to eq "drop series from \"dummy\" where (dummy_id = '1') and (host = 'eu')"
     end
   end

data/spec/metrics/scoping_spec.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Influxer::Metrics, :query do
   let(:klass) do
     Class.new(Influxer::Metrics) do
-      set_series 'dummy'
+      set_series "dummy"
     end
   end
 

data/spec/model/user_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
 describe User do
-  let(:user) { described_class.create age: 20, gender: 1, email: 'user@example.com' }
+  let(:user) { described_class.create age: 20, gender: 1, email: "user@example.com" }
   subject { user }
 
   specify { is_expected.to respond_to :metrics }

data/spec/spec_helper.rb

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-ENV["RAILS_ENV"] ||= 'test'
+ENV["RAILS_ENV"] ||= "test"
 
-if ENV['COVER']
-  require 'simplecov'
-  SimpleCov.root File.join(File.dirname(__FILE__), '..')
-  SimpleCov.start
+require "rspec"
+require "webmock/rspec"
+
+begin
+  require "pry-byebug"
+rescue LoadError # rubocop:disable Lint/HandleExceptions
 end
 
-require 'rspec'
-require "webmock/rspec"
-require 'pry-byebug'
-require 'timecop'
+require "timecop"
 
-require 'active_record'
-require 'sqlite3'
+require "active_record"
+require "sqlite3"
 
 require "influxer"
 
@@ -33,7 +32,7 @@ class Rails
     end
 
     def env
-      'test'
+      "test"
     end
   end
 end
@@ -42,7 +41,7 @@ require "influxer/rails/client"
 
 ActiveRecord::Base.send :include, Influxer::Model
 
-ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
 
 Dir["#{File.dirname(__FILE__)}/support/metrics/*.rb"].each { |f| require f }
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/spec/support/shared_contexts/shared_precision.rb

@@ -3,7 +3,7 @@
 shared_context "precision:seconds", precision: :s do
   around do |ex|
     old_precision = Influxer.config.time_precision
-    Influxer.config.time_precision = 's'
+    Influxer.config.time_precision = "s"
     ex.run
     Influxer.config.time_precision = old_precision
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxer
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Vlad Dem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -42,14 +42,14 @@ dependencies:
   name: anyway_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,61 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.39
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.39
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-md
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
 description: InfluxDB the Rails way
 email:
 - dementiev.vm@gmail.com
@@ -194,9 +152,11 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- bin/console
 - gemfiles/rails32.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails5.gemfile
+- gemfiles/rails6.gemfile
 - influxer.gemspec
 - lib/influxer.rb
 - lib/influxer/client.rb
@@ -238,7 +198,12 @@ files:
 homepage: http://github.com/palkan/influxer
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: http://github.com/palkan/influxer/issues
+  changelog_uri: https://github.com/palkan/influxer/blob/master/Changelog.md
+  documentation_uri: http://github.com/palkan/influxer
+  homepage_uri: http://github.com/palkan/influxer
+  source_code_uri: http://github.com/palkan/influxer
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -247,15 +212,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: InfluxDB for Rails