switchman 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62a38cba848a274d99ab64d7e6de6a9d3cf25d8a
-  data.tar.gz: fd23f4718d778dd580703478253658610c7bc2ba
+  metadata.gz: dd5f72df8592b3efb7cc2e7719366b8df053e527
+  data.tar.gz: 4458254cf9f9d965736323e1621c8b11d262bc1d
 SHA512:
-  metadata.gz: ce4357fb9fb1898b19c2dae8696ab457022bad518b871e38a06d03a64e3ef17fa137e7dceda600ba5acbfcd622004b35bd3fcfda6d23be4d7541e88da9ba873b
-  data.tar.gz: f8e25efd8028727f282b9d37598f6caa0dc83e8d39645e888bf9e7741a1658519c5623638a41c8628a22630d036966bde3a53f1eb91534b0cae7d281cac9ff39
+  metadata.gz: e42226c9cb67fd197902946e0f7be1c5a83970e213658e3abd0c7ecaf64122d3bb56be4c23be00751882d9c716ae39526bc60518d28f0426b844f8e7fe66c548
+  data.tar.gz: bd6525f1a509381e817f8ae8dbd039a522034ee20cac4c763df3dc14e9b1ae035ad9d8f3d5de3a60bda3274039b4eec05c3f99790b26da48b4aaab0882a93e6a

data/app/models/switchman/shard.rb

@@ -151,7 +151,7 @@ module Switchman
         scope ||= Shard.order("database_server_id IS NOT NULL, database_server_id, id")
 
         if parallel > 0
-          if scope.class == ::ActiveRecord::NamedScope::Scope
+          if scope.class == ::ActiveRecord::Relation
             # still need a post-uniq, cause the default database server could be NULL or Rails.env in the db
             database_servers = scope.reorder('database_server_id').select(:database_server_id).uniq.
                 map(&:database_server).compact.uniq
@@ -190,7 +190,7 @@ module Switchman
           pids = []
           exception_pipe = IO.pipe
           scopes.each do |server, subscopes|
-            if subscopes.first.class != ::ActiveRecord::NamedScope::Scope && subscopes.first.class != Array
+            if subscopes.first.class != ::ActiveRecord::Relation && subscopes.first.class != Array
               subscopes = [subscopes]
             end
             # only one process; don't bother forking

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -129,9 +129,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Rakefile
 - app/models/switchman/shard.rb
 - db/migrate/20130328212039_create_switchman_shards.rb
 - db/migrate/20130328224244_create_default_shard.rb
+- lib/switchman.rb
 - lib/switchman/action_controller/caching.rb
 - lib/switchman/active_record/abstract_adapter.rb
 - lib/switchman/active_record/association.rb
@@ -158,15 +160,15 @@ files:
 - lib/switchman/sharded_instrumenter.rb
 - lib/switchman/test_helper.rb
 - lib/switchman/version.rb
-- lib/switchman.rb
 - lib/tasks/switchman.rake
-- Rakefile
+- spec/dummy/Rakefile
 - spec/dummy/app/models/appendage.rb
 - spec/dummy/app/models/digit.rb
 - spec/dummy/app/models/feature.rb
 - spec/dummy/app/models/mirror_user.rb
 - spec/dummy/app/models/root.rb
 - spec/dummy/app/models/user.rb
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -180,7 +182,6 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
-- spec/dummy/config.ru
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20130403132607_create_users.rb
 - spec/dummy/db/migrate/20130411202442_create_appendages.rb
@@ -191,7 +192,6 @@ files:
 - spec/dummy/db/migrate/20140219183820_create_roots.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/log/development.log
-- spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/lib/action_controller/caching_spec.rb
 - spec/lib/active_record/abstract_adapter_spec.rb
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Rails 3 sharding magic
@@ -292,3 +292,4 @@ test_files:
 - spec/lib/shackles_spec.rb
 - spec/models/shard_spec.rb
 - spec/spec_helper.rb
+has_rdoc: