influxdb-api 0.0.2 → 0.0.3

data/spec/intergrations/users_spec.rb

@@ -0,0 +1,124 @@
+require 'spec_helper'
+
+describe 'users', version: '>0.7.3', integration: true do
+  let(:config){ Influxdb::Api::Configuration.new }
+  let(:client){ Influxdb::Api::Client.new(config) }
+
+  subject{ client.databases('db_name').users }
+
+  before do
+    client.databases.create('db_name')
+    subject.all.each{|u| subject.delete(u['name']) }
+  end
+
+  after{ client.databases.delete('db_name') }
+
+  describe '.all' do
+    context 'when there are no users' do
+      it 'returns empty array' do
+        expect(subject.all).to eq([])
+      end
+    end
+
+    context 'when there are some users' do
+      before do
+        subject.create(name: 'username1', password: 'mypass1')
+        subject.create(name: 'username2', password: 'mypass2')
+      end
+
+      it 'returns the list of users' do
+        expect(subject.all).to match_array([
+          { 'name' => 'username1', 'isAdmin' => false, 'writeTo' => '.*', 'readFrom' => '.*' },
+          { 'name' => 'username2', 'isAdmin' => false, 'writeTo' => '.*', 'readFrom' => '.*' }
+        ])
+      end
+    end
+  end
+
+  describe '.create' do
+    it 'creates a new user with given name' do
+      expect{ subject.create(name: 'username', password: 'mypass') }.to change{ subject.all.size }.from(0).to(1)
+    end
+
+    context 'when there is user with the same name' do
+      before{ subject.create(name: 'username', password: 'mypass') }
+
+      it 'raises error' do
+        expect{ subject.create(name: 'username', password: 'mypass') }.to raise_error(
+          Influxdb::Api::Client::Errors::BadRequest, '[400] User username already exists'
+        )
+      end
+    end
+  end
+
+  describe '.update' do
+    context 'when user does not exist' do
+      it 'raises error' do
+        expect{ subject.update('username', writeTo: 'log\..*', readFrom: '.*') }.to raise_error(
+          Influxdb::Api::Client::Errors::BadRequest, '[400] Invalid database name db_name'
+        )
+      end
+
+      context 'and did not pass both permissions' do
+        it 'does nothing' do
+          subject.update('username', writeTo: 'log\..*')
+          expect(subject.all).to eq([])
+        end
+      end
+    end
+
+    context 'when user exists' do
+      before{ subject.create(name: 'username', password: 'mypass') }
+
+      it 'updates user attributes' do
+        subject.update('username', writeTo: 'log\..*', readFrom: '.*')
+        expect(subject.all).to eq([
+          { 'name' => 'username', 'isAdmin' => false, 'writeTo' => 'log\..*', 'readFrom' => '.*' }
+        ])
+      end
+
+      context 'and did not pass both permissions' do
+        it 'does nothing' do
+          subject.update('username', writeTo: 'log\..*')
+          expect(subject.all).to eq([
+            { 'name' => 'username', 'isAdmin' => false, 'writeTo' => '.*', 'readFrom' => '.*' }
+          ])
+        end
+      end
+    end
+  end
+
+  describe '.find' do
+    context 'when user does not exist' do
+      it 'returns nil' do
+        expect(subject.find('username2')).to be_nil
+      end
+    end
+
+    context 'when user exists' do
+      before{ subject.create(name: 'username', password: 'mypass') }
+
+      it 'returns user' do
+        expect(subject.find('username')).to eq(
+          'name' => 'username', 'isAdmin' => false, 'writeTo' => '.*', 'readFrom' => '.*'
+        )
+      end
+    end
+  end
+
+  describe '.delete' do
+    context 'when user does not exist' do
+      it 'returns false' do
+        expect(subject.delete('username')).to be_falsy
+      end
+    end
+
+    context 'when user exists' do
+      before{ subject.create(name: 'username', password: 'mypass') }
+
+      it 'removes db and returns true' do
+        expect(subject.delete('username')).to be_truthy
+      end
+    end
+  end
+end

data/spec/lib/influxdb/api/database_spec.rb

@@ -19,14 +19,42 @@ describe Influxdb::Api::Namespaces do
   end
 
   describe '#continuous_queries' do
-    specify{ expect(subject.continuous_queries).to be_instance_of(Influxdb::Api::Namespaces::ContinuousQueries) }
+    let(:version){ 'InfluxDB v0.8.3 (git: 023abcdef) (leveldb: 1.8)' }
+
+    before{ expect(client).to receive(:version).and_return(Influxdb::Api::ServerVersion.new(version)) }
+
+    specify{ expect(subject.continuous_queries).to be_instance_of(Influxdb::Api::Namespaces::ContinuousQueries::Api) }
     specify{ expect(subject.continuous_queries.client).to eq(client) }
     specify{ expect(subject.continuous_queries.database_name).to eq('dbname') }
+
+    context 'when Influxdb version is more than 0.8.3' do
+      let(:version){ 'InfluxDB v0.8.4 (git: 023abcdef) (leveldb: 1.8)' }
+
+      specify{ expect(subject.continuous_queries).to be_instance_of(Influxdb::Api::Namespaces::ContinuousQueries::Sql) }
+      specify{ expect(subject.continuous_queries.client).to eq(client) }
+      specify{ expect(subject.continuous_queries.database_name).to eq('dbname') }
+    end
   end
 
   describe '#shard_spaces' do
-    specify{ expect(subject.shard_spaces).to be_instance_of(Influxdb::Api::Namespaces::ShardSpaces) }
-    specify{ expect(subject.shard_spaces.client).to eq(client) }
-    specify{ expect(subject.shard_spaces.database_name).to eq('dbname') }
+    before{ expect(client).to receive(:version).and_return(Influxdb::Api::ServerVersion.new(version)) }
+
+    context 'when Influxdb version is less than 0.8.3' do
+      let(:version){ 'InfluxDB v0.7.3 (git: 023abcdef) (leveldb: 1.8)' }
+
+      specify do
+        expect{ subject.shard_spaces }.to raise_error(
+          Influxdb::Api::UnsupportedFeature, "Shard space's API is supported only after 0.7.3 version. Current is 0.7.3"
+        )
+      end
+    end
+
+    context 'when Influxdb version is eaqual or more than 0.8.3' do
+      let(:version){ 'InfluxDB v0.8.3 (git: 023abcdef) (leveldb: 1.8)' }
+
+      specify{ expect(subject.shard_spaces).to be_instance_of(Influxdb::Api::Namespaces::ShardSpaces) }
+      specify{ expect(subject.shard_spaces.client).to eq(client) }
+      specify{ expect(subject.shard_spaces.database_name).to eq('dbname') }
+    end
   end
 end

data/spec/lib/influxdb/api/namespaces/{continuous_queries_spec.rb → continuous_queries/api_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Influxdb::Api::Namespaces::ContinuousQueries do
+describe Influxdb::Api::Namespaces::ContinuousQueries::Api do
   let(:config){ Influxdb::Api::Configuration.new }
   let(:client){ Influxdb::Api::Client.new(config) }
 
-  subject{ Influxdb::Api::Namespaces::ContinuousQueries.new(client, 'dbname') }
+  subject{ Influxdb::Api::Namespaces::ContinuousQueries::Api.new(client, 'dbname') }
 
   describe '#all' do
     before do

data/spec/lib/influxdb/api/namespaces/continuous_queries/sql_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Influxdb::Api::Namespaces::ContinuousQueries::Sql do
+  let(:config){ Influxdb::Api::Configuration.new }
+  let(:client){ Influxdb::Api::Client.new(config) }
+
+  subject{ Influxdb::Api::Namespaces::ContinuousQueries::Sql.new(client, 'dbname') }
+
+  describe '#all' do
+    let(:response){ MultiJson.dump([{
+      'name' => 'continuous queries',
+      'columns' => ['id', 'query'],
+      'points' => [[1, 'select type from events into events.[page_id]']]
+    }]) }
+
+    before do
+      stub_request(:get, 'http://root:root@localhost:8086/db/dbname/series?q=LIST%20CONTINUOUS%20QUERIES').
+        to_return(status: 200, body: response, headers: { 'Content-Type' => 'application/json' })
+    end
+
+    specify{ expect(subject.all).to eq([{ 'id' => 1, 'query' => 'select type from events into events.[page_id]' }]) }
+  end
+
+  describe '#create' do
+    before do
+      stub_request(:get, 'http://root:root@localhost:8086/db/dbname/series?q=select%20type%20from%20events%20into%20events.[page_id]').
+        to_return(status: 200, body: '{}', headers: { 'Content-Type' => 'application/json' })
+    end
+
+    specify{ expect(subject.create('select type from events into events.[page_id]')).to be_truthy }
+  end
+
+  describe '#delete' do
+    before do
+      stub_request(:get, 'http://root:root@localhost:8086/db/dbname/series?q=DROP%20CONTINUOUS%20QUERY%201').
+        to_return(status: 200, body: '{}', headers: { 'Content-Type' => 'application/json' })
+    end
+
+    specify{ expect(subject.delete(1)).to be_truthy }
+  end
+end

data/spec/lib/influxdb/api/server_version_spec.rb

@@ -7,6 +7,7 @@ describe Influxdb::Api::ServerVersion do
 
   describe '#to_s' do
     specify{ expect(subject.to_s).to eq(source) }
+    specify{ expect(subject.to_s(:mini)).to eq('0.7.3') }
   end
 
   describe '#major' do

data/spec/spec_helper.rb

@@ -1,10 +1,28 @@
 require 'bundler'
 Bundler.require(:default, :test)
+require 'support/version_resolver'
+
+def allow_localhost
+  WebMock.disable_net_connect!(allow_localhost: true)
+  yield
+ensure
+  WebMock.disable_net_connect!(allow_localhost: false)
+end
+
+version_resolver = allow_localhost{ VersionResolver.new }
+
+puts "InfluxDB: #{version_resolver.server_version}"
 
 WebMock.disable_net_connect!(allow_localhost: false)
 
 RSpec.configure do |config|
   config.mock_with :rspec
+  config.filter_run_excluding version: ->(v){ !version_resolver.fit?(v) }
+  #config.filter_run_excluding((VERSIONS - [INFLUXDB_VERSION]).map{|v| { v => true } }.inject(&:merge))
+
+  config.around :each, integration: true do |example|
+    allow_localhost{ example.run }
+  end
 
   config.around :each, time_freeze: ->(v){ v.is_a?(Date) || v.is_a?(Time) || v.is_a?(String) } do |example|
     datetime = if example.metadata[:time_freeze].is_a?(String)

data/spec/support/version_resolver.rb

@@ -0,0 +1,56 @@
+class VersionResolver
+  class Empty
+    def fit?(other)
+      false
+    end
+  end
+
+  class Version < Struct.new(:version, :op)
+    def fit?(other)
+      other.send(op || '==', version)
+    end
+  end
+
+  class Range < Struct.new(:version1, :version2)
+    def fit?(other)
+      other > version1 && other < version2
+    end
+  end
+
+  REGEXP = /([><=]{0,2})(\d+\.\d+\.\d+)/
+
+  attr_reader :server_version
+
+  def initialize(version = nil)
+    @server_version = build_version(version || get_server_version)
+  end
+
+  def fit?(tag)
+    tag = parse_tag(tag)
+    tag.fit?(server_version)
+  end
+
+  private
+
+  def build_version(v)
+    ::Gem::Version.new(v)
+  end
+
+  def get_server_version
+    Influxdb::Api.client.version.to_s(:mini)
+  end
+
+  def parse_tag(tag)
+    tags = tag.split(?-)
+
+    if tags.size > 1
+      Range.new(build_version(tags[0]), build_version(tags[1]))
+    else
+      if m = REGEXP.match(tags[0])
+        Version.new(build_version(m[2]), m[1].empty? ? nil : m[1])
+      else
+        Empty.new
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - undr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -95,6 +95,9 @@ files:
 - README.md
 - Rakefile
 - influxdb-api.gemspec
+- influxdb/Dockerfile.0.7.3
+- influxdb/Dockerfile.0.8.3
+- influxdb/Dockerfile.0.8.8
 - lib/influxdb-api.rb
 - lib/influxdb.rb
 - lib/influxdb/api.rb
@@ -120,6 +123,15 @@ files:
 - lib/influxdb/api/namespaces/with_database.rb
 - lib/influxdb/api/server_version.rb
 - lib/influxdb/api/version.rb
+- spec/intergrations/cluster_admins_spec.rb
+- spec/intergrations/continuous_queries_spec.rb
+- spec/intergrations/databases_spec.rb
+- spec/intergrations/series_spec.rb
+- spec/intergrations/servers_spec.rb
+- spec/intergrations/shard_spaces_spec.rb
+- spec/intergrations/shards_spec.rb
+- spec/intergrations/users_0_7_3_spec.rb
+- spec/intergrations/users_spec.rb
 - spec/lib/influxdb/api/client/connection_pool_spec.rb
 - spec/lib/influxdb/api/client/connection_spec.rb
 - spec/lib/influxdb/api/client/response_spec.rb
@@ -128,7 +140,8 @@ files:
 - spec/lib/influxdb/api/configuration_spec.rb
 - spec/lib/influxdb/api/database_spec.rb
 - spec/lib/influxdb/api/namespaces/cluster_admins_spec.rb
-- spec/lib/influxdb/api/namespaces/continuous_queries_spec.rb
+- spec/lib/influxdb/api/namespaces/continuous_queries/api_spec.rb
+- spec/lib/influxdb/api/namespaces/continuous_queries/sql_spec.rb
 - spec/lib/influxdb/api/namespaces/databases_spec.rb
 - spec/lib/influxdb/api/namespaces/series_spec.rb
 - spec/lib/influxdb/api/namespaces/servers_spec.rb
@@ -138,6 +151,7 @@ files:
 - spec/lib/influxdb/api/namespaces_spec.rb
 - spec/lib/influxdb/api/server_version_spec.rb
 - spec/spec_helper.rb
+- spec/support/version_resolver.rb
 homepage: https://github.com/undr/influxdb-api
 licenses:
 - MIT
@@ -158,11 +172,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby client for InfluxDB
 test_files:
+- spec/intergrations/cluster_admins_spec.rb
+- spec/intergrations/continuous_queries_spec.rb
+- spec/intergrations/databases_spec.rb
+- spec/intergrations/series_spec.rb
+- spec/intergrations/servers_spec.rb
+- spec/intergrations/shard_spaces_spec.rb
+- spec/intergrations/shards_spec.rb
+- spec/intergrations/users_0_7_3_spec.rb
+- spec/intergrations/users_spec.rb
 - spec/lib/influxdb/api/client/connection_pool_spec.rb
 - spec/lib/influxdb/api/client/connection_spec.rb
 - spec/lib/influxdb/api/client/response_spec.rb
@@ -171,7 +194,8 @@ test_files:
 - spec/lib/influxdb/api/configuration_spec.rb
 - spec/lib/influxdb/api/database_spec.rb
 - spec/lib/influxdb/api/namespaces/cluster_admins_spec.rb
-- spec/lib/influxdb/api/namespaces/continuous_queries_spec.rb
+- spec/lib/influxdb/api/namespaces/continuous_queries/api_spec.rb
+- spec/lib/influxdb/api/namespaces/continuous_queries/sql_spec.rb
 - spec/lib/influxdb/api/namespaces/databases_spec.rb
 - spec/lib/influxdb/api/namespaces/series_spec.rb
 - spec/lib/influxdb/api/namespaces/servers_spec.rb
@@ -181,3 +205,4 @@ test_files:
 - spec/lib/influxdb/api/namespaces_spec.rb
 - spec/lib/influxdb/api/server_version_spec.rb
 - spec/spec_helper.rb
+- spec/support/version_resolver.rb