ssdb-attr 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5efc4ce786e9db0a870c84f8bc3a880b8cb15075
-  data.tar.gz: c5f95ff3af09b8b03d7e95af14e276f039ebc8be
+  metadata.gz: 8a0f7707b5bd4d3ab16f2eca649707537455d72b
+  data.tar.gz: 5fdab1774f844fa38f07ebcc704b999cd1ecb5ed
 SHA512:
-  metadata.gz: 18cd44aa779a83b26451447aae23254ba502db90bf95acbabdecd261e8f97eed2b4da494aa537b6bc9d3060a870c7d8e89aea268bb9f08fd490a61e61207769e
-  data.tar.gz: c0eb15dbba8e06aa7260cb3023d76266fb0e1187316ac9bec241099dade49a4078bb019edd9f839081d3dc059e586929e2eb082e59a123fb84714e673da62b00
+  metadata.gz: 3c255affeb6d9db640c95256c2f648bb7310c7b58c5e8589ee44a81ad8d29528e299bc0ad4a53e9b8a0e896806a8d96c23b9d27fe4b082ae52b7195a8794c4ca
+  data.tar.gz: 2d1d2018691436d97ef4b9e482e73141999ec5e5223129b77b9540bd918d6bc12fe097079eef98a193980da804932109eeb3f0489fa1810913c23b8e0599d9c9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ssdb-attr (0.0.3)
+    ssdb-attr (0.0.6)
       activesupport (~> 4.2.1)
       connection_pool (~> 2.1.0)
       redis (~> 3.1.0)

data/lib/ssdb-attr/version.rb

@@ -1,3 +1,3 @@
 module SSDBAttr
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/ssdb/attr.rb

@@ -43,7 +43,15 @@ module SSDB
     end
 
     def to_ssdb_attr_key(name)
-      self.class.to_ssdb_attr_key(name, id)
+      klass = self.class
+
+      custom_id = klass.instance_variable_get("@ssdb_attr_id")
+
+      if custom_id.present?
+        "#{klass.name.tableize}:#{self.send(custom_id)}:#{name}"
+      else
+        "#{klass.name.tableize}:#{id}:#{name}"
+      end
     end
 
     private
@@ -57,11 +65,10 @@ module SSDB
         @ssdb_attr_names ||= []
       end
 
-      def to_ssdb_attr_key(name, id)
-        "#{self.name.tableize}:#{id}:#{name}"
+      def ssdb_attr_id(sym)
+        @ssdb_attr_id = sym
       end
 
-
       # ssdb_attr :content,        :string,   default: 0, touch: true
       # ssdb_attr :writer_version, :integer,  default: 0, touch: [:field1, :field2, :field3]
       #

data/test/ssdb_attr_test.rb

@@ -19,6 +19,10 @@ def setup!
   { 'posts' => 'updated_at DATETIME, saved_at DATETIME, changed_at DATETIME' }.each do |table_name, columns_as_sql_string|
     ActiveRecord::Base.connection.execute "CREATE TABLE #{table_name} (id INTEGER NOT NULL PRIMARY KEY, #{columns_as_sql_string})"
   end
+
+  { 'chat_messages' => 'uuid VARCHAR' }.each do |table_name, columns_as_sql_string|
+    ActiveRecord::Base.connection.execute "CREATE TABLE #{table_name} (id INTEGER NOT NULL PRIMARY KEY, #{columns_as_sql_string})"
+  end
 end
 
 setup!
@@ -50,6 +54,13 @@ class Post < ActiveRecord::Base
   end
 end
 
+class ChatMessage < ActiveRecord::Base
+  include SSDB::Attr
+
+  ssdb_attr :content, :string
+  ssdb_attr_id :uuid
+end
+
 class SsdbAttrTest < test_framework
   def setup
     SSDBAttr.pool.with { |conn| conn.flushdb }
@@ -57,6 +68,7 @@ class SsdbAttrTest < test_framework
       ActiveRecord::Base.connection.execute "DELETE FROM #{table}"
     end
     @post = Post.create(updated_at: 1.day.ago, saved_at: 1.day.ago, changed_at: 1.day.ago)
+    @chat_message = ChatMessage.create(uuid: SecureRandom.uuid)
   end
 
   def test_respond_to_methods
@@ -95,7 +107,11 @@ class SsdbAttrTest < test_framework
   end
 
   def test_to_ssdb_attr_key
-    assert_equal "posts:#{@post.id}:name", Post.to_ssdb_attr_key("name", @post.id)
+    assert_equal "posts:#{@post.id}:name", @post.to_ssdb_attr_key("name")
+  end
+
+  def test_custom_ssdb_attr_id
+    assert_equal "chat_messages:#{@chat_message.uuid}:content", @chat_message.to_ssdb_attr_key("content")
   end
 
   def test_update_ssdb_attrs_with_symbolize_keys
@@ -137,7 +153,7 @@ class SsdbAttrTest < test_framework
     default_title_key = @post.to_ssdb_attr_key(:default_title)
     version_key = @post.to_ssdb_attr_key(:version)
 
-    assert_equal 9, SSDBAttr.pool.with { |conn| conn.keys.count }
+    assert_equal 10, SSDBAttr.pool.with { |conn| conn.keys.count }
     assert_equal true, SSDBAttr.pool.with { |conn| conn.exists(title_key) }
     assert_equal "Untitled", SSDBAttr.pool.with { |conn| conn.get(default_title_key) }
     assert_equal "1", SSDBAttr.pool.with { |conn| conn.get(version_key) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssdb-attr
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Larry Zhao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis