clickhouse 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9430c069f56f33af1e4e54bcad89cf33fd836051
-  data.tar.gz: a708443dd04408661f84e897e0cec49777188330
+  metadata.gz: 0ffb93716a6e9932f89d7d1942539402df85d1b0
+  data.tar.gz: 990fff529eb352d62076b01a2650a62242c9fb07
 SHA512:
-  metadata.gz: 4b99166f3cbe200af3337764a0db939432094168d52cd2ba0f6526ef43fc5778e60030bbb49e7e877def07b5c0670df71a2c548488135a5a7613a2e7510884c8
-  data.tar.gz: a71ad741943715b618bfae02fa34874074b4a72c3b9814c2a38c48bb5fae184b77a9367aa6976d6ca68312397112db11a28bbf3fee4573443839bec5c05fafca
+  metadata.gz: bca9c9ae26b8066ad10aae19b84b2c6c2c984125a7f9ed53299ff15b5ee9e1cec3cb4cef1733abb8515f51ee8a33f0dec61d9a03d7da36807f7935f980f9b761
+  data.tar.gz: e819b57c54e604df2810d7e2c7e55ae5c18087c959581dda41ebc378310f9d0365e31020e9ad35798413356b6a12be71fc3969fd9ab62a5307be73058c21ba30

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Clickhouse CHANGELOG
 
+### Version 0.1.4 (October 25, 2016)
+
+* Ensured that Clickhouse does not modify the passed cluster config
+* Introduced Clickhouse#connect which returns either a cluster or connection without memoizing it as Clickhouse#connection
+
 ### Version 0.1.3 (October 21, 2016)
 
 * Only removing connections from cluster connection pool after a Clickhouse::ConnectionError

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/clickhouse.rb

@@ -37,18 +37,18 @@ module Clickhouse
     end
   end
 
-  def self.connection
-    @connection if instance_variables.include?(:@connection)
+  def self.connect!(config)
+    @connection = connect(config)
+    @connection.connect!
   end
 
-# private
-
-  def self.connect!(config)
+  def self.connect(config)
     klass = (config[:urls] || config["urls"]) ? Cluster : Connection
-    @connection = klass.new(config)
-    @connection.connect!
+    klass.new(config)
   end
 
-  private_class_method :connect!
+  def self.connection
+    @connection if instance_variables.include?(:@connection)
+  end
 
 end

data/lib/clickhouse/cluster.rb

@@ -4,9 +4,10 @@ module Clickhouse
     attr_reader :pond
 
     def initialize(config)
+      config = config.dup
       urls = config.delete(:urls) || config.delete("urls")
-      @pond = ::Pond.new :maximum_size => urls.size, :timeout => 0.1
 
+      @pond = ::Pond.new :maximum_size => urls.size, :timeout => 0.1
       block = ::Proc.new do
         url = (urls - pond.available.collect(&:url)).first || urls.sample
         ::Clickhouse::Connection.new(config.merge(:url => url))

data/lib/clickhouse/version.rb

@@ -1,7 +1,7 @@
 module Clickhouse
   MAJOR = 0
   MINOR = 1
-  TINY  = 3
+  TINY  = 4
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/test/unit/connection/test_cluster.rb

@@ -10,6 +10,12 @@ module Unit
           assert_equal true, cluster.pond.is_a?(Pond)
         end
 
+        it "does not modify the passed config" do
+          config = {:urls => %w(localhost:1234 localhost:1235 localhost:1236)}
+          Clickhouse::Cluster.new config
+          assert_equal({:urls => %w(localhost:1234 localhost:1235 localhost:1236)}, config)
+        end
+
         describe "when connection succeeds" do
           it "keeps valid connections from the pond" do
             Clickhouse::Connection.any_instance.expects(:tables)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday