cellect-client 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa613e71bf121890b018f0a6d738b4a4882d5548
-  data.tar.gz: e9d91db66e59cf82c2d17aff465493933c772838
+  metadata.gz: 1bef3620635a4c9925ddec189583b56ccf60ed08
+  data.tar.gz: 4cf61ff3a15c4661df6279efb382fb0be24cee0c
 SHA512:
-  metadata.gz: b9dea858e333ec11796df53a7521b269df50004a7fd2072cb33fcbdacf8bfb7967539b4b82b5201ad48863dbdcb78c835e819c83cb9b54273ca703e6d7febbd1
-  data.tar.gz: b8244dd21f8889e2f4d7ee443bb3b2c894af4fd6f8295d4ee2d30f94f6697f19c8e9acbae4847dcfa7d046b5b17f7da1b7a1d126a381222cf2110d357198c1a5
+  metadata.gz: 60fe4c89fb71a17972eefb544e76e13960e2e84b94fef1f75b4076730bb2a09180eab9e106ce37d2bff2f108af88b1a1c34dd5c0e8b2c834f5723b8bb5e12ae3
+  data.tar.gz: fe2197a0d56baae9439755057e03c3391a6655ca7b40716137d79c76f10866115a5800ff253f945c81da597536bea6571f31fe02480076ca927641dcc4c063ab

data/cellect-client.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'celluloid-io', '0.16.0.pre'
   spec.add_runtime_dependency 'http', '~> 0.6'
   spec.add_runtime_dependency 'zk', '~> 1.9'
+  spec.add_runtime_dependency 'multi_json', '~> 1.10.1'
 end

data/lib/cellect/client/connection.rb

@@ -1,7 +1,9 @@
 require 'http'
+require 'multi_json'
 
 module Cellect
   module Client
+    class CellectServerError < StandardError; end
     class Connection
       include Celluloid
       include Celluloid::IO
@@ -31,7 +33,9 @@ module Cellect
       end
       
       def get_subjects(user_id: user_id, host: host, workflow_id: workflow_id, limit: limit, group_id: group_id)
-        send_http host, :get, "/workflows/#{ workflow_id }", querystring(user_id: user_id, group_id: group_id, limit: limit)
+        response = send_http host, :get, "/workflows/#{ workflow_id }", querystring(user_id: user_id, group_id: group_id, limit: limit)
+        ensure_valid_response response
+        MultiJson.load response.body
       end
       
       protected
@@ -57,6 +61,12 @@ module Cellect
           end
         end.join('&')
       end
+      
+      def ensure_valid_response(response)
+        unless response.code == 200
+          raise CellectServerError, "Server Responded #{ response.code }"
+        end
+      end
     end
   end
 end

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/client/connection_spec.rb

@@ -5,11 +5,11 @@ module Cellect::Client
     let(:connection){ Cellect::Client.connection }
     
     before(:each) do
-      Cellect::Client.node_set.stub(:nodes).and_return 'a' => '1', 'b' => '2'
+      allow(Cellect::Client.node_set).to receive(:nodes).and_return 'a' => '1', 'b' => '2'
     end
     
     def should_send(action: action, url: url, to: to)
-      HTTP.should_receive(:send).with action, "http://#{ to }/#{ url }", socket_class: Celluloid::IO::TCPSocket
+      expect(HTTP).to receive(:send).with(action, "http://#{ to }/#{ url }", socket_class: Celluloid::IO::TCPSocket).and_return(HTTP::Response.new(200, nil, nil, "{ \"this response\": \"intentionally blank\" }"))
     end
     
     def should_broadcast(action: action, url: url)
@@ -60,12 +60,30 @@ module Cellect::Client
       should_send action: :put, url: 'workflows/random/users/123/add_seen?subject_id=456', to: 1
       connection.add_seen subject_id: 456, host: '1', user_id: 123, workflow_id: 'random'
     end
-
+    
     it 'should get subjects' do
       should_send action: :get, url: 'workflows/random?user_id=1&group_id=1&limit=10', to: 1
       connection.get_subjects host: '1', workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
       should_send action: :get, url: 'workflows/random?user_id=1', to: 1
       connection.get_subjects host: '1', workflow_id: 'random', user_id: 1
     end
+    
+    context 'getting subjects' do
+      def get_subjects
+        connection.get_subjects host: '1', workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
+      end
+      
+      it 'should return subjects as an array' do
+        response = HTTP::Response.new 200, '1.1', nil, '[1, 2, 3, 4, 5]'
+        allow(HTTP).to receive(:send).and_return response
+        expect(get_subjects).to eq [1, 2, 3, 4, 5]
+      end
+      
+      it 'should raise an error for unexpected responses' do
+        response = HTTP::Response.new 404, '1.1', nil, ''
+        allow(HTTP).to receive(:send).and_return response
+        expect{ get_subjects }.to raise_error Cellect::Client::CellectServerError, 'Server Responded 404'
+      end
+    end
   end
 end

data/spec/client/node_set_spec.rb

@@ -14,7 +14,7 @@ module Cellect::Client
           Thread.pass
         end
         
-        node_set.nodes['node0000000001'].should == 'foo'
+        expect(node_set.nodes['node0000000001']).to eq 'foo'
       ensure
         node_set.zk.delete '/nodes/node0000000001'
       end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ end
 Bundler.require :test, :development
 
 ENV['CELLECT_POOL_SIZE'] = '3'
+SPAWN_ZK = !ENV['ZK_URL']
 
 require 'pry'
 require 'oj'
@@ -24,7 +25,6 @@ Cellect::Server.adapter = SpecAdapter.new
 SET_TYPES = %w(random priority pairwise_random pairwise_priority)
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'
@@ -37,6 +37,6 @@ RSpec.configure do |config|
   end
   
   config.after(:suite) do
-    `zkServer stop #{ CELLECT_ZK_CONFIG } > /dev/null 2>&1`
+    `zkServer stop #{ CELLECT_ZK_CONFIG } > /dev/null 2>&1` if SPAWN_ZK
   end
 end

data/spec/support/shared_examples_for_node_set.rb

@@ -2,24 +2,24 @@ shared_examples_for 'node set' do
   let(:node_set){ Cellect::NodeSet.new }
   
   it 'should connect to zoo keeper' do
-    node_set.zk.should be_nil
+    expect(node_set.zk).to be_nil
     pass_until node_set, is: :ready
-    node_set.zk.should be_connected
+    expect(node_set.zk).to be_connected
   end
   
   it 'should know the connection state' do
-    node_set.state.should be :initializing
+    expect(node_set.state).to be :initializing
     pass_until node_set, is: :ready
-    node_set.should be_ready
+    expect(node_set).to be_ready
   end
   
   it 'should accept a connection string' do
     begin
       pass_until node_set, is: :ready
       ENV['ZK_URL'] = 'foobar'
-      node_set.send(:zk_url).should == 'foobar'
+      expect(node_set.send(:zk_url)).to eq 'foobar'
       ENV.delete 'ZK_URL'
-      node_set.send(:zk_url).should == 'localhost:2181'
+      expect(node_set.send(:zk_url)).to eq 'localhost:2181'
     ensure
       ENV['ZK_URL'] = 'localhost:21811'
     end

data/spec/support/shared_examples_for_set.rb

@@ -1,11 +1,11 @@
 shared_examples_for 'a set' do
   it 'should convert to an Array' do
-    set.to_a.should =~ (1..5).to_a
+    expect(set.to_a).to eq (1..5).to_a
   end
   
   it 'should add elements' do
     set.add 100
-    set.to_a.should include 100
+    expect(set.to_a).to include 100
   end
   
   it 'should remove elements' do
@@ -14,7 +14,7 @@ shared_examples_for 'a set' do
   end
   
   it 'should sample elements' do
-    set.sample(2).length.should == 2
+    expect(set.sample(2).length).to eq 2
   end
   
   it 'should not include removed elements in samples' do
@@ -29,6 +29,6 @@ shared_examples_for 'a set' do
   it 'should know if it contains an element' do
     set.should_not include 100
     set.add 100
-    set.should include 100
+    expect(set).to include 100
   end
 end

data/spec/support/shared_examples_for_workflow.rb

@@ -6,21 +6,21 @@ shared_examples_for 'workflow' do |name|
   end
   
   it 'should add singleton instances to the registry' do
-    obj.class[:foo].should be_a_kind_of Cellect::Server::Workflow
-    obj.class[:foo].object_id.should == obj.class[:foo].object_id
+    expect(obj.class[:foo]).to be_a_kind_of Cellect::Server::Workflow
+    expect(obj.class[:foo].object_id).to eq obj.class[:foo].object_id
   end
   
   it 'should initialize empty' do
-    obj.name.should be_a String
-    obj.users.should be_a Hash
+    expect(obj.name).to be_a String
+    expect(obj.users).to be_a Hash
     
     set_klass = obj.prioritized? ? DiffSet::PrioritySet : DiffSet::RandomSet
-    obj.subjects.should be_a set_klass
+    expect(obj.subjects).to be_a set_klass
   end
   
   it 'should provide a user lookup' do
-    obj.user(1).should be_a Cellect::Server::User
-    obj.user(1).object_id.should == obj.user(1).object_id
-    obj.users.keys.should include 1
+    expect(obj.user(1)).to be_a Cellect::Server::User
+    expect(obj.user(1).object_id).to eq obj.user(1).object_id
+    expect(obj.users.keys).to include 1
   end
 end

data/spec/support/zk_setup.rb

@@ -1,26 +1,28 @@
-zk_dir = File.join CELLECT_ROOT, 'tmp/zookeeper'
-
-`rm -rf #{ zk_dir }; mkdir -p #{ zk_dir }`
-
-CELLECT_ZK_CONFIG = "#{ zk_dir }/zoo.cfg"
-File.open(CELLECT_ZK_CONFIG, 'w') do |out|
-  out.puts <<-TEXT
-    tickTime=2000
-    initLimit=10
-    syncLimit=5
-    dataDir=#{ zk_dir }
-    clientPort=21811
-    forceSync=no
-    snapCount=1000000
-  TEXT
+if SPAWN_ZK
+  zk_dir = File.join CELLECT_ROOT, 'tmp/zookeeper'
+  CELLECT_ZK_CONFIG = "#{ zk_dir }/zoo.cfg"
+  
+  `rm -rf #{ zk_dir }; mkdir -p #{ zk_dir }`
+  
+  File.open(CELLECT_ZK_CONFIG, 'w') do |out|
+    out.puts <<-TEXT
+      tickTime=2000
+      initLimit=10
+      syncLimit=5
+      dataDir=#{ zk_dir }
+      clientPort=21811
+      forceSync=no
+      snapCount=1000000
+    TEXT
+  end
+  
+  if `echo ruok | nc 127.0.0.1 21811`.chomp == 'imok'
+    pid = `ps aux | grep -e 'Cellect[\/]tmp[\/]zookeeper'`.split[1]
+    puts "Killing rogue zookeeper process: #{ pid }..."
+    `kill -s TERM #{ pid }`
+    sleep 1
+  end
+  
+  `zkServer start #{ CELLECT_ZK_CONFIG } > /dev/null 2>&1`
+  ENV['ZK_URL'] = 'localhost:21811'
 end
-
-if `echo ruok | nc 127.0.0.1 21811`.chomp == 'imok'
-  pid = `ps aux | grep -e 'Cellect[\/]tmp[\/]zookeeper'`.split[1]
-  puts "Killing rogue zookeeper process: #{ pid }..."
-  `kill -s TERM #{ pid }`
-  sleep 1
-end
-
-`zkServer start #{ CELLECT_ZK_CONFIG } > /dev/null 2>&1`
-ENV['ZK_URL'] = 'localhost:21811'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-client
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.10.1
 description: ''
 email:
 - michael@zooniverse.org
@@ -216,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: ''