active_record_shards 4.0.0.beta6 → 4.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4a5e26f845c2b9628ad246c6afafc466be8d00c8
-  data.tar.gz: ccffb2df58a242e590c6f5940a30814572eaf742
+SHA256:
+  metadata.gz: b8308f1fd9c7b5d8f46c8c5300e91783cf576b829bae63cc461f1df07ce3e3e7
+  data.tar.gz: e96cdbaf9aa27134712b99749f805188fb4ecfcd82a7cad185918055d644913a
 SHA512:
-  metadata.gz: 96333291c802edcfd68cf8bb989252bfed8b08e72c8afca8bf8d09098b7053b18ec58472df76f1cf48cc05a624570ab4996e350440d42c0908f5bb5b86c08e56
-  data.tar.gz: ac5e5f9820f2d91d8eb726312a60e509e9d000dd72d5f04e19ff7cc6956352ec9aa8643ff244385ba48332dbe44eb5e4dd672d5594dfb25382ebbe304ad2ffdd
+  metadata.gz: d284f7740b3a84fe9660560d647494b7416b2f5d47b8c997e64af841a2b06f0c1329858a053a3b48c045f97ccfc1f126232bb9d4d68c12b0f57b4b5b4ebb8359
+  data.tar.gz: '028eb63263c79112299e04aa650fb21a561e297c8aa46452005d44e6d9319313ee5c97534f698c1aa6a3708161c1ffbd5c60c6c454db866b6a316d5ac0c8b9ac'

data/lib/active_record_shards/connection_switcher.rb

@@ -118,25 +118,14 @@ module ActiveRecordShards
     def load_schema_with_default_shard!
       with_default_shard { load_schema_without_default_shard! }
     end
-
-    class MasterSlaveProxy
-      def initialize(target, which)
-        @target = target
-        @which = which
-      end
-
-      def method_missing(method, *args, &block) # rubocop:disable Style/MethodMissing
-        @target.on_master_or_slave(@which) { @target.send(method, *args, &block) }
-      end
-    end
   end
 end
 
 case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
 when '5.0'
-  require 'active_record_shards/connection_switcher-5-0'
-when '5.1'
-  require 'active_record_shards/connection_switcher-5-1'
+  require 'active_record_shards/connection_switcher_5_0'
+when '5.1', '5.2'
+  require 'active_record_shards/connection_switcher_5_1'
 else
   raise "ActiveRecordShards is not compatible with #{ActiveRecord::VERSION::STRING}"
 end

data/lib/active_record_shards/model.rb

@@ -48,7 +48,7 @@ module ActiveRecordShards
     end
 
     def self.extended(base)
-      base.send(:include, InstanceMethods)
+      base.include(InstanceMethods)
       base.after_initialize :initialize_slave
     end
   end

data/lib/active_record_shards/sharded_model.rb

@@ -3,7 +3,7 @@ module ActiveRecordShards
     module ShardedModel
       def self.extended(base)
         base.extend(ActiveRecordShards::ConnectionSwitcher)
-        base.send(:include, InstanceMethods)
+        base.include(InstanceMethods)
         base.after_initialize :initialize_shard
       end
 

data/lib/active_record_shards/tasks.rb

@@ -15,8 +15,8 @@ namespace :db do
       # rescue ActiveRecord::NoDatabaseError # TODO: exists in AR but never is raised here ...
       #   $stderr.puts "Database '#{conf['database']}' does not exist"
       rescue StandardError => error
-        $stderr.puts error, *error.backtrace
-        $stderr.puts "Couldn't drop #{conf['database']}"
+        warn error, *error.backtrace
+        warn "Couldn't drop #{conf['database']}"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta6
+  version: 4.0.0.beta7
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -41,7 +41,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,21 +55,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: minitest-rg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -97,75 +97,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: phenix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: minitest-rg
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
-  name: phenix
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 description: Easily run queries on shard and slave databases.
 email:
 - mick@staugaard.com
@@ -181,9 +181,9 @@ files:
 - lib/active_record_shards/base_config.rb
 - lib/active_record_shards/configuration_parser.rb
 - lib/active_record_shards/connection_resolver.rb
-- lib/active_record_shards/connection_switcher-5-0.rb
-- lib/active_record_shards/connection_switcher-5-1.rb
 - lib/active_record_shards/connection_switcher.rb
+- lib/active_record_shards/connection_switcher_5_0.rb
+- lib/active_record_shards/connection_switcher_5_1.rb
 - lib/active_record_shards/default_slave_patches.rb
 - lib/active_record_shards/model.rb
 - lib/active_record_shards/no_shard_selection.rb
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.