ssdb-attr 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dedea1c81f2baa61f35d107b89e9e88494c96f40
-  data.tar.gz: 8777a84c9a061a041a93deb7e5dc2dce4a742836
+  metadata.gz: 12d34fe49dea6f34f53f02d705685b0b378624b3
+  data.tar.gz: 971ad112430c9f856ec117b8492f39f0384ac504
 SHA512:
-  metadata.gz: b6c1f09802b2a1a9efe05f8efc51f853806a554240740baf7f4a33628245889936e5afe485b4879201baed7fe65cc2f5fc1b2dc57112c633918bc7958da31831
-  data.tar.gz: 9f1c8f50009b59d7727531dc0c354e259f825df0967ad68f265b39c3d5d32da2f351eed6e719148bd48006b195ad6148fa3c3a48318c6cf4d7966d47560d3b06
+  metadata.gz: 4403f533f66cae6458d5ee9c8c6b8cc5146efb4eb07587e893f70ad345d2b6a0f7ca7252b4b58e604c38eb8156f636c995485001b0b9ac830fa1d8493e4a0e0a
+  data.tar.gz: 80e4d601f98c269d45b2438788544b6e79927f0e5ca604162aabf55789245af11db31a997a294dc02b79ca9b5c257ce33c364eb7274c25fffe1c3f894f06fa39

data/Rakefile

@@ -2,6 +2,6 @@ require "bundler/gem_tasks"
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs << 'spec'
-  t.pattern = "spec/**/*_spec.rb"
+  t.libs << 'test'
+  t.pattern = "test/**/*_test.rb"
 end

data/lib/ssdb-attr/version.rb

@@ -1,3 +1,3 @@
 module SSDBAttr
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/ssdb/attr.rb

@@ -3,52 +3,65 @@ module SSDB
     extend ActiveSupport::Concern
 
     included do
-    #   puts 'called'
       define_model_callbacks :update_ssdb_attrs, only: [:before, :after]
+      after_create :init_ssdb_attrs
+      after_destroy :clear_ssdb_attrs
     end
 
-    def to_ssdb_attr_key(name)
-      "#{self.class.to_s.underscore.pluralize}:#{self.id}:#{name}"
-    end
-
-    def update_ssdb_attrs(data={})
-
+    def update_ssdb_attrs(attributes)
       # Determine what attrs are requested to be updated
-      attr_names = data.keys & self.class.ssdb_attr_names
-      if attr_names.empty?
-        return
-      end
+      attributes = attributes.symbolize_keys
+      attr_names = attributes.keys & self.class.ssdb_attr_names
 
       # Determine dirty fields
       attr_names.each do |name|
-        if self.send(name.to_sym) != data[name].to_s
-          attribute_will_change! name.to_sym
-        end
+        send("#{name}_will_change!") unless attributes[name] == send(name)
       end
 
-      # trigger_ssdb_attr_before_callbacks if self.respond_to? :trigger_ssdb_attr_before_callbacks
       run_callbacks :update_ssdb_attrs do
         SSDBAttr.pool.with do |conn|
-          attr_names.each do |name|
-            conn.set("#{self.to_ssdb_attr_key(name)}", data[name])
-          end
+          attr_names.each { |name| send("#{name}=", attributes[name]) }
         end
       end
 
-      # trigger_ssdb_attr_after_callbacks if self.respond_to? :trigger_ssdb_attr_after_callbacks
-
       # Clear dirty fields
-      attr_names.each do |name|
-        clear_attribute_changes name.to_sym
+      clear_attribute_changes(attr_names)
+
+      true # always return true
+    end
+
+    def init_ssdb_attrs
+      self.class.ssdb_attr_names.each do |attribute|
+        SSDBAttr.pool.with { |conn| conn.set(to_ssdb_attr_key(attribute), self.send(attribute)) }
       end
     end
 
+    def clear_ssdb_attrs
+      self.class.ssdb_attr_names.each do |attribute|
+        SSDBAttr.pool.with { |conn| conn.del(to_ssdb_attr_key(attribute)) }
+      end
+    end
+
+    def to_ssdb_attr_key(name)
+      self.class.to_ssdb_attr_key(name, id)
+    end
+
+    private
+
+    def touch_db_column(names)
+      names == true ? touch : touch(*names)
+    end
+
     module ClassMethods
       def ssdb_attr_names
-        @ssdb_attr_names = [] if @ssdb_attr_names.nil?
-        @ssdb_attr_names
+        @ssdb_attr_names ||= []
+      end
+
+      def to_ssdb_attr_key(name, id)
+        "#{self.name.tableize}:#{id}:#{name}"
       end
 
+
       # ssdb_attr :content,        :string,   default: 0, touch: true
       # ssdb_attr :writer_version, :integer,  default: 0, touch: [:field1, :field2, :field3]
       #
@@ -60,62 +73,31 @@ module SSDB
       #
       # @return [type] [description]
       def ssdb_attr(name, type, options={})
-
-        if ![:string, :integer].include?(type)
+        unless %i(string integer).include?(type)
           raise "Type not supported, only `:string` and `:integer` are supported now."
         end
 
-        self.ssdb_attr_names ||= []
         self.ssdb_attr_names << name
 
         define_method(name) do
           conversion = type == :string ? :to_s : :to_i
-
-          value = SSDBAttr.pool.with do |conn|
-            conn.get("#{self.to_ssdb_attr_key(name)}")
-          end
-
-          value.try(conversion) || options[:default]
+          value = SSDBAttr.pool.with { |conn| conn.get("#{to_ssdb_attr_key(name)}") }
+          (value || options[:default]).send(conversion)
         end
 
-        define_method("#{name}=") do |v|
-          SSDBAttr.pool.with do |conn|
-            conn.set("#{self.to_ssdb_attr_key(name)}", v)
-          end
-
-          self.send("touch_ssdb_attr_#{name}".to_sym) if self.respond_to?("touch_ssdb_attr_#{name}".to_sym)
+        define_method("#{name}=") do |val|
+          SSDBAttr.pool.with { |conn| conn.set("#{to_ssdb_attr_key(name)}", val) }
+          touch_db_column(options[:touch]) if options[:touch].present?
         end
 
-        if options[:touch].present?
-          define_method("touch_ssdb_attr_#{name}") do
-            if options[:touch].kind_of?(Array)
-              touch(*options[:touch])
-            else
-              touch(:updated_at)
-            end
-          end
+        define_method("#{name}_will_change!") do
+          attribute_will_change!(name)
         end
 
         define_method("#{name}_changed?") do
-          attribute_changed?(name.to_sym)
+          attribute_changed?(name)
         end
       end
-
-      # def after_update_ssdb_attrs(*args)
-      #   define_method("trigger_ssdb_attr_after_callbacks") do
-      #     args.each do |arg|
-      #       self.send(arg.to_sym)
-      #     end
-      #   end
-      # end
-      #
-      # def before_update_ssdb_attrs(*args)
-      #   define_method("trigger_ssdb_attr_before_callbacks") do
-      #     args.each do |arg|
-      #       self.send(arg.to_sym)
-      #     end
-      #   end
-      # end
     end
   end
 end

data/test/ssdb_attr_test.rb

@@ -0,0 +1,145 @@
+require 'ssdb-attr'
+require 'active_record'
+ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::VERSION::STRING >= '4.2'
+
+require 'minitest/autorun'
+require 'minitest/spec'
+require 'minitest/pride'
+test_framework = defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase
+
+require File.expand_path(File.dirname(__FILE__) + "/../lib/ssdb/attr")
+
+def connect!
+  SSDBAttr.setup(url: 'redis://localhost:6379/15')
+  ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
+end
+
+def setup!
+  connect!
+  { '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
+end
+
+setup!
+
+class Post < ActiveRecord::Base
+  include SSDB::Attr
+
+  ssdb_attr :name, :string
+  ssdb_attr :int_version, :integer
+  ssdb_attr :default_title, :string, default: "Untitled"
+  ssdb_attr :plain_touch, :string, touch: true
+  ssdb_attr :custom_touch_single_column, :string, touch: :saved_at
+  ssdb_attr :custom_touch_multiple_columns, :string, touch: [:saved_at, :changed_at]
+  ssdb_attr :title, :string
+  ssdb_attr :content, :string
+  ssdb_attr :version, :integer, default: 1
+
+  before_update_ssdb_attrs :before1, :before2
+  after_update_ssdb_attrs :after1, :after2
+
+  def callback_out
+    @callback_out ||= []
+  end
+
+  %i(before1 before2 after1 after2).each do |name|
+    define_method(name) do
+      callback_out << name
+    end
+  end
+end
+
+class SsdbAttrTest < test_framework
+  def setup
+    SSDBAttr.pool.with { |conn| conn.flushdb }
+    ActiveRecord::Base.connection.tables.each do |table|
+      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)
+  end
+
+  def test_respond_to_methods
+    assert_equal true, @post.respond_to?(:name)
+    assert_equal true, @post.respond_to?(:name=)
+    assert_equal true, @post.respond_to?(:name_changed?)
+    assert_equal true, @post.respond_to?(:name_will_change!)
+  end
+
+  def test_integer_attribute
+    @post.int_version = "4"
+    assert_equal 4, @post.int_version
+  end
+
+  def test_with_default_value
+    assert_equal "Untitled", @post.default_title
+  end
+
+  def test_with_plain_touch
+    original_updated_at = @post.updated_at
+    @post.plain_touch = "something"
+    refute_equal original_updated_at, @post.updated_at
+  end
+
+  def test_with_custom_touch_signle_column
+    original_saved_at = @post.saved_at
+    @post.custom_touch_single_column = "something"
+    refute_equal original_saved_at, @post.saved_at
+  end
+
+  def test_with_custom_touch_multiple_columns
+    original_saved_at, original_changed_at = @post.saved_at, @post.changed_at
+    @post.custom_touch_multiple_columns = "something"
+    refute_equal original_saved_at, @post.saved_at
+    refute_equal original_changed_at, @post.changed_at
+  end
+
+  def test_to_ssdb_attr_key
+    assert_equal "posts:#{@post.id}:name", Post.to_ssdb_attr_key("name", @post.id)
+  end
+
+  def test_update_ssdb_attrs_with_symbolize_keys
+    @post.update_ssdb_attrs(title: "note one", content: "testing!!!", version: 1)
+    assert_equal "note one", @post.title
+    assert_equal "testing!!!", @post.content
+    assert_equal 1, @post.version
+  end
+
+  def test_update_ssdb_attrs_with_string_keys
+    @post.update_ssdb_attrs("title" => "note one", "content" => "testing!!!", "version" => 1)
+    assert_equal "note one", @post.title
+    assert_equal "testing!!!", @post.content
+    assert_equal 1, @post.version
+  end
+
+  def test_update_ssdb_attrs_on_object_return_true
+    assert_equal true, @post.update_ssdb_attrs(title: "note one", content: "testing!!!", version: 1)
+  end
+
+  def test_update_ssdb_attrs_callbacks
+    @post.update_ssdb_attrs(title: "something")
+    assert_equal [:before1, :before2, :after1, :after2], @post.callback_out
+  end
+
+  def test_object_destroy_callbacks
+    @post.update_ssdb_attrs(title: "note one", content: "nice job!")
+    ssdb_title_key = @post.to_ssdb_attr_key(:title)
+    ssdb_content_key = @post.to_ssdb_attr_key(:content)
+    assert_equal true, SSDBAttr.pool.with { |conn| conn.exists(ssdb_title_key) }
+    assert_equal true, SSDBAttr.pool.with { |conn| conn.exists(ssdb_content_key) }
+    @post.destroy
+    assert_equal false, SSDBAttr.pool.with { |conn| conn.exists(ssdb_title_key) }
+    assert_equal false, SSDBAttr.pool.with { |conn| conn.exists(ssdb_content_key) }
+  end
+
+  def test_object_create_callbacks
+    title_key = @post.to_ssdb_attr_key(:title)
+    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 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) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssdb-attr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Larry Zhao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -157,6 +157,7 @@ files:
 - spec/ssdb-attr_spec.rb
 - spec/ssdb/attr_spec.rb
 - ssdb-attr.gemspec
+- test/ssdb_attr_test.rb
 homepage: ''
 licenses:
 - MIT
@@ -186,3 +187,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/ssdb-attr_spec.rb
 - spec/ssdb/attr_spec.rb
+- test/ssdb_attr_test.rb