wraithdb 0.0.1 → 0.0.2

data/.gitignore

@@ -14,4 +14,5 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
+gh-pages
 tmp

data/lib/gems/db-charmer.rb

@@ -1,23 +1,24 @@
 module ActiveRecord
   class Base
     class << self
-      # This clobbers the DB Charmer wrapping of relation and does the same thing except
-      # it leaves connection resolution to runtime rather than assigning an instance variable
-      def relation_with_db_charmer(*args, &block)
-        relation_without_db_charmer(*args, &block).tap do |rel|
-          begin
-            rel.db_charmer_connection = @connection
-          rescue StandardError => e
-            base = self
-            rel.define_singleton_method(:db_charmer_connection) do
-              base.connection
-            end
+
+      def relation_with_wraith_charmed(*args, &block)
+        begin
+          relation_without_wraith_charmed(*args, &block)
+        rescue StandardError => e
+          # This leaves connection resolution for db_charmer to runtime rather than assigning an
+          # instance variable
+          base = self
+          rel = relation_without_db_charmer
+          rel.define_singleton_method(:db_charmer_connection) do
+            base.connection
           end
           rel.db_charmer_enable_slaves = self.db_charmer_slaves.any?
           rel.db_charmer_connection_is_forced = !db_charmer_top_level_connection?
+          rel
         end
       end
-      alias relation relation_with_db_charmer
+      alias_method_chain :relation, :wraith_charmed
     end
   end
 end

data/lib/wraithdb/version.rb

@@ -1,3 +1,3 @@
 module Wraithdb
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wraithdb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord