activerecord-shard_for 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cad523e3ec520b0697848ece57f5703c5d049ea0
-  data.tar.gz: cf3f36c9de0afd5f6f42addc95d9f29081a5d51a
+  metadata.gz: 7e7b2e6d1521f83ec993bccc75ed606b39792a9b
+  data.tar.gz: ba474a4e900eabfb0bd551da9514111b9322e6df
 SHA512:
-  metadata.gz: 18da70aea7e423466d39cd5c677b469320cc18e57f475e60fa82bde5c4370de58bf3c000f8e91c38371ead208842ea91cc848fa3998d257b1bb48171bece222a
-  data.tar.gz: 35261193e6150eefd81f8f323912254edc6448493a701dfaf952edfe3c75bdd8be1ba8c864d7d2e6cf57d415f98fb017de328dd8c545699920b419003d81302f
+  metadata.gz: 5d5fbe559b15b32b65313380b4aa3d433ffcd01379f19fb756612d7c0f831cd9046279c37e876e5edddac23ae13c5de3bd0d0608a89bd71ff8594b655173f3c6
+  data.tar.gz: 3df865e864a0e7c39faebb0907630353dce1f2d0663747893f111574ea74b63f1b2d1deac38b2f449ed6c4a53d31ef9ab9236fded931dae3acd163160b511c9c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG for activerecord-shard_for
 
+## 0.4.0
+
+- Distkey support to instance method. [#9](https://github.com/yuemori/activerecord-shard_for/pull/9)
+
 ## 0.3.0
 
 - Add using syntax. [#8](https://github.com/yuemori/activerecord-shard_for/pull/8)

data/README.md

@@ -12,19 +12,6 @@ This is Sharding Library for ActiveRecord, inspire and import codes from [mixed_
 - small
 - pluggable
 
-### Simple
-
-This idea principal take over from `mixed_gauge`, and `activerecord-sharding`. `activerecord-shard_for` needs minimum and simply of settings.
-
-### Small
-
-- Small Dependency: To facilitate version up (important!).
-- Small code: Easy to read code when cause trouble.
-
-### pluggable
-
-Default sharding rule is [modulo with hashed key](https://github.com/yuemori/activerecord-shard_for/blob/master/lib/activerecord/shard_for/hash_modulo_router.rb). But, `activerecord-shard_for` adopt pluggable structer. This rule can be easy to change!
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -43,8 +30,6 @@ Or install it yourself as:
 
 # Getting Started
 
-More example to see [wiki](https://github.com/yuemori/activerecord-shard_for/wiki).
-
 Add additional database connection config to database.yml.
 
 ```yaml
@@ -105,6 +90,11 @@ alice.save!
 User.all_shards.flat_map {|m| m.find_by(name: 'alice') }.compact
 ```
 
+## Wiki
+
+More imformation and example to see [wiki](https://github.com/yuemori/activerecord-shard_for/wiki)!
+
+
 ## Contributing with ActiveRecord::ShardFor
 
 Contributors are welcome! This is what you need to setup your Octopus development environment:

data/lib/activerecord/shard_for/model.rb

@@ -50,11 +50,11 @@ 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 = attributes[distkey]
 
-          raise ActiveRecord::ShardFor::MissingDistkeyAttribute unless key || attributes[distkey.to_s]
+          key = fetch_distkey_from_attributes(attributes)
+
+          raise ActiveRecord::ShardFor::MissingDistkeyAttribute unless key
 
           shard_for(key).create!(attributes)
         end
@@ -139,6 +139,20 @@ module ActiveRecord
         def switch(role_name, &block)
           replication_mapping.switch(self, role_name, &block)
         end
+
+        private
+
+        # @param [Hash] attributes
+        # @return [Object or nil] distkey
+        def fetch_distkey_from_attributes(attributes)
+          key = attributes[distkey] || attributes[distkey.to_s]
+          return key if key
+
+          instance = all_shards.first.new(attributes)
+          return unless instance.respond_to?(distkey)
+
+          instance.send(distkey)
+        end
       end
     end
   end

data/lib/activerecord/shard_for/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module ShardFor
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-shard_for
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - yuemori