db-charmer 1.7.0.pre1 → 1.7.0.pre2

data/CHANGES

@@ -7,6 +7,9 @@ Heavily reorganized the source code to match Rails code structure (class names,
 make it much easier for other contributors to work with the code.
 Added smarter environment detection (using Rails.env, RAILS_ENV or RACK_ENV).
 
+Changed dependencies a bit: instead of depending on rails, we now require specific components
+(ActiveRecord, ActiveSupport, etc) + we do not require blankslate gem anymore.
+
 Bugfixes: Fix for N+1 queries when accessing shard_info for db_block_group_map sharding method.
 
 ----------------------------------------------------------------------------------------

data/Rakefile

@@ -12,8 +12,9 @@ begin
 
     gemspec.version = DbCharmer::Version::STRING
 
-    gemspec.add_dependency('rails', '~> 2.2')
-    gemspec.add_dependency('blankslate', '>= 0')
+    gemspec.add_dependency('activesupport', '~> 2.2')
+    gemspec.add_dependency('activerecord', '~> 2.2')
+    gemspec.add_dependency('actionpack', '~> 2.2')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/db-charmer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{db-charmer}
-  s.version = "1.7.0.pre1"
+  s.version = "1.7.0.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexey Kovyrin"]
-  s.date = %q{2011-05-16}
+  s.date = %q{2011-05-23}
   s.description = %q{ActiveRecord Connections Magic (slaves, multiple connections, etc)}
   s.email = %q{alexey@kovyrin.net}
   s.extra_rdoc_files = [
@@ -61,15 +61,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 2.2"])
-      s.add_runtime_dependency(%q<blankslate>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 2.2"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 2.2"])
+      s.add_runtime_dependency(%q<actionpack>, ["~> 2.2"])
     else
-      s.add_dependency(%q<rails>, ["~> 2.2"])
-      s.add_dependency(%q<blankslate>, [">= 0"])
+      s.add_dependency(%q<activesupport>, ["~> 2.2"])
+      s.add_dependency(%q<activerecord>, ["~> 2.2"])
+      s.add_dependency(%q<actionpack>, ["~> 2.2"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 2.2"])
-    s.add_dependency(%q<blankslate>, [">= 0"])
+    s.add_dependency(%q<activesupport>, ["~> 2.2"])
+    s.add_dependency(%q<activerecord>, ["~> 2.2"])
+    s.add_dependency(%q<actionpack>, ["~> 2.2"])
   end
 end
 

data/lib/db_charmer.rb

@@ -58,9 +58,6 @@ private
   end
 end
 
-# We need blankslate for all the proxies we have
-require 'blankslate'
-
 # Add useful methods to global object
 require 'db_charmer/core_extensions'
 

data/lib/db_charmer/active_record/multi_db_proxy.rb

@@ -3,7 +3,10 @@ module DbCharmer
     module MultiDbProxy
       # Simple proxy class that switches connections and then proxies all the calls
       # This class is used to implement chained on_db calls
-      class OnDbProxy < BlankSlate
+      class OnDbProxy < ActiveSupport::BasicObject
+        # We need to do this because in Rails 2.3 BasicObject does not remove object_id method, which is stupid
+        undef_method(:object_id) if instance_methods.member?('object_id')
+
         def initialize(proxy_target, slave)
           @proxy_target = proxy_target
           @slave = slave

data/lib/db_charmer/connection_proxy.rb

@@ -1,6 +1,9 @@
 # Simple proxy that sends all method calls to a real database connection
 module DbCharmer
-  class ConnectionProxy < BlankSlate
+  class ConnectionProxy < ActiveSupport::BasicObject
+    # We need to do this because in Rails 2.3 BasicObject does not remove object_id method, which is stupid
+    undef_method(:object_id) if instance_methods.member?('object_id')
+
     def initialize(abstract_class, db_name)
       @abstract_connection_class = abstract_class
       @db_name = db_name

data/lib/db_charmer/version.rb

@@ -3,7 +3,7 @@ module DbCharmer
     MAJOR = 1
     MINOR = 7
     PATCH = 0
-    BUILD = 'pre1'
+    BUILD = 'pre2'
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: db-charmer
 version: !ruby/object:Gem::Version 
-  hash: 1923832059
+  hash: 1923832061
   prerelease: 6
   segments: 
   - 1
   - 7
   - 0
   - pre
-  - 1
-  version: 1.7.0.pre1
+  - 2
+  version: 1.7.0.pre2
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -17,11 +17,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -04:00
+date: 2011-05-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -36,19 +36,35 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: blankslate
+  name: activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 2
+        version: "2.2"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        version: "2.2"
+  type: :runtime
+  version_requirements: *id003
 description: ActiveRecord Connections Magic (slaves, multiple connections, etc)
 email: alexey@kovyrin.net
 executables: []