cellect-server 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b7f28e9a20fa75b575fe23b06eb1690f1c78943
-  data.tar.gz: ece4c409106d6bdba0d50e9fead70d0c1ce399d9
+  metadata.gz: cd1ff2b4c25231cf18b03a8a558077a22915881c
+  data.tar.gz: 926b9cc3da11fcb74cf25994377d566ef2a9c1d2
 SHA512:
-  metadata.gz: 439ca8ce160576d91933308d882ce74c131d926d8b9e1394e45e37b532f0c36ca122b79e9e4625508712b89eee2cddc4654d55f694a71f21aa0cfcd23837c579
-  data.tar.gz: 90b0afb4aa5ab74af30c3094fb8e103b507ab96c8ad2dbe6b5119844ddbea2b0f451e8b7cfd386373d1959e43c6dd5339b53ec5b2e118a499caf63edcf23e561
+  metadata.gz: 80c13d8c484811d77c62afbe567b966df465a4aac0f0f7e885711a2ed21e1e4afbdfab51d654b0242048c4b01ee70bded2b2de39da3846f61c160f93c21b3171
+  data.tar.gz: 9506e44c1991d879f7282fd9129222e49e5dca854619b4dbf06123c17fa2679a219e28ed9ff74cca3cabe88ea2d3942df62b0cdbf13117c8e580dd5ebe97448e

data/lib/cellect/server/adapters/default.rb

@@ -2,7 +2,7 @@ module Cellect
   module Server
     module Adapters
       class Default
-        # Return a list of projects to load in the form:
+        # Return a list of workflows to load in the form:
         #   [{
         #     'id' => 123,
         #     'name' => 'foo',
@@ -10,49 +10,49 @@ module Cellect
         #     'pairwise' => false,
         #     'grouped' => false
         #   }, ...]
-        def project_list
+        def workflow_list
           raise NotImplementedError
         end
         
-        # Load the data for a project, this method:
-        #   Accepts a project
+        # Load the data for a workflow, this method:
+        #   Accepts a workflow
         #   Returns an array of hashes in the form:
         #   {
         #     'id' => 123,
         #     'priority' => 0.123,
         #     'group_id' => 456
         #   }
-        def load_data_for(project_name)
+        def load_data_for(workflow_name)
           raise NotImplementedError
         end
         
         # Load seen ids for a user, this method:
-        #   Accepts a project_name, and a user id
+        #   Accepts a workflow_name, and a user id
         #   Returns an array in the form:
         #   [1, 2, 3]
-        def load_user(project_name, id)
+        def load_user(workflow_name, id)
           raise NotImplementedError
         end
         
-        def load_projects
-          project_list.each{ |project_info| load_project project_info }
+        def load_workflows
+          workflow_list.each{ |workflow_info| load_workflow workflow_info }
         end
         
-        def load_project(args)
+        def load_workflow(args)
           info = if args.is_a?(Hash)
             args
           elsif args.is_a?(String)
-            project_list.select{ |h| h['name'] == args }.first
+            workflow_list.select{ |h| h['name'] == args }.first
           else
             raise ArgumentError
           end
           
-          project_for info
+          workflow_for info
         end
         
-        def project_for(opts = { })
-          project_klass = opts.fetch('grouped', false) ? GroupedProject : Project
-          project_klass[opts['name'], pairwise: opts['pairwise'], prioritized: opts['prioritized']]
+        def workflow_for(opts = { })
+          workflow_klass = opts.fetch('grouped', false) ? GroupedWorkflow : Workflow
+          workflow_klass[opts['name'], pairwise: opts['pairwise'], prioritized: opts['prioritized']]
         end
       end
     end

data/lib/cellect/server/adapters/postgres.rb

@@ -11,9 +11,9 @@ module Cellect
           end
         end
         
-        def project_list
+        def workflow_list
           with_pg do |pg|
-            pg.exec('select * from projects').collect do |row|
+            pg.exec('select * from workflows').collect do |row|
               {
                 'id' => row['id'].to_i,
                 'name' => row['id'],
@@ -25,9 +25,9 @@ module Cellect
           end
         end
         
-        def load_data_for(project_name)
+        def load_data_for(workflow_name)
           with_pg do |pg|
-            pg.exec("select id, priority, group_id from project_#{ project_name }_subjects").collect do |row|
+            pg.exec("select id, priority, group_id from workflow_#{ workflow_name }_subjects").collect do |row|
               {
                 'id' => row['id'].to_i,
                 'priority' => row['priority'].to_f,
@@ -37,9 +37,9 @@ module Cellect
           end
         end
         
-        def load_user(project_name, id)
+        def load_user(workflow_name, id)
           with_pg do |pg|
-            pg.exec("select subject_id from project_#{ project_name }_classifications where user_id=#{ id }").collect do |row|
+            pg.exec("select subject_id from workflow_#{ workflow_name }_classifications where user_id=#{ id }").collect do |row|
               row['subject_id'].to_i
             end
           end

data/lib/cellect/server/api/helpers.rb

@@ -2,8 +2,8 @@ module Cellect
   module Server
     class API
       module Helpers
-        def project
-          @project ||= Project[params[:project_id]]
+        def workflow
+          @workflow ||= Workflow[params[:workflow_id]]
         end
         
         def selector_params

data/lib/cellect/server/api/sets.rb

@@ -3,16 +3,16 @@ module Cellect
     class API
       class Sets < Grape::API
         get do
-          project.sample selector_params
+          workflow.sample selector_params
         end
         
         put :add do
-          project.add update_params
+          workflow.add update_params
           nil
         end
         
         put :remove do
-          project.remove update_params
+          workflow.remove update_params
           nil
         end
       end

data/lib/cellect/server/api/users.rb

@@ -9,7 +9,7 @@ module Cellect
               subject_id = param_to_int :subject_id
               
               if user_id && user_id > 0 && subject_id && subject_id > 0
-                project.async.add_seen_for user_id, subject_id
+                workflow.async.add_seen_for user_id, subject_id
               end
               
               nil
@@ -19,7 +19,7 @@ module Cellect
               user_id = param_to_int :user_id
               
               if user_id && user_id > 0
-                project.async.user user_id
+                workflow.async.user user_id
               end
               
               nil

data/lib/cellect/server/api.rb

@@ -20,26 +20,26 @@ module Cellect
         }
       end
       
-      resources :projects do
+      resources :workflows do
         get do
-          Cellect::Server.adapter.project_list
+          Cellect::Server.adapter.workflow_list
         end
         
-        segment '/:project_id' do
+        segment '/:workflow_id' do
           helpers Helpers
           mount Sets
           mount Users
           
           get :status do
-            project.status
+            workflow.status
           end
           
           post :reload do
-            project.async.load_data
+            workflow.async.load_data
           end
           
           delete do
-            # delete a project (maybe?)
+            # delete a workflow (maybe?)
           end
         end
       end

data/lib/cellect/server/{grouped_project.rb → grouped_workflow.rb}

@@ -1,6 +1,6 @@
 module Cellect
   module Server
-    class GroupedProject < Project
+    class GroupedWorkflow < Workflow
       attr_accessor :groups
       
       def initialize(name, pairwise: false, prioritized: false)

data/lib/cellect/server/node_set.rb

@@ -10,8 +10,9 @@ module Cellect
       
       def setup
         zk.mkdir_p '/nodes'
-        ip = Socket.ip_address_list.find{ |address| address.ipv4? && !address.ipv4_loopback? }.ip_address
-        path = zk.create '/nodes/node', data: ip, mode: :ephemeral_sequential
+        address = Socket.ip_address_list.find{ |address| address.ipv4? && !address.ipv4_loopback? }
+        raise "Cannot identify IP address" unless address
+        path = zk.create '/nodes/node', data: address.ip_address, mode: :ephemeral_sequential
         self.id = path.sub /^\/nodes\//, ''
       end
     end

data/lib/cellect/server/user.rb

@@ -4,23 +4,23 @@ module Cellect
       include Celluloid
       include Celluloid::Logger
       
-      trap_exit :project_crashed
+      trap_exit :workflow_crashed
       finalizer :cancel_ttl_timer
       
-      attr_accessor :id, :project_name, :seen, :state
+      attr_accessor :id, :workflow_name, :seen, :state
       attr_accessor :ttl, :ttl_timer
       
-      def initialize(id, project_name: nil, ttl: nil)
+      def initialize(id, workflow_name: nil, ttl: nil)
         self.id = id
-        self.project_name = project_name
+        self.workflow_name = workflow_name
         self.seen = DiffSet::RandomSet.new
-        monitor Project[project_name]
+        monitor Workflow[workflow_name]
         @ttl = ttl
         load_data
       end
       
       def load_data
-        data = Cellect::Server.adapter.load_user(project_name, id) || []
+        data = Cellect::Server.adapter.load_user(workflow_name, id) || []
         data.each do |subject_id|
           @seen.add subject_id
         end
@@ -50,14 +50,14 @@ module Cellect
       def ttl_expired!
         debug "User #{ id } TTL expired"
         cancel_ttl_timer
-        Project[project_name].async.remove_user(id)
+        Workflow[workflow_name].async.remove_user(id)
       end
       
       def ttl
         @ttl || 60 * 15 # 15 minutes
       end
       
-      def project_crashed(actor, reason)
+      def workflow_crashed(actor, reason)
         cancel_ttl_timer
         terminate
       end

data/lib/cellect/server/{project.rb → workflow.rb}

@@ -1,25 +1,25 @@
 module Cellect
   module Server
-    class Project
+    class Workflow
       include Celluloid
       
       attr_accessor :name, :users, :subjects, :state
       attr_accessor :pairwise, :prioritized
       
       def self.[](name, pairwise: false, prioritized: false)
-        key = "project_#{ name }".to_sym
+        key = "workflow_#{ name }".to_sym
         Actor[key] ||= supervise name, pairwise: pairwise, prioritized: prioritized
         Actor[key].actors.first
       end
       
       def self.names
         actor_names = Celluloid.actor_system.registry.names.collect &:to_s
-        project_actors = actor_names.select{ |key| key =~ /^project_/ }
-        project_actors.collect{ |name| name.sub(/^project_/, '').to_sym }
+        workflow_actors = actor_names.select{ |key| key =~ /^workflow_/ }
+        workflow_actors.collect{ |name| name.sub(/^workflow_/, '').to_sym }
       end
       
       def self.all
-        names.collect{ |name| Project[name] }
+        names.collect{ |name| Workflow[name] }
       end
       
       def initialize(name, pairwise: false, prioritized: false)
@@ -41,7 +41,7 @@ module Cellect
       end
       
       def user(id)
-        self.users[id] ||= User.supervise id, project_name: name
+        self.users[id] ||= User.supervise id, workflow_name: name
         users[id].actors.first
       end
       

data/lib/cellect/server.rb

@@ -6,8 +6,8 @@ module Cellect
   module Server
     require 'cellect/server/node_set'
     require 'cellect/server/adapters'
-    require 'cellect/server/project'
-    require 'cellect/server/grouped_project'
+    require 'cellect/server/workflow'
+    require 'cellect/server/grouped_workflow'
     require 'cellect/server/user'
     require 'cellect/server/api'
     
@@ -16,8 +16,8 @@ module Cellect
     end
     
     def self.ready?
-      Project.all.each do |project|
-        return false unless project.ready?
+      Workflow.all.each do |workflow|
+        return false unless workflow.ready?
       end
       
       true

data/lib/cellect/version.rb

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

data/spec/server/api/add_seen_spec.rb

@@ -7,16 +7,16 @@ module Cellect::Server
     { 'Ungrouped' => nil, 'Grouped' => 'grouped' }.each_pair do |grouping_type, grouping|
       SET_TYPES.shuffle.each do |set_type|
         context "#{ grouping_type } #{ set_type }" do
-          let(:project_type){ [grouping, set_type].compact.join '_' }
-          let(:project){ Project[project_type] }
-          let(:user){ project.user 123 }
-          before(:each){ pass_until project, is: :ready }
+          let(:workflow_type){ [grouping, set_type].compact.join '_' }
+          let(:workflow){ Workflow[workflow_type] }
+          let(:user){ workflow.user 123 }
+          before(:each){ pass_until workflow, is: :ready }
           
           it 'should add seen subjects' do
-            async_project = double
-            project.should_receive(:async).and_return async_project
-            async_project.should_receive(:add_seen_for).with 123, 123
-            put "/projects/#{ project_type }/users/123/add_seen", subject_id: 123
+            async_workflow = double
+            workflow.should_receive(:async).and_return async_workflow
+            async_workflow.should_receive(:add_seen_for).with 123, 123
+            put "/workflows/#{ workflow_type }/users/123/add_seen", subject_id: 123
             last_response.status.should == 200
           end
         end

data/spec/server/api/add_spec.rb

@@ -7,30 +7,30 @@ module Cellect::Server
     { 'Ungrouped' => nil, 'Grouped' => 'grouped' }.each_pair do |grouping_type, grouping|
       SET_TYPES.shuffle.each do |set_type|
         context "#{ grouping_type } #{ set_type }" do
-          let(:project_type){ [grouping, set_type].compact.join '_' }
-          let(:project){ Project[project_type] }
-          let(:user){ project.user 123 }
-          before(:each){ pass_until project, is: :ready }
+          let(:workflow_type){ [grouping, set_type].compact.join '_' }
+          let(:workflow){ Workflow[workflow_type] }
+          let(:user){ workflow.user 123 }
+          before(:each){ pass_until workflow, is: :ready }
           
           let(:opts) do
             { subject_id: 123 }.tap do |h|
-              h[:priority] = 456.0 if project.prioritized?
-              h[:group_id] = 1 if project.grouped?
+              h[:priority] = 456.0 if workflow.prioritized?
+              h[:group_id] = 1 if workflow.grouped?
             end
           end
           
           it 'should add subjects' do
-            if project.grouped? && project.prioritized?
-              project.should_receive(:add).with subject_id: 123, group_id: 1, priority: 456.0
-            elsif project.grouped?
-              project.should_receive(:add).with subject_id: 123, group_id: 1, priority: nil
-            elsif project.prioritized?
-              project.should_receive(:add).with subject_id: 123, group_id: nil, priority: 456.0
+            if workflow.grouped? && workflow.prioritized?
+              workflow.should_receive(:add).with subject_id: 123, group_id: 1, priority: 456.0
+            elsif workflow.grouped?
+              workflow.should_receive(:add).with subject_id: 123, group_id: 1, priority: nil
+            elsif workflow.prioritized?
+              workflow.should_receive(:add).with subject_id: 123, group_id: nil, priority: 456.0
             else
-              project.should_receive(:add).with subject_id: 123, group_id: nil, priority: nil
+              workflow.should_receive(:add).with subject_id: 123, group_id: nil, priority: nil
             end
             
-            put "/projects/#{ project_type }/add", opts
+            put "/workflows/#{ workflow_type }/add", opts
             last_response.status.should == 200
           end
         end

data/spec/server/api/remove_spec.rb

@@ -7,25 +7,25 @@ module Cellect::Server
     { 'Ungrouped' => nil, 'Grouped' => 'grouped' }.each_pair do |grouping_type, grouping|
       SET_TYPES.shuffle.each do |set_type|
         context "#{ grouping_type } #{ set_type }" do
-          let(:project_type){ [grouping, set_type].compact.join '_' }
-          let(:project){ Project[project_type] }
-          let(:user){ project.user 123 }
-          before(:each){ pass_until project, is: :ready }
+          let(:workflow_type){ [grouping, set_type].compact.join '_' }
+          let(:workflow){ Workflow[workflow_type] }
+          let(:user){ workflow.user 123 }
+          before(:each){ pass_until workflow, is: :ready }
           
           let(:opts) do
             { subject_id: 123 }.tap do |h|
-              h[:group_id] = 1 if project.grouped?
+              h[:group_id] = 1 if workflow.grouped?
             end
           end
           
           it 'should remove subjects' do
-            if project.grouped?
-              project.should_receive(:remove).with subject_id: 123, group_id: 1, priority: nil
+            if workflow.grouped?
+              workflow.should_receive(:remove).with subject_id: 123, group_id: 1, priority: nil
             else
-              project.should_receive(:remove).with subject_id: 123, group_id: nil, priority: nil
+              workflow.should_receive(:remove).with subject_id: 123, group_id: nil, priority: nil
             end
             
-            put "/projects/#{ project_type }/remove", opts
+            put "/workflows/#{ workflow_type }/remove", opts
             last_response.status.should == 200
           end
         end

data/spec/server/api/sample_spec.rb

@@ -7,14 +7,14 @@ module Cellect::Server
     { 'Ungrouped' => nil, 'Grouped' => 'grouped' }.each_pair do |grouping_type, grouping|
       SET_TYPES.shuffle.each do |set_type|
         context "#{ grouping_type } #{ set_type }" do
-          let(:project_type){ [grouping, set_type].compact.join '_' }
-          let(:project){ Project[project_type] }
-          let(:user){ project.user 123 }
-          before(:each){ pass_until project, is: :ready }
+          let(:workflow_type){ [grouping, set_type].compact.join '_' }
+          let(:workflow){ Workflow[workflow_type] }
+          let(:user){ workflow.user 123 }
+          before(:each){ pass_until workflow, is: :ready }
           
           it 'should sample without a user, limit, or group' do
-            project.should_receive(:sample).with(limit: 5, user_id: nil, group_id: nil).and_call_original
-            get "/projects/#{ project_type }"
+            workflow.should_receive(:sample).with(limit: 5, user_id: nil, group_id: nil).and_call_original
+            get "/workflows/#{ workflow_type }"
             last_response.status.should == 200
             json.should be_a Array
           end
@@ -22,8 +22,8 @@ module Cellect::Server
           shoulda = grouping ? 'limit, group, and user' : 'limit and user'
           it "should sample with a #{ shoulda }" do
             group_id = grouping ? 1 : nil
-            project.should_receive(:sample).with(limit: 3, user_id: 123, group_id: group_id).and_call_original
-            get "/projects/#{ project_type }?limit=3&user_id=123#{ grouping ? '&group_id=1' : '' }"
+            workflow.should_receive(:sample).with(limit: 3, user_id: 123, group_id: group_id).and_call_original
+            get "/workflows/#{ workflow_type }?limit=3&user_id=123#{ grouping ? '&group_id=1' : '' }"
             last_response.status.should == 200
             json.should be_a Array
           end

data/spec/server/api/user_load_spec.rb

@@ -7,15 +7,15 @@ module Cellect::Server
     { 'Ungrouped' => nil, 'Grouped' => 'grouped' }.each_pair do |grouping_type, grouping|
       SET_TYPES.shuffle.each do |set_type|
         context "#{ grouping_type } #{ set_type }" do
-          let(:project_type){ [grouping, set_type].compact.join '_' }
-          let(:project){ Project[project_type] }
-          before(:each){ pass_until project, is: :ready }
+          let(:workflow_type){ [grouping, set_type].compact.join '_' }
+          let(:workflow){ Workflow[workflow_type] }
+          before(:each){ pass_until workflow, is: :ready }
           
           it 'should load users' do
-            async_project = double
-            project.should_receive(:async).and_return async_project
-            async_project.should_receive(:user).with 123
-            post "/projects/#{ project_type }/users/123/load"
+            async_workflow = double
+            workflow.should_receive(:async).and_return async_workflow
+            async_workflow.should_receive(:user).with 123
+            post "/workflows/#{ workflow_type }/users/123/load"
             last_response.status.should == 201
           end
         end

data/spec/server/grouped_workflow_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+module Cellect::Server
+  describe GroupedWorkflow do
+    SET_TYPES.collect{ |type| "grouped_#{ type }" }.each do |workflow_type|
+      context workflow_type do
+        it_behaves_like 'workflow', :workflow
+        let(:workflow){ GroupedWorkflow[workflow_type] }
+        let(:user){ workflow.user 123 }
+        let(:set_klass){ workflow.prioritized? ? DiffSet::PrioritySet : DiffSet::RandomSet }
+        before(:each){ pass_until workflow, is: :ready }
+        
+        it 'should provide unseen from a random group for users' do
+          workflow.groups = { }
+          workflow.groups[1] = set_klass.new
+          workflow.groups[1].should_receive(:subtract).with user.seen, 3
+          workflow.unseen_for 123, limit: 3
+        end
+        
+        it 'should provide unseen from a specific group for users' do
+          3.times{ |i| workflow.groups[i] = set_klass.new }
+          workflow.group(1).should_receive(:subtract).with user.seen, 3
+          workflow.unseen_for 123, group_id: 1, limit: 3
+        end
+        
+        it 'should sample subjects from a random group without a user' do
+          workflow.groups = { }
+          workflow.groups[1] = set_klass.new
+          workflow.group(1).should_receive(:sample).with 3
+          workflow.sample limit: 3
+        end
+        
+        it 'should sample subjects from a specific group without a user' do
+          3.times{ |i| workflow.groups[i] = set_klass.new }
+          workflow.group(1).should_receive(:sample).with 3
+          workflow.sample group_id: 1, limit: 3
+        end
+        
+        it 'should sample subjects from a random group for a user' do
+          workflow.groups = { }
+          workflow.groups[1] = set_klass.new
+          workflow.groups[1].should_receive(:subtract).with user.seen, 3
+          workflow.sample user_id: 123, limit: 3
+        end
+        
+        it 'should sample subjects from a specific group for a user' do
+          3.times{ |i| workflow.groups[i] = set_klass.new }
+          workflow.group(1).should_receive(:subtract).with user.seen, 3
+          workflow.sample user_id: 123, group_id: 1, limit: 3
+        end
+        
+        it 'should add subjects' do
+          workflow.groups[1] = set_klass.new
+          
+          if workflow.prioritized?
+            workflow.groups[1].should_receive(:add).with 123, 456
+            workflow.add subject_id: 123, group_id: 1, priority: 456
+          else
+            workflow.groups[1].should_receive(:add).with 123
+            workflow.add subject_id: 123, group_id: 1
+          end
+        end
+        
+        it 'should remove subjects' do
+          workflow.groups[1] = set_klass.new
+          workflow.groups[1].should_receive(:remove).with 123
+          workflow.remove subject_id: 123, group_id: 1
+        end
+        
+        it 'should be grouped' do
+          workflow.should be_grouped
+        end
+      end
+    end
+  end
+end

data/spec/server/server_spec.rb

@@ -6,18 +6,18 @@ module Cellect::Server
       let(:default){ Cellect::Server::Adapters::Default.new }
       
       it 'should raise a NotImplementedError when using the default adapter' do
-        expect{ default.project_list }.to raise_error NotImplementedError
-        expect{ default.load_data_for(Project.new('test')) }.to raise_error NotImplementedError
+        expect{ default.workflow_list }.to raise_error NotImplementedError
+        expect{ default.load_data_for(Workflow.new('test')) }.to raise_error NotImplementedError
         expect{ default.load_user 'random', 123 }.to raise_error NotImplementedError
       end
       
-      it 'should return a project given a set of options' do
-        default.project_for('name' => 'a').should be_an_instance_of Project
-        default.project_for('name' => 'b', 'grouped' => true).should be_an_instance_of GroupedProject
-        default.project_for('name' => 'c', 'pairwise' => true).should be_pairwise
-        default.project_for('name' => 'd', 'prioritized' => true).should be_prioritized
-        default.project_for('name' => 'e', 'pairwise' => true, 'prioritized' => true).should be_pairwise
-        default.project_for('name' => 'e', 'pairwise' => true, 'prioritized' => true).should be_prioritized
+      it 'should return a workflow given a set of options' do
+        default.workflow_for('name' => 'a').should be_an_instance_of Workflow
+        default.workflow_for('name' => 'b', 'grouped' => true).should be_an_instance_of GroupedWorkflow
+        default.workflow_for('name' => 'c', 'pairwise' => true).should be_pairwise
+        default.workflow_for('name' => 'd', 'prioritized' => true).should be_prioritized
+        default.workflow_for('name' => 'e', 'pairwise' => true, 'prioritized' => true).should be_pairwise
+        default.workflow_for('name' => 'e', 'pairwise' => true, 'prioritized' => true).should be_prioritized
       end
     end
   end

data/spec/server/user_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Cellect::Server
   describe User do
-    let(:user){ User.new 1, project_name: 'random' }
+    let(:user){ User.new 1, workflow_name: 'random' }
     
     it 'should store seen ids' do
       user.seen.should be_a DiffSet::RandomSet
@@ -13,7 +13,7 @@ module Cellect::Server
     end
     
     it 'should allow custom ttl' do
-      User.new(2, project_name: 'random', ttl: 123).ttl.should == 123
+      User.new(2, workflow_name: 'random', ttl: 123).ttl.should == 123
     end
     
     it 'should reset the ttl timer on activity' do
@@ -22,9 +22,9 @@ module Cellect::Server
     end
     
     it 'should terminate on ttl expiry' do
-      async_project = double
-      Project[user.project_name].should_receive(:async).and_return async_project
-      async_project.should_receive(:remove_user).with user.id
+      async_workflow = double
+      Workflow[user.workflow_name].should_receive(:async).and_return async_workflow
+      async_workflow.should_receive(:remove_user).with user.id
       user.ttl_expired!
       user.ttl_timer.should be_nil
     end

data/spec/server/workflow_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+module Cellect::Server
+  describe Workflow do
+    SET_TYPES.each do |workflow_type|
+      context workflow_type do
+        it_behaves_like 'workflow', :workflow
+        let(:workflow){ Workflow[workflow_type] }
+        let(:user){ workflow.user 123 }
+        before(:each){ pass_until workflow, is: :ready }
+        
+        it 'should provide unseen for users' do
+          workflow.subjects.should_receive(:subtract).with user.seen, 3
+          workflow.unseen_for 123, limit: 3
+        end
+        
+        it 'should sample subjects without a user' do
+          workflow.subjects.should_receive(:sample).with 3
+          workflow.sample limit: 3
+        end
+        
+        it 'should sample subjects with a user' do
+          workflow.subjects.should_receive(:subtract).with user.seen, 3
+          workflow.sample user_id: 123, limit: 3
+        end
+        
+        it 'should add subjects' do
+          if workflow.prioritized?
+            workflow.subjects.should_receive(:add).with 123, 456
+            workflow.add subject_id: 123, priority: 456
+          else
+            workflow.subjects.should_receive(:add).with 123
+            workflow.add subject_id: 123
+          end
+        end
+        
+        it 'should remove subjects' do
+          workflow.subjects.should_receive(:add).with 123
+          workflow.add subject_id: 123
+        end
+        
+        it 'should be notified of a user ttl expiry' do
+          async_workflow = double
+          workflow.should_receive(:async).and_return async_workflow
+          async_workflow.should_receive(:remove_user).with user.id
+          user.ttl_expired!
+        end
+        
+        it 'should remove users when their ttl expires' do
+          id = user.id
+          workflow.remove_user id
+          workflow.users.should_not have_key id
+          expect{ user.id }.to raise_error
+        end
+        
+        it 'should not be grouped' do
+          workflow.should_not be_grouped
+        end
+      end
+    end
+  end
+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-server
 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
@@ -245,39 +245,39 @@ files:
 - lib/cellect/server/api/helpers.rb
 - lib/cellect/server/api/sets.rb
 - lib/cellect/server/api/users.rb
-- lib/cellect/server/grouped_project.rb
+- lib/cellect/server/grouped_workflow.rb
 - lib/cellect/server/node_set.rb
-- lib/cellect/server/project.rb
 - lib/cellect/server/user.rb
+- lib/cellect/server/workflow.rb
 - lib/cellect/version.rb
 - log/.gitkeep
-- 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/server/api/add_seen_spec.rb
 - spec/server/api/add_spec.rb
 - spec/server/api/remove_spec.rb
 - spec/server/api/sample_spec.rb
 - spec/server/api/user_load_spec.rb
-- spec/server/grouped_project_spec.rb
+- spec/server/grouped_workflow_spec.rb
 - spec/server/node_set_spec.rb
-- spec/server/project_spec.rb
 - spec/server/server_spec.rb
 - spec/server/user_spec.rb
+- spec/server/workflow_spec.rb
 - 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
@@ -306,32 +306,32 @@ signing_key:
 specification_version: 4
 summary: ''
 test_files:
-- 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/server/api/add_seen_spec.rb
 - spec/server/api/add_spec.rb
 - spec/server/api/remove_spec.rb
 - spec/server/api/sample_spec.rb
 - spec/server/api/user_load_spec.rb
-- spec/server/grouped_project_spec.rb
+- spec/server/grouped_workflow_spec.rb
 - spec/server/node_set_spec.rb
-- spec/server/project_spec.rb
 - spec/server/server_spec.rb
 - spec/server/user_spec.rb
+- spec/server/workflow_spec.rb
 - 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

data/spec/server/grouped_project_spec.rb

@@ -1,76 +0,0 @@
-require 'spec_helper'
-
-module Cellect::Server
-  describe GroupedProject do
-    SET_TYPES.collect{ |type| "grouped_#{ type }" }.each do |project_type|
-      context project_type do
-        it_behaves_like 'project', :project
-        let(:project){ GroupedProject[project_type] }
-        let(:user){ project.user 123 }
-        let(:set_klass){ project.prioritized? ? DiffSet::PrioritySet : DiffSet::RandomSet }
-        before(:each){ pass_until project, is: :ready }
-        
-        it 'should provide unseen from a random group for users' do
-          project.groups = { }
-          project.groups[1] = set_klass.new
-          project.groups[1].should_receive(:subtract).with user.seen, 3
-          project.unseen_for 123, limit: 3
-        end
-        
-        it 'should provide unseen from a specific group for users' do
-          3.times{ |i| project.groups[i] = set_klass.new }
-          project.group(1).should_receive(:subtract).with user.seen, 3
-          project.unseen_for 123, group_id: 1, limit: 3
-        end
-        
-        it 'should sample subjects from a random group without a user' do
-          project.groups = { }
-          project.groups[1] = set_klass.new
-          project.group(1).should_receive(:sample).with 3
-          project.sample limit: 3
-        end
-        
-        it 'should sample subjects from a specific group without a user' do
-          3.times{ |i| project.groups[i] = set_klass.new }
-          project.group(1).should_receive(:sample).with 3
-          project.sample group_id: 1, limit: 3
-        end
-        
-        it 'should sample subjects from a random group for a user' do
-          project.groups = { }
-          project.groups[1] = set_klass.new
-          project.groups[1].should_receive(:subtract).with user.seen, 3
-          project.sample user_id: 123, limit: 3
-        end
-        
-        it 'should sample subjects from a specific group for a user' do
-          3.times{ |i| project.groups[i] = set_klass.new }
-          project.group(1).should_receive(:subtract).with user.seen, 3
-          project.sample user_id: 123, group_id: 1, limit: 3
-        end
-        
-        it 'should add subjects' do
-          project.groups[1] = set_klass.new
-          
-          if project.prioritized?
-            project.groups[1].should_receive(:add).with 123, 456
-            project.add subject_id: 123, group_id: 1, priority: 456
-          else
-            project.groups[1].should_receive(:add).with 123
-            project.add subject_id: 123, group_id: 1
-          end
-        end
-        
-        it 'should remove subjects' do
-          project.groups[1] = set_klass.new
-          project.groups[1].should_receive(:remove).with 123
-          project.remove subject_id: 123, group_id: 1
-        end
-        
-        it 'should be grouped' do
-          project.should be_grouped
-        end
-      end
-    end
-  end
-end

data/spec/server/project_spec.rb

@@ -1,62 +0,0 @@
-require 'spec_helper'
-
-module Cellect::Server
-  describe Project do
-    SET_TYPES.each do |project_type|
-      context project_type do
-        it_behaves_like 'project', :project
-        let(:project){ Project[project_type] }
-        let(:user){ project.user 123 }
-        before(:each){ pass_until project, is: :ready }
-        
-        it 'should provide unseen for users' do
-          project.subjects.should_receive(:subtract).with user.seen, 3
-          project.unseen_for 123, limit: 3
-        end
-        
-        it 'should sample subjects without a user' do
-          project.subjects.should_receive(:sample).with 3
-          project.sample limit: 3
-        end
-        
-        it 'should sample subjects with a user' do
-          project.subjects.should_receive(:subtract).with user.seen, 3
-          project.sample user_id: 123, limit: 3
-        end
-        
-        it 'should add subjects' do
-          if project.prioritized?
-            project.subjects.should_receive(:add).with 123, 456
-            project.add subject_id: 123, priority: 456
-          else
-            project.subjects.should_receive(:add).with 123
-            project.add subject_id: 123
-          end
-        end
-        
-        it 'should remove subjects' do
-          project.subjects.should_receive(:add).with 123
-          project.add subject_id: 123
-        end
-        
-        it 'should be notified of a user ttl expiry' do
-          async_project = double
-          project.should_receive(:async).and_return async_project
-          async_project.should_receive(:remove_user).with user.id
-          user.ttl_expired!
-        end
-        
-        it 'should remove users when their ttl expires' do
-          id = user.id
-          project.remove_user id
-          project.users.should_not have_key id
-          expect{ user.id }.to raise_error
-        end
-        
-        it 'should not be grouped' do
-          project.should_not be_grouped
-        end
-      end
-    end
-  end
-end