octoshark 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a80290fe7affe4b399c3a48d9676c9f910618fdc
-  data.tar.gz: 65278830e411768633d4ec5f65e227caea97f52e
+  metadata.gz: e36f799c08e10ce190cd98d93fbc9133388f85cc
+  data.tar.gz: 4d3b95a2b17155770a2f22c6d0fb7598bb192eda
 SHA512:
-  metadata.gz: 3759cd06b0ac6f5f6426287a191dc6c1a6e427b0cc93ef8ddebc998cd413f83cd6147dc9d47f58faaaf580d7e4de63038cec0b78a6ee96aa6bc88709021dc2e8
-  data.tar.gz: 62b469072a953bf8cd6d62d7e9fd6c9e4517371bfb16fc23b6d7edeab6f0533ee923306f0c118ce3de6e1158e3f5888889ba9ef5f400cdb3f68b544e9d3dfc4a
+  metadata.gz: 62ae7717fe0960b31426328514a7bd59ec3084e409dd19cbdcf8f8b10b74348c030b36c3b3afe01c218ad5ee1790842073981f5d662f236b507ec34c7b3b5c1b
+  data.tar.gz: 8f639d0260942633132b479193ba1c4105bf1b965929bf57a804e0a3c1ce2aaf7caa190c947ad08d749ac788a1f6fa398ec4c133481c8146b2b78d7e495fefda

data/.ruby-version

@@ -0,0 +1 @@
+2.1.1

data/lib/octoshark.rb

@@ -17,6 +17,7 @@ module Octoshark
       :disconnect!,
       :find_connection_pool,
       :with_connection,
+      :without_connection,
       :current_connection,
       :current_connection?,
       to: :switcher

data/lib/octoshark/connection_switcher.rb

@@ -27,22 +27,21 @@ module Octoshark
     end
 
     def with_connection(name, &block)
-      result = nil
-
       find_connection_pool(name).with_connection do |connection|
-        previous_connection = Thread.current[OCTOSHARK]
-        Thread.current[OCTOSHARK] = connection
-
         connection.connection_name = name
 
-        begin
-          result = yield(connection)
-        ensure
-          Thread.current[OCTOSHARK] = previous_connection
+        change_connection_reference(connection) do
+          yield(connection)
         end
       end
+    end
 
-      result
+    def without_connection(&block)
+      connection = nil
+
+      change_connection_reference(connection) do
+        yield(connection)
+      end
     end
 
     def find_connection_pool(name)
@@ -63,5 +62,16 @@ module Octoshark
         spec_class = ActiveRecord::Base::ConnectionSpecification
       end
     end
+
+    def change_connection_reference(connection)
+      previous_connection = Thread.current[OCTOSHARK]
+      Thread.current[OCTOSHARK] = connection
+
+      begin
+        yield
+      ensure
+        Thread.current[OCTOSHARK] = previous_connection
+      end
+    end
   end
 end

data/lib/octoshark/version.rb

@@ -1,3 +1,3 @@
 module Octoshark
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/octoshark/connection_switcher_spec.rb

@@ -123,6 +123,12 @@ describe Octoshark::ConnectionSwitcher do
       end
     end
 
+    it "returns value from execution" do
+      switcher = Octoshark::ConnectionSwitcher.new({})
+      result = switcher.with_connection(:default) { |connection| connection.execute("SELECT 1") }
+      expect(result).to eq([{"1"=>1, 0=>1}])
+    end
+
     it "raises Octoshark::NoConnectionError" do
       switcher = Octoshark::ConnectionSwitcher.new({})
 
@@ -130,6 +136,22 @@ describe Octoshark::ConnectionSwitcher do
     end
   end
 
+  describe '#without_connection' do
+    it "can reset current connection temporarily inside nested connection block" do
+      switcher = Octoshark::ConnectionSwitcher.new({})
+
+      switcher.with_connection(:default) do |connection|
+        expect(db(switcher.current_connection)).to eq("default")
+
+        switcher.without_connection do |connection|
+          expect { switcher.current_connection }.to raise_error(Octoshark::NoCurrentConnectionError)
+        end
+
+        expect(db(switcher.current_connection)).to eq("default")
+      end
+    end
+  end
+
   describe "#disconnect!" do
     it "removes all connections from connection pools" do
       switcher = Octoshark::ConnectionSwitcher.new({})

data/spec/octoshark_spec.rb

@@ -78,6 +78,7 @@ describe Octoshark do
     :disconnect!,
     :find_connection_pool,
     :with_connection,
+    :without_connection,
   ].each do |method_name|
     describe ".#{method_name}" do
       it "delegates #{method_name} to connection switcher" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoshark
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Dalibor Nasevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Appraisals
 - Gemfile