ohm-tallyable 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MThkM2VkOTljMmQ4ZmIzNzc4YzE0NGZiN2U1ZGNjNWEyZDdhYzU0Mg==
+    Yzk4Mzk5MWIwNzE4NDQ4YWU0MTVkNGJiMWE5NzA3ZjlkMDk2ZTkyYw==
   data.tar.gz: !binary |-
-    NDIwYmEwOWJlYTM3ODA3Y2Y0YmIzYzcxZTg0ZGE4Y2RjMzkxMDIzMA==
+    MDc1MTIxYmNlNmI4ZTIzZmI5NGIxM2U4OTQyYTliM2ZlYzQ0YjFiZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDkxMWE0M2Y3ZWQ3ZTc2OWVlNDMwZTJmZjM3YzhiY2ViYzFjOGU1Y2Q5MjEx
-    NTg0ZWM2YTkzYzM4ZjY5OGNhNmJjY2VlZTBlN2NmNmU5NjNlMDA3NGFiNDA4
-    YzZlYmE5ZjFiZTFiNGNmNGRiYmQzMmI0MDE4Yzc2MmExM2I0ZmE=
+    YWNhNWU3NzdkMDFiMDNiMzgxNGMxYjc3NTI4MzA5YWFmMTY0YTgzYTU3ZTVj
+    YmNiMzMzN2ZkMjA1NDRjMzhmNzc5M2Y5N2E3YjYxZWM4ODZiMWQxYjI3NDFk
+    ODk3YTQwMWE3YTk4MGQwN2JjZDg0M2UwMzMzMzhlODliNDMwYjI=
   data.tar.gz: !binary |-
-    YjdlYmZmZmIxNWE2NGU3NGU1NWNlZGEwZTY1ZDM5NmI4ZmQyMzc5MGQyN2Vm
-    NWQ0MWIwOTM3OTA1MWE3MWEzNWUwNDZkMTFiZTZkMjY4NzAzODMxNzg5NzNk
-    MjAyZDMwMzZiZmVjNzgwODg5YjdhMDE3ZjhmMzIzMDNkOTJlZmE=
+    ZTE1YTlmMWY4YmUwMGE3MThiM2M5ZWYzNmNkZGY4ZGZiNDI4OGM4Mzk2NzUz
+    NjlmMzNhYTQ2Y2YzMzVkYzcwZjJkYjJjYmRhYTU4NWRmYzFjZjdhN2ZiM2Vj
+    ZTZkYTVhYmEwOTQxNjI4YjU1ZTA1NTY3MGZiYjhkN2I0YjI4NDI=

data/.gitignore

@@ -0,0 +1,3 @@
+/pkg
+/doc
+/test/db/*

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+### 0.1.4
+
+ - Fix support for Ohm 1.x and Redis 3.x
+
+### 0.1.3
+
+ - Minor refactoring
+
+### 0.1.1, 0.1.2
+
+ - Style fixes
+
+### 0.1.0
+
+ - Initial release

data/lib/ohm/tallyable.rb

@@ -45,15 +45,30 @@ module Ohm
     end
 
     def self.included(model)
-      model.before(:delete, :_decrement_tallies)
-      model.before(:save, :_decrement_tallies)
-      model.after(:save, :_increment_tallies)
-
+      unless new_callbacks?
+        model.before(:delete, :_decrement_tallies)
+        model.before(:save, :_decrement_tallies)
+        model.after(:save, :_increment_tallies)
+      end
       model.extend(Macros)
     end
 
+    private
+    def self.new_callbacks?
+      Ohm::Callbacks.protected_instance_methods.include?(:before_save)
+    end
+
+    protected
     def _decrement_tallies
-      _update_tallies(-1) { |attribute| read_remote(attribute) }
+      _update_tallies(-1) do |attribute|
+        if respond_to? :read_remote
+          read_remote(attribute)
+        else
+          # ugly, but better than using get and having
+          # to save and restore the old value
+          db.hget(key, attribute)
+        end
+      end
     end
 
     def _increment_tallies
@@ -67,9 +82,25 @@ module Ohm
 
         if (value = yield(attribute))
           key.zincrby(amount, value)
-          key.zrem(value) if key.zscore(value) == 0.0
+          # need to convert zscore to_i because older versions
+          # return a double encoded in a string
+          key.zrem(value) if key.zscore(value).to_i == 0
         end
       end
     end
+
+    if new_callbacks?
+      def before_delete
+        _decrement_tallies
+      end
+
+      def before_update
+        _decrement_tallies
+      end
+
+      def after_save
+        _increment_tallies
+      end
+    end
   end
 end

data/ohm-tallyable.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name        = 'ohm-tallyable'
-  s.version     = '0.1.3'
+  s.version     = '0.1.4'
   s.summary     = "Ohm Tally Plugin"
   s.description = "A tally plugin for Ohm that keeps counts of records for every value of an attribute"
   s.author      = "Federico Bond"
   s.email       = 'federico@educabilia.com'
-  s.files       = Dir["UNLICENSE", "README.md", "Rakefile", "lib/**/*.rb", "*.gemspec", "test/*.*"]
+  s.files       = `git ls-files`.split("\n")
   s.homepage    = 'https://github.com/educabilia/ohm-tallyable'
   s.license     = 'UNLICENSE'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohm-tallyable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Federico Bond
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies: []
 description: A tally plugin for Ohm that keeps counts of records for every value of
   an attribute
@@ -17,11 +17,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- UNLICENSE
+- .gitignore
+- CHANGELOG.md
 - README.md
 - Rakefile
+- UNLICENSE
 - lib/ohm/tallyable.rb
 - ohm-tallyable.gemspec
+- test/db/.empty
 - test/test-tallyable.rb
 - test/test.conf
 homepage: https://github.com/educabilia/ohm-tallyable