cellect-server 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c4c76b5033ebc886495182a0cceda05b09dfb94
-  data.tar.gz: 7c58e799df156fada54824d98be0c9dc7d1dc276
+  metadata.gz: e6f50bc35da0b22aed570a3820f089359cd29aaf
+  data.tar.gz: 1ee19a258a5ec1eac02d34e7cf87fdb6c31e70fa
 SHA512:
-  metadata.gz: 4c6a8b5e0dfab1ad0605789175cd01ab8bf222aa6daf059e0862145b6b756606ffd8114d652bcd089bc0149bfb81b940c17e56cd107702feeaf1c6798dd0bb77
-  data.tar.gz: 0744ec694028b02e2a1ca0b978f446e55b019fbb6d52d88926eeed476d328bbecfd39cdc9f20a8d2062c1d3cb2aed7d3b79bf8740a31f83527c3f536e4dd3c79
+  metadata.gz: df88efc975c8fb833e6e63d56c051aaa25c91fbf045d46ed64dc5704420c5f3f8f4d4a837aaa6aa5aa05639b55875e9477284788df77496ca8f3652b5e7f2bdc
+  data.tar.gz: e1af49629a0d2024a3d25d70b3df749699ae6b5b3586c09837dd3da07550c59437907c60cbcc760d5677707a6c93139866dcb29f32270f1e3ac93e60f13dc3b0

data/.travis.yml

@@ -0,0 +1,24 @@
+language: ruby
+cache: bundler
+
+before_install:
+  - sudo add-apt-repository ppa:boost-latest/ppa -y
+  - sudo apt-get update -q
+  - sudo apt-get install -y autoconf automake boost1.55 libffi-dev
+
+before_script:
+  - test `which zkServer.sh` && zkServer.sh stop && rm -rf /tmp/zookeeper/*; true
+  - wget -q -O - "http://mirrors.koehn.com/apache/zookeeper/zookeeper-3.4.6/zookeeper-3.4.6.tar.gz" | tar zx -C "$HOME/"
+  - export PATH="$PATH:/$HOME/zookeeper-3.4.6/bin"
+  - cp "$HOME/zookeeper-3.4.6/conf/zoo_sample.cfg" "$HOME/zookeeper-3.4.6/conf/zoo.cfg"
+  - zkServer.sh start
+
+rvm:
+  - 2.1.5
+  - 2.1.2
+  - 2.2.0
+
+jdk:
+  - openjdk7
+
+script: ZK_URL=localhost:2181 bundle exec rake

data/README.md

@@ -1,4 +1,4 @@
-# Cellect
+# Cellect [![Build Status](https://travis-ci.org/zooniverse/Cellect.svg?branch=master)](https://travis-ci.org/zooniverse/Cellect)
 
 This is a work in progress
 

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

@@ -10,7 +10,7 @@ module Cellect
         #     'pairwise' => false,
         #     'grouped' => false
         #   }, ...]
-        def workflow_list
+        def workflow_list(*names)
           raise NotImplementedError
         end
         
@@ -34,8 +34,8 @@ module Cellect
           raise NotImplementedError
         end
         
-        def load_workflows
-          workflow_list.each{ |workflow_info| load_workflow workflow_info }
+        def load_workflows(*names)
+          workflow_list(*names).each{ |workflow_info| load_workflow workflow_info }
         end
         
         def load_workflow(args)
@@ -52,7 +52,8 @@ module Cellect
         
         def workflow_for(opts = { })
           workflow_klass = opts.fetch('grouped', false) ? GroupedWorkflow : Workflow
-          workflow_klass[opts['name'], pairwise: opts['pairwise'], prioritized: opts['prioritized']]
+          workflow_klass[opts['name']] = opts 
+          workflow_klass[opts['name']]
         end
       end
     end

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

@@ -11,9 +11,18 @@ module Cellect
           end
         end
 
-        def workflow_list
+        def workflow_list(*names)
           with_pg do |pg|
-            pg.exec('SELECT * FROM workflows').collect do |row|
+            statement = 'SELECT * FROM workflows'
+            statement += case names.length
+                         when 0
+                           ""
+                         when 1
+                           "WHERE \"workflows\".\"id\" = #{ names.first }"
+                         else
+                           "WHERE \"workflows\".\"id\" IN (#{ names.join(',') })"
+                         end
+            pg.exec(statement).collect do |row|
               {
                 'id' => row['id'].to_i,
                 'name' => row['id'],

data/lib/cellect/server/workflow.rb

@@ -6,10 +6,13 @@ module Cellect
       attr_accessor :name, :users, :subjects, :state
       attr_accessor :pairwise, :prioritized
       
-      def self.[](name, pairwise: false, prioritized: false)
-        key = "workflow_#{ name }".to_sym
-        Actor[key] ||= supervise name, pairwise: pairwise, prioritized: prioritized
-        Actor[key].actors.first
+      def self.[](name)
+        Cellect::Server.adapter.load_workflows(name) unless Actor[name]
+        Actor[name].actors.first
+      end
+      
+      def self.[]=(name, opts)
+        Actor[name] = supervise name, pairwise: opts['pairwise'], prioritized: opts['prioritized']
       end
       
       def self.names

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/server/workflow_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 module Cellect::Server
   describe Workflow do
+    it "should try to load workflows that aren't loaded" do
+      expect(Cellect::Server.adapter).to receive(:load_workflows).with('random').and_call_original
+      Workflow['random']
+    end
+    
     SET_TYPES.each do |workflow_type|
       context workflow_type do
         it_behaves_like 'workflow', :workflow
@@ -35,8 +40,8 @@ module Cellect::Server
         end
         
         it 'should remove subjects' do
-          expect(workflow.subjects).to receive(:add).with 123
-          workflow.add subject_id: 123
+          expect(workflow.subjects).to receive(:remove).with 123
+          workflow.remove subject_id: 123
         end
         
         it 'should be notified of a user ttl expiry' do

data/spec/support/shared_examples_for_node_set.rb

@@ -14,6 +14,7 @@ shared_examples_for 'node set' do
   end
   
   it 'should accept a connection string' do
+    url_before = ENV['ZK_URL']
     begin
       pass_until node_set, is: :ready
       ENV['ZK_URL'] = 'foobar'
@@ -21,7 +22,7 @@ shared_examples_for 'node set' do
       ENV.delete 'ZK_URL'
       expect(node_set.send(:zk_url)).to eq 'localhost:2181'
     ensure
-      ENV['ZK_URL'] = 'localhost:21811'
+      ENV['ZK_URL'] = url_before
     end
   end
 end

data/spec/support/shared_examples_for_workflow.rb

@@ -6,8 +6,8 @@ shared_examples_for 'workflow' do |name|
   end
   
   it 'should add singleton instances to the registry' do
-    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
+    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
   end
   
   it 'should initialize empty' do

data/spec/support/spec_adapter.rb

@@ -1,8 +1,12 @@
 require 'oj'
 
 class SpecAdapter < Cellect::Server::Adapters::Default
-  def workflow_list
-    fixtures.values
+  def workflow_list(*names)
+    if names.empty?
+      fixtures.values
+    else
+      fixtures.values_at(*names)
+    end
   end
   
   def load_data_for(workflow_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-server
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -229,6 +229,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile