cellect-server 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af4dc267e4676e156bff663deb7d214da9ee8209
-  data.tar.gz: 8b5b88fa5b11b5a1f67a6463b53b868193e40ce6
+  metadata.gz: 87c22c0c9de05b34f0da9f19778ffc5cb89faf2f
+  data.tar.gz: 6018574d21d7b9c74a67419bfff573153bdfcf9c
 SHA512:
-  metadata.gz: a5d77e05e2df2fd6e4d75c4fb3462123b40a35e2b58645cfe3cbe3d17c7a10977f7905706df51d2dca28a0644b404d74b5e050ca592cf0aa533845e569d9eff5
-  data.tar.gz: f3d20a24995e1f09cdc65b4b0d2fe500dc8e8eb4276b2d292371d678766023b9d8734f9a4cc4233c20733616ea38b3b4eb8eee670a39f6c9e8066b7c75f8f3ab
+  metadata.gz: 47f439777229098490e256db315e66e9bb20f285262f2a1bf72cbeca3ecac88c2c7055e9bf3b05a2a6aef685084e0d7c860f745301e0372d957361afb2cd01da
+  data.tar.gz: b73b3f427c2329dd3ef7b7e2d0697cabf09fc07624f2d33f2d994f74cff8578b7ccc9ba9b9daacaa2e7e7d6e8b002a7f1b739c788a2bea2bc6e901c12564b75b

data/lib/cellect/server/api.rb

@@ -47,6 +47,7 @@ module Cellect
           # 
           # Returns the workflow's status
           get :status do
+            return four_oh_four unless workflow
             workflow.status
           end
 
@@ -54,6 +55,7 @@ module Cellect
           # 
           # Reloads the workflow from the adapter
           post :reload do
+            return four_oh_four unless workflow
             workflow.async.load_data
           end
 

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

@@ -6,6 +6,10 @@ module Cellect
           @workflow ||= Workflow[params[:workflow_id]]
         end
 
+        def four_oh_four
+          error! 'Not Found', 404
+        end
+
         def selector_params
           {
             limit: param_to_int(:limit, default: 5),

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

@@ -10,7 +10,8 @@ module Cellect
         #   user_id: integer, optional
         #   group_id: integer, optional
         get do
-          workflow.sample selector_params
+          return four_oh_four unless workflow
+          workflow.sample(selector_params)
         end
 
         # PUT /workflows/:workflow_id/add
@@ -21,7 +22,8 @@ module Cellect
         #   group_id: integer, required if grouped
         #   priority: float, required if prioritized
         put :add do
-          workflow.add update_params
+          return four_oh_four unless workflow
+          workflow.add(update_params)
           nil
         end
 
@@ -32,7 +34,8 @@ module Cellect
         #   subject_id: integer
         #   group_id: integer, required if grouped
         put :remove do
-          workflow.remove update_params
+          return four_oh_four unless workflow
+          workflow.remove(update_params)
           nil
         end
       end

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

@@ -10,6 +10,7 @@ module Cellect
             # Accepts params
             #   subject_id: integer, required
             put :add_seen do
+              return four_oh_four unless workflow
               user_id = param_to_int :user_id
               subject_id = param_to_int :subject_id
 
@@ -24,6 +25,7 @@ module Cellect
             # 
             # Preloads a user for a workflow
             post :load do
+              return four_oh_four unless workflow
               user_id = param_to_int :user_id
 
               if user_id && user_id > 0

data/lib/cellect/server/workflow.rb

@@ -19,8 +19,9 @@ module Cellect
 
       # Load a workflow
       def self.[]=(name, opts)
-        Workflow.workflow_names[name] = true
         Actor[name] = supervise name, pairwise: opts['pairwise'], prioritized: opts['prioritized']
+        Workflow.workflow_names[name] = true if Actor[name]
+        Actor[name]
       end
 
       # The names of all workflows currently loaded
@@ -31,7 +32,7 @@ module Cellect
 
       # All currently loaded workflows
       def self.all
-        names.collect{ |name| Workflow[name] }
+        names.collect{ |name| Workflow[name] }.compact
       end
 
       # Sets up a new workflow and starts the data loading

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/spec/server/api/add_seen_spec.rb

@@ -22,5 +22,12 @@ module Cellect::Server
         end
       end
     end
+
+    it 'should handle missing workflows' do
+      allow(Workflow).to receive(:[]).with('missing').and_return nil
+      put '/workflows/missing/users/123/add_seen', subject_id: 123
+      expect(last_response.status).to eql 404
+      expect(last_response.body).to match /Not Found/
+    end
   end
 end

data/spec/server/api/add_spec.rb

@@ -36,5 +36,12 @@ module Cellect::Server
         end
       end
     end
+
+    it 'should handle missing workflows' do
+      allow(Workflow).to receive(:[]).with('missing').and_return nil
+      put '/workflows/missing/add', subject_id: 123
+      expect(last_response.status).to eql 404
+      expect(last_response.body).to match /Not Found/
+    end
   end
 end

data/spec/server/api/remove_spec.rb

@@ -31,5 +31,12 @@ module Cellect::Server
         end
       end
     end
+
+    it 'should handle missing workflows' do
+      allow(Workflow).to receive(:[]).with('missing').and_return nil
+      put '/workflows/missing/remove', subject_id: 123
+      expect(last_response.status).to eql 404
+      expect(last_response.body).to match /Not Found/
+    end
   end
 end

data/spec/server/api/sample_spec.rb

@@ -30,5 +30,12 @@ module Cellect::Server
         end
       end
     end
+
+    it 'should handle missing workflows' do
+      allow(Workflow).to receive(:[]).with('missing').and_return nil
+      get '/workflows/missing', limit: 3, user_id: 123
+      expect(last_response.status).to eql 404
+      expect(last_response.body).to match /Not Found/
+    end
   end
 end

data/spec/server/api/user_load_spec.rb

@@ -21,5 +21,12 @@ module Cellect::Server
         end
       end
     end
+
+    it 'should handle missing workflows' do
+      allow(Workflow).to receive(:[]).with('missing').and_return nil
+      post '/workflows/missing/users/123/load'
+      expect(last_response.status).to eql 404
+      expect(last_response.body).to match /Not Found/
+    end
   end
 end

data/spec/server/server_spec.rb

@@ -38,7 +38,7 @@ module Cellect::Server
 
       before(:each) do
         pass_until{ all_workflows.all? &:ready? }
-        get :stats
+        get '/stats'
       end
 
       it 'should include information' do
@@ -69,6 +69,12 @@ module Cellect::Server
           end
         end
       end
+
+      it 'should handle missing workflows' do
+        Workflow.names << 'missing'
+        get '/stats'
+        expect(last_response).to be_ok
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-server
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler