activerecord-shard_for 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4922fc214f9808a86225606f05fec0236ec3bc51
-  data.tar.gz: 6cdc0fa7c6bd162b71a163344b306ed16e8165a6
+  metadata.gz: 7598d89f3c2df373c8936c3df0e9e77e6b1f96f6
+  data.tar.gz: f9b9a4405849837c138184f68ad12e8374340c8f
 SHA512:
-  metadata.gz: 20fb33271d1d5b08213e09c34b4ca4d0fc7455cbe92a2a60f0b2b9edc16b4dda4c21939fada4ed9c68f2da07db50370a6faf399304827d15d88006175b859c2e
-  data.tar.gz: 749685bb5b2402582a73f9fc3672a2e3efb699d2bcfd839df834a27f65da50a48d74083e2b41e7b5156dfaa6d7175f8eb0be2cd9a01b7a231d0cbf6bbdd76d68
+  metadata.gz: 1f95be02a5787e073cb98f04059633cfb629c00e6c9854e22e0a590408162e0abd1299f5039f0f3710e1b79c7963f3d7c799094fe1e052668bbb848394df9089
+  data.tar.gz: 5f56d475a656397f86282a5930bbc2b0ab9c5aa2609bf453ca28ad92432251421331683041be42381ef9d57e5b438d23adc7f3a18f95807d44149882bb5b293d

data/.rubocop.yml

@@ -27,3 +27,7 @@ Style/ParallelAssignment:
 
 Style/Alias:
   EnforcedStyle: prefer_alias_method
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'

data/.travis.yml

@@ -3,18 +3,20 @@ sudo: false
 rvm:
 - 2.2.4
 - 2.3.1
+- 2.4.0
 branches:
   only:
     - master
-before_install: gem install bundler -v 1.12.5
+before_install:
+  - gem update --system 
+  - gem update --remote bundler
 cache: bundler
 script:
-- CODECLIMATE_REPO_TOKEN=dfc951e2d70b56ee62ffe989eb6286a6f21bf57209ccbd111bd336c372d8d06e bundle exec rspec
 - bundle exec rubocop
 - bundle exec ruby spec/performance_test.rb
+- bundle exec rspec
+- CODECLIMATE_REPO_TOKEN=dfc951e2d70b56ee62ffe989eb6286a6f21bf57209ccbd111bd336c372d8d06e bundle exec codeclimate-test-reporter
 gemfile:
-- gemfiles/ar_4.1.0.gemfile
-- gemfiles/ar_4.1.7.gemfile
 - gemfiles/ar_4.1.8.gemfile
 - gemfiles/ar_4.2.gemfile
 - gemfiles/ar_5.0.gemfile
@@ -27,6 +29,8 @@ matrix:
     gemfile: gemfiles/rails_edge.gemfile
   - rvm: 2.1.9
     gemfile: gemfiles/ar_5.0.gemfile
+  - rvm: 2.4.0
+    gemfile: gemfiles/ar_4.1.8.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/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG for activerecord-shard_for
 
+## 0.5.0
+
+- Support Single Table Inheritance. [#14](https://github.com/yuemori/activerecord-shard_for/pull/14)
+
 ## 0.4.1
 
 - Fix defined_enums is empty. [#11](https://github.com/yuemori/activerecord-shard_for/pull/11)

data/activerecord-shard_for.gemspec

@@ -26,14 +26,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-doc'
-  spec.add_development_dependency 'pry-stack_explorer'
-  spec.add_development_dependency 'pry-inline'
-  spec.add_development_dependency 'pry-rescue'
+  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 'rspec-parameterized'
-  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.0'
 end

data/lib/activerecord/shard_for.rb

@@ -1,6 +1,7 @@
 require 'active_record'
 require 'expeditor'
 require 'activerecord/shard_for/version'
+require 'activerecord/shard_for/abstract_shard_repository'
 require 'activerecord/shard_for/config'
 require 'activerecord/shard_for/cluster_config'
 require 'activerecord/shard_for/model'
@@ -14,6 +15,8 @@ require 'activerecord/shard_for/all_shards_in_parallel'
 require 'activerecord/shard_for/replication_mapping'
 require 'activerecord/shard_for/railtie' if defined?(Rails)
 require 'activerecord/shard_for/patch'
+require 'activerecord/shard_for/sti'
+require 'activerecord/shard_for/sti_shard_repository'
 
 module ActiveRecord
   module ShardFor

data/lib/activerecord/shard_for/abstract_shard_repository.rb

@@ -0,0 +1,37 @@
+module ActiveRecord
+  module ShardFor
+    class AbstractShardRepository
+      attr_reader :shards
+
+      # @param [Symbol] connection_name
+      # @return [Class] A model class for this shard
+      def fetch(connection_name)
+        shards.fetch(connection_name)
+      end
+
+      # @param [Object] key sharding key object for connection
+      # @return [Class, nil] A AR model class.
+      def fetch_by_key(key)
+        shards.values.find do |model|
+          case model.assigned_key
+          when Range then model.assigned_key.include?(key)
+          else model.assigned_key == key
+          end
+        end
+      end
+
+      # @return [Array<Class>]
+      def all
+        shards.values
+      end
+
+      private
+
+      # @param [Symbol] connection_name
+      # @return [String]
+      def generate_class_name(connection_name)
+        "ShardFor#{connection_name.to_s.tr('-', '_').classify}"
+      end
+    end
+  end
+end

data/lib/activerecord/shard_for/model.rb

@@ -44,6 +44,13 @@ module ActiveRecord
           shard_repository.fetch(connection_name)
         end
 
+        # Evaluate block in all shard instances.
+        def shard_eval(&block)
+          all_shards.each do |shard|
+            shard.class_eval(&block)
+          end
+        end
+
         # Create new record with given attributes in proper shard for given key.
         # When distkey value is empty, raises ActiveRecord::ShardFor::MissingDistkeyAttribute
         # error.

data/lib/activerecord/shard_for/shard_repogitory.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ShardFor
-    class ShardRepogitory
+    class ShardRepogitory < AbstractShardRepository
       attr_reader :base_class
 
       # @param [ClusterConfig] cluster_config
@@ -8,33 +8,11 @@ module ActiveRecord
       def initialize(cluster_config, base_class)
         @base_class = base_class
 
-        shards = cluster_config.connection_registry.map do |key, connection_name|
-          [connection_name, generate_model_for_shard(connection_name, key)]
+        @shards = cluster_config.connection_registry.each_with_object({}) do |(key, connection_name), hash|
+          model = generate_model_for_shard(connection_name, key)
+          base_class.const_set(:"#{generate_class_name(connection_name)}", model)
+          hash[connection_name] = model
         end
-
-        @shards = Hash[shards]
-      end
-
-      # @param [Symbol] connection_name
-      # @return [Class] A model class for this shard
-      def fetch(connection_name)
-        @shards.fetch(connection_name)
-      end
-
-      # @param [Object] key sharding key object for connection
-      # @return [Class, nil] A AR model class.
-      def fetch_by_key(key)
-        @shards.values.find do |model|
-          case model.assigned_key
-          when Range then model.assigned_key.include?(key)
-          else model.assigned_key == key
-          end
-        end
-      end
-
-      # @return [Array<Class>]
-      def all
-        @shards.values
       end
 
       private
@@ -63,12 +41,6 @@ module ActiveRecord
         model.class_eval { establish_connection(connection_name) }
         model
       end
-
-      # @param [Symbol] connection_name
-      # @return [String]
-      def generate_class_name(connection_name)
-        "ShardFor#{connection_name.to_s.tr('-', '_').classify}"
-      end
     end
   end
 end

data/lib/activerecord/shard_for/sti.rb

@@ -0,0 +1,12 @@
+module ActiveRecord
+  module ShardFor
+    module STI
+      extend ActiveSupport::Concern
+
+      included do
+        self.abstract_class = true
+        self.shard_repository = STIShardRepository.new(self, superclass.shard_repository.shards)
+      end
+    end
+  end
+end

data/lib/activerecord/shard_for/sti_shard_repository.rb

@@ -0,0 +1,40 @@
+module ActiveRecord
+  module ShardFor
+    class STIShardRepository < AbstractShardRepository
+      attr_reader :inherited_class
+
+      # @param [Class] A sub class of AR model.
+      # @base_shards [Array<Class>] An array of shard models.
+      def initialize(inherited_class, base_shards)
+        @inherited_class = inherited_class
+
+        @shards = base_shards.each_with_object({}) do |(connection_name, base_model), hash|
+          model = generate_model_from_shard(connection_name, base_model)
+          inherited_class.const_set(:"#{generate_class_name(connection_name)}", model)
+          hash[connection_name] = model
+        end
+      end
+
+      private
+
+      # @param [Symbol] connection_name
+      # @param [Class] A class of shard model.
+      # @return [Class] A sub class of given model.
+      def generate_model_from_shard(connection_name, base_model)
+        class_name = generate_class_name(connection_name)
+        module_name = inherited_class.name
+
+        model = Class.new(base_model) do
+          @assigned_key = base_model.assigned_key
+
+          module_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def self.name
+              "#{module_name}::#{class_name}"
+            end
+          RUBY
+        end
+        model
+      end
+    end
+  end
+end

data/lib/activerecord/shard_for/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module ShardFor
-    VERSION = '0.4.1'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-shard_for
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - yuemori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -95,63 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-doc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-inline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-rescue
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -224,16 +168,16 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 description: Database sharding library for ActiveRecord
 email:
 - yuemori@aiming-inc.com
@@ -263,6 +207,7 @@ files:
 - gemfiles/ar_5.0.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/activerecord/shard_for.rb
+- lib/activerecord/shard_for/abstract_shard_repository.rb
 - lib/activerecord/shard_for/all_shards_in_parallel.rb
 - lib/activerecord/shard_for/cluster_config.rb
 - lib/activerecord/shard_for/config.rb
@@ -276,6 +221,8 @@ files:
 - lib/activerecord/shard_for/railtie.rb
 - lib/activerecord/shard_for/replication_mapping.rb
 - lib/activerecord/shard_for/shard_repogitory.rb
+- lib/activerecord/shard_for/sti.rb
+- lib/activerecord/shard_for/sti_shard_repository.rb
 - lib/activerecord/shard_for/version.rb
 - lib/activerecord/tasks/activerecord_shard_for.rake
 homepage: https://github.com/yuemori/activerecord-shard_for
@@ -298,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Database sharding library for ActiveRecord