cellect-server 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce5ed6155919dbcb28b9deed2f937b67dbe726e0
-  data.tar.gz: b08a7bf06a958740ff668b927a970be4f6b17b9d
+  metadata.gz: efa9bdf71d7f86007ecd6f45dbe0f5cf0893f924
+  data.tar.gz: 07fa08cfb0ff77ad4c099f9ada1a4bebedabb7e1
 SHA512:
-  metadata.gz: 278e910a81b231c326267c2a8be769c7759f3ec815a1fd95e9ced36a26be3e838642746832a5d6c646d3ee78b7e8f0337af860d55e2d297b054b5a3102e8f579
-  data.tar.gz: 86e06b066a4d8a308949cc23356f3dac6f06d2acd5341196cbd1007c9bb964dae696fa23539b3951e10c55c050b8c1c0aebd8b381199b80d5c63c74bb770d01a
+  metadata.gz: 2733ecff41bcb63e5d5e135e0e68701356e32bce5d02e13110fe009a0c7e00ef28899d83c63a0d4304e145ba4889b648e73f323ba8fe38405daa206ad24ce349
+  data.tar.gz: b8ec41a5c735f5af7fbc2feb767b023f56d8a35e6a400d037b5a35b376673da538c537ba65fa95bcb606080fc2d8537871c6ff2b536cc3a47912231c36768b75

data/.gitignore

@@ -16,3 +16,4 @@ pkg/*
 *.swp
 ext/
 /coverage
+/Gemfile.lock

data/.travis.yml

@@ -5,16 +5,10 @@ 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
+  - gem update bundler
 
 rvm:
   - 2.1.5
   - 2.2.1
 
-script: ZK_URL=localhost:2181 bundle exec rake
+script: bundle exec rake spec

data/cellect-server.gemspec

@@ -12,15 +12,15 @@ Gem::Specification.new do |spec|
   spec.description   = ''
   spec.homepage      = 'https://github.com/parrish/Cellect'
   spec.license       = 'MIT'
-  
+
   ignored_paths = %w(config data log script tmp).collect{ |path| Dir["#{ path }/**/*"] }.flatten
   ignored_files = %w(Dockerfile Vagrantfile Gemfile.lock config.ru) + ignored_paths
-  
+
   spec.files         = `git ls-files -z`.split("\x0").reject{ |f| f =~ /client/ } - ignored_files
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  
+
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'oj'
@@ -30,7 +30,7 @@ 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_runtime_dependency 'diff_set', '~> 0.0.3'
   spec.add_runtime_dependency 'celluloid', '0.16.0'
   spec.add_runtime_dependency 'celluloid-io', '0.16.0'

data/cellect.gemspec

@@ -12,23 +12,24 @@ Gem::Specification.new do |spec|
   spec.description   = ''
   spec.homepage      = 'https://github.com/parrish/Cellect'
   spec.license       = 'MIT'
-  
+
   spec.files         = ['lib/cellect.rb', 'lib/cellect/version.rb']
   spec.executables   = []
   spec.test_files    = []
   spec.require_paths = ['lib']
-  
+
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'oj'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'zk-server'
   spec.add_development_dependency 'pry'
   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_runtime_dependency 'cellect-server', Cellect::VERSION
   spec.add_runtime_dependency 'cellect-client', Cellect::VERSION
 end

data/lib/cellect.rb

@@ -3,5 +3,5 @@ require 'celluloid/io'
 require 'cellect/version'
 
 module Cellect
-  
+
 end

data/lib/cellect/node_set.rb

@@ -1,39 +1,39 @@
 require 'zk'
-require 'timeout'
 
 module Cellect
   class NodeSet
     include Celluloid
-    
+    ConnectionError = Class.new(StandardError)
+
     attr_accessor :zk, :state
-    
+
     # Sets up the node set and starts connecting to ZooKeeper
     def initialize(zk_url = nil)
       @zk_url = zk_url
       self.state = :initializing
       after(0.001){ async.initialize_zk } # don't block waiting for ZK to connect
     end
-    
+
     # Connect to ZooKeeper, setup this node, and change state
     def initialize_zk
-      # don't let ZK hang the thread, just retry connection on restart
-      Timeout::timeout(5) do
-        self.zk = ZK.new zk_url, chroot: '/cellect'
-      end
+      # don't let ZK hang the thread, timeout and check connection status
+      zk = ZK::Client.new zk_url, timeout: 0.5, chroot: '/cellect'
+      raise ConnectionError.new("Can't connect to ZK server.") unless zk.connected?
+      self.zk = zk
       setup
       self.state = :ready
     end
-    
+
     def ready?
       state == :ready
     end
-    
+
     protected
-    
+
     def zk_url
       @zk_url || ENV.fetch('ZK_URL', 'localhost:2181')
     end
-    
+
     def setup
       # Specialized in subclasses
     end

data/lib/cellect/server.rb

@@ -10,22 +10,22 @@ module Cellect
     require 'cellect/server/grouped_workflow'
     require 'cellect/server/user'
     require 'cellect/server/api'
-    
+
     class << self
       attr_accessor :node_set
     end
-    
+
     # The server is ready when all workflows have finished loading
     def self.ready?
       Workflow.all.each do |workflow|
         return false unless workflow.ready?
       end
-      
+
       true
     rescue
       false
     end
-    
+
     Server.node_set = NodeSet.supervise
   end
 end

data/lib/cellect/server/adapters.rb

@@ -3,11 +3,11 @@ module Cellect
     class << self
       attr_accessor :adapter
     end
-    
+
     module Adapters
       require 'cellect/server/adapters/default'
     end
-    
+
     Cellect::Server.adapter = Adapters::Default.new
   end
 end

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

@@ -13,7 +13,7 @@ module Cellect
         def workflow_list(*names)
           raise NotImplementedError
         end
-        
+
         # Load the data for a workflow, this method:
         #   Accepts a workflow
         #   Returns an array of hashes in the form:
@@ -25,7 +25,7 @@ module Cellect
         def load_data_for(workflow_name)
           raise NotImplementedError
         end
-        
+
         # Load seen ids for a user, this method:
         #   Accepts a workflow_name, and a user id
         #   Returns an array in the form:
@@ -33,11 +33,11 @@ module Cellect
         def load_user(workflow_name, id)
           raise NotImplementedError
         end
-        
+
         def load_workflows(*names)
           workflow_list(*names).each{ |workflow_info| load_workflow workflow_info }
         end
-        
+
         def load_workflow(args)
           info = if args.is_a?(Hash)
             args
@@ -46,10 +46,10 @@ module Cellect
           else
             raise ArgumentError
           end
-          
+
           workflow_for info
         end
-        
+
         def workflow_for(opts = { })
           workflow_klass = opts.fetch('grouped', false) ? GroupedWorkflow : Workflow
           workflow_klass[opts['name']] = opts 

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

@@ -10,7 +10,7 @@ module Cellect
             PG.connect connection_options
           end
         end
-        
+
         def workflow_list(*names)
           with_pg do |pg|
             statement = 'SELECT * FROM workflows'
@@ -33,7 +33,7 @@ module Cellect
             end
           end
         end
-        
+
         def load_data_for(workflow_name)
           with_pg do |pg|
             statement = <<-SQL
@@ -52,7 +52,7 @@ module Cellect
             end
           end
         end
-        
+
         def load_user(workflow_name, id)
           with_pg do |pg|
             statement = <<-SQL
@@ -64,11 +64,11 @@ module Cellect
             end
           end
         end
-        
+
         def with_pg
           @pg.with{ |pg| yield pg }
         end
-        
+
         def connection_options
           {
             host: ENV.fetch('PG_HOST', '127.0.0.1'),

data/lib/cellect/server/api.rb

@@ -4,11 +4,11 @@ module Cellect
   module Server
     class API < Grape::API
       format :json
-      
+
       require 'cellect/server/api/helpers'
       require 'cellect/server/api/sets'
       require 'cellect/server/api/users'
-      
+
       # GET /stats
       # 
       # Provides system load information
@@ -16,41 +16,41 @@ module Cellect
         usage = ->(keyword) do
           `ps axo #{ keyword }`.chomp.split("\n")[1..-1].collect(&:to_f).inject :+
         end
-        
+
         {
           memory: usage.call('%mem'),
           cpu: usage.call('%cpu')
         }
       end
-      
+
       resources :workflows do
-        
+
         # GET /workflows
         # 
         # Returns a list of available workflows
         get do
           Cellect::Server.adapter.workflow_list
         end
-        
+
         segment '/:workflow_id' do
           helpers Helpers
           mount Sets
           mount Users
-          
+
           # GET /workflows/:workflow_id/status
           # 
           # Returns the workflow's status
           get :status do
             workflow.status
           end
-          
+
           # POST /workflows/:workflow_id/reload
           # 
           # Reloads the workflow from the adapter
           post :reload do
             workflow.async.load_data
           end
-          
+
           # DELETE /workflows/:workflow_id
           # 
           # Not implemented

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

@@ -5,7 +5,7 @@ module Cellect
         def workflow
           @workflow ||= Workflow[params[:workflow_id]]
         end
-        
+
         def selector_params
           {
             limit: param_to_int(:limit, default: 5),
@@ -13,7 +13,7 @@ module Cellect
             group_id: param_to_int(:group_id)
           }
         end
-        
+
         def update_params
           {
             subject_id: param_to_int(:subject_id),
@@ -21,15 +21,15 @@ module Cellect
             priority: param_to_float(:priority)
           }
         end
-        
+
         def param_to_int(param, default: nil)
           _param_to param, :to_i, default
         end
-        
+
         def param_to_float(param, default: nil)
           _param_to param, :to_f, default
         end
-        
+
         def _param_to(param, conversion, default)
           val = params[param].try conversion
           params[param] && val && val > 0 ? val : default

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

@@ -12,7 +12,7 @@ module Cellect
         get do
           workflow.sample selector_params
         end
-        
+
         # PUT /workflows/:workflow_id/add
         # 
         # Adds a subject to a workflow or updates the priority
@@ -24,7 +24,7 @@ module Cellect
           workflow.add update_params
           nil
         end
-        
+
         # PUT /workflows/:workflow_id/remove
         # 
         # Removes a subject from a workflow

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

@@ -12,24 +12,24 @@ module Cellect
             put :add_seen do
               user_id = param_to_int :user_id
               subject_id = param_to_int :subject_id
-              
+
               if user_id && user_id > 0 && subject_id && subject_id > 0
                 workflow.async.add_seen_for user_id, subject_id
               end
-              
+
               nil
             end
-            
+
             # POST /workflows/:workflow_id/users/:user_id/load
             # 
             # Preloads a user for a workflow
             post :load do
               user_id = param_to_int :user_id
-              
+
               if user_id && user_id > 0
                 workflow.async.user user_id
               end
-              
+
               nil
             end
           end

data/lib/cellect/server/grouped_workflow.rb

@@ -2,13 +2,13 @@ module Cellect
   module Server
     class GroupedWorkflow < Workflow
       attr_accessor :groups
-      
+
       # Sets up the new workflow
       def initialize(name, pairwise: false, prioritized: false)
         self.groups = { }
         super
       end
-      
+
       # Load subjects from the adapter into their groups
       def load_data
         self.state = :initializing
@@ -20,17 +20,17 @@ module Cellect
         end
         self.state = :ready
       end
-      
+
       # Returns a group by id or samples one randomly
       def group(group_id = nil)
         groups[group_id] || groups.values.sample
       end
-      
+
       # Get unseen subjects from a group for a user
       def unseen_for(user_name, group_id: nil, limit: 5)
         group(group_id).subtract user(user_name).seen, limit
       end
-      
+
       # Get a sample of subjects from a group for a user
       # 
       # Accepts a hash in the form:
@@ -46,7 +46,7 @@ module Cellect
            group(opts[:group_id]).sample opts[:limit]
         end
       end
-      
+
       # Adds or updates a subject in a group
       # 
       # Accepts a hash in the form:
@@ -62,7 +62,7 @@ module Cellect
           groups[opts[:group_id]].add opts[:subject_id]
         end
       end
-      
+
       # Removes a subject from a group
       # 
       # Accepts a hash in the form:
@@ -73,19 +73,19 @@ module Cellect
       def remove(opts = { })
         groups[opts[:group_id]].remove opts[:subject_id]
       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]
-        
+
         super.merge({
           grouped: true,
           subjects: group_counts.values.inject(:+),
           groups: group_counts
         })
       end
-      
+
       def grouped?
         true
       end