ssdb-attr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0af0af4f71bf1a2334ba60e48f6dea9ecc54eed
-  data.tar.gz: 6a3961ede70cc7c2c206220f3e85ea4ca427a764
+  metadata.gz: dedea1c81f2baa61f35d107b89e9e88494c96f40
+  data.tar.gz: 8777a84c9a061a041a93deb7e5dc2dce4a742836
 SHA512:
-  metadata.gz: 9d86ccf61150eaaa6f3037742168d0f5798b62091621447846002285797cc540a22c19b283b2163b43fa53cfaed7014290382a2be47ccb9237ab8996b93c0ded
-  data.tar.gz: eb0a242d995163bce6d8595458f5e6e8f2a678bdeae92494899144f9e534c238758fd830be825071375f5c68b56948a0524909448ff8c52d46aebe08184e8c83
+  metadata.gz: b6c1f09802b2a1a9efe05f8efc51f853806a554240740baf7f4a33628245889936e5afe485b4879201baed7fe65cc2f5fc1b2dc57112c633918bc7958da31831
+  data.tar.gz: 9f1c8f50009b59d7727531dc0c354e259f825df0967ad68f265b39c3d5d32da2f351eed6e719148bd48006b195ad6148fa3c3a48318c6cf4d7966d47560d3b06

data/Gemfile.lock

@@ -1,46 +1,38 @@
 PATH
   remote: .
   specs:
-    ssdb-attr (0.0.1)
-      activesupport (~> 4.1.8)
+    ssdb-attr (0.0.3)
+      activesupport (~> 4.2.1)
       connection_pool (~> 2.1.0)
       redis (~> 3.1.0)
 
 GEM
   remote: http://ruby.taobao.org/
   specs:
-    activemodel (4.1.10)
-      activesupport (= 4.1.10)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.1.10)
-      activemodel (= 4.1.10)
-      activesupport (= 4.1.10)
-      arel (~> 5.0.0)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
     activerecord-nulldb-adapter (0.3.1)
       activerecord (>= 2.0.0)
-    activesupport (4.1.10)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0)
     builder (3.2.2)
-    coderay (1.1.0)
     connection_pool (2.1.3)
     i18n (0.7.0)
     json (1.8.2)
-    method_source (0.8.2)
     minitest (5.5.1)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
     rake (10.4.2)
     redis (3.1.0)
-    slop (3.5.0)
+    sqlite3 (1.3.10)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -49,11 +41,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 4.1.8)
+  activerecord (~> 4.2.1)
   activerecord-nulldb-adapter
   bundler (~> 1.5)
   minitest (~> 5.5.1)
-  pry
-  pry-nav
   rake
+  sqlite3
   ssdb-attr!

data/lib/ssdb-attr/version.rb

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

data/lib/ssdb/attr.rb

@@ -2,11 +2,53 @@ module SSDB
   module Attr
     extend ActiveSupport::Concern
 
+    included do
+    #   puts 'called'
+      define_model_callbacks :update_ssdb_attrs, only: [:before, :after]
+    end
+
     def to_ssdb_attr_key(name)
       "#{self.class.to_s.underscore.pluralize}:#{self.id}:#{name}"
     end
 
+    def update_ssdb_attrs(data={})
+
+      # Determine what attrs are requested to be updated
+      attr_names = data.keys & self.class.ssdb_attr_names
+      if attr_names.empty?
+        return
+      end
+
+      # 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
+      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
+        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
+      end
+    end
+
     module ClassMethods
+      def ssdb_attr_names
+        @ssdb_attr_names = [] if @ssdb_attr_names.nil?
+        @ssdb_attr_names
+      end
+
       # ssdb_attr :content,        :string,   default: 0, touch: true
       # ssdb_attr :writer_version, :integer,  default: 0, touch: [:field1, :field2, :field3]
       #
@@ -23,6 +65,9 @@ module SSDB
           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
 
@@ -36,28 +81,41 @@ module SSDB
         define_method("#{name}=") do |v|
           SSDBAttr.pool.with do |conn|
             conn.set("#{self.to_ssdb_attr_key(name)}", v)
-            self.send("touch_ssdb_attr_#{name}".to_sym) if self.respond_to?("touch_ssdb_attr_#{name}".to_sym)
           end
+
+          self.send("touch_ssdb_attr_#{name}".to_sym) if self.respond_to?("touch_ssdb_attr_#{name}".to_sym)
         end
 
         if options[:touch].present?
           define_method("touch_ssdb_attr_#{name}") do
-            t = Time.now
-
             if options[:touch].kind_of?(Array)
-              data = {}
-
-              options[:touch].each do |field|
-                data[field.to_sym] = t if ActiveRecord::Base.connection.column_exists?(self.class.table_name, field.to_sym, :datetime)
-              end
-
-              self.update(data) if !data.empty?
+              touch(*options[:touch])
             else
-              self.update(updated_at: t) if ActiveRecord::Base.connection.column_exists?(self.class.table_name, :updated_at, :datetime)
+              touch(:updated_at)
             end
           end
         end
+
+        define_method("#{name}_changed?") do
+          attribute_changed?(name.to_sym)
+        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/spec/spec_helper.rb

@@ -6,6 +6,11 @@ require 'minitest/autorun'
 require 'minitest/mock'
 require 'minitest/pride'
 
-SSDBAttr.setup url: 'http://localhost:8888'
+SSDBAttr.setup url: 'redis://localhost:6379/15'
 
-ActiveRecord::Base.establish_connection :adapter => :nulldb
+# Setup activerecord
+ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::VERSION::STRING >= '4.2'
+
+ActiveRecord::Base.establish_connection :adapter => 'sqlite3', database: ':memory:'
+
+ActiveRecord::Base.connection.execute "CREATE TABLE posts (id INTEGER NOT NULL PRIMARY KEY, updated_at DATETIME, content_updated_at DATETIME, title_updated_at DATETIME)"

data/spec/ssdb/attr_spec.rb

@@ -1,49 +1,86 @@
 require 'spec_helper'
 
-class Dummy
+class Post < ActiveRecord::Base
   include SSDB::Attr
 
-  attr_accessor :id
+  ssdb_attr :title,           :string, touch: [:content_updated_at]
+  ssdb_attr :content,         :string, touch: true
+  ssdb_attr :version,         :integer, default: 22
+  ssdb_attr :counter,         :integer, default: 4
 
-  ssdb_attr :title,   :string
-  ssdb_attr :version, :integer, default: 22
-  ssdb_attr :content, :string,  touch: true
+  before_update_ssdb_attrs  :before_callback1, :before_callback2
+  after_update_ssdb_attrs   :after_callback1, :after_callback2
 
-  def initialize
-    @id = Random.rand(10000)
+  def before_callback1
+    puts "before callback 1"
+
+    if title_changed?
+      puts "title changed detected."
+    end
+  end
+
+  def before_callback2
+    puts "before callback 2"
   end
 
-  def candies
-    15
+  def after_callback1
+    puts "after callback 1"
   end
+
+  def after_callback2
+    puts "after callback 2"
+  end
+
+  # touch_ssdb_attr [:title, :content], touch: [:content_at]
+  #
+  # dummy.update_ssdb_attrs(title: 'abc', content: 'cbd')
+  #
+  # before_update_ssdb_attributes args*
+  # after_update_ssdb_attributes :touch_updated_at
 end
 
 describe SSDB::Attr do
-  describe "method definition" do
 
+  describe "method created" do
   end
 
-  describe "default value" do
-    it 'should set default value correctly' do
-      dummy = Dummy.new
+  describe "#update_ssdb_attrs" do
+    if 'should correctly set values'
+      post = Post.create
+
+      post.update_ssdb_attrs(title: 'bar2')
+      post.update_ssdb_attrs(title: 'bar2')
 
-      dummy.version.must_equal 22
+      # title =  'foo'
+      # content = 'bar'
+      #
+      # title.must_equal 'foo'
+      # content.must_equal 'bar'
+      #
+      #post.title.must_equal 'foo'
+      #post.content.must_equal 'bar'
     end
   end
 
-  describe "Type conversion" do
+  describe "#ssdb_attr" do
+    it 'should set default value correctly' do
+      post = Post.create
+
+      post.counter.must_equal 4
+    end
+
     it "should convert to string correctly" do
-      dummy = Dummy.new
+      post = Post.create
 
-      dummy.title = 120
-      dummy.title.must_equal '120'
+      post.title = 120
+      post.title.must_equal '120'
     end
 
     it "should convert to integer correctly" do
-      dummy = Dummy.new
+      post = Post.create
 
-      dummy.version = '120'
-      dummy.version.must_equal 120
+      post.version = '120'
+      post.version.must_equal 120
     end
   end
 end

data/ssdb-attr.gemspec

@@ -24,9 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-nav"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "minitest", "~> 5.5.1"
-  spec.add_development_dependency "activerecord", "~> 4.1.8"
+  spec.add_development_dependency "activerecord", "~> 4.2.1"
   spec.add_development_dependency "activerecord-nulldb-adapter"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssdb-attr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Larry Zhao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -81,21 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
-  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'
-- !ruby/object:Gem::Dependency
-  name: pry-nav
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: 4.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: activerecord-nulldb-adapter
   requirement: !ruby/object:Gem::Requirement