ruby-druid 0.1.9 → 0.9.0

data/spec/lib/{zoo_handler_spec.rb → zk_spec.rb}

@@ -7,8 +7,8 @@ module ZK
     include RSpec::Matchers
 
     def initialize(uri, opts)
-      uri.should == 'test-uri'
-      opts.should == { :chroot => :check }
+      expect(uri).to eq('test-uri')
+      expect(opts).to eq({ :chroot => :check })
       @registrations = {}
       @paths = {
         '/disco' => ['a', 'b'],
@@ -19,8 +19,8 @@ module ZK
     end
 
     def register(path, opts, &block)
-      opts.should == { :only => :child }
-      @registrations[path].should == nil
+      expect(opts).to eq({ :only => :child })
+      expect(@registrations[path]).to eq(nil)
 
       zk = self
       block.define_singleton_method :unregister do
@@ -37,7 +37,7 @@ module ZK
     end
 
     def children(path, opts)
-      @registrations[path].should be_a(Proc)
+      expect(@registrations[path]).to be_a(Proc)
 
       value = @paths[path]
       throw "no mock code for #{path}" unless value
@@ -47,30 +47,15 @@ module ZK
     def get(path)
       case path
       when '/disco/a/b1'
-        [{
-          :address => 'b1_address',
-          :port => 80
-        }.to_json]
+        [{ :address => 'b1_address', :port => 80 }.to_json]
       when '/disco/a/m1'
-        [{
-          :address => 'm1_address',
-          :port => 81
-        }.to_json]
+        [{ :address => 'm1_address', :port => 81 }.to_json]
       when '/disco/b/b2'
-        [{
-          :address => 'b2_address',
-          :port => 90
-        }.to_json]
+        [{ :address => 'b2_address', :port => 90 }.to_json]
       when '/disco/b/m2'
-        [{
-          :address => 'm2_address',
-          :port => 85
-        }.to_json]
+        [{ :address => 'm2_address', :port => 85 }.to_json]
       when '/disco/a/b3'
-        [{
-          :address => 'b3_address',
-          :port => 83
-        }.to_json]
+        [{ :address => 'b3_address', :port => 83 }.to_json]
       else
         throw "no mock code for #{path}"
       end
@@ -101,98 +86,98 @@ class RestClientResponseMock
   end
 end
 
-describe Druid::ZooHandler do
+describe Druid::ZK do
   it 'reports services and data sources correctly' do
     calls = []
-    RestClient::Request.stub(:execute) do |opts|
-      uri_match = opts[:url].match /^http:\/\/(.+)_address:(.+)\/druid\/v2\/datasources\/$/
+    expect(RestClient::Request).to receive(:execute).at_least(:once) do |opts|
+      uri_match = opts[:url].match(/^http:\/\/(.+)_address:(.+)\/druid\/v2\/datasources\/$/)
 
       host = uri_match[1]
       port = uri_match[2].to_i
 
-      calls.push [host, port]
+      calls.push([host, port])
 
       case host
       when 'b1'
-        RestClientResponseMock.new(200, ['s1','s2'].to_json)
+        RestClientResponseMock.new(200, ['s1', 's2'].to_json)
       when 'b2'
-        RestClientResponseMock.new(200, ['s3','s4'].to_json)
+        RestClientResponseMock.new(200, ['s3', 's4'].to_json)
       when 'b3'
-        RestClientResponseMock.new(200, ['s5','s6'].to_json)
+        RestClientResponseMock.new(200, ['s5', 's6'].to_json)
       else
         RestClientResponseMock.new(404, nil)
       end
     end
 
-    zk = Druid::ZooHandler.new 'test-uri', :discovery_path => '/disco'
+    zk = Druid::ZK.new('test-uri', :discovery_path => '/disco')
 
-    calls.should == [
+    expect(calls).to eq([
       ['b1', 80],
       ['m1', 81],
       ['b2', 90],
       ['m2', 85]
-    ]
-    zk.services.should == ['a', 'b']
-    zk.data_sources.should == {
+    ])
+    expect(zk.services).to eq(['a', 'b'])
+    expect(zk.data_sources).to eq({
       'a/s1' => 'http://b1_address:80/druid/v2/',
       'a/s2' => 'http://b1_address:80/druid/v2/',
       'b/s3' => 'http://b2_address:90/druid/v2/',
       'b/s4' => 'http://b2_address:90/druid/v2/'
-    }
+    })
 
     calls = []
     mock = zk.instance_variable_get('@zk')
-    mock.unregistrations.should == []
+    expect(mock.unregistrations).to eq([])
 
     # unregister a whole service
     mock.change '/disco', ['a']
-    calls.should == []
-    zk.services.should == ['a']
-    zk.data_sources.should == {
+    expect(calls).to eq([])
+    expect(zk.services).to eq(['a'])
+    expect(zk.data_sources).to eq({
       'a/s1' => 'http://b1_address:80/druid/v2/',
       'a/s2' => 'http://b1_address:80/druid/v2/'
-    }
-    mock.unregistrations.should == ['/disco/b']
+    })
+    expect(mock.unregistrations).to eq(['/disco/b'])
     # register it again
     mock.change '/disco', ['a', 'b']
-    calls.should == [
+    expect(calls).to eq([
       ['b2', 90],
       ['m2', 85]
-    ]
-    zk.services.should == ['a', 'b']
-    zk.data_sources.should == {
+    ])
+    expect(zk.services).to eq(['a', 'b'])
+    expect(zk.data_sources).to eq({
       'a/s1' => 'http://b1_address:80/druid/v2/',
       'a/s2' => 'http://b1_address:80/druid/v2/',
       'b/s3' => 'http://b2_address:90/druid/v2/',
       'b/s4' => 'http://b2_address:90/druid/v2/'
-    }
-    mock.unregistrations.should == []
+    })
+    expect(mock.unregistrations).to eq([])
 
     #register a new broker
     calls = []
     mock.change '/disco/a', ['b1', 'b3']
-    calls.should == [['b3', 83]]
-    zk.services.should == ['a', 'b']
-    zk.data_sources.should == {
-      "a/s1" => "http://b1_address:80/druid/v2/",
-      "a/s2" => "http://b1_address:80/druid/v2/",
-      "b/s3" => "http://b2_address:90/druid/v2/",
-      "b/s4" => "http://b2_address:90/druid/v2/",
-      "a/s5" => "http://b3_address:83/druid/v2/",
-      "a/s6" => "http://b3_address:83/druid/v2/"
-    }
-    mock.unregistrations.should == ['/disco/a']
+    expect(calls).to eq([['b3', 83]])
+    expect(zk.services).to eq(['a', 'b'])
+    expect(zk.data_sources).to eq({
+      'a/s1' => 'http://b1_address:80/druid/v2/',
+      'a/s2' => 'http://b1_address:80/druid/v2/',
+      'b/s3' => 'http://b2_address:90/druid/v2/',
+      'b/s4' => 'http://b2_address:90/druid/v2/',
+      'a/s5' => 'http://b3_address:83/druid/v2/',
+      'a/s6' => 'http://b3_address:83/druid/v2/'
+    })
+    expect(mock.unregistrations).to eq(['/disco/a'])
     # unregister it
     calls = []
     mock.change '/disco/a', ['b1']
-    calls.should == []
-    zk.services.should == ['a', 'b']
-    zk.data_sources.should == {
+    expect(calls).to eq([])
+    expect(zk.services).to eq(['a', 'b'])
+    expect(zk.data_sources).to eq({
       'a/s1' => 'http://b1_address:80/druid/v2/',
       'a/s2' => 'http://b1_address:80/druid/v2/',
       'b/s3' => 'http://b2_address:90/druid/v2/',
       'b/s4' => 'http://b2_address:90/druid/v2/'
-    }
-    mock.unregistrations.should == ['/disco/a']
+    })
+    expect(mock.unregistrations).to eq(['/disco/a'])
   end
 end

metadata

@@ -1,76 +1,184 @@
 --- !ruby/object:Gem::Specification
 name: ruby-druid
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.9.0
 platform: ruby
 authors:
-- LiquidM, Inc.
+- Ruby Druid Community
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: zk
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: iso8601
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: zk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Ruby client for metamx druid
-email:
-- opensource@liquidm.com
-executables:
-- dripl
+        version: '2.1'
+description: |2
+      ruby-druid is a Ruby client for Druid. It includes a Squeel-like query DSL
+      and generates a JSON query that can be sent to Druid directly.
+email: 
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- bin/dripl
-- dot_driplrc_example
 - lib/druid.rb
+- lib/druid/aggregation.rb
 - lib/druid/client.rb
-- lib/druid/console.rb
+- lib/druid/context.rb
+- lib/druid/data_source.rb
 - lib/druid/filter.rb
+- lib/druid/granularity.rb
 - lib/druid/having.rb
 - lib/druid/post_aggregation.rb
 - lib/druid/query.rb
-- lib/druid/response_row.rb
-- lib/druid/serializable.rb
-- lib/druid/zoo_handler.rb
+- lib/druid/version.rb
+- lib/druid/zk.rb
 - ruby-druid.gemspec
 - spec/lib/client_spec.rb
+- spec/lib/data_source_spec.rb
 - spec/lib/query_spec.rb
-- spec/lib/zoo_handler_spec.rb
+- spec/lib/zk_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/liquidm/ruby-druid
+homepage: https://github.com/ruby-druid/ruby-druid
 licenses:
 - MIT
 metadata: {}
@@ -90,13 +198,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Ruby client for metamx druid
+summary: A Ruby client for Druid
 test_files:
 - spec/lib/client_spec.rb
+- spec/lib/data_source_spec.rb
 - spec/lib/query_spec.rb
-- spec/lib/zoo_handler_spec.rb
+- spec/lib/zk_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/.gitignore

@@ -1,6 +0,0 @@
-Gemfile.lock
-.driplrc
-ruby-druid-0.0.1.gem
-spec/test.json
-tmp/rspec_guard_result
-pkg/

data/.rspec

@@ -1,2 +0,0 @@
---colour
---require spec_helper

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-rvm:
-- jruby
-- 2.0.0
-- 1.9.3
-script:
-- bundle exec rspec --format documentation
-notifications:
-  email: false