db-charmer 1.6.8 → 1.6.9

data/CHANGES

@@ -1,3 +1,8 @@
+1.6.9 (2010-04-08):
+
+Bugfix release: now DbCharmer works without Rails.
+
+----------------------------------------------------------------------------------------
 1.6.7 (2010-04-07):
 
 Changed the way we handle associations in on_db(:foo).find(:include) calls. Now we

data/VERSION

@@ -1 +1 @@
-1.6.8
+1.6.9

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.6.8"
+  s.version = "1.6.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2010-04-07}
+  s.date = %q{2010-04-08}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/db_charmer/connection_factory.rb",
      "lib/db_charmer/connection_proxy.rb",
      "lib/db_charmer/connection_switch.rb",
+     "lib/db_charmer/core_extensions.rb",
      "lib/db_charmer/db_magic.rb",
      "lib/db_charmer/finder_overrides.rb",
      "lib/db_charmer/multi_db_migrations.rb",

data/lib/db_charmer.rb

@@ -63,10 +63,12 @@ require 'blankslate'
 
 require 'db_charmer/active_record_extensions'
 require 'db_charmer/abstract_adapter_extensions'
+require 'db_charmer/core_extensions'
 
 require 'db_charmer/connection_factory'
 require 'db_charmer/connection_proxy'
 require 'db_charmer/connection_switch'
+require 'db_charmer/stub_connection'
 require 'db_charmer/scope_proxy'
 require 'db_charmer/multi_db_proxy'
 

data/lib/db_charmer/association_preload.rb

@@ -2,17 +2,20 @@ module DbCharmer
   module AssociationPreload
     module ClassMethods
       ASSOCIATION_TYPES = [ :has_one, :has_many, :belongs_to, :has_and_belongs_to_many ]
-      ASSOCIATION_TYPES.each do |association_type|
-        class_eval <<-EOF, __FILE__, __LINE__ + 1
-          def preload_#{association_type}_association(records, reflection, preload_options = {})
-            if self.db_charmer_top_level_connection? || self.db_charmer_default_connection != reflection.klass.db_charmer_default_connection
-              return super(records, reflection, preload_options)
+
+      def self.extended(base)
+        ASSOCIATION_TYPES.each do |association_type|
+          base.class_eval <<-EOF, __FILE__, __LINE__ + 1
+            def self.preload_#{association_type}_association(records, reflection, preload_options = {})
+              if self.db_charmer_top_level_connection? || self.db_charmer_default_connection != reflection.klass.db_charmer_default_connection
+                return super(records, reflection, preload_options)
+              end
+              reflection.klass.on_db(self) do
+                super(records, reflection, preload_options)
+              end
             end
-            reflection.klass.on_db(self) do
-              super(records, reflection, preload_options)
-            end
-          end
-        EOF
+          EOF
+        end
       end
     end
   end

data/lib/db_charmer/core_extensions.rb

@@ -0,0 +1,13 @@
+class Object
+  unless defined?(try)
+    def try(method, *options, &block)
+      send(method, *options, &block)
+    end
+  end
+end
+
+class NilClass
+  def try(method, *options, &block)
+    nil
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 6
-  - 8
-  version: 1.6.8
+  - 9
+  version: 1.6.9
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -04:00
+date: 2010-04-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - lib/db_charmer/connection_factory.rb
 - lib/db_charmer/connection_proxy.rb
 - lib/db_charmer/connection_switch.rb
+- lib/db_charmer/core_extensions.rb
 - lib/db_charmer/db_magic.rb
 - lib/db_charmer/finder_overrides.rb
 - lib/db_charmer/multi_db_migrations.rb