cellect-client 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d18d3658bb52800a79bd803aefafff0263d2ce8
-  data.tar.gz: cc4dce1522594061908ef7cd649e0156c04be786
+  metadata.gz: afa825f4a300482bd14b901c3329bb4cdbbdefc5
+  data.tar.gz: b05da041f863b7236b51d7589a13f105b8c0b7cb
 SHA512:
-  metadata.gz: 8917a3f2a0371147d7d0a77cad67b95d29c53d3d0dc08c2ca35532b2a350fcd967ac2a3e1347dfd8c2ee3e812eb869efb6286038ebae0a774a286b900eb3d109
-  data.tar.gz: ccae5ce575a0e831efd936d7699ef54a8b6cfb180761bf8c4c7497afd018f4baebb1d2d2855466bdfc9bd247727df85a8dcb4603622fd72ee1a742cfc0159ad9
+  metadata.gz: 1c91dc81813eb58e9801a8d05859e06134cc62b845deaa911d75cf9817ccdd083468cadc9af959e0bd4f5ae748ba463535103d3b82c0dded2e8a9d51c2250543
+  data.tar.gz: 61131fff07cc2d147b83ad68edea75dcc1238f3be3ca8baaf1c5895f7bb1cd10ae6eaaf5cac585c53ff3febc6e50ec0c19d016843deb8c335451660fb063e4bc

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-client.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'oj'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'zk-server'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'pry'
 

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/client/connection.rb

@@ -7,53 +7,53 @@ module Cellect
     class Connection
       include Celluloid
       include Celluloid::IO
-      
+
       # Reload the data for a workflow on all servers
       def reload_workflow(id)
         broadcast :post, "/workflows/#{ id }/reload"
       end
-      
+
       # Remove the workflow from all servers
       def delete_workflow(id)
         broadcast :delete, "/workflows/#{ id }"
       end
-      
+
       # Adds or updates a subject on all servers
       def add_subject(id, workflow_id:, group_id: nil, priority: nil)
         broadcast :put, "/workflows/#{ workflow_id }/add", querystring(subject_id: id, group_id: group_id, priority: priority)
       end
-      
+
       # Removes a subject on all servers
       def remove_subject(id, workflow_id:, group_id: nil)
         broadcast :put, "/workflows/#{ workflow_id }/remove", querystring(subject_id: id, group_id: group_id)
       end
-      
+
       # Preload a user on a server
       def load_user(user_id:, host:, workflow_id:)
         send_http host, :post, "/workflows/#{ workflow_id }/users/#{ user_id }/load"
       end
-      
+
       # Adds a subject to a users seen set
       def add_seen(subject_id:, user_id:, host:, workflow_id:)
         send_http host, :put, "/workflows/#{ workflow_id }/users/#{ user_id }/add_seen", querystring(subject_id: subject_id)
       end
-      
+
       # Gets unseen subjects for a user
       def get_subjects(user_id:, host:, workflow_id:, limit: nil, group_id: nil)
         response = send_http host, :get, "/workflows/#{ workflow_id }", querystring(user_id: user_id, group_id: group_id, limit: limit)
         ensure_valid_response response
         MultiJson.load response.body
       end
-      
+
       protected
-      
+
       # Broadcast by iterating over each server
       def broadcast(action, path, query = '')
         Cellect::Client.node_set.nodes.each_pair do |node, host|
           send_http host, action, path, query
         end
       end
-      
+
       # Makes an API call through an evented Celluloid Socket
       def send_http(host, action, path, query = '')
         params = { host: host, path: path }
@@ -61,7 +61,7 @@ module Cellect
         uri = URI::HTTP.build params
         HTTP.send action, uri.to_s, socket_class: Celluloid::IO::TCPSocket
       end
-      
+
       # Builds a querystring from a hash
       def querystring(hash = { })
         [].tap do |list|
@@ -71,7 +71,7 @@ module Cellect
           end
         end.join('&')
       end
-      
+
       # Ensure the API response was OK
       def ensure_valid_response(response)
         unless response.code == 200

data/lib/cellect/client/node_set.rb

@@ -4,15 +4,15 @@ module Cellect
   module Client
     class NodeSet < Cellect::NodeSet
       attr_accessor :nodes
-      
+
       # Sets up an empty node set
       def initialize(zk_url = nil)
         self.nodes = { }
         super
       end
-      
+
       protected
-      
+
       # Respond to a node coming online or timing out
       def nodes_changed(nodes)
         self.nodes = { }
@@ -20,14 +20,14 @@ module Cellect
           self.nodes[node] = zk.get("/nodes/#{ node }").first
         end
       end
-      
+
       # Register with ZooKeeper and get the list of nodes
       def setup
         watch_nodes
         zk.mkdir_p '/nodes'
         nodes_changed zk.children('/nodes', watch: true)
       end
-      
+
       # Watch ZooKeeper for changes to the node set
       def watch_nodes
         zk.register('/nodes') do |event|

data/lib/cellect/client/railtie.rb

@@ -1,7 +1,7 @@
 module Cellect
   module Client
     class ConfigurationError < StandardError; end;
-    
+
     # Allow YAML configuration from config/cellect.yml
     # 
     # development:
@@ -16,33 +16,33 @@ module Cellect
         ensure_config_url config
         connect_zookeeper config if load_zookeeper
       end
-      
+
       private
-      
+
       def config_file
         Rails.root.join 'config/cellect.yml'
       end
-      
+
       def ensure_config_file
         return if File.exists?(config_file)
         raise ConfigurationError.new 'No configuration file found. Create config/cellect.yml first'
       end
-      
+
       def ensure_config_environment(yaml)
         return if yaml[Rails.env].is_a?(Hash)
         raise ConfigurationError.new "No configuration for #{ Rails.env } found"
       end
-      
+
       def ensure_config_url(hash)
         return if hash[:zk_url].present?
         raise ConfigurationError.new "No Zookeeper URL provided for #{ Rails.env } environment"
       end
-      
+
       def connect_zookeeper(config)
         Client.node_set config[:zk_url]
         Client.connection = Connection.pool size: config.fetch(:pool_size, 100)
       end
-      
+
       def load_zookeeper
         !Client.mock_zookeeper?
       rescue NoMethodError

data/lib/cellect/client.rb

@@ -4,31 +4,31 @@ module Cellect
   module Client
     require 'cellect/client/node_set'
     require 'cellect/client/connection'
-    
+
     class << self
       attr_accessor :connection, :_node_set
     end
-    
+
     # Sets up the set of server nodes
     def self.node_set(zk_url=nil)
       self._node_set ||= NodeSet.supervise(zk_url)
       _node_set.actors.first
     end
-    
+
     def self.ready?
       node_set.ready?
     end
-    
+
     # Selects a server for a user
     def self.choose_host
       node_set.nodes.values.sample
     end
-    
+
     # Ensure a previously selected server is still available
     def self.host_exists?(ip)
       node_set.nodes.values.include? ip
     end
-    
+
     if defined?(::Rails)
       require 'cellect/client/railtie'
     else

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/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '0.1.3'
+  VERSION = '1.0.0'
 end

data/lib/cellect.rb

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

data/spec/client/connection_spec.rb

@@ -3,85 +3,85 @@ require 'spec_helper'
 module Cellect::Client
   describe Connection do
     let(:connection){ Cellect::Client.connection }
-    
+
     before(:each) do
       allow(Cellect::Client.node_set).to receive(:nodes).and_return 'a' => '1', 'b' => '2'
     end
-    
+
     def should_send(action:, url:, to:)
       expect(HTTP).to receive(:send).with(action, "http://#{ to }/#{ url }", socket_class: Celluloid::IO::TCPSocket).and_return(HTTP::Response.new(200, nil, nil, "{ \"this response\": \"intentionally blank\" }"))
     end
-    
+
     def should_broadcast(action:, url:)
       [1, 2].each{ |i| should_send action: action, url: url, to: i }
     end
-    
+
     it 'should reload workflows' do
       should_broadcast action: :post, url: 'workflows/random/reload'
       connection.reload_workflow 'random'
     end
-    
+
     it 'should delete workflows' do
       should_broadcast action: :delete, url: 'workflows/random'
       connection.delete_workflow 'random'
     end
-    
+
     it 'should add subjects' do
       should_broadcast action: :put, url: 'workflows/random/add?subject_id=123'
       connection.add_subject 123, workflow_id: 'random'
     end
-    
+
     it 'should add grouped subjects' do
       should_broadcast action: :put, url: 'workflows/random/add?subject_id=123&group_id=321'
       connection.add_subject 123, workflow_id: 'random', group_id: 321
     end
-    
+
     it 'should add prioritized grouped subjects' do
       should_broadcast action: :put, url: 'workflows/random/add?subject_id=123&group_id=321&priority=0.123'
       connection.add_subject 123, workflow_id: 'random', group_id: 321, priority: 0.123
     end
-    
+
     it 'should remove subjects' do
       should_broadcast action: :put, url: 'workflows/random/remove?subject_id=123'
       connection.remove_subject 123, workflow_id: 'random'
     end
-    
+
     it 'should remove grouped subjects' do
       should_broadcast action: :put, url: 'workflows/random/remove?subject_id=123&group_id=321'
       connection.remove_subject 123, workflow_id: 'random', group_id: 321
     end
-    
+
     it 'should load users' do
       should_send action: :post, url: 'workflows/random/users/123/load', to: 1
       connection.load_user user_id: 123, host: '1', workflow_id: 'random'
     end
-    
+
     it 'should add seen subjects' do
       should_send action: :put, url: 'workflows/random/users/123/add_seen?subject_id=456', to: 1
       connection.add_seen subject_id: 456, host: '1', user_id: 123, workflow_id: 'random'
     end
-    
+
     it 'should get subjects' do
       should_send action: :get, url: 'workflows/random?user_id=1', to: 1
       connection.get_subjects host: '1', workflow_id: 'random', user_id: 1
     end
-    
+
     it 'should get grouped subjects' do
       should_send action: :get, url: 'workflows/random?user_id=1&group_id=1&limit=10', to: 1
       connection.get_subjects host: '1', workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
     end
-    
+
     context 'getting subjects' do
       def get_subjects
         connection.get_subjects host: '1', workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
       end
-      
+
       it 'should return subjects as an array' do
         response = HTTP::Response.new 200, '1.1', nil, '[1, 2, 3, 4, 5]'
         allow(HTTP).to receive(:send).and_return response
         expect(get_subjects).to eq [1, 2, 3, 4, 5]
       end
-      
+
       it 'should raise an error for unexpected responses' do
         response = HTTP::Response.new 404, '1.1', nil, ''
         allow(HTTP).to receive(:send).and_return response

data/spec/client/node_set_spec.rb

@@ -4,7 +4,10 @@ module Cellect::Client
   describe NodeSet do
     it_behaves_like 'node set'
     let(:node_set){ Cellect::Client.node_set }
-    
+
+    #@note: node_set.nodes has state from intial code loading
+    # the above def which is really a cached celluloid actor from boot
+    # see Cellect::Client / Cellect::Server
     it 'should update the node list when changing' do
       begin
         pass_until node_set, is: :ready
@@ -13,7 +16,6 @@ module Cellect::Client
           break if node_set.nodes['node0000000001']
           Thread.pass
         end
-        
         expect(node_set.nodes['node0000000001']).to eq 'foo'
       ensure
         node_set.zk.delete '/nodes/node0000000001'

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ Bundler.require :test, :development
 
 ENV['CELLECT_POOL_SIZE'] = '3'
 SPAWN_ZK = !ENV['ZK_URL']
-
 require 'pry'
 require 'oj'
 require './spec/support/zk_setup.rb'
@@ -32,14 +31,14 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.order = 'random'
   config.include CellectHelper
-  
+
   config.around(:each) do |example|
     Celluloid.boot
     example.run
     Celluloid.shutdown
   end
-  
+
   config.after(:suite) do
-    `zkServer stop #{ CELLECT_ZK_CONFIG } > /dev/null 2>&1` if SPAWN_ZK
+    ZK_Setup.stop_zk
   end
 end

data/spec/support/shared_api_context.rb

@@ -1,10 +1,10 @@
 shared_context 'API' do
   include Rack::Test::Methods
-  
+
   def app
     $app ||= Cellect::Server::API.new
   end
-  
+
   def json
     Oj.strict_load last_response.body
   end

data/spec/support/shared_examples_for_node_set.rb

@@ -1,18 +1,18 @@
 shared_examples_for 'node set' do
   let(:node_set){ Cellect::NodeSet.new }
-  
+
   it 'should connect to zoo keeper' do
     expect(node_set.zk).to be_nil
     pass_until node_set, is: :ready
     expect(node_set.zk).to be_connected
   end
-  
+
   it 'should know the connection state' do
     expect(node_set.state).to be :initializing
     pass_until node_set, is: :ready
     expect(node_set).to be_ready
   end
-  
+
   it 'should accept a connection string' do
     url_before = ENV['ZK_URL']
     begin

data/spec/support/shared_examples_for_set.rb

@@ -2,30 +2,30 @@ shared_examples_for 'a set' do
   it 'should convert to an Array' do
     expect(set.to_a).to eq (1..5).to_a
   end
-  
+
   it 'should add elements' do
     set.add 100
     expect(set.to_a).to include 100
   end
-  
+
   it 'should remove elements' do
     set.remove 1
     set.to_a.should_not include 1
   end
-  
+
   it 'should sample elements' do
     expect(set.sample(2).length).to eq 2
   end
-  
+
   it 'should not include removed elements in samples' do
     set.remove 5
     set.sample(5).should_not include 5
   end
-  
+
   it 'should know how many elements it contains' do
     expect{ set.add 100 }.to change{ set.size }.from(5).to 6
   end
-  
+
   it 'should know if it contains an element' do
     set.should_not include 100
     set.add 100

data/spec/support/shared_examples_for_workflow.rb

@@ -1,23 +1,23 @@
 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
   end
-  
+
   it 'should initialize empty' do
     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
   end
-  
+
   it 'should provide a user lookup' do
     expect(obj.user(1)).to be_a Cellect::Server::User
     expect(obj.user(1).object_id).to eq obj.user(1).object_id

data/spec/support/spec_adapter.rb

@@ -8,11 +8,11 @@ class SpecAdapter < Cellect::Server::Adapters::Default
       fixtures.values_at(*names)
     end
   end
-  
+
   def load_data_for(workflow_name)
     fixtures.fetch(workflow_name, { }).fetch 'entries', []
   end
-  
+
   def fixtures
     @fixtures ||= { }.tap do |fixtures|
       Dir["#{ _fixture_path }/workflow_data/*.json"].collect do |f|
@@ -22,7 +22,7 @@ class SpecAdapter < Cellect::Server::Adapters::Default
       end
     end
   end
-  
+
   def user_fixtures
     @user_fixtures ||= { }.tap do |user_fixtures|
       Dir["#{ _fixture_path }/user_data/*.json"].sort.collect.with_index do |f, i|
@@ -33,14 +33,14 @@ class SpecAdapter < Cellect::Server::Adapters::Default
       end
     end
   end
-  
+
   def load_user(workflow_name, id)
     user = user_fixtures[id]
     user ? user[workflow_name] : user_fixtures['new_user'][workflow_name]
   end
-  
+
   protected
-  
+
   def _fixture_path
     File.expand_path File.join(__FILE__, '../../fixtures')
   end

data/spec/support/zk_setup.rb

@@ -1,28 +1,51 @@
-if SPAWN_ZK
-  zk_dir = File.join CELLECT_ROOT, 'tmp/zookeeper'
-  CELLECT_ZK_CONFIG = "#{ zk_dir }/zoo.cfg"
-  
-  `rm -rf #{ zk_dir }; mkdir -p #{ zk_dir }`
-  
-  File.open(CELLECT_ZK_CONFIG, 'w') do |out|
-    out.puts <<-TEXT
-      tickTime=2000
-      initLimit=10
-      syncLimit=5
-      dataDir=#{ zk_dir }
-      clientPort=21811
-      forceSync=no
-      snapCount=1000000
-    TEXT
+module ZK_Setup
+  def self.start_zk(port=21811)
+    @port = port
+    if SPAWN_ZK
+      kill_old_zk_servers
+      remove_zk_data
+      server = ZK::Server.new do |config|
+        config.client_port = port
+        config.client_port_address = 'localhost'
+        config.force_sync = false
+        config.tick_time = 2000
+        config.init_limit = 10
+        config.sync_limit = 5
+        config.snap_count = 1000000
+        config.base_dir = zk_dir
+      end
+      server.run
+      @zk_server = server
+      ENV['ZK_URL'] = "localhost:#{port}"
+    end
   end
-  
-  if `echo ruok | nc 127.0.0.1 21811`.chomp == 'imok'
-    pid = `ps aux | grep -e 'Cellect[\/]tmp[\/]zookeeper'`.split[1]
-    puts "Killing rogue zookeeper process: #{ pid }..."
-    `kill -s TERM #{ pid }`
-    sleep 1
+
+  def self.stop_zk
+    if SPAWN_ZK
+      @zk_server.shutdown
+    end
+  end
+
+  def self.zk_dir
+    File.join CELLECT_ROOT, 'tmp/zookeeper'
+  end
+
+  def self.zk_ok?
+    `echo ruok | nc 127.0.0.1 #{@port}`.chomp == 'imok'
+  end
+
+  def self.kill_old_zk_servers
+    if zk_ok?
+      pid = `ps aux | grep -e 'Cellect[\/]tmp[\/]zookeeper'`.split[1]
+      puts "Killing rogue zookeeper process: #{ pid }..."
+      `kill -s TERM #{ pid }`
+      sleep 1
+    end
+  end
+
+  def self.remove_zk_data
+    `rm -rf #{ zk_dir }; mkdir -p #{ zk_dir }`
   end
-  
-  `zkServer start #{ CELLECT_ZK_CONFIG } > /dev/null 2>&1`
-  ENV['ZK_URL'] = 'localhost:21811'
 end
+
+ZK_Setup.start_zk

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zk-server
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -232,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: ''