connection_manager 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGZjYTQyMmJjZDkyODU2MDMyYWU4OGJmYjRkZTg4ZmNjMmM3YmYwNw==
+    OWYwNWEwZTI2NjRkZTVkNDYxOGZjMTY4YTk1NDFhOTk5MTRkMGE5ZQ==
   data.tar.gz: !binary |-
-    MjVhMjBlN2NhZGU3ZmVlYmJiOGRjODUxZmYwMDFjOTE3N2I3OGI0ZA==
+    YTRmOTk4MzVmM2ZmZGU3MjdjNTAzYWFiNmExMjcxYmM1YTFlYzE3NQ==
 SHA512:
   metadata.gz: !binary |-
-    NjFmMDZkNDE3NjgxMWU2NTRiNDZlMGZhMmJkN2JmZmE4YjQwMDdhY2UxMDY3
-    NDEzYmM0OTk2MmZlNGRiNTYyZWM4ZWE4OTc1MTc3NjRmY2ZhMzI1OTk5YWQ3
-    MWNkYjY2MGNmNDdjMTdhMjZhODE1ZWY4ZTE5NTRmZDRlNDMzMGE=
+    YWYwNjUyODIyNzVkZGNjYzYwZjExOWJkNmFmNzUyOGFmZTA5MzI2Yzk1ODdl
+    ODRmMTgzNWY4MzQ1YmE4MDAzYjY3N2JlMjM0Y2Q3ZjJiZGVhZjEyODgwMzNk
+    N2ViMWVmMDA4MmM5YTQ2NDA5NjVkZDU0NDMzNDk4NGM0MzUxNzI=
   data.tar.gz: !binary |-
-    MzYwMjJjMzU5NWRlODk3MGRjMmEzMWI2ODJkNThkMGRiMjUzNWE1NmMxMjQ5
-    YzkzMjQzNjAyMmEzZDg5MTVmMjI0ZWMwMDdhMjcyY2E4ZjVmZTY2OWFkZTVi
-    MGI5MWUwZTkxYTAyZTZlYWYwZjBlMmZmYzE2MDkwMzE0MTYxMjE=
+    ZGM4MGRkMTQwM2IzY2RiZGJjN2ExZjI0YWNlMzU5ZDAwYTcxMGNlNWViYWQy
+    MTg0NTBlMDQ3NGQ5Y2E5NzY0MGVlODc1ZTIzMjM0MDY1NGQzY2QwOWE3MDQ5
+    MWIyNDA4YjAwYTc1MDAyZTBlOTk5ZjEwNWVhOWQ2YmVlNDAwMmU=

data/CHANGE.md

@@ -5,6 +5,10 @@ HEAD
 =======
 - Nothing yet!
 
+1.1.1
+=======
+- Fix bug when comparing relation.klass to Using::Proxy instance.klass 
+
 1.1.0
 =======
 - BREAKING CHANGE - Code has been organized to mirror as much a possible their ActiveRecord 4 counter parts.

data/lib/connection_manager/using.rb

@@ -1,5 +1,21 @@
 module ConnectionManager
   module Using
+    module ClassMethods
+      def >=(compare)
+        return self >= compare.klass if compare.is_a?(ConnectionManager::Using::Proxy)
+        super(compare)
+      end
+
+      def ==(compare)
+        return self == compare.klass if compare.is_a?(ConnectionManager::Using::Proxy)
+        super(compare)
+      end
+
+      def !=(compare)
+        return self != compare.klass if compare.is_a?(ConnectionManager::Using::Proxy)
+        super(compare)
+      end
+    end
     class Proxy
       attr_accessor :klass, :connection_class
 
@@ -61,3 +77,5 @@ module ConnectionManager
     end
   end
 end
+ActiveRecord::Relation.send(:extend, ConnectionManager::Using::ClassMethods)
+ActiveRecord::Base.send(:extend, ConnectionManager::Using::ClassMethods)

data/lib/connection_manager/version.rb

@@ -1,3 +1,3 @@
 module ConnectionManager
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/lib/using_spec.rb

@@ -20,11 +20,11 @@ describe ConnectionManager::Using do
 
     it "should have the same connection if called from model or from relation" do
       expect(Fruit.where(:name => "malarky").using("CmFooSlaveConnection").connection.
-        config).to eql(Fruit.using("CmFooSlaveConnection").where(:name => "malarky").connection.config)
+             config).to eql(Fruit.using("CmFooSlaveConnection").where(:name => "malarky").connection.config)
       expect(Fruit.using("CmFooSlaveConnection").where(:name => "malarky").connection.
-        config).to_not eql(Fruit.where(:name => "malarky").connection.config)
+             config).to_not eql(Fruit.where(:name => "malarky").connection.config)
       expect(Fruit.where(:name => "malarky").using("CmFooSlaveConnection").connection.
-        config).to_not eql(Fruit.where(:name => "malarky").connection.config)
+             config).to_not eql(Fruit.where(:name => "malarky").connection.config)
     end
 
     context "A replication like connection" do
@@ -36,7 +36,7 @@ describe ConnectionManager::Using do
       it "should work" do
         fb = FactoryGirl.create(:fruit_basket)
         expect(lambda {FruitBasket.using("CmFooSlaveConnection").
-          joins(:fruit,:basket).includes(:fruit,:basket).where(:id => fb.id).first}).to_not raise_error
+                       joins(:fruit,:basket).includes(:fruit,:basket).where(:id => fb.id).first}).to_not raise_error
       end
     end
 
@@ -46,5 +46,18 @@ describe ConnectionManager::Using do
         expect(Fruit.using("OtherConnection").where(:name => fruit.name).exists?).to be_false
       end
     end
+
+    context "`klass` comparators should work" do
+      context "Proxy to non proxy" do
+        it "should work" do
+          expect(lambda { Fruit.using("OtherConnection").klass >=  Fruit.where(:id => 1).klass}).to_not raise_error
+        end
+      end
+      context "non-proxy to proxy" do
+        it "should work" do
+          expect(lambda { Fruit.where(:id => 1).klass >= Fruit.using("OtherConnection").klass}).to_not raise_error
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: connection_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Joshua Mckinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord