cellect-client 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe514c3f6a707c05dd2ced856393161be2f04d1
-  data.tar.gz: ea1ec754a475c3601ca6a205ecd6e031fb895132
+  metadata.gz: a3e274e1943008aaed80c4fe3108524e957503d1
+  data.tar.gz: 154f4715e5f8b565e753e3b7a6cee28ff2276f26
 SHA512:
-  metadata.gz: d9b76e88177b1c902e72bcada00180575d0e038c9a678d3e093ef57549043490282a233aae4735b18bdaffd9b94daf4aeab97dc587fa9e193c0355c96437e5ea
-  data.tar.gz: 11cf6f27299e1a413ec0d842afb2830fa65683c463e7263d9bd35a155d7b502e48a65ee8ab57b47b0e39bb8755a68c0e49e1035112c487b93b84af87ca7c6d59
+  metadata.gz: d63309ac6b9d1b493e5f09d7e267343e0122efe414d1bc1dd96d7e098fa79f916beb6650c3233d0507fc1f37de2469b52d0c81099431b181949822d04865c747
+  data.tar.gz: 47b0afae6ea956ad89bb377d8bbc621b0fb68499310cfbad28894718b97bc502b9d40ee52bb6194eda6b434434ee02b4039d804e44124c17f886336180d84173

data/lib/cellect/client.rb

@@ -9,6 +9,11 @@ module Cellect
       attr_accessor :connection, :_node_set
     end
 
+    # Disabled with lib/cellect/testing.rb
+    def self.mock_zookeeper?
+      false
+    end
+
     # Sets up the set of server nodes
     def self.node_set(zk_url=nil)
       self._node_set ||= NodeSet.supervise(zk_url)
@@ -29,11 +34,7 @@ module Cellect
       node_set.nodes.values.include? ip
     end
 
-    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
+    Client.node_set
+    Client.connection = Connection.pool size: ENV.fetch('CELLECT_POOL_SIZE', 100).to_i
   end
 end

data/lib/cellect/version.rb

@@ -1,3 +1,3 @@
 module Cellect
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cellect-client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -199,7 +199,6 @@ 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

data/lib/cellect/client/railtie.rb

@@ -1,53 +0,0 @@
-module Cellect
-  module Client
-    class ConfigurationError < StandardError; end;
-
-    # Allow YAML configuration from config/cellect.yml
-    # 
-    # development:
-    #   zk_url: localhost:2181
-    #   pool_size: 50
-    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
-        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
-        true
-      end
-    end
-  end
-end