activerecord-shard_for 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 18b127f1099df390fc67db8548a308d1dc66cded
-  data.tar.gz: 25f90de3cad7a5824d1f164370e6b146589614b8
+SHA256:
+  metadata.gz: 67af2da78df9da03fc8dcb0f8ec43360ef50ef2db165b8aca97c2f11d70c81f2
+  data.tar.gz: 7a3c2ad776f3a73efd5a8eb4116fc47404a02837374cf9f30c7903dae05922f3
 SHA512:
-  metadata.gz: f0b5fc995889395482558bc950bc113a2692e21f8dc7a5ef0d75de8a1cb172e0c100cfeb28c77fc05536df4243513c5a4a54316d94d34299e7605cc9044fd764
-  data.tar.gz: 15dda5d854a5191a9559b020722a1fc6c960f8412479fda3d53a4fe6beeb2e6a738d0f948f29c5eb942ed31058e7bd474851b26bb79c3cee6e39c843d21112fb
+  metadata.gz: 47a9f15465c8c921ee26df83a327d81776eff5f348314f83a907fb9b0af3b7c442209581369168dd0e6c76260143ee47bdc9f0893b5ba605e49416dccf24c489
+  data.tar.gz: c38eb2a219785ce3d350b9158e7fdf635b35b2fbe508850039df06f60b5478bd005b20e14109b8335c4a39337b21fd874151c47d2b976e5c5a36712ba9f5be1a

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 sudo: false
 rvm:
-- 2.2.7
-- 2.3.4
-- 2.4.1
+- 2.3.8
+- 2.4.5
+- 2.5.3
+- 2.6.1
 branches:
   only:
     - master
@@ -20,16 +21,22 @@ gemfile:
 - gemfiles/ar_5.0.gemfile
 - gemfiles/ar_5.1.gemfile
 - gemfiles/ar_5.2.gemfile
+- gemfiles/ar_6.0.gemfile
 - gemfiles/rails_edge.gemfile
 matrix:
   allow_failures:
+  - gemfile: gemfiles/ar_6.0.gemfile
   - gemfile: gemfiles/rails_edge.gemfile
-  # rails_edge required ruby version over 2.4.1
+  # rails_edge required ruby version over 2.5.0
   exclude:
-  - rvm: 2.2.7
+  - rvm: 2.3.8
     gemfile: gemfiles/rails_edge.gemfile
-  - rvm: 2.3.4
+  - rvm: 2.4.5
     gemfile: gemfiles/rails_edge.gemfile
+  - rvm: 2.3.8
+    gemfile: gemfiles/ar_6.0.gemfile
+  - rvm: 2.4.5
+    gemfile: gemfiles/ar_6.0.gemfile
 notifications:
   slack:
     secure: S1W/Lw+dH3wb8FfkMIWPZmr6M4Q6S2WMkSlanpKva1HM7K5QL7hXdmUl2yBUxJE26BHSsb1ScozMEzadyda2+i/W34UvZ7LXgKeHkUKEdjy/AmsSJPK1ZjMfgnv10tVgbEIusNb4bF/sSuChdZKK3ILwOlqIPDlQNdMwF1xRA2xt5J7tb26UgyIzoCI4P3bJYMULWsEkk+UwHiJH0YO9ulkTZI/j0N+hLXQLJTZPjmKtMk/tE0NbBmFVL4md89hUcR5gKTGGrNzEMJ58K+zqeDG/DubkcIbA5ZuqKv+oE5m0pDODZExxnC+oeENTvq/VfYwOfD0pTDrBNYjj+Bm3YiyGDzQAgov9XPDG8g/fKEs/LNAT79UZXkZlFO99Yn/vrYH9o5DKpOE9smENUXylb55MgLTUiYe17CTp7pB3trbJl3wwIbLjSmTjAdSUNgPv8qDP4uk3K4U32mknXCDDkU9EI7f6F731ocdoxsGarEBcPcgjs73Y84iwDteQp847Gigtgo4Y4TCWH657uzLolR2O8NSw+vWT0VNI9qtR5PZD7iVYtSp1qHtPAKowCztodewY2Nu+Ds9Z95udf4GPUkFg/SNEJPTPrQFLiiJZ8UYP8NJEuA+IP1tc2zG3zU/ADrjenRC1ZiupQG7OMH82y11408U6PcHFSlF+7NuDkac=

data/Appraisals

@@ -12,6 +12,10 @@ appraise 'ar-5.2' do
   gem 'activerecord', '~> 5.2.1'
 end
 
+appraise 'ar-6.0' do
+  gem 'activerecord', '~> 6.0.0.beta1'
+end
+
 appraise 'rails-edge' do
   gem 'activerecord', github: 'rails/rails'
   gem 'arel', github: 'rails/arel'

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG for activerecord-shard_for
 
+## 0.7.0
+
+- Fix establish_connection is called on class loading. [#20](https://github.com/yuemori/activerecord-shard_for/pull/20)
+- Bump up supporeted rails versions. [#21](https://github.com/yuemori/activerecord-shard_for/pull/21)
+  - Add rails 6.0.0.beta1(experimental)
+- Drop ruby 2.2.x support
+- Fix set_callback raises NoMethodError when already defined callback. [#22](https://github.com/yuemori/activerecord-shard_for/pull/22)
+
 ## 0.6.1
 
 - Allow settings `thread_pool_base_size` and command executor. [#18](https://github.com/yuemori/activerecord-shard_for/pull/18)

data/activerecord-shard_for.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -20,19 +19,19 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 5.0.0'
-  spec.add_dependency 'activesupport', '>= 5.0.0'
+  spec.add_dependency 'activerecord'
+  spec.add_dependency 'activesupport'
   spec.add_dependency 'expeditor', '>= 0.1.0'
+  spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler', '>= 1.14'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.0'
   spec.add_development_dependency 'guard'
-  spec.add_development_dependency 'guard-rubocop'
   spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'guard-rubocop'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-parameterized'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.0'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
 end

data/gemfiles/ar_6.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0.beta1"
+
+gemspec path: "../"

data/lib/activerecord/shard_for/cluster_config.rb

@@ -14,6 +14,8 @@ module ActiveRecord
       # @raise [RuntimeError] when duplicate entry of key
       def register(key, connection_name)
         raise RuntimeError.new, "#{key} is registered" if connection_registry.key?(key)
+
+        establish_connection(connection_name)
         connection_registry[key] = connection_name
       end
 
@@ -35,6 +37,38 @@ module ActiveRecord
 
         raise KeyError.new, "#{key} is not registerd connection"
       end
+
+      private
+
+      # @param [Symbol] connection_name
+      # @return [String]
+      def generate_shard_name(connection_name)
+        "ShardFor#{connection_name.to_s.tr('-', '_').classify}"
+      end
+
+      # Establish connection for shard.
+      # @param [Symbol] connection_name
+      def establish_connection(connection_name)
+        shard_name = generate_shard_name(connection_name)
+
+        model = shard_name.safe_constantize
+
+        return if model
+
+        model = Class.new(ActiveRecord::Base) do
+          self.abstract_class = true
+
+          module_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def self.name
+              "#{shard_name}"
+            end
+          RUBY
+        end
+
+        Object.const_set(shard_name, model)
+
+        model.establish_connection connection_name
+      end
     end
   end
 end

data/lib/activerecord/shard_for/database_tasks.rb

@@ -3,6 +3,11 @@ module ActiveRecord
     module DatabaseTasks
       module_function
 
+      # @return [Boolean]
+      def ar6?
+        ActiveRecord::VERSION::MAJOR == 6
+      end
+
       # @return [Boolean]
       def ar5?
         ActiveRecord::VERSION::MAJOR == 5
@@ -167,7 +172,7 @@ module ActiveRecord
           configuration = ActiveRecord::Base.configurations[connection_name]
 
           case
-          when ar5?
+          when ar5? || ar6?
             ActiveRecord::Tasks::DatabaseTasks.load_schema(configuration, :ruby)
           when ar42? || ar417_above?
             ActiveRecord::Tasks::DatabaseTasks.load_schema_for(configuration, :ruby)

data/lib/activerecord/shard_for/model.rb

@@ -69,6 +69,7 @@ module ActiveRecord
         # @raise [ActiveRecord::ShardFor::MissingDistkeyAttribute]
         def put!(attributes)
           raise '`distkey` is not defined. Use `def_distkey`.' unless distkey
+
           @before_put_callback.call(attributes) if defined?(@before_put_callback) && @before_put_callback
 
           key = fetch_distkey_from_attributes(attributes)

data/lib/activerecord/shard_for/patch.rb

@@ -10,6 +10,20 @@ module ActiveRecord
           super
           shard_repository.all.each { |shard| shard.defined_enums = defined_enums }
         end
+
+        # For ActiveSupport::Callbacks patch.
+        #
+        # Since define_callbacks has not been successfully propagated to the shard class when called,
+        # we also call define_callback of the shard class.
+        def define_callbacks(*args)
+          if abstract_class
+            all_shards.each do |model|
+              model.define_callbacks(*args)
+            end
+          end
+
+          super
+        end
       end
     end
   end

data/lib/activerecord/shard_for/shard_repository.rb

@@ -9,7 +9,6 @@ module ActiveRecord
         @base_class = base_class
 
         @shards = cluster_config.connection_registry.each_with_object({}) do |(key, connection_name), hash|
-          establish_connection(connection_name)
           model = generate_model_for_shard(connection_name, key)
           base_class.const_set(:"#{generate_shard_name(connection_name)}", model)
           hash[connection_name] = model
@@ -18,24 +17,6 @@ module ActiveRecord
 
       private
 
-      # Establish connection for shard.
-      # @param [Symbol] connection_name
-      def establish_connection(connection_name)
-        shard_name = generate_shard_name(connection_name)
-
-        model = Class.new(base_class) do
-          self.table_name = base_class.table_name
-
-          module_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def self.name
-              "#{shard_name}"
-            end
-          RUBY
-        end
-
-        model.establish_connection connection_name
-      end
-
       # @param [Symbol] connection_name
       # @param [Range] slot_range
       # @return [Class] A sub class of given AR model.

data/lib/activerecord/shard_for/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module ShardFor
-    VERSION = '0.6.1'.freeze
+    VERSION = '0.7.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-shard_for
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - yuemori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: expeditor
   requirement: !ruby/object:Gem::Requirement
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rubocop
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,21 +165,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec-parameterized
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-parameterized
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,19 +207,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.3.6
 description: Database sharding library for ActiveRecord
 email:
 - yuemori@aiming-inc.com
@@ -245,6 +245,7 @@ files:
 - gemfiles/ar_5.0.gemfile
 - gemfiles/ar_5.1.gemfile
 - gemfiles/ar_5.2.gemfile
+- gemfiles/ar_6.0.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/activerecord/shard_for.rb
 - lib/activerecord/shard_for/abstract_shard_repository.rb
@@ -285,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Database sharding library for ActiveRecord