db-charmer 1.4.6 → 1.5.0

data/CHANGES

@@ -0,0 +1,22 @@
+1.4.6 -> 1.5.0:
+
+Major change in this version of DbCharmer is association preload support. For example,
+let's say we have a schema:
+
+    class Post < ActiveRecord::Base
+      belongs_to :user
+    end
+
+    class User < ActiveRecord::Base
+      has_many :posts
+    end
+
+Now, if we have the following call in our code:
+
+    User.on_db(:foo).all(:include => :posts)
+
+In 1.4.6 it would load the users from connection :foo and posts from the
+default connection, which is not what we would expect from this line of code.
+So, starting 1.5.0 all finder calls on models having :include parameter would
+switch associated models' connections to the same connection as the main model
+in the call.

data/Rakefile

@@ -9,8 +9,9 @@ begin
     gemspec.authors = ['Alexey Kovyrin']
 
     gemspec.add_dependency('rails', '>= 2.2.0')
+    gemspec.add_dependency('blankslate', '>= 0')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts 'Jeweler not available. Install it with: sudo gem install jeweler'
-end
+end

data/VERSION

@@ -1 +1 @@
-1.4.6
+1.5.0

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.4.6"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2009-11-09}
+  s.date = %q{2010-03-05}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CHANGES",
      "LICENSE",
      "Makefile",
      "README.rdoc",
@@ -27,6 +28,7 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/db_charmer.rb",
      "lib/db_charmer/active_record_extensions.rb",
+     "lib/db_charmer/association_preload.rb",
      "lib/db_charmer/connection_factory.rb",
      "lib/db_charmer/connection_proxy.rb",
      "lib/db_charmer/connection_switch.rb",
@@ -40,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/kovyrin/db-charmer}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{ActiveRecord Connections Magic}
 
   if s.respond_to? :specification_version then
@@ -49,11 +51,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 2.2.0"])
+      s.add_runtime_dependency(%q<blankslate>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 2.2.0"])
+      s.add_dependency(%q<blankslate>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 2.2.0"])
+    s.add_dependency(%q<blankslate>, [">= 0"])
   end
 end
 

data/lib/db_charmer.rb

@@ -31,6 +31,9 @@ class Object
   end
 end
 
+# We need blankslate for all the proxies we have
+require 'blankslate'
+
 #puts "Extending AR..."
 
 require 'db_charmer/active_record_extensions'
@@ -83,6 +86,7 @@ end
 
 require 'db_charmer/db_magic'
 require 'db_charmer/finder_overrides'
+require 'db_charmer/association_preload'
 require 'db_charmer/multi_db_migrations'
 require 'db_charmer/multi_db_proxy'
 
@@ -91,3 +95,6 @@ ActiveRecord::Migration.extend(DbCharmer::MultiDbMigrations)
 
 # Enable the magic
 ActiveRecord::Base.extend(DbCharmer::DbMagic::ClassMethods)
+
+# Setup association preload magic
+ActiveRecord::Base.extend(DbCharmer::AssociationPreload::ClassMethods)

data/lib/db_charmer/association_preload.rb

@@ -0,0 +1,17 @@
+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 = {})
+            return super(records, reflection, preload_options) if self.db_charmer_top_level_connection?
+            reflection.klass.on_db(self) do
+              super(records, reflection, preload_options)
+            end
+          end
+        EOF
+      end
+    end
+  end
+end

data/lib/db_charmer/db_magic.rb

@@ -15,7 +15,7 @@ module DbCharmer
         opt[:slaves] ||= []
         opt[:slaves] << opt[:slave] if opt[:slave]
         db_magic_slaves(opt[:slaves], should_exist) if opt[:slaves].any?
-        
+
         # Setup inheritance magic
         setup_children_magic(opt)
       end
@@ -24,7 +24,7 @@ module DbCharmer
 
       def setup_children_magic(opt)
         self.db_charmer_opts = opt.clone
-        
+
         def self.inherited(child)
           child.db_magic(self.db_charmer_opts)
           super

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: db-charmer
 version: !ruby/object:Gem::Version 
-  version: 1.4.6
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -9,19 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -05:00
+date: 2010-03-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: blankslate
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: ActiveRecord Connections Magic (slaves, multiple connections, etc)
 email: alexey@kovyrin.net
 executables: []
@@ -33,6 +54,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- CHANGES
 - LICENSE
 - Makefile
 - README.rdoc
@@ -42,6 +64,7 @@ files:
 - init.rb
 - lib/db_charmer.rb
 - lib/db_charmer/active_record_extensions.rb
+- lib/db_charmer/association_preload.rb
 - lib/db_charmer/connection_factory.rb
 - lib/db_charmer/connection_proxy.rb
 - lib/db_charmer/connection_switch.rb
@@ -64,18 +87,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ActiveRecord Connections Magic