switchman 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 657642d7cee67361f96f71c662754e3045797d54
-  data.tar.gz: b812153caf29c4699863e85c3fd65f1146b1ba83
+  metadata.gz: afbf29688ae3158c8e0a6e02d5dd27355d33fcc9
+  data.tar.gz: 104a872cbf73ba12f5a9bdc74d25db7d25d68c59
 SHA512:
-  metadata.gz: 85b96aae81f8939ab5625d582ede7a46e795db85b6fc60c04207dde636701ff8dca25d1517ceb794c232f39309a45df8f3e00a812e91c63776471883da53eea0
-  data.tar.gz: 081fd47e581206a4b628ff13d3eff837c8a4fbc9f143b08ae32cabfeff53153a78d733eb904048bcf4f23bd7aab6dfbb8fa1e2049388882e7cb060e6af9eea5f
+  metadata.gz: 453bb244bc91a04501f5952f629a964ebcb338629a6ba4e3530954a71325bb268acbc514619e1ca06d68c6d56d333e24575dc6eb053c8c86a22506462882c0ca
+  data.tar.gz: 9f39e116166e29ce9bfaf22aff35d84821f8d8ccbd2ff93032cb8dfbabd77c695e4a4a1aaf4608ca5171b31b17a66325357f16a85b9b6aeb83bb1aa9c8f84941

data/app/models/switchman/shard_internal.rb

@@ -470,6 +470,7 @@ module Switchman
       end
 
       def shard_for(any_id, source_shard = nil)
+        return any_id.shard if any_id.is_a?(::ActiveRecord::Base)
         _, shard = local_id_for(any_id)
         shard || source_shard || Shard.current
       end

data/lib/switchman/active_record/association.rb

@@ -103,7 +103,7 @@ module Switchman
               # for belongs_to, it's the shard of the foreign_key
               partition_proc = ->(owner) do
                 if owner.class.sharded_column?(owner_key_name)
-                  Shard.shard_for(owner, owner[owner_key_name])
+                  Shard.shard_for(owner[owner_key_name], owner.shard)
                 else
                   Shard.current
                 end

data/lib/switchman/active_record/connection_pool.rb

@@ -1,3 +1,5 @@
+require 'switchman/errors'
+
 module Switchman
   module ActiveRecord
     module ConnectionPool
@@ -26,6 +28,7 @@ module Switchman
 
       def connection
         conn = super
+        raise NonExistentShardError if shard.new_record?
         switch_database(conn) if conn.shard != self.shard
         conn
       end

data/lib/switchman/default_shard.rb

@@ -11,6 +11,7 @@ module Switchman
     def global_id_for(local_id); local_id; end
     def database_server_id; nil; end
     def database_server; DatabaseServer.find(nil); end
+    def new_record?; false; end
     def name
       unless instance_variable_defined?(:@name)
         @name = nil # prevent taking this branch on recursion

data/lib/switchman/engine.rb~

@@ -0,0 +1,203 @@
+module Switchman
+  class Engine < ::Rails::Engine
+    require 'byebug'
+    debugger
+    isolate_namespace Switchman
+
+    config.autoload_once_paths << File.expand_path(File.join(__FILE__, "../../../app/models"))
+
+    def self.lookup_stores(cache_store_config)
+      result = {}
+      cache_store_config.each do |key, value|
+        next if value.is_a?(String)
+        result[key] = ::ActiveSupport::Cache.lookup_store(value)
+      end
+
+      cache_store_config.each do |key, value|
+        next unless value.is_a?(String)
+        result[key] = result[value]
+      end
+      result
+    end
+
+    initializer 'switchman.initialize_cache', :before => 'initialize_cache' do
+      require "switchman/active_support/cache"
+      ::ActiveSupport::Cache.singleton_class.prepend(ActiveSupport::Cache::ClassMethods)
+
+      # if we haven't already setup our cache map out-of-band, set it up from
+      # config.cache_store now. behaves similarly to Rails' default
+      # initialize_cache initializer, but for each value in the map, rather
+      # than just Rails.cache. if config.cache_store is a flat value, uses it
+      # to fill just the Rails.env entry in the cache map.
+      unless Switchman.config[:cache_map].present?
+        cache_store_config = ::Rails.configuration.cache_store
+        unless cache_store_config.is_a?(Hash)
+          cache_store_config = {::Rails.env => cache_store_config}
+        end
+
+        Switchman.config[:cache_map] = Engine.lookup_stores(cache_store_config)
+      end
+
+      # if the configured cache map (either from before, or as populated from
+      # config.cache_store) didn't have an entry for Rails.env, add one using
+      # lookup_store(nil); matches the behavior of Rails' default
+      # initialize_cache initializer when config.cache_store is nil.
+      unless Switchman.config[:cache_map].has_key?(::Rails.env)
+        value = ::ActiveSupport::Cache.lookup_store(nil)
+        Switchman.config[:cache_map][::Rails.env] = value
+      end
+
+      middlewares = Switchman.config[:cache_map].values.map do |store|
+        store.middleware if store.respond_to?(:middleware)
+      end.compact.uniq
+      middlewares.each do |middleware|
+        config.middleware.insert_before("Rack::Runtime", middleware)
+      end
+
+      # prevent :initialize_cache from trying to (or needing to) set
+      # Rails.cache. once our switchman.extend_ar initializer (below) runs
+      # Rails.cache will be overridden to pull appropriate values from the
+      # cache map, but between now and then, Rails.cache should return the
+      # Rails.env entry in the cache map.
+      ::Rails.cache = Switchman.config[:cache_map][::Rails.env]
+
+      require "switchman/rails"
+      ::Rails.singleton_class.prepend(Rails::ClassMethods)
+    end
+
+    initializer 'switchman.asplode', :after => "active_record.initialize_database" do
+      ::Rails.cache
+    end
+
+      initializer 'switchman.extend_ar', :before => "active_record.initialize_database" do
+      ::ActiveSupport.on_load(:active_record) do
+        require 'byebug'
+        debugger
+        require "switchman/active_record/abstract_adapter"
+        require "switchman/active_record/association"
+        require "switchman/active_record/attribute_methods"
+        require "switchman/active_record/base"
+        require "switchman/active_record/calculations"
+        require "switchman/active_record/connection_handler"
+        require "switchman/active_record/connection_pool"
+        require "switchman/active_record/finder_methods"
+        require "switchman/active_record/log_subscriber"
+        require "switchman/active_record/model_schema"
+        require "switchman/active_record/persistence"
+        require "switchman/active_record/predicate_builder"
+        require "switchman/active_record/query_cache"
+        require "switchman/active_record/query_methods"
+        require "switchman/active_record/reflection"
+        require "switchman/active_record/relation"
+        require "switchman/active_record/spawn_methods"
+        require "switchman/active_record/where_clause_factory"
+        require "switchman/active_record/type_caster"
+        require "switchman/arel"
+        require "switchman/shackles/relation"
+
+        include ActiveRecord::Base
+        include ActiveRecord::AttributeMethods
+        include ActiveRecord::Persistence
+        singleton_class.prepend ActiveRecord::ModelSchema::ClassMethods
+
+        if ::Rails.version > '4.2'
+          require "switchman/active_record/statement_cache"
+          ::ActiveRecord::StatementCache.prepend(ActiveRecord::StatementCache)
+          ::ActiveRecord::StatementCache::BindMap.prepend(ActiveRecord::StatementCache::BindMap)
+          ::ActiveRecord::StatementCache::Substitute.send(:attr_accessor, :primary, :sharded)
+
+          ::ActiveRecord::Associations::CollectionAssociation.prepend(ActiveRecord::CollectionAssociation)
+          ::ActiveRecord::PredicateBuilder.singleton_class.prepend(ActiveRecord::PredicateBuilder)
+        end
+
+        if ::Rails.version > '4.1'
+          prepend(ActiveRecord::AutosaveAssociation)
+        end
+
+        ::ActiveRecord::Associations::Association.prepend(ActiveRecord::Association)
+        ::ActiveRecord::Associations::BelongsToAssociation.prepend(ActiveRecord::BelongsToAssociation)
+        ::ActiveRecord::Associations::CollectionProxy.include(ActiveRecord::CollectionProxy)
+        if ::Rails.version < '5'
+          ::ActiveRecord::Associations::Builder::CollectionAssociation.include(ActiveRecord::Builder::CollectionAssociation)
+        end
+
+        ::ActiveRecord::Associations::Preloader::Association.prepend(ActiveRecord::Preloader::Association)
+        ::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(ActiveRecord::AbstractAdapter)
+        ::ActiveRecord::ConnectionAdapters::ConnectionHandler.prepend(ActiveRecord::ConnectionHandler)
+        ::ActiveRecord::ConnectionAdapters::ConnectionPool.prepend(ActiveRecord::ConnectionPool)
+        ::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(ActiveRecord::QueryCache)
+        # when we call super in Switchman::ActiveRecord::QueryCache#select_all,
+        # we want it to find the definition from
+        # ActiveRecord::ConnectionAdapters::DatabaseStatements, not
+        # ActiveRecord::ConnectionAdapters::QueryCache
+        ::ActiveRecord::ConnectionAdapters::QueryCache.send(:remove_method, :select_all)
+
+        ::ActiveRecord::LogSubscriber.prepend(ActiveRecord::LogSubscriber)
+        ::ActiveRecord::Reflection::AssociationReflection.prepend(ActiveRecord::Reflection::AssociationReflection)
+        ::ActiveRecord::Relation.prepend(ActiveRecord::Calculations)
+        ::ActiveRecord::Relation.include(ActiveRecord::FinderMethods)
+        ::ActiveRecord::Relation.include(ActiveRecord::QueryMethods)
+        ::ActiveRecord::Relation.prepend(ActiveRecord::Relation)
+        ::ActiveRecord::Relation.include(ActiveRecord::SpawnMethods)
+        ::ActiveRecord::Relation.prepend(Shackles::Relation)
+
+        if ::Rails.version >= '5'
+          ::ActiveRecord::Relation::WhereClauseFactory.prepend(ActiveRecord::WhereClauseFactory)
+          ::ActiveRecord::PredicateBuilder::AssociationQueryValue.prepend(ActiveRecord::PredicateBuilder::AssociationQueryValue)
+          ::ActiveRecord::TypeCaster::Map.include(ActiveRecord::TypeCaster::Map)
+          ::ActiveRecord::TypeCaster::Connection.include(ActiveRecord::TypeCaster::Connection)
+        end
+
+        ::Arel::Table.prepend(Arel::Table)
+        ::Arel::Visitors::ToSql.prepend(Arel::Visitors::ToSql)
+        ::Arel::Visitors::PostgreSQL.include(Arel::Visitors::PostgreSQL) if ::Rails.version < '4.2'
+      end
+    end
+
+    def self.foreign_key_check(name, type, options)
+      if name.to_s =~ /_id\z/ && type.to_s == 'integer' && options[:limit].to_i < 8
+        puts "WARNING: All foreign keys need to be 8-byte integers. #{name} looks like a foreign key. If so, please add the option: `:limit => 8`"
+      end
+    end
+
+    initializer 'switchman.extend_connection_adapters', :after => "active_record.initialize_database" do
+      ::ActiveSupport.on_load(:active_record) do
+        ::ActiveRecord::ConnectionAdapters::AbstractAdapter.descendants.each do |klass|
+          klass.prepend(ActiveRecord::AbstractAdapter::ForeignKeyCheck)
+        end
+
+        require 'switchman/active_record/table_definition'
+        ::ActiveRecord::ConnectionAdapters::TableDefinition.prepend(ActiveRecord::TableDefinition)
+
+        if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+          require "switchman/active_record/postgresql_adapter"
+          ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(ActiveRecord::PostgreSQLAdapter)
+        end
+      end
+    end
+
+    initializer 'switchman.eager_load' do
+      ::ActiveSupport.on_load(:before_eager_load) do
+        # This needs to be loaded before Switchman::Shard, otherwise it won't autoload it correctly
+        require 'active_record/base'
+      end
+    end
+
+    initializer 'switchman.extend_shackles', :before => "switchman.extend_ar" do
+      ::ActiveSupport.on_load(:active_record) do
+        require "switchman/shackles"
+
+        ::Shackles.singleton_class.prepend(Shackles::ClassMethods)
+      end
+    end
+
+    initializer 'switchman.extend_controller', :after => "shackles.extend_ar" do
+      ::ActiveSupport.on_load(:action_controller) do
+        require "switchman/action_controller/caching"
+
+        ::ActionController::Base.include(ActionController::Caching)
+      end
+    end
+
+  end
+end

data/lib/switchman/errors.rb

@@ -0,0 +1,3 @@
+module Switchman
+  class NonExistentShardError < RuntimeError; end
+end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

data/lib/tasks/switchman.rake

@@ -225,6 +225,20 @@ module Switchman
           run_cmd('pg_dump', args, 'dumping')
           File.open(filename, "a") { |f| f << "SET search_path TO #{serialized_search_path};\n\n" }
         end
+
+        if ::Rails.version < '4.2.5'
+          # These methods are backported from rails 4.2.5 to work with the above
+          def run_cmd(cmd, args, action)
+            fail run_cmd_error(cmd, args, action) unless Kernel.system(cmd, *args)
+          end
+
+          def run_cmd_error(cmd, args, action)
+            msg = "failed to execute:\n"
+            msg << "#{cmd} #{args.join(' ')}\n\n"
+            msg << "Please check the output above for any errors and make sure that `#{cmd}` is installed in your PATH and has proper permissions.\n\n"
+            msg
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -192,7 +192,9 @@ files:
 - lib/switchman/database_server.rb
 - lib/switchman/default_shard.rb
 - lib/switchman/engine.rb
+- lib/switchman/engine.rb~
 - lib/switchman/environment.rb
+- lib/switchman/errors.rb
 - lib/switchman/r_spec_helper.rb
 - lib/switchman/rails.rb
 - lib/switchman/schema_cache.rb
@@ -222,9 +224,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic
 test_files: []
-has_rdoc: