activerecord-shard_for 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a145bb643f713e31825e2bf87446c2657d10a1a4
-  data.tar.gz: 01eedb436a6b730078c624cf539fb5cd402c9495
+  metadata.gz: 511906085a601bbdbaf769215dbd7e471480ee8c
+  data.tar.gz: de31a223085a86f97315a259b32ed0e3a12e9f18
 SHA512:
-  metadata.gz: 7c642c62650b872380169af15830b0c96c772f6aaf90bfa74340bb8e499eb794a90f5f905cc4fc74c8414189ee7faffa894a576baffac8085d26d01d56a4704e
-  data.tar.gz: 338d2512639fc8ababdad1d3b8f4afb4d1915026adc5d65622662be63237b6449b7d3cd4f546384461ef11c1bc3e881f7d8b1c879c10b3d024652930350fde3b
+  metadata.gz: 691b4787767101d7d36cf3227b93635fa6a340f6628a7a63376e2f94a5fa1f282d3882bc2a3945238d27ab5ca34a2323ad2f713741330f3161778f252fc67f91
+  data.tar.gz: e11f634a244d6e04bcf01541d37facde6d85026e4df76ce9490a08f68b1e6c7b1ba2d70e249551d93ac226aea4510a96dc1dedb98b83bfbb5b95792826ff9bc2

data/.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
     - activerecord-shard_for.gemspec
     - Guardfile
     - lib/activerecord/tasks/activerecord_shard_for.rake
+    - gemfiles/**/*
   DisplayCopNames: true
 
 Style/FrozenStringLiteralComment:

data/.travis.yml

@@ -1,4 +1,31 @@
 language: ruby
+sudo: false
 rvm:
-  - 2.3.0
-before_install: gem install bundler -v 1.11.2
+- 2.2.4
+- 2.3.1
+before_install: gem install bundler -v 1.12.5
+cache: bundler
+script:
+- CODECLIMATE_REPO_TOKEN=dfc951e2d70b56ee62ffe989eb6286a6f21bf57209ccbd111bd336c372d8d06e bundle exec rspec
+- bundle exec rubocop
+- bundle exec ruby spec/performance_test.rb
+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
+- 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
+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=
+    on_success: never
+    on_failure: change

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# CHANGELOG for activerecord-shard_for
+
+## 0.2.0
+
+- Enable Range support for cluster key
+- Add built-in connection router of DistkeyRouter
+
+## 0.1.2
+
+- Fix `cluster_router` is now working

data/Guardfile

@@ -1,4 +1,4 @@
-guard :rspec, cmd: 'bundle exec appraisal rspec' do
+guard :rspec, cmd: 'bundle exec rspec' do
   require 'guard/rspec/dsl'
   dsl = Guard::RSpec::Dsl.new(self)
 

data/README.md

@@ -1,5 +1,7 @@
 # ActiveRecord::ShardFor
 
+[![Build Status](https://travis-ci.org/yuemori/activerecord-shard_for.svg?branch=master)](https://travis-ci.org/yuemori/activerecord-shard_for) [![Dependency Status](https://gemnasium.com/badges/github.com/yuemori/activerecord-shard_for.svg)](https://gemnasium.com/github.com/yuemori/activerecord-shard_for) [![Code Climate](https://codeclimate.com/github/yuemori/activerecord-shard_for/badges/gpa.svg)](https://codeclimate.com/github/yuemori/activerecord-shard_for) [![Test Coverage](https://codeclimate.com/github/yuemori/activerecord-shard_for/badges/coverage.svg)](https://codeclimate.com/github/yuemori/activerecord-shard_for/coverage)
+
 This is Sharding Library for ActiveRecord, inspire and import codes from [mixed_gauge](https://github.com/taiki45/mixed_gauge) and [activerecord-sharding](https://github.com/hirocaster/activerecord-sharding) (Thanks!).
 
 ## Concept
@@ -108,7 +110,6 @@ User.all_shards_in_parallel.map(&count) #=> 1
 User.parallel.flat_map {|m| m.where(age: 1) }.size #=> 1
 ```
 
-
 Sometimes you want to generates distkey value before validation. Since activerecord-shard_for generates sub class of your models, AR's callback is usesless for this usecase, so activerecord-shard_for offers its own callback method.
 
 ```ruby
@@ -134,6 +135,34 @@ access_token = AccessToken.put!
 access_token.token #=> a generated token
 ```
 
+If you want to range sharding, `Range` object set to cluster key.
+
+```ruby
+ActiveRecord::ShardFor.configure do |config|
+  config.define_cluster(:user) do |cluster|
+    # unique identifier, connection name
+    cluster.register(0...100, :production_user_001)
+    cluster.register(100...200, :production_user_002)
+    cluster.register(200...300, :production_user_003)
+    cluster.register(300..Float::INFINITY, :production_user_004)
+  end
+end
+
+class User < ActiveRecord::Base
+  include ActiveRecord::ShardFor::Model
+  use_cluster :user, :distkey
+  def_distkey :id
+
+  def self.generate_unique_id
+    # Implement to generate unique id
+  end
+
+  before_put do |attributes|
+    attributes[:id] = generate_unique_id unless attributes[:id]
+  end
+end
+```
+
 ## Sharding with Replication
 
 activerecord-shard_for also supports replication.
@@ -187,7 +216,7 @@ You can split read/write by defining AR model class for each connection:
 ```ruby
 class User < ActiveRecord::Base
   include ActiveRecord::ShardFor::Model
-  use_cluster :user
+  use_cluster :user, :hash_modulo
   def_distkey :email
 end
 
@@ -195,7 +224,7 @@ class UserReadonly < ActiveRecord::Base
   self.table_name = 'users'
 
   include ActiveRecord::ShardFor::Model
-  use_cluster :user_readonly
+  use_cluster :user_readonly, :hash_modulo
   def_distkey :email
 end
 
@@ -236,11 +265,38 @@ UserReadonly.all_shards do |readonly|
 end
 ```
 
-## Plugin of cluster router
+## Plugin of connection router
+
+If you need to advanced connection routing, implement router class and register this.
+
+### Embeded
 
-If you need to advanced cluster routing, implement router class and register this.
+Embeded routers:
 
-Reference a interface to [HashModuloRouter](https://github.com/yuemori/activerecord-shard_for/blob/master/lib/activerecord/shard_for/hash_modulo_router.rb) and [ConnectionRouter](https://github.com/yuemori/activerecord-shard_for/blob/master/lib/activerecord/shard_for/connection_router.rb).
+|name|class|description|
+|:---:|:---:|:---|
+|:hash_modulo|[HashModuloRouter](https://github.com/yuemori/activerecord-shard_for/blob/master/lib/activerecord/shard_for/hash_modulo_router.rb)|use `hash(key) mod connection_count`|
+|:distkey|[DistkeyRouter](https://github.com/yuemori/activerecord-shard_for/blob/master/lib/activerecord/shard_for/distkey_router.rb)|use `distkey` at it is|
+
+Connection Routers specific with cluster in AR model.
+
+```ruby
+class User < ActiveRecord::Base
+  include ActiveRecord::ShardFor::Model
+  use_cluster :user, :hash_modulo # use hash_modulo
+  def_distkey :email
+end
+
+class Character < ActiveRecord::Base
+  include ActiveRecord::ShardFor::Model
+  use_cluster :character, :distkey # use distkey at it is
+  def_distkey :shard_no
+end
+```
+
+### Implement
+
+Reference a interface to [HashModuloRouter](https://github.com/yuemori/activerecord-shard_for/blob/master/lib/activerecord/shard_for/hash_modulo_router.rb), [DistkeyRouter](https://github.com/yuemori/activerecord-shard_for/blob/master/lib/activerecord/shard_for/distkey_router.rb) and [ConnectionRouter](https://github.com/yuemori/activerecord-shard_for/blob/master/lib/activerecord/shard_for/connection_router.rb).
 
 Example, simple modulo router:
 
@@ -256,7 +312,7 @@ Your initializer for activerecord-shard_for might be like this:
 
 ```ruby
 ActiveRecord::ShardFor.configure do |config|
-  config.register_cluster_router(:modulo, SimpleModuloRouter)
+  config.register_connection_router(:modulo, SimpleModuloRouter)
 end
 ```
 
@@ -278,6 +334,47 @@ class User < ActiveRecord::Base
 end
 ```
 
+## Advanced
+
+More example, sharding key is String:
+
+```ruby
+ActiveRecord::ShardFor.configure do |config|
+  config.define_cluster(:user) do |cluster|
+    # unique identifier, connection name
+    cluster.register('a'..'z', :production_user_001)
+    cluster.register('A'..'Z', :production_user_002)
+    cluster.register('0'..'9', :production_user_003)
+  end
+end
+
+class InitialStringRouter < ActiveRecord::ShardFor::ConnectionRouter
+  def route(key)
+    key.to_s.first
+  end
+end
+
+ActiveRecord::ShardFor.configure do |config|
+  config.register_connection_router(:initial_string, InitialStringRouter)
+end
+
+class User < ActiveRecord::Base
+  include ActiveRecord::ShardFor::Model
+  use_cluster :user, :initial_string
+  def_distkey :id
+
+  def self.generate_unique_id
+    SecureRandom.uuid
+  end
+
+  before_put do |attributes|
+    attributes[:id] = generate_unique_id unless attributes[:id]
+  end
+end
+
+```
+
+
 ## Contributing with ActiveRecord::ShardFor
 
 Contributors are welcome! This is what you need to setup your Octopus development environment:

data/activerecord-shard_for.gemspec

@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'rspec-parameterized'
+  spec.add_development_dependency 'codeclimate-test-reporter'
 end

data/gemfiles/ar_4.1.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activerecord-shard_for (0.1.0)
+    activerecord-shard_for (0.1.2)
       activerecord (>= 4.1.0)
       activesupport (>= 4.1.0)
       expeditor (>= 0.1.0)
@@ -35,6 +35,8 @@ GEM
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
+    codeclimate-test-reporter (0.6.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
     concord (0.1.5)
       adamantium (~> 0.2.0)
@@ -44,6 +46,7 @@ GEM
       concurrent-ruby (~> 1.0.2)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     equalizer (0.0.11)
     expeditor (0.4.0)
       concurrent-ruby (~> 1.0.0)
@@ -143,6 +146,11 @@ GEM
     ruby-progressbar (1.8.1)
     ruby_dep (1.3.1)
     shellany (0.0.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
     sqlite3 (1.3.11)
     thor (0.19.1)
@@ -169,6 +177,7 @@ DEPENDENCIES
   activerecord-shard_for!
   appraisal
   bundler (~> 1.11)
+  codeclimate-test-reporter
   guard-rspec
   guard-rubocop
   pry

data/gemfiles/ar_4.1.7.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activerecord-shard_for (0.1.0)
+    activerecord-shard_for (0.1.2)
       activerecord (>= 4.1.0)
       activesupport (>= 4.1.0)
       expeditor (>= 0.1.0)
@@ -35,6 +35,8 @@ GEM
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
+    codeclimate-test-reporter (0.6.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
     concord (0.1.5)
       adamantium (~> 0.2.0)
@@ -44,6 +46,7 @@ GEM
       concurrent-ruby (~> 1.0.2)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     equalizer (0.0.11)
     expeditor (0.4.0)
       concurrent-ruby (~> 1.0.0)
@@ -143,6 +146,11 @@ GEM
     ruby-progressbar (1.8.1)
     ruby_dep (1.3.1)
     shellany (0.0.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
     sqlite3 (1.3.11)
     thor (0.19.1)
@@ -169,6 +177,7 @@ DEPENDENCIES
   activerecord-shard_for!
   appraisal
   bundler (~> 1.11)
+  codeclimate-test-reporter
   guard-rspec
   guard-rubocop
   pry

data/gemfiles/ar_4.1.8.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activerecord-shard_for (0.1.0)
+    activerecord-shard_for (0.1.2)
       activerecord (>= 4.1.0)
       activesupport (>= 4.1.0)
       expeditor (>= 0.1.0)
@@ -35,6 +35,8 @@ GEM
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
+    codeclimate-test-reporter (0.6.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
     concord (0.1.5)
       adamantium (~> 0.2.0)
@@ -44,6 +46,7 @@ GEM
       concurrent-ruby (~> 1.0.2)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     equalizer (0.0.11)
     expeditor (0.4.0)
       concurrent-ruby (~> 1.0.0)
@@ -143,6 +146,11 @@ GEM
     ruby-progressbar (1.8.1)
     ruby_dep (1.3.1)
     shellany (0.0.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
     sqlite3 (1.3.11)
     thor (0.19.1)
@@ -169,6 +177,7 @@ DEPENDENCIES
   activerecord-shard_for!
   appraisal
   bundler (~> 1.11)
+  codeclimate-test-reporter
   guard-rspec
   guard-rubocop
   pry

data/gemfiles/ar_4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activerecord-shard_for (0.1.0)
+    activerecord-shard_for (0.1.2)
       activerecord (>= 4.1.0)
       activesupport (>= 4.1.0)
       expeditor (>= 0.1.0)
@@ -35,6 +35,8 @@ GEM
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
+    codeclimate-test-reporter (0.6.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
     concord (0.1.5)
       adamantium (~> 0.2.0)
@@ -44,6 +46,7 @@ GEM
       concurrent-ruby (~> 1.0.2)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     equalizer (0.0.11)
     expeditor (0.4.0)
       concurrent-ruby (~> 1.0.0)
@@ -143,6 +146,11 @@ GEM
     ruby-progressbar (1.8.1)
     ruby_dep (1.3.1)
     shellany (0.0.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
     sqlite3 (1.3.11)
     thor (0.19.1)
@@ -169,6 +177,7 @@ DEPENDENCIES
   activerecord-shard_for!
   appraisal
   bundler (~> 1.11)
+  codeclimate-test-reporter
   guard-rspec
   guard-rubocop
   pry

data/gemfiles/ar_5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activerecord-shard_for (0.1.0)
+    activerecord-shard_for (0.1.2)
       activerecord (>= 4.1.0)
       activesupport (>= 4.1.0)
       expeditor (>= 0.1.0)
@@ -32,6 +32,8 @@ GEM
     ast (2.3.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    codeclimate-test-reporter (0.6.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
     concord (0.1.5)
       adamantium (~> 0.2.0)
@@ -41,6 +43,7 @@ GEM
       concurrent-ruby (~> 1.0.2)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     equalizer (0.0.11)
     expeditor (0.4.0)
       concurrent-ruby (~> 1.0.0)
@@ -68,6 +71,7 @@ GEM
     i18n (0.7.0)
     ice_nine (0.11.2)
     interception (0.5)
+    json (2.0.2)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -139,6 +143,11 @@ GEM
     ruby-progressbar (1.8.1)
     ruby_dep (1.3.1)
     shellany (0.0.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
     sqlite3 (1.3.11)
     thor (0.19.1)
@@ -165,6 +174,7 @@ DEPENDENCIES
   activerecord-shard_for!
   appraisal
   bundler (~> 1.11)
+  codeclimate-test-reporter
   guard-rspec
   guard-rubocop
   pry

data/gemfiles/rails_edge.gemfile.lock

@@ -23,7 +23,7 @@ GIT
 PATH
   remote: ../
   specs:
-    activerecord-shard_for (0.1.0)
+    activerecord-shard_for (0.1.2)
       activerecord (>= 4.1.0)
       activesupport (>= 4.1.0)
       expeditor (>= 0.1.0)
@@ -42,6 +42,8 @@ GEM
     ast (2.3.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    codeclimate-test-reporter (0.6.0)
+      simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
     concord (0.1.5)
       adamantium (~> 0.2.0)
@@ -51,6 +53,7 @@ GEM
       concurrent-ruby (~> 1.0.2)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     equalizer (0.0.11)
     expeditor (0.4.0)
       concurrent-ruby (~> 1.0.0)
@@ -78,6 +81,7 @@ GEM
     i18n (0.7.0)
     ice_nine (0.11.2)
     interception (0.5)
+    json (2.0.2)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -149,6 +153,11 @@ GEM
     ruby-progressbar (1.8.1)
     ruby_dep (1.3.1)
     shellany (0.0.1)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
     sqlite3 (1.3.11)
     thor (0.19.1)
@@ -176,6 +185,7 @@ DEPENDENCIES
   appraisal
   arel!
   bundler (~> 1.11)
+  codeclimate-test-reporter
   guard-rspec
   guard-rubocop
   pry

data/lib/activerecord/shard_for/cluster_config.rb

@@ -25,7 +25,12 @@ module ActiveRecord
       # @param [Object] key
       # @return [Symbol] registered connection name
       def fetch(key)
-        connection_registry.fetch(key)
+        connection_registry.find do |connection_key, _connection|
+          case connection_key
+          when Range then connection_key.include?(key)
+          else connection_key == key
+          end
+        end.second
       end
     end
   end

data/lib/activerecord/shard_for/config.rb

@@ -35,10 +35,11 @@ module ActiveRecord
         connection_routers[router_name] = router_class
       end
 
-      # @param [Symbol] router_name
+      # @param [Symbol] connection_router_name
       # @return [Class] registered class by [#register_router]
-      def fetch_connection_router(router_name)
-        connection_routers[router_name]
+      # @raise [KeyError] when not registerd router_name given
+      def fetch_connection_router(connection_router_name)
+        connection_routers.fetch(connection_router_name)
       end
     end
   end

data/lib/activerecord/shard_for/distkey_router.rb

@@ -0,0 +1,11 @@
+module ActiveRecord
+  module ShardFor
+    class DistkeyRouter < ConnectionRouter
+      # @param [Object] key sharding key
+      # @return [Object] key given key
+      def route(key)
+        key
+      end
+    end
+  end
+end

data/lib/activerecord/shard_for/model.rb

@@ -43,7 +43,7 @@ module ActiveRecord
           key = attributes[distkey]
           raise ActiveRecord::ShardFor::MissingDistkeyAttribute unless key || attributes[distkey.to_s]
 
-          @before_put_callback.call(attributes) if @before_put_callback
+          @before_put_callback.call(attributes) if defined?(@before_put_callback) && @before_put_callback
 
           shard_for(key).create!(attributes)
         end
@@ -85,8 +85,8 @@ module ActiveRecord
           raise ActiveRecord::ShardFor::RecordNotFound
         end
 
-        # Distkey is a column. activerecord-shard_for gave to cluster_router that value
-        # and cluster_router determine which shard to store.
+        # Distkey is a column. activerecord-shard_for gave to connection_router that value
+        # and connection_router determine which shard to store.
         # @param [Symbol] column
         def def_distkey(column)
           self.distkey = column.to_sym

data/lib/activerecord/shard_for/shard_repogitory.rb

@@ -24,7 +24,12 @@ module ActiveRecord
       # @param [Object] key sharding key object for connection
       # @return [Class, nil] A AR model class.
       def fetch_by_key(key)
-        @shards.find { |_, model| model.assigned_key == key }[1]
+        @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>]

data/lib/activerecord/shard_for/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module ShardFor
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/lib/activerecord/shard_for.rb

@@ -7,6 +7,7 @@ require 'activerecord/shard_for/model'
 require 'activerecord/shard_for/errors'
 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/all_shards_in_parallel'
@@ -29,4 +30,7 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::ShardFor.config.register_connection_router(:hash_modulo, ActiveRecord::ShardFor::HashModuloRouter)
+ActiveRecord::ShardFor.configure do |config|
+  config.register_connection_router(:hash_modulo, ActiveRecord::ShardFor::HashModuloRouter)
+  config.register_connection_router(:distkey, ActiveRecord::ShardFor::DistkeyRouter)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-shard_for
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - yuemori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2016-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -248,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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'
 description: Database sharding library for ActiveRecord
 email:
 - yuemori@aiming-inc.com
@@ -260,7 +274,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Appraisals
-- CODE_OF_CONDUCT.md
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -288,6 +302,7 @@ files:
 - lib/activerecord/shard_for/config.rb
 - lib/activerecord/shard_for/connection_router.rb
 - lib/activerecord/shard_for/database_tasks.rb
+- lib/activerecord/shard_for/distkey_router.rb
 - lib/activerecord/shard_for/errors.rb
 - lib/activerecord/shard_for/hash_modulo_router.rb
 - lib/activerecord/shard_for/model.rb

data/CODE_OF_CONDUCT.md

@@ -1,49 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
-
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at yuemori@aiming-inc.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Maintainers are
-obligated to maintain confidentiality with regard to the reporter of an
-incident.
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/