norton 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c89415440b323b271c5897927a73e8d272a16561
-  data.tar.gz: f4a82ea218cb03c067e222f3d7a3cdafaee9d9c0
+  metadata.gz: 6535a6a6aa0b6aafc903750f29736fdb867e436e
+  data.tar.gz: f6a843aaa3aac77be86602b45dc8f4181cb03a10
 SHA512:
-  metadata.gz: cb0ba052090f2b4d687f1f11def1d3f9ada80ca4ac894427bffa94938b0485574a8a99c633e10fc69a803892b1359b379beea8531f879d3ac13fc32e7ab1e9c0
-  data.tar.gz: a79e8d1b49987a9fe0dca3eb7e692fe20fa600b377e7df88d197edfbf17e2e2555cd6601b32f7e050e56b58b263d118275d2607cc295de367d3a057a1a5a5d6e
+  metadata.gz: ec3d694c9179a844a3f4b48915f7a62e32ce0d130d14b5e4685f08f8d87d8e9a05c4f68693af28d02dd07037af0b8b8e3b60f8de4d7c248fe7eea1b5e05acd1b
+  data.tar.gz: e86b51e2e964fbd2a646ef88cbbd59504506fe7bd553be74c688ffb8463a8ed1478038a7bee66d77ad671942ea73b0efab9f27546f9a601d841e1d58e98c6875

data/.rspec

@@ -0,0 +1,2 @@
+--format Fuubar
+--color

data/lib/norton/counter.rb

@@ -29,6 +29,18 @@ module Norton
           end
         end
 
+        define_method("incr_#{name}_by") do |increment|
+          Norton.redis.with do |conn|
+            conn.incrby("#{self.class.to_s.pluralize.underscore}:#{self.id}:#{name}", increment)
+          end
+        end
+
+        define_method("decr_#{name}_by") do |decrement|
+          Norton.redis.with do |conn|
+            conn.decrby("#{self.class.to_s.pluralize.underscore}:#{self.id}:#{name}", decrement)
+          end
+        end
+
         define_method("#{name}=") do |v|
           Norton.redis.with do |conn|
             conn.set("#{self.class.to_s.pluralize.underscore}:#{self.id}:#{name}", v)
@@ -48,7 +60,7 @@ module Norton
             conn.del("#{self.class.to_s.pluralize.underscore}:#{self.id}:#{name}")
           end
         end
-        send(:after_destroy, "remove_#{name}".to_sym)
+        send(:after_destroy, "remove_#{name}".to_sym) if respond_to? :after_destroy
 
         # Add Increment callback
         unless options[:incr].nil?
@@ -66,4 +78,4 @@ module Norton
       end
     end
   end
-end
+end

data/lib/norton/helper.rb

@@ -0,0 +1,29 @@
+module Norton
+  module Helper
+    extend ActiveSupport::Concern
+
+    #
+    # 批量取出当前对象的多个 Norton value
+    #
+    # @param [Array] *value_keys 直接传入需要的值的 key，例如: :key1, :key2, :key3
+    #
+    # @return [Hash]
+    #
+    def norton_values(*keys)
+      ret = {}
+
+      redis_keys = keys.map { |k| "#{self.class.to_s.pluralize.underscore}:#{self.id}:#{k}" }
+
+      redis_values = Norton.redis.with do |conn|
+        conn.mget(redis_keys)
+      end
+
+      keys.each_with_index do |key, index|
+        ret[key] = redis_values[index].try(:to_i)
+      end
+
+      ret
+    end
+
+  end
+end

data/lib/norton/version.rb

@@ -1,3 +1,3 @@
 module Norton
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/lib/norton.rb

@@ -6,6 +6,7 @@ require "norton/version"
 require "norton/timestamp"
 require "norton/counter"
 require "norton/timed_value"
+require "norton/helper"
 
 module Norton
   class << self

data/norton.gemspec

@@ -24,7 +24,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "~> 5.5.1"
+  spec.add_development_dependency "rspec", "~> 3.5.0"
+  spec.add_development_dependency "fuubar"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-nav"
   spec.add_development_dependency "activerecord", "~> 4.1"
   spec.add_development_dependency "activerecord-nulldb-adapter"
 end

data/spec/norton/counter_spec.rb

@@ -9,7 +9,7 @@ class Dummy
   end
 
   def id
-    Random.rand(10000)
+    @id ||= Random.rand(10000)
   end
 
   def candies
@@ -23,7 +23,7 @@ describe Norton::Counter do
       dummy = Dummy.new
       dummy.reset_candies_count
 
-      dummy.candies_count.must_equal 15
+      expect(dummy.candies_count).to eq(15)
     end
   end
 
@@ -32,7 +32,26 @@ describe Norton::Counter do
       dummy = Dummy.new
       dummy.candies_count = 200
 
-      dummy.candies_count.must_equal 200
+      expect(dummy.candies_count).to eq(200)
     end
   end
-end
+
+  describe ".incr_value_by" do
+    it "should increase the value of the given amount" do
+      dummy = Dummy.new
+      dummy.incr_candies_count_by(3)
+
+      expect(dummy.candies_count).to eq(3)
+    end
+  end
+
+  describe ".decr_value_by" do
+    it "should decrease the value of the given amount" do
+      dummy = Dummy.new
+      dummy.candies_count = 15
+      dummy.decr_candies_count_by(5)
+
+      expect(dummy.candies_count).to eq(10)
+    end
+  end
+end

data/spec/norton/helper_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+class Dummy
+  include Norton::Counter
+  include Norton::Timestamp
+  include Norton::Helper
+
+  counter :counter1
+  counter :counter2
+  counter :counter3
+
+  timestamp :time1
+
+  def id
+    @id ||= Random.rand(10000)
+  end
+end
+
+describe Norton::Helper do
+  describe ".norton_values" do
+    it "should respond to `:norton_values`" do
+      dummy = Dummy.new
+
+      expect(dummy).to respond_to(:norton_values)
+    end
+
+    it "should return the specific values" do
+      dummy = Dummy.new
+
+      dummy.counter1 = 10
+      dummy.counter2 = 15
+      dummy.counter3 = 100
+
+      dummy.touch_time1
+
+      values = dummy.norton_values(:counter1, :time1)
+
+      expect(values).to include(:counter1, :time1)
+      expect(values.size).to eq(2)
+      expect(values[:counter1]).to eq(dummy.counter1)
+      expect(values[:time1]).to eq(dummy.time1)
+    end
+
+    it "should return nil if the specific key does not exist" do
+      dummy = Dummy.new
+
+      dummy.counter1 = 10
+      dummy.counter2 = 15
+      dummy.counter3 = 100
+
+      dummy.touch_time1
+
+      values = dummy.norton_values(:counter1, :counter2, :time2)
+
+      expect(values).to include(:counter1, :counter2, :time2)
+      expect(values.size).to eq(3)
+      expect(values[:counter1]).to eq(dummy.counter1)
+      expect(values[:counter2]).to eq(dummy.counter2)
+      expect(values[:time2]).to be_nil
+    end
+  end
+end

data/spec/norton/timestamp_spec.rb

@@ -7,22 +7,21 @@ class Dummy
   # timestamp :graduated_at, before_save: -> { title_changed? || content_changed? }
 
   def id
-    1
+    @id ||= Random.rand(10000)
   end
 end
 
 describe Norton::Timestamp do
   describe "#timestamp" do
     it "should add a class method timestamp to the class" do
-      Dummy.must_respond_to :timestamp
+      expect(Dummy).to respond_to(:timestamp)
     end
 
     it 'should create timestamp accessors and touch method' do
       dummy = Dummy.new
 
-      dummy.must_respond_to :born_at
-      # dummy.must_respond_to :'born_at='
-      dummy.must_respond_to :touch_born_at
+      expect(dummy).to respond_to(:born_at)
+      expect(dummy).to respond_to(:touch_born_at)
     end
   end
 
@@ -33,7 +32,7 @@ describe Norton::Timestamp do
 
       Norton.redis.with do |conn|
         born_at = conn.get("#{Dummy.to_s.pluralize.downcase}:#{dummy.id}:born_at")
-        born_at.to_i.must_be :>, 0
+        expect(born_at.to_i).to be > 0
       end
     end
   end
@@ -42,8 +41,8 @@ describe Norton::Timestamp do
     it 'should get the timestamp' do
       dummy = Dummy.new
       dummy.touch_born_at
-      dummy.born_at.wont_be_nil
-      dummy.born_at.must_be_kind_of Fixnum
+      expect(dummy.born_at).not_to be_nil
+      expect(dummy.born_at).to be_a(Fixnum)
     end
   end
-end
+end

data/spec/norton_spec.rb

@@ -4,8 +4,7 @@ describe Norton do
   describe "#setup" do
     it "should setup a redis connection pool" do
       Norton.setup url: 'redis://localhost:6379/0'
-
-      Norton.redis.wont_be_nil
+      expect(Norton.redis).not_to be_nil
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,26 @@
 require 'active_record'
 require 'nulldb'
 require 'norton'
-require 'minitest/spec'
-require 'minitest/autorun'
-require 'minitest/mock'
-require 'minitest/pride'
+require 'rspec'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :expect
+    mocks.verify_partial_doubles = true
+  end
+
+  config.order = :random
+
+  # Clean Up Redis
+  config.before(:each) do
+    Norton.redis.with { |conn| conn.flushdb }
+  end
+end
 
 Norton.setup url: 'redis://localhost:6379/0'
 
-ActiveRecord::Base.establish_connection :adapter => :nulldb
+ActiveRecord::Base.establish_connection :adapter => :nulldb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: norton
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Larry Zhao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -81,19 +81,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.1
+        version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  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:
+    - - ">="
+      - !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
+  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: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +172,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE
 - LICENSE.txt
@@ -137,11 +180,13 @@ files:
 - Rakefile
 - lib/norton.rb
 - lib/norton/counter.rb
+- lib/norton/helper.rb
 - lib/norton/timed_value.rb
 - lib/norton/timestamp.rb
 - lib/norton/version.rb
 - norton.gemspec
 - spec/norton/counter_spec.rb
+- spec/norton/helper_spec.rb
 - spec/norton/timestamp_spec.rb
 - spec/norton_spec.rb
 - spec/spec_helper.rb
@@ -172,6 +217,7 @@ summary: Provide simple helpers on persist values in redis for performance. Work
   with ActiveRecord.
 test_files:
 - spec/norton/counter_spec.rb
+- spec/norton/helper_spec.rb
 - spec/norton/timestamp_spec.rb
 - spec/norton_spec.rb
 - spec/spec_helper.rb