ssdb-attr 0.1.6 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4f3d5d24b28601b0a28fea83e2c94a42ceb84aa1
-  data.tar.gz: 50c1fb44c11fec003ec6d0020b0f0d953c9fe417
+SHA256:
+  metadata.gz: cf8bc6e43c0b5fb21814507308944afa6b29600cc14f2f4c88515d39ef6c4e50
+  data.tar.gz: 614888c10a52cb6803c56c92bfb699dd26451dc43c25a58683d89b0a4422e0ea
 SHA512:
-  metadata.gz: 9bdf23f8f43482b91d1061010dd2f3e5e69bf57a5dc927c446f489c773716a12c17bfb1397a939b216d0eed7023b02a2f3f5b8beb699411765d705696552e4e3
-  data.tar.gz: 29dbf077916d43e8b77bdde704c49834b36b47edd7a6d3e5f565671d7c7ac9e761ff632c18f402a84535653f8c90cdd0ad6857461f22018ed77549c73acf5937
+  metadata.gz: 6a3713508cf4b7b9361254caa29ebd77e1788a03da2aafefeca966d5837bf433b35bb3440f39db4bbed375eac16fb823c9cb37af40ee200b8b7af9bdd418a9e2
+  data.tar.gz: 7443900e14cf2515608c95bd34ea6b37550f4c16cb884b59524c6077e3a7e0cc6ea5e720c06743b2a30ebbc8d451e43b0fffca3037a07aad57732f86588c1ebb

data/.ruby-version

@@ -1 +1 @@
-2.3.4
+2.5.3

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source "https://gems.ruby-china.com"
 
 gemspec
 

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    ssdb-attr (0.1.6)
+    ssdb-attr (0.2.3)
       activerecord (>= 4.2.1, < 5.1)
       connection_pool (~> 2.2.0)
       redis (>= 3.2.1)
 
 GEM
-  remote: https://rubygems.org/
+  remote: https://gems.ruby-china.com/
   specs:
     activemodel (5.0.5)
       activesupport (= 5.0.5)
@@ -25,7 +25,7 @@ GEM
     arel (7.1.4)
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
+    connection_pool (2.2.2)
     diff-lcs (1.3)
     i18n (0.8.6)
     method_source (0.8.2)
@@ -35,7 +35,7 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rake (12.0.0)
-    redis (3.2.2)
+    redis (4.1.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -68,4 +68,4 @@ DEPENDENCIES
   ssdb-attr!
 
 BUNDLED WITH
-   1.15.3
+   1.17.3

data/lib/ssdb-attr.rb

@@ -60,6 +60,15 @@ module SSDBAttr
 
           SSDBAttr.pools[pool_name.to_sym] = create_pool(conf)
           SSDBAttr.default_pool_name = pool_name if conf[:default]
+
+          slaves_conf = conf[:slaves]
+          if slaves_conf.present?
+            SSDBAttr.pools["#{pool_name}_slaves".to_sym] = []
+
+            slaves_conf.each do |slave|
+              SSDBAttr.pools["#{pool_name}_slaves".to_sym] << create_pool(slave.symbolize_keys)
+            end
+          end
         end
       end
 
@@ -71,6 +80,18 @@ module SSDBAttr
       SSDBAttr.pools[name.to_sym]
     end
 
+    def read_pool(name=nil)
+      name = name || SSDBAttr.default_pool_name
+      
+      slaves = SSDBAttr.pools["#{name}_slaves".to_sym]
+      if !slaves.nil? && !slaves.empty?
+        slave_idx = rand(0..(slaves.size - 1))
+        return slaves[slave_idx]
+      end
+      
+      SSDBAttr.pools[name.to_sym]
+    end
+
     def default_pool
       SSDBAttr.pools[SSDBAttr.default_pool_name]
     end
@@ -89,7 +110,11 @@ module SSDBAttr
       if !conn_options[:url].nil?
         Redis.new(:url => conn_options[:url])
       else
-        Redis.new(:host => conn_options[:host], :port => conn_options[:port])
+        Redis.new(
+          :host => conn_options[:host],
+          :port => conn_options[:port],
+          :db => conn_options[:db] || 0
+        )
       end
     end
 
@@ -107,15 +132,21 @@ module SSDBAttr
     # @return [ActiveRecord::Relation|Array]
     #
     def load_attrs(objects, *fields)
+      return if objects.nil? || objects.empty?
+
       fields.map!(&:to_s)
 
       keys = objects.flat_map do |object|
+        next if object.nil?
         fields.map { |name| object.ssdb_attr_key(name) }
       end
-      values = SSDBAttr.pool.with { |conn| conn.mget(keys) }
+
+      values = SSDBAttr.read_pool.with { |conn| conn.mget(keys) }
       key_values = keys.zip(values).to_h
 
       objects.each do |object|
+        next if object.nil?
+
         fields.each do |name|
           next unless object.class.ssdb_attr_names.include?(name.to_s)
 

data/lib/ssdb-attr/version.rb

@@ -1,3 +1,3 @@
 module SSDBAttr
-  VERSION = "0.1.6"
+  VERSION = "0.2.3"
 end

data/lib/ssdb/attr.rb

@@ -60,7 +60,12 @@ module SSDB
 
         define_method(name) do
           instance_variable_get("@#{name}") || begin
-            val = ssdb_attr_pool.with { |conn| conn.get(ssdb_attr_key(name)) } || options[:default]
+            val = if ssdb_attr_id.nil?
+              options[:default]
+            else
+              ssdb_attr_read_pool.with { |conn| conn.get(ssdb_attr_key(name)) } || options[:default]
+            end
+
             instance_variable_set("@#{name}", typecaster(val, type))
           end
         end
@@ -75,15 +80,10 @@ module SSDB
         end
 
         define_method("#{name}_was")          { attribute_was(name) }
-
         define_method("#{name}_change")       { attribute_change(name) }
-
         define_method("#{name}_changed?")     { attribute_changed?(name) }
-
         define_method("restore_#{name}!")     { restore_attribute!(name) }
-
         define_method("#{name}_will_change!") { attribute_will_change!(name) }
-
       end
     end
 
@@ -108,7 +108,7 @@ module SSDB
     def load_ssdb_attrs(*fields)
       fields = (fields.map(&:to_s) & self.class.ssdb_attr_names)
 
-      values = ssdb_attr_pool.with do |conn|
+      values = ssdb_attr_read_pool.with do |conn|
         conn.mget(fields.map { |name| ssdb_attr_key(name) })
       end
 
@@ -158,6 +158,22 @@ module SSDB
       SSDBAttr.pool(self.class.ssdb_attr_pool_name)
     end
 
+    #
+    # Return the ConnectionPool for reading purpose
+    #
+    #
+    # @return [ConnectionPool]
+    #
+    def ssdb_attr_read_pool
+      SSDBAttr.read_pool(self.class.ssdb_attr_pool_name)
+    end
+
+    #
+    # Return ssdb_attr_id for the current object
+    #
+    #
+    # @return [String]
+    #
     def ssdb_attr_id
       send(self.class.ssdb_attr_id_field || :id)
     end
@@ -200,7 +216,7 @@ module SSDB
     #
     def reload_ssdb_attrs
       keys = self.class.ssdb_attr_names.map { |name| ssdb_attr_key(name) }
-      values = ssdb_attr_pool.with { |conn| conn.mget(keys) }
+      values = ssdb_attr_read_pool.with { |conn| conn.mget(keys) }
 
       self.class.ssdb_attr_names.each_with_index do |attr, index|
         instance_variable_set("@#{attr}", typecaster(values[index], self.class.ssdb_attr_definition[attr]))

data/spec/spec_helper.rb

@@ -64,6 +64,7 @@ class CustomIdField < ActiveRecord::Base
 
   ssdb_attr_id :uuid
   ssdb_attr :content, :string
+  ssdb_attr :title, :string, default: "foobar"
 end
 
 class CustomPoolName < ActiveRecord::Base

data/spec/ssdb-attr_spec.rb

@@ -28,6 +28,36 @@ describe SSDBAttr do
     end
   end
 
+  describe "#read_pool" do
+    it "should fetch the reading slave pool if slave exists" do
+      options = [
+        {
+          :host => "localhost",
+          :port => "8888",
+          :name => "default",
+          :default => true,
+          :slaves => [
+            { 
+              :host => "localhost",
+              :port => "6379",
+              :name => "slave0"
+            },
+            {
+              :host => "localhost",
+              :port => "6379",
+              :name => "slave1"
+            }
+          ]
+        }
+      ]
+
+      SSDBAttr.setup(options)
+      expect(SSDBAttr.pools[:default]).to be_a(ConnectionPool)
+      expect(SSDBAttr.pools[:default_slaves].size).to eq(2)
+      expect(SSDBAttr.pools[:default_slaves]).to include(SSDBAttr.read_pool)
+    end
+  end
+
   describe "#setup" do
     context "with only one pool" do
       it "should setup a ssdb connection pool with no name specified" do
@@ -129,6 +159,34 @@ describe SSDBAttr do
   end
 
   describe ".load_attrs" do
+    it "should not raise exception if objects is nil" do
+      expect {
+        SSDBAttr.load_attrs(nil, :name)
+      }.not_to raise_error
+    end
+
+    it "should not raise exception if objects contains nil" do
+      post1 = Post.create(:name => "lol", :version => 2)
+      post2 = Post.create(:name => "dota", :version => 3)
+
+      posts = Post.where(:id => [post1.id, nil, post2.id])
+
+      posts.each do |post|
+        expect(post.instance_variable_get(:@name)).to be(nil)
+        expect(post.instance_variable_get(:@version)).to be(nil)
+      end
+
+      expect {
+        SSDBAttr.load_attrs(posts, :name, :version)
+      }.not_to raise_error
+
+      expect(posts[0].instance_variable_get(:@name)).to eq("lol")
+      expect(posts[0].instance_variable_get(:@version)).to eq(2)
+
+      expect(posts[1].instance_variable_get(:@name)).to eq("dota")
+      expect(posts[1].instance_variable_get(:@version)).to eq(3)
+    end
+
     it "returns the values correctly" do
       post1 = Post.create(:name => "lol", :version => 2)
       post2 = Post.create(:name => "dota", :version => 3)

data/spec/ssdb/attr_spec.rb

@@ -32,6 +32,11 @@ describe SSDB::Attr do
     end
 
     describe "#attribute=" do
+      it "should not request ssdb and return default directly if ssdb_attr_id is nil" do
+        post = Post.new
+        expect(post.default_title).to eq("Untitled")
+      end
+
       it "shouldn't change the attribute value in SSDB" do
         post.title = "foobar"
         expect(redis.get(post.send(:ssdb_attr_key, :title))).not_to eq("foobar")
@@ -188,6 +193,17 @@ describe SSDB::Attr do
     end
   end
 
+  context "ssdb_attr_id" do
+    context "id is nil" do
+      it "should return the default value" do
+        custom_field = CustomIdField.new
+        expect(custom_field).not_to receive(:ssdb_attr_read_pool)
+        expect(custom_field.uuid).to be_nil
+        expect(custom_field.title).to eq("foobar")
+      end
+    end
+  end
+
   context "CustomIdField" do
     let(:custom_id_field) { CustomIdField.create(:uuid => 123) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssdb-attr
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.3
 platform: ruby
 authors:
 - Larry Zhao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Provide simple helpers on persist values in redis for performance. Works