ssdb-attr 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0a8577ee7cc342983ced7c743a36fb4bf06a99
-  data.tar.gz: c202f59301160470540f18f6fd8bfb7a6c346d97
+  metadata.gz: 4a289ae79142236400a07707a60202ab5b1f6145
+  data.tar.gz: 2215310bf7c08fbfd041b65fe7f8e3c3e7755579
 SHA512:
-  metadata.gz: 0ab615231b7df6dc1bc6e9a9db48c1120150636c474961ba9d0653c7634e4bbe9580cf360fa4951d9f8257ab7f48b7ff98fee9f19b3c4478275ecb9cfe294110
-  data.tar.gz: 18e23b76f1d825bc3dd5bfb26be2756c976d06f58e31aaade8bb89393d6dbcd29c2380c2dca7dd3d13abac32352179813e3f3846fb36acda64daf1eab2ab14f9
+  metadata.gz: 192fec65d8cfaef017ce5b1b96080f1b46ecb638957187d6014273d1b501e8d5bb6e31add92c26a02d5640c56a0570746514b53e28108e74c2c7ae87b0481b95
+  data.tar.gz: 5c459ca635fd3ce0c916ecdae4dac4cb7460e708ab0dfb51c5ebd33e7891002643b2666e1af21867d758047b544e404393a3355ae8b8bb388becc901808bf8ae

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.0
+2.3.4

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 
 rvm:
-  - 2.3.0
+  - 2.3.4
+
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile.activerecord-4.2.x
 
 before_install:
   - git clone -b stable-1.9.2 git://github.com/ideawu/ssdb.git

data/Gemfile

@@ -1,4 +1,11 @@
-source 'https://gems.ruby-china.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in ssdb-attr.gemspec
 gemspec
+
+gem "activerecord", "~> 5.0"
+
+gem "rake"
+gem "pry"
+gem "sqlite3"
+gem "activerecord-nulldb-adapter"
+gem "rspec"

data/Gemfile.lock

@@ -1,73 +1,69 @@
 PATH
   remote: .
   specs:
-    ssdb-attr (0.1.3)
-      activesupport (~> 4.2.1)
+    ssdb-attr (0.1.4)
+      activerecord (>= 4.2.1, < 5.1)
       connection_pool (~> 2.2.0)
       redis (~> 3.2.1)
 
 GEM
-  remote: https://gems.ruby-china.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
-      builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
-      arel (~> 6.0)
-    activerecord-nulldb-adapter (0.3.1)
+    activemodel (5.0.5)
+      activesupport (= 5.0.5)
+    activerecord (5.0.5)
+      activemodel (= 5.0.5)
+      activesupport (= 5.0.5)
+      arel (~> 7.0)
+    activerecord-nulldb-adapter (0.3.7)
       activerecord (>= 2.0.0)
-    activesupport (4.2.1)
+    activesupport (5.0.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
-    builder (3.2.2)
+    arel (7.1.4)
     coderay (1.1.1)
+    concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    json (1.8.2)
+    diff-lcs (1.3)
+    i18n (0.8.6)
     method_source (0.8.2)
-    minitest (5.5.1)
+    minitest (5.10.3)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.4.2)
+    rake (12.0.0)
     redis (3.2.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     slop (3.6.0)
-    sqlite3 (1.3.10)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 4.2.1)
+  activerecord (~> 5.0)
   activerecord-nulldb-adapter
-  bundler (~> 1.5)
   pry
   rake
-  rspec (~> 3.5.0)
+  rspec
   sqlite3
   ssdb-attr!
 

data/README.md

@@ -6,6 +6,11 @@ This gem provides an intuitive interface to define attributes on your ActiveMode
 
 # Changelog
 
+### 0.1.5
+
+- Upgrade `activerecord` dependency to support 5.1
+- Change `after_commit` callback to use `after_create` & `after_save`
+
 ### 0.1.4
 
 - Add `SSDBAttr.load_attrs(objects, *fields)` to load multiple attrs for multiple same objects at one time.

data/gemfiles/Gemfile.activerecord-4.2.x

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "activerecord", "~> 4.2", ">= 4.2.1"
+
+gem "rake"
+gem "pry"
+gem "sqlite3"
+gem "activerecord-nulldb-adapter"
+gem "rspec"

data/gemfiles/Gemfile.activerecord-4.2.x.lock

@@ -0,0 +1,72 @@
+PATH
+  remote: ..
+  specs:
+    ssdb-attr (0.1.4)
+      activerecord (>= 4.2.1, < 5.1)
+      connection_pool (~> 2.2.0)
+      redis (~> 3.2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
+      builder (~> 3.1)
+    activerecord (4.2.9)
+      activemodel (= 4.2.9)
+      activesupport (= 4.2.9)
+      arel (~> 6.0)
+    activerecord-nulldb-adapter (0.3.7)
+      activerecord (>= 2.0.0)
+    activesupport (4.2.9)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.4)
+    builder (3.2.3)
+    coderay (1.1.1)
+    connection_pool (2.2.1)
+    diff-lcs (1.3)
+    i18n (0.8.6)
+    method_source (0.8.2)
+    minitest (5.10.3)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (12.0.0)
+    redis (3.2.2)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    slop (3.6.0)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.2, >= 4.2.1)
+  activerecord-nulldb-adapter
+  pry
+  rake
+  rspec
+  sqlite3
+  ssdb-attr!
+
+BUNDLED WITH
+   1.15.3

data/lib/ssdb-attr/version.rb

@@ -1,3 +1,3 @@
 module SSDBAttr
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/ssdb/attr.rb

@@ -5,7 +5,8 @@ module SSDB
     included do
       instance_variable_set(:@ssdb_attr_definition, {})
 
-      after_commit :save_ssdb_attrs,  on: %i(create update)
+      after_create :save_ssdb_attrs
+      after_update :save_ssdb_attrs
       after_commit :clear_ssdb_attrs, on: :destroy
     end
 
@@ -180,8 +181,8 @@ module SSDB
     # @return [void]
     #
     def save_ssdb_attrs
-      params = (previous_changes.keys & self.class.ssdb_attr_names).map do |attr|
-        ["#{ssdb_attr_key(attr)}", previous_changes[attr][1]]
+      params = (changes.keys & self.class.ssdb_attr_names).map do |attr|
+        ["#{ssdb_attr_key(attr)}", changes[attr][1]]
       end
 
       ssdb_attr_pool.with do |conn|

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require "nulldb"
 require "ssdb-attr"
 
 # Setup ActiveRecord
-ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::VERSION::STRING >= "4.2"
+ActiveRecord::Base.raise_in_transactional_callbacks = true if ActiveRecord::VERSION::STRING < "5.0"
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
 RSpec.configure do |config|
@@ -18,7 +18,7 @@ RSpec.configure do |config|
     # Clean up SSDB
     system('printf "7\nflushdb\n\n4\nping\n\n" | nc 127.0.0.1 8888 -i 1 > /dev/null')
 
-    ActiveRecord::Base.connection.tables.each do |table|
+    ActiveRecord::Base.connection.data_sources.each do |table|
       ActiveRecord::Base.connection.execute "DELETE FROM #{table}"
     end
   end

data/spec/ssdb/attr_spec.rb

@@ -76,10 +76,18 @@ describe SSDB::Attr do
     end
 
     describe "#save_ssdb_attrs" do
-      it "should save attribute values in SSDB" do
-        allow(post).to receive(:previous_changes).and_return({"title"=>["", "foobar2"]})
-        post.send(:save_ssdb_attrs)
-        expect(redis.get("posts:#{post.id}:title")).to eq("foobar2")
+      it "saves attribute values in ssdb when create a new record" do
+        post = Post.create(title: "foobar")
+
+        expect(redis.get("posts:#{post.id}:title")).to eq("foobar")
+      end
+
+      it "saves attribute values in ssdb when update a record" do
+        expect(redis.get("posts:#{post.id}:title")).to be_nil
+
+        post.update(title: "foobar")
+
+        expect(redis.get("posts:#{post.id}:title")).to eq("foobar")
       end
     end
 

data/ssdb-attr.gemspec

@@ -20,13 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "redis", "~> 3.2.1"
   spec.add_dependency "connection_pool", "~> 2.2.0"
-  spec.add_dependency "activesupport", "~> 4.2.1"
-
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rspec", "~> 3.5.0"
-  spec.add_development_dependency "activerecord", "~> 4.2.1"
-  spec.add_development_dependency "activerecord-nulldb-adapter"
+  spec.add_dependency "activerecord", ">= 4.2.1", "< 5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssdb-attr
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Larry Zhao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -39,117 +39,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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: sqlite3
+  name: activerecord
   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
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: 4.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '5.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.1
-- !ruby/object:Gem::Dependency
-  name: activerecord-nulldb-adapter
-  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'
+        version: '5.1'
 description: ''
 email:
 - thehiddendepth@gmail.com
@@ -166,6 +74,8 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- gemfiles/Gemfile.activerecord-4.2.x
+- gemfiles/Gemfile.activerecord-4.2.x.lock
 - lib/ssdb-attr.rb
 - lib/ssdb-attr/version.rb
 - lib/ssdb/attr.rb
@@ -193,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Provide simple helpers on persist values in redis for performance. Works