octoshark 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d633a471d22eac63cd9221ccc6d05446f0dd374f
-  data.tar.gz: 17bbd7dd09f26461f283520e1a7dd2eec5224817
+  metadata.gz: a80290fe7affe4b399c3a48d9676c9f910618fdc
+  data.tar.gz: 65278830e411768633d4ec5f65e227caea97f52e
 SHA512:
-  metadata.gz: 5e44c905b0c564be6446d7e9adde9d69cf6013da491da760194eeafc86c50b43322b1de1b036d1d1f18b6ba4a88f17a7740b399540f2f67d21a024f3152cf36f
-  data.tar.gz: ee16b4532fd1efc1709c3a401ae084de11e3bf62c53a657f5fab86bfa1fed022d2263c4a17d7d62b623362d1e432df5be2abdc3a8adcd64a43f381788a19937c
+  metadata.gz: 3759cd06b0ac6f5f6426287a191dc6c1a6e427b0cc93ef8ddebc998cd413f83cd6147dc9d47f58faaaf580d7e4de63038cec0b78a6ee96aa6bc88709021dc2e8
+  data.tar.gz: 62b469072a953bf8cd6d62d7e9fd6c9e4517371bfb16fc23b6d7edeab6f0533ee923306f0c118ce3de6e1158e3f5888889ba9ef5f400cdb3f68b544e9d3dfc4a

data/README.md

@@ -131,27 +131,24 @@ Here's an example how to clean default and shard databases using both default co
 
 ```ruby
 config.before(:suite) do
-  clean_database_with(:truncation)
+  setup_database_cleaner
+  DatabaseCleaner.clean_with(:truncation)
 end
 
 config.before(:each) do
+  setup_database_cleaner
   DatabaseCleaner.start
 end
 
 config.after(:each) do
-  clean_database_with(:transaction)
+  setup_database_cleaner
+  DatabaseCleaner.clean_with(:transaction)
 end
 
-def clean_database_with
-  # default ActiveRecord::Base connection pool
-  DatabaseCleaner[:active_record, {connection: ActiveRecord::Base.connection_pool}]
-
-  # Octoshark connection pool for the connection
-  Octoshark.connection_pools.each_pair do |name, connection_pool|
+def setup_database_cleaner
+  Octoshark.connection_pools.each_pair do |connection_name, connection_pool|
     DatabaseCleaner[:active_record, {connection: connection_pool}]
   end
-
-  DatabaseCleaner.clean_with(strategy)
 end
 ```
 

data/lib/octoshark.rb

@@ -12,10 +12,14 @@ module Octoshark
   OCTOSHARK = :octoshark
 
   class << self
-    delegate :current_connection, :with_connection,
-      :connection, :current_or_default_connection,
-      :connection_pools, :find_connection_pool,
-      :disconnect!, to: :switcher
+    delegate :connection_pools,
+      :current_or_default_connection,
+      :disconnect!,
+      :find_connection_pool,
+      :with_connection,
+      :current_connection,
+      :current_connection?,
+      to: :switcher
 
     def configure(configs)
       @configs = configs

data/lib/octoshark/connection_switcher.rb

@@ -18,6 +18,10 @@ module Octoshark
       Thread.current[OCTOSHARK] || raise(NoCurrentConnectionError, "No current connection, use Octoshark.with_connection")
     end
 
+    def current_connection?
+      !Thread.current[OCTOSHARK].nil?
+    end
+
     def current_or_default_connection
       Thread.current[OCTOSHARK] || @default_pool.connection
     end

data/lib/octoshark/version.rb

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

data/spec/octoshark/connection_switcher_spec.rb

@@ -41,6 +41,21 @@ describe Octoshark::ConnectionSwitcher do
     end
   end
 
+  describe "#current_connection?" do
+    it "returns true if current one" do
+      switcher = Octoshark::ConnectionSwitcher.new(configs)
+      switcher.with_connection(:db1) do |connection|
+        expect(switcher.current_connection?).to be_truthy
+      end
+    end
+
+    it "returns false if no current one" do
+      switcher = Octoshark::ConnectionSwitcher.new
+
+      expect(switcher.current_connection?).to be_falsey
+    end
+  end
+
   describe "#current_or_default_connection" do
     it "returns current connection" do
       switcher = Octoshark::ConnectionSwitcher.new(configs)

data/spec/octoshark_spec.rb

@@ -71,14 +71,18 @@ describe Octoshark do
   end
 
   [
-    :current_connection, :with_connection,
-    :connection, :current_or_default_connection,
-    :connection_pools, :find_connection_pool,
-    :disconnect!
+    :connection_pools,
+    :current_connection,
+    :current_connection?,
+    :current_or_default_connection,
+    :disconnect!,
+    :find_connection_pool,
+    :with_connection,
   ].each do |method_name|
     describe ".#{method_name}" do
       it "delegates #{method_name} to connection switcher" do
         Octoshark.configure({})
+        expect(Octoshark.switcher).to respond_to(method_name)
         expect(Octoshark.switcher).to receive(method_name)
 
         Octoshark.send(method_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoshark
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Dalibor Nasevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Octoshark is an ActiveRecord connection switcher