cellect-client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c518a38534d81e84960fb603a85089268949d7ca
-  data.tar.gz: ba71be03ab92b66cfd378dbb555c735c83cd4043
+  metadata.gz: 6cd2bca44b019223a6da43db439f1cf5cb5650c7
+  data.tar.gz: f2e7e6cd755aba1f96c734e7396507a0c910ec34
 SHA512:
-  metadata.gz: decf62a6c9470b6975d2f11a06039e37794d7f8eb2175388143235e1a4e75e677b372ed2907f9a501561a48b68374c6d34e398c5f47025c56f5ee8711736d0a6
-  data.tar.gz: bc56057cbe643cf9751095c5a01fa5f48d7fcfb1f815bfe1d85da034694d66286932d867b2111cba32e60ad213d8f4533958c891a2bcdda0dfd2d6993101082f
+  metadata.gz: 8501160197b8cd42a6293ef475f4050148b5db6cf28936185a0564cfa494f1c51d4341dcf913e3be0805b88119afe8909df8100af91dc117bd7a02e184ccfae9
+  data.tar.gz: 32a8a91403d0a50309e6de27be1ad68e299d1697d2becaa2b48cca2d1c0c9a3240c6529efee363f4141a164b58ff024771633266df76cfe2856e4885d3823604

data/lib/cellect/client.rb

@@ -9,8 +9,8 @@ module Cellect
       attr_accessor :connection, :_node_set
     end
     
-    def self.node_set
-      self._node_set ||= NodeSet.supervise
+    def self.node_set(zk_url=nil)
+      self._node_set ||= NodeSet.supervise(zk_url)
       _node_set.actors.first
     end
     
@@ -22,7 +22,11 @@ module Cellect
       node_set.nodes.values.sample
     end
     
-    Client.node_set
-    Client.connection = Connection.pool size: ENV.fetch('CELLECT_POOL_SIZE', 100).to_i
+    if defined?(::Rails)
+      require 'cellect/client/railtie'
+    else
+      Client.node_set
+      Client.connection = Connection.pool size: ENV.fetch('CELLECT_POOL_SIZE', 100).to_i
+    end
   end
 end

data/lib/cellect/client/node_set.rb

@@ -5,7 +5,7 @@ module Cellect
     class NodeSet < Cellect::NodeSet
       attr_accessor :nodes
       
-      def initialize
+      def initialize(zk_url = nil)
         self.nodes = { }
         super
       end

data/lib/cellect/client/railtie.rb

@@ -0,0 +1,37 @@
+module Cellect
+  module Client 
+    class ConfigurationError < StandardError; end;
+    
+    class CellectRailtie < Rails::Railtie
+      initializer 'cellect.connect_to_zookeeper' do
+        ensure_config_file
+        config = YAML.load_file config_file
+        ensure_config_environment config
+        config = config[Rails.env].symbolize_keys
+        ensure_config_url config
+        
+        Client.node_set config[:zk_url]
+        Client.connection = Connection.pool size: config.fetch(:pool_size, 100)
+      end
+      
+      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
+    end
+  end
+end

data/lib/cellect/node_set.rb

@@ -7,7 +7,8 @@ module Cellect
     
     attr_accessor :zk, :state
     
-    def initialize
+    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
@@ -28,7 +29,7 @@ module Cellect
     protected
     
     def zk_url
-      ENV.fetch 'ZK_URL', 'localhost:2181'
+      @zk_url || ENV.fetch('ZK_URL', 'localhost:2181')
     end
     
     def setup

data/lib/cellect/testing.rb

@@ -0,0 +1,17 @@
+module Cellect
+  class NodeSet
+    class ZK
+      def initialize(*args)
+        
+      end
+      
+      def children(*args)
+        []
+      end
+      
+      def method_missing(*args, &block)
+        
+      end
+    end
+  end
+end

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/client/connection_spec.rb

@@ -62,10 +62,10 @@ module Cellect::Client
     end
 
     it 'should get subjects' do
-      should_send action: :get, url: 'workflows/random?user_id=1&limit=10&group_id=1', to: 1
-      connection.get_subjects host: 1, workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
+      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
       should_send action: :get, url: 'workflows/random?user_id=1', to: 1
-      connection.get_subjects host: 1, workflow_id: 'random', user_id: 1
+      connection.get_subjects host: '1', workflow_id: 'random', user_id: 1
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -169,7 +169,9 @@ files:
 - lib/cellect/client.rb
 - lib/cellect/client/connection.rb
 - lib/cellect/client/node_set.rb
+- lib/cellect/client/railtie.rb
 - lib/cellect/node_set.rb
+- lib/cellect/testing.rb
 - lib/cellect/version.rb
 - log/.gitkeep
 - spec/client/connection_spec.rb