data_fabric 1.3.1 → 1.3.2

data/CHANGELOG

@@ -1,5 +1,10 @@
 DataFabric changelog
 
+v1.3.2 - 2011-06-02
+
+- Fix problem fetching spec for connection pool.
+- Fix issues with Rails 3.1.
+
 v1.3.1 - 2011-02-10
 
 - Add some missing ConnectionPool methods (e.g. clear_reloadable_connections!)

data/README.rdoc

@@ -25,7 +25,7 @@ or add data_fabric to your Gemfile:
 
   gem 'data_fabric'
 
-data_fabric has been tested with Rails 2.3.10, 3.0.0 and 3.0.3.
+data_fabric has been tested with Rails 2.3.10 and 3.0.7.
 
 == How does it work?
 

data/lib/data_fabric/connection_proxy.rb

@@ -28,7 +28,7 @@ module DataFabric
     end
 
     def spec
-      @proxy.spec
+      @proxy.current_pool.spec
     end
 
     def with_connection
@@ -46,11 +46,21 @@ module DataFabric
         end
       end
     end
+
+    %w(columns columns_hash table_exists? primary_keys).each do |name|
+      define_method(name.to_sym) do |*args|
+        @proxy.current_pool.send(name.to_sym, *args)
+      end
+    end
+
+    def method_missing(name, *args)
+      DataFabric.logger.warn "Add '#{name}' to DataFabric::PoolProxy for performance"
+      @proxy.current_pool.send(name, *args)
+    end
   end
 
   class ConnectionProxy
     cattr_accessor :shard_pools
-    attr_accessor :spec
     
     def initialize(model_class, options)
       @model_class = model_class      
@@ -105,12 +115,6 @@ module DataFabric
       current_pool.connection
     end
 
-  private
-
-    def in_transaction?
-      current_role == 'master'
-    end
-
     def current_pool
       name = connection_name
       self.class.shard_pools[name] ||= begin
@@ -120,12 +124,18 @@ module DataFabric
       end
     end
     
+    private
+
+    def in_transaction?
+      current_role == 'master'
+    end
+
     def spec_for(config)
       # XXX This looks pretty fragile.  Will break if AR changes how it initializes connections and adapters.
       config = config.symbolize_keys
       adapter_method = "#{config[:adapter]}_connection"
       initialize_adapter(config[:adapter])
-      @spec = ActiveRecord::Base::ConnectionSpecification.new(config, adapter_method)
+      ActiveRecord::Base::ConnectionSpecification.new(config, adapter_method)
     end
     
     def initialize_adapter(adapter)

data/lib/data_fabric/version.rb

@@ -1,5 +1,5 @@
 module DataFabric
   module Version
-    STRING = '1.3.1'
+    STRING = '1.3.2'
   end
 end

data/lib/data_fabric/version.rbc

@@ -0,0 +1,203 @@
+!RBIX
+17831730954501249321
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+28
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+10
+DataFabric
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+10
+DataFabric
+i
+28
+5
+66
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+7
+Version
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+7
+Version
+i
+12
+5
+66
+65
+7
+0
+7
+1
+64
+49
+2
+2
+11
+I
+3
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+6
+STRING
+s
+5
+1.3.1
+x
+9
+const_set
+p
+3
+I
+2
+I
+3
+I
+c
+x
+61
+/Users/mperham/src/git/data_fabric/lib/data_fabric/version.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+2
+I
+1c
+x
+61
+/Users/mperham/src/git/data_fabric/lib/data_fabric/version.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1c
+x
+61
+/Users/mperham/src/git/data_fabric/lib/data_fabric/version.rb
+p
+0

data/test/connection_test.rb

@@ -37,6 +37,9 @@ class AdapterMock < ActiveRecord::ConnectionAdapters::AbstractAdapter
    def table_exists?(name)
      true
    end
+   def last_inserted_id(result)
+     1
+   end
    def method_missing(name, *args)
      raise ArgumentError, "#{self.class.name} missing '#{name}': #{args.inspect}"
    end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: data_fabric
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
+  prerelease: 
+  version: 1.3.2
 platform: ruby
 authors: 
 - Mike Perham
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 -08:00
-default_executable: 
+date: 2011-06-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: flexmock
@@ -25,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -38,12 +31,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
-description: Sharding and replication support for ActiveRecord 2.x
+description: Sharding and replication support for ActiveRecord
 email: mperham@gmail.com
 executables: []
 
@@ -55,6 +46,7 @@ files:
 - lib/data_fabric/connection_proxy.rb
 - lib/data_fabric/extensions.rb
 - lib/data_fabric/version.rb
+- lib/data_fabric/version.rbc
 - lib/data_fabric.rb
 - example23/app/controllers/accounts_controller.rb
 - example23/app/controllers/application_controller.rb
@@ -158,7 +150,6 @@ files:
 - test/vr_austin_slave.db
 - test/vr_dallas_master.db
 - test/vr_dallas_slave.db
-has_rdoc: true
 homepage: http://github.com/mperham/data_fabric
 licenses: []
 
@@ -172,24 +163,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: Sharding and replication support for ActiveRecord 2.x
+summary: Sharding and replication support for ActiveRecord
 test_files: 
 - test/connection_test.rb
 - test/database.yml