switchman 1.5.13 → 1.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c25757a3ecb19cfba0a82adbe3fa0e881d58c302
-  data.tar.gz: 13b9c2b34b8f9f562b84a19bb43865436e4bdff5
+  metadata.gz: 991a3392b5b0202a9bcaf8029a7bb7c103ec1643
+  data.tar.gz: 3687768e39078beaf8fff5e1cdf2aae1cc4b2c31
 SHA512:
-  metadata.gz: 0382c38297c9ef9cb15622fbaf342870942b660d1be4131ad085f2d891f6d38e79f5c584aba8866306f18a813703beaeafe675685f483fa75aae9de1cb1d35db
-  data.tar.gz: 03a4c27d1596eac4ced134b60abe9a2d05970a74d89c0040b8fdb3bacd4999e785c4f3d6ee14e9aa55943dfe6574d3c725b5a3b0be2c9f8d98080133de3fc2f7
+  metadata.gz: 36845dd017c674600b9d7ec1d66ba5a8fe9732dcb7597d5c0490a6bbfbcceeb8def4a413941895f48a8b541f5487a33fd850b475a03c1f38a7b2b7012be0cc05
+  data.tar.gz: 9b6774b94a699618901e82f020f3ce61b0e54dff581e947f9e738472db2637d81c65f0afc2ef5abdb709a0e1cd238a7fac677d805a25bd602144ebe9733061c9

data/lib/switchman/database_server.rb

@@ -272,7 +272,9 @@ module Switchman
 
     def primary_shard
       unless instance_variable_defined?(:@primary_shard)
-        @primary_shard = shards.where(name: nil).first
+        # if sharding isn't fully set up yet, we may not be able to query the shards table
+        @primary_shard = Shard.default if Shard.default.database_server == self
+        @primary_shard ||= shards.where(name: nil).first
       end
       @primary_shard
     end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.5.13"
+  VERSION = "1.5.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.5.14
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -112,16 +112,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,6 @@ 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

data/lib/switchman/engine.rb~

@@ -1,203 +0,0 @@
-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