cellect-server 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2329c741f3e1c93571991a828999c115ffd4d052
-  data.tar.gz: 55c3766d563da3f902dde9b2a18557d3d99d26b7
+  metadata.gz: d2e026d8345a63a009cc6fe11553fc8bfc87fbd0
+  data.tar.gz: 101d9b968ddb2445505ffbd4aff4b3503c608721
 SHA512:
-  metadata.gz: bc5f12c17737323843881ce4bd8e53b730ee5a896feef7909a849fed5ab85b1bebda409b4e0cc5a683359da303cda75491cfa0a3773a0636e299643c76ee5abb
-  data.tar.gz: 3cb690279afa355a07034cf45519d3f7faa58f399b663fc6f197622f02fe60844d25bb3f3fe01aba4ae09dedff16a0a4e5fc4c14bc3667a61904bfa4fd832920
+  metadata.gz: 650931de9ff9aed416f1388fbb8b31bb67b87b6c5d3890d8116548eda0aba018b5de847a075385df682c2eb6235a29091d5e8f38b1dc6f8a25c9df7b95024a67
+  data.tar.gz: 110a3703be03e56a8300c1c79aea3e39b753c97e97249a12dad8fbcba3fa79a60fa7793ca7ea91afa75dab8eccb63e7c20417cdf696114dc32e5dc915dcb9c07

data/.travis.yml

@@ -13,3 +13,10 @@ rvm:
 script: bundle exec rake spec
 services:
   - redis-server
+
+addons:
+  code_climate:
+    repo_token: $CODECLIMATE_REPO_TOKEN
+
+after_success:
+  - bundle exec codeclimate-test-reporter

data/cellect.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'puma', '~> 2.8'
   spec.add_development_dependency 'pg', '~> 0.17'
   spec.add_development_dependency 'connection_pool', '~> 2.0'
-  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
 
   spec.add_runtime_dependency 'cellect-server', Cellect::VERSION
   spec.add_runtime_dependency 'cellect-client', Cellect::VERSION

data/lib/cellect/server.rb

@@ -10,6 +10,8 @@ module Cellect
     require 'cellect/server/workflow'
     require 'cellect/server/grouped_workflow'
     require 'cellect/server/user'
+    require 'cellect/server/loader'
+    require 'cellect/server/grouped_loader'
     require 'cellect/server/api'
 
     class << self

data/lib/cellect/server/api.rb

@@ -10,7 +10,7 @@ module Cellect
       require 'cellect/server/api/users'
 
       # GET /stats
-      # 
+      #
       # Provides system load information
       get :stats do
         instance = Attention.instance
@@ -32,7 +32,7 @@ module Cellect
       resources :workflows do
 
         # GET /workflows
-        # 
+        #
         # Returns a list of available workflows
         get do
           Cellect::Server.adapter.workflow_list
@@ -44,7 +44,7 @@ module Cellect
           mount Users
 
           # GET /workflows/:workflow_id/status
-          # 
+          #
           # Returns the workflow's status
           get :status do
             return four_oh_four unless workflow
@@ -52,15 +52,15 @@ module Cellect
           end
 
           # POST /workflows/:workflow_id/reload
-          # 
+          #
           # Reloads the workflow from the adapter
           post :reload do
             return four_oh_four unless workflow
-            workflow.async.load_data
+            workflow.reload_data
           end
 
           # DELETE /workflows/:workflow_id
-          # 
+          #
           # Not implemented
           delete do
             # delete a workflow (maybe?)

data/lib/cellect/server/grouped_loader.rb

@@ -0,0 +1,13 @@
+module Cellect
+  module Server
+    class GroupedLoader < Loader
+
+      def run_load!(set)
+        Cellect::Server.adapter.load_data_for(workflow.name) do |hash|
+          set[hash['group_id']] ||= workflow.set_klass.new
+          set[hash['group_id']].add hash['id'], hash['priority']
+        end
+      end
+    end
+  end
+end

data/lib/cellect/server/grouped_workflow.rb

@@ -1,29 +1,20 @@
 module Cellect
   module Server
     class GroupedWorkflow < Workflow
-      attr_accessor :groups
 
       # Sets up the new workflow
       def initialize(name, pairwise: false, prioritized: false)
-        self.groups = { }
+        self.subjects = { }
         super
       end
 
-      # Load subjects from the adapter into their groups
-      def load_data
-        self.state = :initializing
-        self.groups = { }
-        klass = set_klass
-        Cellect::Server.adapter.load_data_for(name).each do |hash|
-          self.groups[hash['group_id']] ||= klass.new
-          self.groups[hash['group_id']].add hash['id'], hash['priority']
-        end
-        self.state = :ready
+      def groups
+        subjects
       end
 
-      # Returns a group by id or samples one randomly
+      # Returns a group by id or samples one randomly with a fall back to a new group
       def group(group_id = nil)
-        groups[group_id] || groups.values.sample
+        subjects[group_id] || subjects.values.sample || fetch_or_setup_group(group_id)
       end
 
       # Get unseen subjects from a group for a user
@@ -32,7 +23,7 @@ module Cellect
       end
 
       # Get a sample of subjects from a group for a user
-      # 
+      #
       # Accepts a hash in the form:
       #   {
       #     user_id: 123,
@@ -43,12 +34,12 @@ module Cellect
         if opts[:user_id]
           unseen_for opts[:user_id], group_id: opts[:group_id], limit: opts[:limit]
         else
-           group(opts[:group_id]).sample opts[:limit]
+          group(opts[:group_id]).sample opts[:limit]
         end
       end
 
       # Adds or updates a subject in a group
-      # 
+      #
       # Accepts a hash in the form:
       # {
       #   subject_id: 1,
@@ -56,28 +47,32 @@ module Cellect
       #   priority: 0.5  # (if the workflow is prioritized)
       # }
       def add(opts = { })
+        add_group = fetch_or_setup_group(opts[:group_id])
+
         if prioritized?
-          groups[opts[:group_id]].add opts[:subject_id], opts[:priority]
+          add_group.add opts[:subject_id], opts[:priority]
         else
-          groups[opts[:group_id]].add opts[:subject_id]
+          add_group.add opts[:subject_id]
         end
       end
 
       # Removes a subject from a group
-      # 
+      #
       # Accepts a hash in the form:
       # {
       #   group_id: 1,
       #   subject_id: 2
       # }
       def remove(opts = { })
-        groups[opts[:group_id]].remove opts[:subject_id]
+        if group = subjects[opts[:group_id]]
+          group.remove opts[:subject_id]
+        end
       end
 
       # General information about this workflow
       def status
         # Get the number of subjects in each group
-        group_counts = Hash[*groups.collect{ |id, set| [id, set.size] }.flatten]
+        group_counts = Hash[*subjects.collect{ |id, set| [id, set.size] }.flatten]
 
         super.merge({
           grouped: true,
@@ -89,6 +84,16 @@ module Cellect
       def grouped?
         true
       end
+
+      private
+
+      def data_loader
+        GroupedLoader.new(self)
+      end
+
+      def fetch_or_setup_group(group_id)
+        subjects[group_id] ||= set_klass.new
+      end
     end
   end
 end

data/lib/cellect/server/loader.rb

@@ -0,0 +1,37 @@
+module Cellect
+  module Server
+    class Loader
+      include Celluloid
+
+      attr_reader :workflow
+
+      def initialize(workflow)
+        @workflow = workflow
+      end
+
+      def load_data
+        run_load!(workflow.subjects)
+        mark_workflow_as_loaded
+      end
+
+      def reload_data(set)
+        run_load!(set)
+        workflow.subjects = set
+        mark_workflow_as_loaded
+      end
+
+      private
+
+      def mark_workflow_as_loaded
+        workflow.set_reload_at_time
+        workflow.state = :ready
+      end
+
+      def run_load!(set)
+        Cellect::Server.adapter.load_data_for(workflow.name) do |hash|
+          set.add hash['id'], hash['priority']
+        end
+      end
+    end
+  end
+end

data/lib/cellect/server/user.rb

@@ -18,11 +18,13 @@ module Cellect
         self.seen = DiffSet::RandomSet.new
         monitor Workflow[workflow_name]
         @ttl = ttl
-        load_data
+        self.state = :initializing
       end
 
       # Load the seen subjects for a user and restarts the TTL
       def load_data
+        return if self.state == :ready
+        self.state = :loading
         data = Cellect::Server.adapter.load_user(workflow_name, id) || []
         data.each do |subject_id|
           @seen.add subject_id

data/lib/cellect/server/workflow.rb

@@ -8,8 +8,11 @@ module Cellect
       end
       self.workflow_names = { }
 
-      attr_accessor :name, :users, :subjects, :state
-      attr_accessor :pairwise, :prioritized
+      attr_accessor :name, :users, :subjects, :state, :pairwise,
+        :prioritized, :can_reload_at
+
+      SKIP_RELOAD_STATES = [ :reloading, :loading, :initializing ].freeze
+      RELOAD_TIMEOUT = ENV.fetch('RELOAD_TIMEOUT', 600).to_i.freeze
 
       # Look up and/or load a workflow
       def self.[](name)
@@ -41,23 +44,32 @@ module Cellect
         self.users = { }
         self.pairwise = !!pairwise
         self.prioritized = !!prioritized
-        self.subjects = set_klass.new
+        self.subjects ||= set_klass.new
+        self.state = :initializing
       end
 
       # Loads subjects from the adapter
       def load_data
-        self.state = :initializing
-        self.subjects = set_klass.new
-        Cellect::Server.adapter.load_data_for(name).each do |hash|
-          subjects.add hash['id'], hash['priority']
+        return if [:loading, :ready ].include? state
+        self.state = :loading
+        data_loader.async.load_data
+      end
+
+      # Reloads subjects from the adapter
+      def reload_data
+        if can_reload_data?
+          self.state = :reloading
+          reload_set = subjects.class.new
+          data_loader.async.reload_data(reload_set)
         end
-        self.state = :ready
       end
 
       # Look up and/or load a user
       def user(id)
         self.users[id] ||= User.supervise id, workflow_name: name
-        users[id].actors.first
+        user = self.users[id].actors.first
+        user.load_data
+        user
       end
 
       # Get unseen subjects for a user
@@ -79,7 +91,7 @@ module Cellect
       end
 
       # Get a sample of subjects for a user
-      # 
+      #
       # Accepts a hash in the form:
       #   {
       #     user_id: 123,
@@ -94,7 +106,7 @@ module Cellect
       end
 
       # Adds or updates a subject
-      # 
+      #
       # Accepts a hash in the form:
       # {
       #   subject_id: 1,
@@ -109,7 +121,7 @@ module Cellect
       end
 
       # Removes a subject
-      # 
+      #
       # Accepts a hash in the form:
       # {
       #   subject_id: 1
@@ -145,7 +157,7 @@ module Cellect
 
       # Looks up the set class
       def set_klass
-        SET_KLASS[[prioritized, pairwise]]
+        @set_klass ||= SET_KLASS[[prioritized, pairwise]]
       end
 
       # General information about this workflow
@@ -160,6 +172,24 @@ module Cellect
           users: users.length
         }
       end
+
+      def can_reload_data?
+        if SKIP_RELOAD_STATES.include?(self.state)
+          false
+        elsif can_reload_at.nil?
+          true
+        else
+          can_reload_at <= Time.now
+        end
+      end
+
+      def set_reload_at_time(time_stamp=Time.now + RELOAD_TIMEOUT)
+        self.can_reload_at = time_stamp
+      end
+
+      def data_loader
+        Loader.new(self)
+      end
     end
   end
 end

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '2.1.1'
+  VERSION = '3.0.0'
 end

data/spec/cellect/server/api/reload_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+module Cellect::Server
+  describe API do
+    include_context 'API'
+
+    { 'Ungrouped' => nil, 'Grouped' => 'grouped' }.each_pair do |grouping_type, grouping|
+      SET_TYPES.shuffle.each do |set_type|
+        context "#{ grouping_type } #{ set_type }" do
+          let(:workflow_type){ [grouping, set_type].compact.join '_' }
+          let(:workflow){ Workflow[workflow_type] }
+          before(:each){ pass_until_state_of workflow, is: :ready }
+
+          it 'should call reload_data' do
+            expect(workflow).to receive(:reload_data)
+            post "/workflows/#{ workflow_type }/reload"
+            expect(last_response.status).to eq 201
+            expect(json).to be_nil
+          end
+        end
+      end
+    end
+  end
+end

data/spec/cellect/server/grouped_loader_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+module Cellect::Server
+  describe Loader do
+    SET_TYPES.collect{ |type| "grouped_#{ type }" }.each do |workflow_type|
+      it_behaves_like "loader" do
+        let(:workflow) { GroupedWorkflow.new(workflow_type) }
+        let(:loader) { GroupedLoader.new(workflow) }
+        let(:subjects) { {} }
+        let(:group_counts) do
+          fixtures.map { |f| f["group_id"] }.uniq.count
+        end
+
+        describe "#load_data" do
+          it "should setup the groups" do
+            expect(workflow.subjects)
+              .to receive(:[]=)
+              .exactly(group_counts)
+              .and_call_original
+            loader.load_data
+          end
+
+          it "should add data to the workflow subjects" do
+            set = workflow.set_klass.new
+            allow(workflow.set_klass)
+              .to receive(:new)
+              .and_return(set)
+            expect(set)
+              .to receive(:add)
+              .exactly(fixture_count)
+            loader.load_data
+          end
+        end
+
+        describe "#reload_data" do
+          it "should add data to the workflow subjects" do
+            expect(subjects)
+              .to receive(:[]=)
+              .exactly(group_counts)
+              .and_call_original
+            loader.reload_data(subjects)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/cellect/server/grouped_workflow_spec.rb

@@ -4,67 +4,136 @@ 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(:workflow){ GroupedWorkflow.new(workflow_type) }
         let(:user){ workflow.user 123 }
         let(:set_klass){ workflow.prioritized? ? DiffSet::PrioritySet : DiffSet::RandomSet }
-        before(:each){ pass_until_state_of workflow, is: :ready }
 
-        it 'should provide unseen from a random group for users' do
-          workflow.groups = { }
-          workflow.groups[1] = set_klass.new
-          expect(workflow.groups[1]).to receive(:subtract).with user.seen, 3
-          workflow.unseen_for 123, limit: 3
+        it_behaves_like 'workflow', :workflow do
+          let(:obj) { workflow }
         end
 
-        it 'should provide unseen from a specific group for users' do
-          3.times{ |i| workflow.groups[i] = set_klass.new }
-          expect(workflow.group(1)).to receive(:subtract).with user.seen, 3
-          workflow.unseen_for 123, group_id: 1, limit: 3
-        end
+        describe "#group" do
+          context "no group is pre-defined" do
+            it "should be an empty set" do
+              expect(workflow.subjects).to be_empty
+            end
 
-        it 'should sample subjects from a random group without a user' do
-          workflow.groups = { }
-          workflow.groups[1] = set_klass.new
-          expect(workflow.group(1)).to receive(:sample).with 3
-          workflow.sample limit: 3
-        end
+            it "should setup a group" do
+              expect(workflow.group(1)).to be_instance_of(workflow.set_klass)
+            end
+
+            it "should setup a group if no group_id param" do
+              expect(workflow.group).to be_instance_of(workflow.set_klass)
+            end
+          end
 
-        it 'should sample subjects from a specific group without a user' do
-          3.times{ |i| workflow.groups[i] = set_klass.new }
-          expect(workflow.group(1)).to receive(:sample).with 3
-          workflow.sample group_id: 1, limit: 3
+          context "with a pre-defined group" do
+            let(:set) { workflow.set_klass.new }
+            before do
+              workflow.subjects = { 1 => set }
+            end
+
+            it 'should retrieve a pre-defined group' do
+              expect(workflow.group(1)).to eq(set)
+            end
+
+            it 'should randomly select if no group param' do
+              expect(workflow.group).to eq(set)
+            end
+          end
         end
 
-        it 'should sample subjects from a random group for a user' do
-          workflow.groups = { }
-          workflow.groups[1] = set_klass.new
-          expect(workflow.groups[1]).to receive(:subtract).with user.seen, 3
-          workflow.sample user_id: 123, limit: 3
+        describe "#unseen_for" do
+          it 'should not fail if a group is not loaded' do
+            workflow.subjects = { }
+            expect { workflow.unseen_for 123, limit: 3 }.not_to raise_error
+          end
+
+          it 'should provide unseen from a random group for users' do
+            workflow.subjects = { }
+            workflow.groups[1] = set_klass.new
+            expect(workflow.groups[1]).to 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 }
+            expect(workflow.group(1)).to receive(:subtract).with user.seen, 3
+            workflow.unseen_for 123, group_id: 1, limit: 3
+          end
         end
 
-        it 'should sample subjects from a specific group for a user' do
-          3.times{ |i| workflow.groups[i] = set_klass.new }
-          expect(workflow.group(1)).to receive(:subtract).with user.seen, 3
-          workflow.sample user_id: 123, group_id: 1, limit: 3
+        describe "#sample" do
+          it 'should not fail if a group is not loaded' do
+            workflow.subjects = { }
+            expect { workflow.sample limit: 3 }.not_to raise_error
+          end
+
+          it 'should sample subjects from a random group without a user' do
+            workflow.subjects = { }
+            workflow.groups[1] = set_klass.new
+            expect(workflow.group(1)).to 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 }
+            expect(workflow.group(1)).to 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.subjects = { }
+            workflow.groups[1] = set_klass.new
+            expect(workflow.groups[1]).to 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 }
+            expect(workflow.group(1)).to receive(:subtract).with user.seen, 3
+            workflow.sample user_id: 123, group_id: 1, limit: 3
+          end
         end
 
-        it 'should add subjects' do
-          workflow.groups[1] = set_klass.new
+        describe "#add" do
+          let(:opts) do
+            opts = { subject_id: 123, group_id: 1 }
+            opts[:priority] = 456 if workflow.prioritized?
+            opts
+          end
+
+          it 'should add a data to a new group if a group is not loaded' do
+            workflow.subjects = { }
+            workflow.add opts
+            group_data = workflow.subjects[1]
+            expect(group_data.to_a).to_not eq(opts[:subject_id])
+          end
+
+          it 'should add subjects' do
+            workflow.groups[1] = set_klass.new
 
-          if workflow.prioritized?
-            expect(workflow.groups[1]).to receive(:add).with 123, 456
-            workflow.add subject_id: 123, group_id: 1, priority: 456
-          else
-            expect(workflow.groups[1]).to receive(:add).with 123
-            workflow.add subject_id: 123, group_id: 1
+            if workflow.prioritized?
+              expect(workflow.groups[1]).to receive(:add).with 123, 456
+              workflow.add opts
+            else
+              expect(workflow.groups[1]).to receive(:add).with 123
+              workflow.add opts
+            end
           end
         end
 
-        it 'should remove subjects' do
-          workflow.groups[1] = set_klass.new
-          expect(workflow.groups[1]).to receive(:remove).with 123
-          workflow.remove subject_id: 123, group_id: 1
+        describe "#remove" do
+          it 'should not fail if a group is not loaded' do
+            workflow.subjects = { }
+            expect { workflow.remove subject_id: 123, group_id: 1 }.not_to raise_error
+          end
+
+          it 'should remove subjects' do
+            workflow.groups[1] = set_klass.new
+            expect(workflow.groups[1]).to receive(:remove).with 123
+            workflow.remove subject_id: 123, group_id: 1
+          end
         end
 
         it 'should be grouped' do

data/spec/cellect/server/loader_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+module Cellect::Server
+  describe Loader do
+    SET_TYPES.each do |workflow_type|
+      it_behaves_like "loader" do
+        let(:workflow) { Workflow.new(workflow_type) }
+        let(:loader) { Loader.new(workflow) }
+        let(:subjects) { workflow.set_klass.new }
+
+        describe "#load_data" do
+          it "should add data to the workflow subjects" do
+            expect(workflow.subjects)
+              .to receive(:add)
+              .exactly(fixture_count)
+            loader.load_data
+          end
+        end
+
+        describe "#reload_data" do
+          it "should add data to the workflow subjects" do
+            expect(subjects)
+              .to receive(:add)
+              .exactly(fixture_count)
+            loader.reload_data(subjects)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/cellect/server/user_spec.rb

@@ -28,5 +28,24 @@ module Cellect::Server
       user.ttl_expired!
       expect(user.ttl_timer).to be_nil
     end
+
+    describe '#load_data' do
+      it 'should request data from the adapater' do
+        expect(Cellect::Server.adapter)
+          .to receive(:load_user)
+          .with(user.workflow_name, user.id)
+          .and_return([])
+        user.load_data
+      end
+
+      it 'should add data to seens' do
+        expect { user.load_data }.to change { user.seen.size }
+      end
+
+      it 'should not add new subjects when already loaded' do
+        user.load_data
+        expect { user.load_data }.not_to change { user.seen.size }
+      end
+    end
   end
 end

data/spec/cellect/server/workflow_spec.rb

@@ -9,10 +9,12 @@ module Cellect::Server
 
     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_state_of workflow, is: :ready }
+        let(:workflow) { Workflow.new(workflow_type) }
+        let(:user) { workflow.user 123 }
+
+        it_behaves_like 'workflow', :workflow do
+          let(:obj) { workflow }
+        end
 
         it 'should provide unseen for users' do
           expect(workflow.subjects).to receive(:subtract).with user.seen, 3
@@ -46,7 +48,7 @@ module Cellect::Server
 
         it 'should be notified of a user ttl expiry' do
           async_workflow = double
-          expect(workflow).to receive(:async).and_return async_workflow
+          expect(Workflow[workflow.name]).to receive(:async).and_return async_workflow
           expect(async_workflow).to receive(:remove_user).with user.id
           user.ttl_expired!
         end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require "simplecov"
+SimpleCov.start
 
 CELLECT_ROOT = File.expand_path File.join(File.dirname(__FILE__), '../')
 

data/spec/support/shared_examples_for_loader.rb

@@ -0,0 +1,42 @@
+shared_examples_for 'loader' do |name|
+  let(:fixtures) do
+    Cellect::Server
+      .adapter
+      .fixtures
+      .fetch(workflow.name, { })
+      .fetch('entries', [])
+  end
+  let(:fixture_count) { fixtures.count }
+
+  describe "#load_data" do
+    it "should use the server adapter to load data" do
+      expect(Cellect::Server.adapter)
+        .to receive(:load_data_for)
+        .with(workflow.name)
+        .and_call_original
+      loader.load_data
+    end
+
+    it "should mark the workflow as loaded" do
+      expect { loader.load_data }.to change { workflow.state }.to(:ready)
+    end
+  end
+
+  describe "#reload_data" do
+    it "should replace the existing subjects with the reloaded set" do
+      expect {
+        loader.reload_data(subjects)
+      }.to change {
+        workflow.subjects
+      }.to(subjects)
+    end
+
+    it "should mark the workflow as ready" do
+      expect {
+        loader.reload_data(subjects)
+      }.to change {
+        workflow.state
+      }.to(:ready)
+    end
+  end
+end

data/spec/support/shared_examples_for_workflow.rb

@@ -1,10 +1,4 @@
 shared_examples_for 'workflow' do |name|
-  let(:obj){ send name }
-
-  before(:each) do
-    Cellect::Server.adapter.load_workflow obj.name
-  end
-
   it 'should add singleton instances to the registry' do
     expect(obj.class[obj.name]).to be_a_kind_of Cellect::Server::Workflow
     expect(obj.class[obj.name].object_id).to eq obj.class[obj.name].object_id
@@ -14,8 +8,12 @@ shared_examples_for 'workflow' do |name|
     expect(obj.name).to be_a String
     expect(obj.users).to be_a Hash
 
-    set_klass = obj.prioritized? ? DiffSet::PrioritySet : DiffSet::RandomSet
-    expect(obj.subjects).to be_a set_klass
+    if obj.grouped?
+      expect(obj.subjects).to eq({})
+    else
+      set_klass = obj.prioritized? ? DiffSet::PrioritySet : DiffSet::RandomSet
+      expect(obj.subjects).to be_a set_klass
+    end
   end
 
   it 'should provide a user lookup' do
@@ -23,4 +21,82 @@ shared_examples_for 'workflow' do |name|
     expect(obj.user(1).object_id).to eq obj.user(1).object_id
     expect(obj.users.keys).to include 1
   end
+
+  context "with a celluloid stubbed async loader" do
+    let(:loader) do
+      if obj.grouped?
+        Cellect::Server::GroupedLoader.new(obj)
+      else
+        Cellect::Server::Loader.new(obj)
+      end
+    end
+    let(:celluloid_target) { loader.wrapped_object }
+
+    before do
+      allow(obj.wrapped_object).to receive(:data_loader).and_return(loader)
+      allow(loader).to receive(:async).and_return(loader)
+    end
+
+    describe '#load_data' do
+      it 'should request data from the loader' do
+        expect(celluloid_target).to receive(:load_data)
+        obj.load_data
+      end
+
+      it 'should not attempt to reload subjects when in ready state' do
+        obj.state = :ready
+        expect(celluloid_target).not_to receive(:load_data)
+        obj.load_data
+      end
+    end
+
+    describe '#reload_data' do
+      context "able to reload" do
+        before do
+          obj.can_reload_at = Time.now - 1
+          obj.state = :ready
+        end
+
+        it 'should request data from the loader' do
+          expect(celluloid_target)
+            .to receive(:reload_data)
+            .with(instance_of(obj.subjects.class))
+          obj.reload_data
+        end
+
+        it 'should not reload subjects when state is in any kind of loading' do
+          %i(reloading loading).each do |state|
+            obj.state = state
+            expect(celluloid_target).not_to receive(:reload_data)
+            obj.reload_data
+          end
+        end
+      end
+
+      it 'should not allow reloading until after loading' do
+        expect(celluloid_target).not_to receive(:reload_data)
+        obj.reload_data
+      end
+
+      context "after initial data load" do
+        before do
+          obj.state = :ready
+          obj.set_reload_at_time
+        end
+
+        it 'should not allow reloading after first load' do
+          expect(celluloid_target).not_to receive(:reload_data)
+          obj.reload_data
+        end
+
+        context "when reload time gaurds has past" do
+          it 'should allow reloading after timer has reset' do
+            obj.can_reload_at = Time.now - 1
+            expect(celluloid_target).to receive(:reload_data)
+            obj.reload_data
+          end
+        end
+      end
+    end
+  end
 end

data/spec/support/spec_adapter.rb

@@ -10,7 +10,12 @@ class SpecAdapter < Cellect::Server::Adapters::Default
   end
 
   def load_data_for(workflow_name)
-    fixtures.fetch(workflow_name, { }).fetch 'entries', []
+    entries = fixtures.fetch(workflow_name, { }).fetch 'entries', []
+    if block_given?
+      entries.each { |entry| yield entry }
+    else
+      entries
+    end
   end
 
   def fixtures

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-server
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -266,7 +266,9 @@ files:
 - lib/cellect/server/api/helpers.rb
 - lib/cellect/server/api/sets.rb
 - lib/cellect/server/api/users.rb
+- lib/cellect/server/grouped_loader.rb
 - lib/cellect/server/grouped_workflow.rb
+- lib/cellect/server/loader.rb
 - lib/cellect/server/node_set.rb
 - lib/cellect/server/user.rb
 - lib/cellect/server/workflow.rb
@@ -274,10 +276,13 @@ files:
 - log/.gitkeep
 - spec/cellect/server/api/add_seen_spec.rb
 - spec/cellect/server/api/add_spec.rb
+- spec/cellect/server/api/reload_spec.rb
 - spec/cellect/server/api/remove_spec.rb
 - spec/cellect/server/api/sample_spec.rb
 - spec/cellect/server/api/user_load_spec.rb
+- spec/cellect/server/grouped_loader_spec.rb
 - spec/cellect/server/grouped_workflow_spec.rb
+- spec/cellect/server/loader_spec.rb
 - spec/cellect/server/node_set_spec.rb
 - spec/cellect/server/server_spec.rb
 - spec/cellect/server/user_spec.rb
@@ -296,6 +301,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/cellect_helper.rb
 - spec/support/shared_api_context.rb
+- spec/support/shared_examples_for_loader.rb
 - spec/support/shared_examples_for_set.rb
 - spec/support/shared_examples_for_workflow.rb
 - spec/support/spec_adapter.rb
@@ -327,10 +333,13 @@ summary: ''
 test_files:
 - spec/cellect/server/api/add_seen_spec.rb
 - spec/cellect/server/api/add_spec.rb
+- spec/cellect/server/api/reload_spec.rb
 - spec/cellect/server/api/remove_spec.rb
 - spec/cellect/server/api/sample_spec.rb
 - spec/cellect/server/api/user_load_spec.rb
+- spec/cellect/server/grouped_loader_spec.rb
 - spec/cellect/server/grouped_workflow_spec.rb
+- spec/cellect/server/loader_spec.rb
 - spec/cellect/server/node_set_spec.rb
 - spec/cellect/server/server_spec.rb
 - spec/cellect/server/user_spec.rb
@@ -349,6 +358,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/cellect_helper.rb
 - spec/support/shared_api_context.rb
+- spec/support/shared_examples_for_loader.rb
 - spec/support/shared_examples_for_set.rb
 - spec/support/shared_examples_for_workflow.rb
 - spec/support/spec_adapter.rb