activerecord-shard_for 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7598d89f3c2df373c8936c3df0e9e77e6b1f96f6
-  data.tar.gz: f9b9a4405849837c138184f68ad12e8374340c8f
+  metadata.gz: 13ad1572bb8ed11c7e554775318e57ed90d790c2
+  data.tar.gz: 3fbd2d039d58050bce3b5c99d15e5d9fa3d4a9c4
 SHA512:
-  metadata.gz: 1f95be02a5787e073cb98f04059633cfb629c00e6c9854e22e0a590408162e0abd1299f5039f0f3710e1b79c7963f3d7c799094fe1e052668bbb848394df9089
-  data.tar.gz: 5f56d475a656397f86282a5930bbc2b0ab9c5aa2609bf453ca28ad92432251421331683041be42381ef9d57e5b438d23adc7f3a18f95807d44149882bb5b293d
+  metadata.gz: d63e1c46d46ea2aeac501ef28b1a072bd4c321150f5394fc83591204cd72045e33a4bb2e8de0e5c5dee90ab484676fd108cac0431e16229412f89c5db3b2616e
+  data.tar.gz: 28909b54eb841e9fa7eb5fbcb4d0818c06dbfed05a1931cb905ecc4e8b96e30ac01e9a04d638975699d17c084c9bb27b90c7387e1f3127ca694f4c16dea0daa3

data/.rubocop.yml

@@ -5,6 +5,7 @@ AllCops:
     - Guardfile
     - lib/activerecord/tasks/activerecord_shard_for.rake
     - gemfiles/**/*
+    - vendor/bundle/**/*
   DisplayCopNames: true
 
 Style/FrozenStringLiteralComment:

data/.travis.yml

@@ -17,20 +17,11 @@ script:
 - bundle exec rspec
 - CODECLIMATE_REPO_TOKEN=dfc951e2d70b56ee62ffe989eb6286a6f21bf57209ccbd111bd336c372d8d06e bundle exec codeclimate-test-reporter
 gemfile:
-- gemfiles/ar_4.1.8.gemfile
-- gemfiles/ar_4.2.gemfile
 - gemfiles/ar_5.0.gemfile
 - gemfiles/rails_edge.gemfile
 matrix:
   allow_failures:
   - gemfile: gemfiles/rails_edge.gemfile
-  exclude:
-  - rvm: 2.1.9
-    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/Appraisals

@@ -1,21 +1,5 @@
 # vim: set ft=ruby
 
-appraise 'ar-4.1.0' do
-  gem 'activerecord', '4.1.0'
-end
-
-appraise 'ar-4.1.7' do
-  gem 'activerecord', '4.1.7'
-end
-
-appraise 'ar-4.1.8' do
-  gem 'activerecord', '4.1.8'
-end
-
-appraise 'ar-4.2' do
-  gem 'activerecord', '~> 4.2'
-end
-
 appraise 'ar-5.0' do
   gem 'activerecord', '~> 5.0.0'
 end

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG for activerecord-shard_for
 
+## 0.6.0
+
+- Support same connection to connect for same shard. [#15](https://github.com/yuemori/activerecord-shard_for/pull/15)
+- Drop rails4 support
+
 ## 0.5.0
 
 - Support Single Table Inheritance. [#14](https://github.com/yuemori/activerecord-shard_for/pull/14)

data/activerecord-shard_for.gemspec

@@ -20,12 +20,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 4.1.0'
-  spec.add_dependency 'activesupport', '>= 4.1.0'
+  spec.add_dependency 'activerecord', '>= 5.0.0'
+  spec.add_dependency 'activesupport', '>= 5.0.0'
   spec.add_dependency 'expeditor', '>= 0.1.0'
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '>= 1.14'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rubocop'
+  spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'appraisal'

data/lib/activerecord/shard_for.rb

@@ -10,7 +10,7 @@ require 'activerecord/shard_for/connection_router'
 require 'activerecord/shard_for/hash_modulo_router'
 require 'activerecord/shard_for/distkey_router'
 require 'activerecord/shard_for/database_tasks'
-require 'activerecord/shard_for/shard_repogitory'
+require 'activerecord/shard_for/shard_repository'
 require 'activerecord/shard_for/all_shards_in_parallel'
 require 'activerecord/shard_for/replication_mapping'
 require 'activerecord/shard_for/railtie' if defined?(Rails)

data/lib/activerecord/shard_for/abstract_shard_repository.rb

@@ -29,7 +29,7 @@ module ActiveRecord
 
       # @param [Symbol] connection_name
       # @return [String]
-      def generate_class_name(connection_name)
+      def generate_shard_name(connection_name)
         "ShardFor#{connection_name.to_s.tr('-', '_').classify}"
       end
     end

data/lib/activerecord/shard_for/model.rb

@@ -21,7 +21,7 @@ module ActiveRecord
           cluster_config = ActiveRecord::ShardFor.config.fetch_cluster_config(name)
           connection_router_class = ActiveRecord::ShardFor.config.fetch_connection_router(router_name)
           self.connection_router = connection_router_class.new(cluster_config)
-          self.shard_repository = ActiveRecord::ShardFor::ShardRepogitory.new(cluster_config, self)
+          self.shard_repository = ActiveRecord::ShardFor::ShardRepository.new(cluster_config, self)
           self.abstract_class = true
         end
 

data/lib/activerecord/shard_for/{shard_repogitory.rb → shard_repository.rb}

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ShardFor
-    class ShardRepogitory < AbstractShardRepository
+    class ShardRepository < AbstractShardRepository
       attr_reader :base_class
 
       # @param [ClusterConfig] cluster_config
@@ -9,22 +9,41 @@ 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_class_name(connection_name)}", model)
+          base_class.const_set(:"#{generate_shard_name(connection_name)}", model)
           hash[connection_name] = model
         end
       end
 
       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.
       #   A sub class has connection setting for specific shard.
       def generate_model_for_shard(connection_name, key)
-        class_name = generate_class_name(connection_name)
+        shard_name = generate_shard_name(connection_name)
 
-        model = Class.new(base_class) do
+        Class.new(base_class) do
           self.table_name = base_class.table_name
           class << self
             attr_reader :assigned_key
@@ -33,13 +52,11 @@ module ActiveRecord
 
           module_eval <<-RUBY, __FILE__, __LINE__ + 1
             def self.name
-              "#{base_class.name}::#{class_name}"
+              "#{base_class.name}::#{shard_name}"
             end
+            self.connection_specification_name = "#{shard_name}"
           RUBY
         end
-
-        model.class_eval { establish_connection(connection_name) }
-        model
       end
     end
   end

data/lib/activerecord/shard_for/sti_shard_repository.rb

@@ -10,7 +10,7 @@ module ActiveRecord
 
         @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)
+          inherited_class.const_set(:"#{generate_shard_name(connection_name)}", model)
           hash[connection_name] = model
         end
       end
@@ -21,7 +21,7 @@ module ActiveRecord
       # @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)
+        shard_name = generate_shard_name(connection_name)
         module_name = inherited_class.name
 
         model = Class.new(base_model) do
@@ -29,7 +29,7 @@ module ActiveRecord
 
           module_eval <<-RUBY, __FILE__, __LINE__ + 1
             def self.name
-              "#{module_name}::#{class_name}"
+              "#{module_name}::#{shard_name}"
             end
           RUBY
         end

data/lib/activerecord/shard_for/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-shard_for
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - yuemori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: expeditor
   requirement: !ruby/object:Gem::Requirement
@@ -56,30 +56,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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: guard-rubocop
+  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: guard-rspec
+  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-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -200,10 +242,6 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/.bundle/config
-- 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
 - gemfiles/rails_edge.gemfile
 - lib/activerecord/shard_for.rb
@@ -220,7 +258,7 @@ files:
 - lib/activerecord/shard_for/patch.rb
 - lib/activerecord/shard_for/railtie.rb
 - lib/activerecord/shard_for/replication_mapping.rb
-- lib/activerecord/shard_for/shard_repogitory.rb
+- lib/activerecord/shard_for/shard_repository.rb
 - lib/activerecord/shard_for/sti.rb
 - lib/activerecord/shard_for/sti_shard_repository.rb
 - lib/activerecord/shard_for/version.rb

data/gemfiles/ar_4.1.0.gemfile

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

data/gemfiles/ar_4.1.7.gemfile

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

data/gemfiles/ar_4.1.8.gemfile

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

data/gemfiles/ar_4.2.gemfile

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