cellect-client 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a945054d21ad4dccae1e6a4447fef9dcbf7f30d4
-  data.tar.gz: fee2b2070cff140fe90e41cce096e1f80d13e1d6
+  metadata.gz: c518a38534d81e84960fb603a85089268949d7ca
+  data.tar.gz: ba71be03ab92b66cfd378dbb555c735c83cd4043
 SHA512:
-  metadata.gz: dc92be103ff6b6027bcd2b915430a9fe7877ed03077e71a8b00ac3f99e4f63c5b8c04db104a8abf1ab019453ed7f1fecd3ca8f5acd7032025f1f8c423e060a02
-  data.tar.gz: a7b7cfb49ff7b3c196d1d3e6711c70af644b828aa732a6dd1021c777a3d28d5900c09abe2413858995d359723dc094eae9dc654feccdb6fcae2a6768c66a562d
+  metadata.gz: decf62a6c9470b6975d2f11a06039e37794d7f8eb2175388143235e1a4e75e677b372ed2907f9a501561a48b68374c6d34e398c5f47025c56f5ee8711736d0a6
+  data.tar.gz: bc56057cbe643cf9751095c5a01fa5f48d7fcfb1f815bfe1d85da034694d66286932d867b2111cba32e60ad213d8f4533958c891a2bcdda0dfd2d6993101082f

data/lib/cellect/client/connection.rb

@@ -6,28 +6,32 @@ module Cellect
       include Celluloid
       include Celluloid::IO
       
-      def reload_project(id)
-        broadcast :post, "/projects/#{ id }/reload"
+      def reload_workflow(id)
+        broadcast :post, "/workflows/#{ id }/reload"
       end
       
-      def delete_project(id)
-        broadcast :delete, "/projects/#{ id }"
+      def delete_workflow(id)
+        broadcast :delete, "/workflows/#{ id }"
       end
       
-      def add_subject(id, project_id: project_id, group_id: nil, priority: nil)
-        broadcast :put, "/projects/#{ project_id }/add", querystring(subject_id: id, group_id: group_id, priority: priority)
+      def add_subject(id, workflow_id: workflow_id, group_id: nil, priority: nil)
+        broadcast :put, "/workflows/#{ workflow_id }/add", querystring(subject_id: id, group_id: group_id, priority: priority)
       end
       
-      def remove_subject(id, project_id: project_id, group_id: nil)
-        broadcast :put, "/projects/#{ project_id }/remove", querystring(subject_id: id, group_id: group_id)
+      def remove_subject(id, workflow_id: workflow_id, group_id: nil)
+        broadcast :put, "/workflows/#{ workflow_id }/remove", querystring(subject_id: id, group_id: group_id)
       end
       
-      def load_user(id, host: host, project_id: project_id)
-        send_http host, :post, "/projects/#{ project_id }/users/#{ id }/load"
+      def load_user(id, host: host, workflow_id: workflow_id)
+        send_http host, :post, "/workflows/#{ workflow_id }/users/#{ id }/load"
       end
       
-      def add_seen(id, user_id: user_id, host: host, project_id: project_id)
-        send_http host, :put, "/projects/#{ project_id }/users/#{ user_id }/add_seen", querystring(subject_id: id)
+      def add_seen(id, user_id: user_id, host: host, workflow_id: workflow_id)
+        send_http host, :put, "/workflows/#{ workflow_id }/users/#{ user_id }/add_seen", querystring(subject_id: id)
+      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)
       end
       
       protected

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/client/connection_spec.rb

@@ -16,49 +16,56 @@ module Cellect::Client
       [1, 2].each{ |i| should_send action: action, url: url, to: i }
     end
     
-    it 'should reload projects' do
-      should_broadcast action: :post, url: 'projects/random/reload'
-      connection.reload_project 'random'
+    it 'should reload workflows' do
+      should_broadcast action: :post, url: 'workflows/random/reload'
+      connection.reload_workflow 'random'
     end
     
-    it 'should delete projects' do
-      should_broadcast action: :delete, url: 'projects/random'
-      connection.delete_project 'random'
+    it 'should delete workflows' do
+      should_broadcast action: :delete, url: 'workflows/random'
+      connection.delete_workflow 'random'
     end
     
     it 'should add subjects' do
-      should_broadcast action: :put, url: 'projects/random/add?subject_id=123'
-      connection.add_subject 123, project_id: 'random'
+      should_broadcast action: :put, url: 'workflows/random/add?subject_id=123'
+      connection.add_subject 123, workflow_id: 'random'
     end
     
     it 'should add grouped subjects' do
-      should_broadcast action: :put, url: 'projects/random/add?subject_id=123&group_id=321'
-      connection.add_subject 123, project_id: 'random', group_id: 321
+      should_broadcast action: :put, url: 'workflows/random/add?subject_id=123&group_id=321'
+      connection.add_subject 123, workflow_id: 'random', group_id: 321
     end
     
     it 'should add prioritized grouped subjects' do
-      should_broadcast action: :put, url: 'projects/random/add?subject_id=123&group_id=321&priority=0.123'
-      connection.add_subject 123, project_id: 'random', group_id: 321, priority: 0.123
+      should_broadcast action: :put, url: 'workflows/random/add?subject_id=123&group_id=321&priority=0.123'
+      connection.add_subject 123, workflow_id: 'random', group_id: 321, priority: 0.123
     end
     
     it 'should remove subjects' do
-      should_broadcast action: :put, url: 'projects/random/remove?subject_id=123'
-      connection.remove_subject 123, project_id: 'random'
+      should_broadcast action: :put, url: 'workflows/random/remove?subject_id=123'
+      connection.remove_subject 123, workflow_id: 'random'
     end
     
     it 'should remove grouped subjects' do
-      should_broadcast action: :put, url: 'projects/random/remove?subject_id=123&group_id=321'
-      connection.remove_subject 123, project_id: 'random', group_id: 321
+      should_broadcast action: :put, url: 'workflows/random/remove?subject_id=123&group_id=321'
+      connection.remove_subject 123, workflow_id: 'random', group_id: 321
     end
     
     it 'should load users' do
-      should_send action: :post, url: 'projects/random/users/123/load', to: 1
-      connection.load_user 123, host: '1', project_id: 'random'
+      should_send action: :post, url: 'workflows/random/users/123/load', to: 1
+      connection.load_user 123, host: '1', workflow_id: 'random'
     end
     
     it 'should add seen subjects' do
-      should_send action: :put, url: 'projects/random/users/123/add_seen?subject_id=456', to: 1
-      connection.add_seen 456, host: '1', user_id: 123, project_id: 'random'
+      should_send action: :put, url: 'workflows/random/users/123/add_seen?subject_id=456', to: 1
+      connection.add_seen 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&limit=10&group_id=1', 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
   end
 end

data/spec/client/node_set_spec.rb

@@ -9,8 +9,7 @@ module Cellect::Client
       begin
         pass_until node_set, is: :ready
         node_set.zk.create '/nodes/node', data: 'foo', mode: :ephemeral_sequential
-        
-        10.times do
+        100.times do |i|
           break if node_set.nodes['node0000000001']
           Thread.pass
         end

data/spec/support/{shared_examples_for_project.rb → shared_examples_for_workflow.rb}

@@ -1,12 +1,12 @@
-shared_examples_for 'project' do |name|
+shared_examples_for 'workflow' do |name|
   let(:obj){ send name }
   
   before(:each) do
-    Cellect::Server.adapter.load_project obj.name
+    Cellect::Server.adapter.load_workflow obj.name
   end
   
   it 'should add singleton instances to the registry' do
-    obj.class[:foo].should be_a_kind_of Cellect::Server::Project
+    obj.class[:foo].should be_a_kind_of Cellect::Server::Workflow
     obj.class[:foo].object_id.should == obj.class[:foo].object_id
   end
   

data/spec/support/spec_adapter.rb

@@ -1,17 +1,17 @@
 require 'oj'
 
 class SpecAdapter < Cellect::Server::Adapters::Default
-  def project_list
+  def workflow_list
     fixtures.values
   end
   
-  def load_data_for(project_name)
-    fixtures.fetch(project_name, { }).fetch 'entries', []
+  def load_data_for(workflow_name)
+    fixtures.fetch(workflow_name, { }).fetch 'entries', []
   end
   
   def fixtures
     @fixtures ||= { }.tap do |fixtures|
-      Dir["#{ _fixture_path }/project_data/*.json"].collect do |f|
+      Dir["#{ _fixture_path }/workflow_data/*.json"].collect do |f|
         name = File.basename(f).sub /\.json$/, ''
         data = Oj.strict_load File.read f
         fixtures[name] = data
@@ -30,9 +30,9 @@ class SpecAdapter < Cellect::Server::Adapters::Default
     end
   end
   
-  def load_user(project_name, id)
+  def load_user(workflow_name, id)
     user = user_fixtures[id]
-    user ? user[project_name] : user_fixtures['new_user'][project_name]
+    user ? user[workflow_name] : user_fixtures['new_user'][workflow_name]
   end
   
   protected

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,23 +174,23 @@ files:
 - log/.gitkeep
 - spec/client/connection_spec.rb
 - spec/client/node_set_spec.rb
-- spec/fixtures/project_data/grouped_pairwise_priority.json
-- spec/fixtures/project_data/grouped_pairwise_random.json
-- spec/fixtures/project_data/grouped_priority.json
-- spec/fixtures/project_data/grouped_random.json
-- spec/fixtures/project_data/pairwise_priority.json
-- spec/fixtures/project_data/pairwise_random.json
-- spec/fixtures/project_data/priority.json
-- spec/fixtures/project_data/random.json
 - spec/fixtures/user_data/complete_user.json
 - spec/fixtures/user_data/new_user.json
 - spec/fixtures/user_data/partial_user.json
+- spec/fixtures/workflow_data/grouped_pairwise_priority.json
+- spec/fixtures/workflow_data/grouped_pairwise_random.json
+- spec/fixtures/workflow_data/grouped_priority.json
+- spec/fixtures/workflow_data/grouped_random.json
+- spec/fixtures/workflow_data/pairwise_priority.json
+- spec/fixtures/workflow_data/pairwise_random.json
+- spec/fixtures/workflow_data/priority.json
+- spec/fixtures/workflow_data/random.json
 - spec/spec_helper.rb
 - spec/support/cellect_helper.rb
 - spec/support/shared_api_context.rb
 - spec/support/shared_examples_for_node_set.rb
-- spec/support/shared_examples_for_project.rb
 - spec/support/shared_examples_for_set.rb
+- spec/support/shared_examples_for_workflow.rb
 - spec/support/spec_adapter.rb
 - spec/support/zk_setup.rb
 - tmp/.gitkeep
@@ -221,22 +221,22 @@ summary: ''
 test_files:
 - spec/client/connection_spec.rb
 - spec/client/node_set_spec.rb
-- spec/fixtures/project_data/grouped_pairwise_priority.json
-- spec/fixtures/project_data/grouped_pairwise_random.json
-- spec/fixtures/project_data/grouped_priority.json
-- spec/fixtures/project_data/grouped_random.json
-- spec/fixtures/project_data/pairwise_priority.json
-- spec/fixtures/project_data/pairwise_random.json
-- spec/fixtures/project_data/priority.json
-- spec/fixtures/project_data/random.json
 - spec/fixtures/user_data/complete_user.json
 - spec/fixtures/user_data/new_user.json
 - spec/fixtures/user_data/partial_user.json
+- spec/fixtures/workflow_data/grouped_pairwise_priority.json
+- spec/fixtures/workflow_data/grouped_pairwise_random.json
+- spec/fixtures/workflow_data/grouped_priority.json
+- spec/fixtures/workflow_data/grouped_random.json
+- spec/fixtures/workflow_data/pairwise_priority.json
+- spec/fixtures/workflow_data/pairwise_random.json
+- spec/fixtures/workflow_data/priority.json
+- spec/fixtures/workflow_data/random.json
 - spec/spec_helper.rb
 - spec/support/cellect_helper.rb
 - spec/support/shared_api_context.rb
 - spec/support/shared_examples_for_node_set.rb
-- spec/support/shared_examples_for_project.rb
 - spec/support/shared_examples_for_set.rb
+- spec/support/shared_examples_for_workflow.rb
 - spec/support/spec_adapter.rb
 - spec/support/zk_setup.rb