influxdb 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c027fe626b731c0fe89678ae44f7f87a24db7c68
-  data.tar.gz: 929dc5eda07eabfba284891ede0a293a6b0fc49a
+  metadata.gz: de7cdbcf5a4222dcaa8d992605533a4b1961da0f
+  data.tar.gz: e449d025b563a796dde3412612713383a1a9f0ab
 SHA512:
-  metadata.gz: 64db490708b15350c4e2ab2cc76b5f934db510a86eec7be024f9a6c652e26d09fa2570b729ab6987887382769b5b9a1f5bbfdb0a3c8fc96775ce2db7b0a563fb
-  data.tar.gz: b4fc2890772ec74612dac94633e5607904b4aadeef0a3760d698b24cbf16d4a23e6c004edece2b15d8926fa21e028f7479a26d168a03ab59ae4cbaedccc782f5
+  metadata.gz: 0959fc07ab3a1753edfef682273bfb5472e7b492098b8e0c466f4ebc9f24851818868bda53ef323efc5e903bb865e8f02095a46e9bac3784aae4cb271b094b3c
+  data.tar.gz: 506cd94546133b923bdb40b120364f48182124df319d1d5994be3b557679b2d52f5d2309d7530be6284e1cb5c60493844e08ecf2b9104e61ac0544d1a6437d78

data/.rubocop.yml

@@ -12,32 +12,13 @@ AllCops:
 Rails:
   Enabled: false
 
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*.rb'
-
 Style/StringLiterals:
   Enabled: false
 
-Style/BlockDelimiters:
-  Exclude:
-    - 'spec/**/*.rb'
-
 Style/RescueModifier:
   Enabled: false
 
-Lint/HandleExceptions:
-  Enabled: false
-
-Lint/Void:
-  Exclude:
-    - 'spec/**/*.rb'
-
 Metrics/LineLength:
   Max: 100
   Exclude:
     - 'spec/**/*.rb'
-
-Metrics/MethodLength:
-  Exclude:
-    - 'spec/**/*.rb'

data/CHANGELOG.md

@@ -6,6 +6,10 @@ For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/
 
 - None.
 
+## v0.3.7, released 2016-08-14
+
+- Fixed `prefix` handling for `#ping` and `#version` (#157, @dimiii)
+
 ## v0.3.6, released 2016-07-24
 
 - Added feature for JSON streaming response, via `"chunk_size"` parameter

data/README.md

@@ -427,7 +427,7 @@ influxdb.write_point(name, data)
 
 ### Reading data
 
-### Querying
+#### Querying
 
 ``` ruby
 username = 'foo'
@@ -547,8 +547,7 @@ If you pass `:retry => -1` it will keep trying forever until it gets the connect
 git clone git@github.com:influxdata/influxdb-ruby.git
 cd influxdb-ruby
 bundle
-bundle exec rake spec
-bundle exec rake rubocop
+bundle exec rake
 ```
 
 ## Contributing
@@ -558,7 +557,6 @@ bundle exec rake rubocop
   - Add tests.
   - Add an entry in the `CHANGELOG.md` in the "unreleased" section on top.
 - Run the tests: `bundle exec rake`.
-- Run Rubocop: `bundle exec rubocop`.
 - Send a pull request.
   - Please rebase against the master branch.
 - If your changes look good, we'll merge them.

data/Rakefile

@@ -13,7 +13,7 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = FileList[file_pattern]
 end
 
-task default: :spec
+task default: [:spec, :rubocop]
 
 task :console do
   lib = File.expand_path('../lib', __FILE__)

data/lib/influxdb/query/core.rb

@@ -3,12 +3,12 @@ module InfluxDB
     # rubocop:disable Metrics/AbcSize
     module Core
       def ping
-        get "/ping".freeze
+        url = URI::Generic.build(path: File.join(config.prefix, '/ping')).to_s
+        get url
       end
 
       def version
-        resp = get "/ping".freeze
-        resp.header['x-influxdb-version']
+        ping.header['x-influxdb-version']
       end
 
       # rubocop:disable Metrics/MethodLength

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB # :nodoc:
-  VERSION = "0.3.6".freeze
+  VERSION = "0.3.7".freeze
 end

data/spec/influxdb/client_spec.rb

@@ -62,6 +62,17 @@ describe InfluxDB::Client do
 
       expect(subject.ping).to be_a(Net::HTTPNoContent)
     end
+
+    context "with prefix" do
+      let(:args) { { prefix: '/dev' } }
+
+      it "returns OK with prefix" do
+        stub_request(:get, "http://influxdb.test:9999/dev/ping")
+          .to_return(status: 204)
+
+        expect(subject.ping).to be_a(Net::HTTPNoContent)
+      end
+    end
   end
 
   describe "GET #version" do
@@ -71,6 +82,17 @@ describe InfluxDB::Client do
 
       expect(subject.version).to eq('1.1.1')
     end
+
+    context "with prefix" do
+      let(:args) { { prefix: '/dev' } }
+
+      it "returns 1.1.1 with prefix" do
+        stub_request(:get, "http://influxdb.test:9999/dev/ping")
+          .to_return(status: 204, headers: { 'x-influxdb-version' => '1.1.1' })
+
+        expect(subject.version).to eq('1.1.1')
+      end
+    end
   end
 
   describe "Load balancing" do

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require "influxdb"
 require "webmock/rspec"
+
 begin
+  # rubocop:disable Lint/HandleExceptions
   require "pry-byebug"
 rescue LoadError
 end

metadata

@@ -1,108 +1,108 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Todd Persen
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: json
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: cause
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: cause
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.24.2
-  name: webmock
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.24.2
 - !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.39.0
-  name: rubocop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -167,7 +167,7 @@ homepage: http://influxdb.org
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -182,9 +182,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Ruby library for InfluxDB.
 test_files: