ohm-tallyable 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.1.5
+
+ - Add `super` calls to callback methods
+ - Improve version handling code
+ - Add retally class method to recompute tallies
+
 ### 0.1.4
 
  - Fix support for Ohm 1.x and Redis 3.x

data/README.md

@@ -10,8 +10,9 @@ A tally plugin for Ohm
 Setup
 -----
 
-1. Include the `Tallyable` module in your model:
+1. Include the `Callbacks` and `Tallyable` modules in your model:
 
+		include Ohm::Callbacks 
 		include Ohm::Tallyable
 
 2. Add a tally to your model with the following line:
@@ -25,7 +26,8 @@ Usage
 
 To query the tallies, use the `leaderboard` class method.
 
-    Post.leaderboard(:category)
+    >> Post.leaderboard(:category)
+    => [["Personal", 2], ["Work", 1]]
 
 
 Advanced Usage

data/Rakefile

@@ -11,17 +11,17 @@ task :run => [:start, :test, :stop]
 
 desc "Start the Redis server"
 task :start do
-    unless File.exists?(REDIS_PID)
-        system "redis-server #{REDIS_CNF}"
-    end
+  unless File.exists?(REDIS_PID)
+    system "redis-server #{REDIS_CNF}"
+  end
 end
 
 desc "Stop the Redis server"
 task :stop do
-    if File.exists?(REDIS_PID)
-        system "kill #{File.read(REDIS_PID)}"
-        File.delete(REDIS_PID)
-    end
+  if File.exists?(REDIS_PID)
+    system "kill #{File.read(REDIS_PID)}"
+    File.delete(REDIS_PID)
+  end
 end
 
 Rake::TestTask.new do |t|

data/lib/ohm/tallyable.rb

@@ -12,8 +12,14 @@ module Ohm
         @tallies ||= {}
       end
 
+      def retally(attribute)
+        raise ArgumentError unless tallies.include?(attribute)
+        db.del(*_tally_keys(attribute))
+        all.each { |e| e.send(:_increment_tallies) }
+      end
+
       def leaderboard(attribute, by=nil)
-        raise ArgumentError if !_has_tally(attribute, by)
+        raise ArgumentError unless _has_tally(attribute, by)
 
         _load_zset(_tally_key(attribute, by))
           .map { |k, v| [k, v.to_i] }
@@ -33,42 +39,58 @@ module Ohm
         key
       end
 
-      if Redis::VERSION.to_i == 2
+      def _tally_keys(attribute)
+        keys = db.keys(_tally_key(attribute))
+        keys.concat(db.keys(_tally_key(attribute)["*"]))
+      end
+
+      if Redis::VERSION.to_i >= 3
         def _load_zset(key)
-          key.zrevrange(0, -1, with_scores: true).each_slice(2)
+          key.zrevrange(0, -1, with_scores: true)
         end
       else
         def _load_zset(key)
-          key.zrevrange(0, -1, with_scores: true)
+          key.zrevrange(0, -1, with_scores: true).each_slice(2)
         end
       end
     end
 
-    def self.included(model)
-      unless new_callbacks?
+    if Ohm::Contrib::VERSION.to_i >= 1
+      def self.included(model)
+        model.extend(Macros)
+      end
+
+      def before_delete
+        _decrement_tallies
+        super
+      end
+      protected :before_delete
+
+      def before_update
+        _decrement_tallies
+        super
+      end
+      protected :before_update
+
+      def after_save
+        _increment_tallies
+        super
+      end
+      protected :after_save
+
+    else
+      def self.included(model)
         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)
+        model.extend(Macros)
+      end
     end
 
-    protected
+  protected
     def _decrement_tallies
-      _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
+      _update_tallies(-1) { |attribute| db.hget(key, attribute) }
     end
 
     def _increment_tallies
@@ -76,6 +98,8 @@ module Ohm
     end
 
     def _update_tallies(amount, &block)
+      return if new?
+
       self.class.tallies.each do |attribute, options|
         by = options[:by] ? {options[:by] => yield(options[:by])} : nil
         key = self.class._tally_key(attribute, by)
@@ -88,19 +112,5 @@ module Ohm
         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,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ohm-tallyable'
-  s.version     = '0.1.4'
+  s.version     = '0.1.5'
   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"

data/test/test-tallyable.rb

@@ -45,6 +45,15 @@ class TallyableTest < Test::Unit::TestCase
     l = Event.leaderboard(:location)
     assert_equal [], l
   end
+
+  def test_retally
+    Event.create(location: "Buenos Aires")
+    Event.create(location: "Rosario")
+    Event.retally(:location)
+
+    l = Event.leaderboard(:location)
+    assert_equal [["Buenos Aires", 2], ["Rosario", 1]], l
+  end
 end
 
 class Post < Ohm::Model
@@ -97,4 +106,16 @@ class TallyableByTest < Test::Unit::TestCase
       Post.leaderboard(:category, foo: "bar")
     end
   end
+
+  def test_retally
+    Post.retally(:category)
+    l = Post.leaderboard(:category, site: "ar")
+    assert_equal [["Personal", 2], ["Work", 1]], l
+  end
+
+  def post_retally_all
+    Post.retally(:category)
+    l = Post.leaderboard(:category, site: "ar")
+    assert_equal [["Personal", 2], ["Work", 1]], l
+  end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ohm-tallyable
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
+  prerelease: 
 platform: ruby
 authors:
 - Federico Bond
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies: []
 description: A tally plugin for Ohm that keeps counts of records for every value of
   an attribute
@@ -30,25 +31,26 @@ files:
 homepage: https://github.com/educabilia/ohm-tallyable
 licenses:
 - UNLICENSE
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ohm Tally Plugin
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Yzk4Mzk5MWIwNzE4NDQ4YWU0MTVkNGJiMWE5NzA3ZjlkMDk2ZTkyYw==
-  data.tar.gz: !binary |-
-    MDc1MTIxYmNlNmI4ZTIzZmI5NGIxM2U4OTQyYTliM2ZlYzQ0YjFiZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YWNhNWU3NzdkMDFiMDNiMzgxNGMxYjc3NTI4MzA5YWFmMTY0YTgzYTU3ZTVj
-    YmNiMzMzN2ZkMjA1NDRjMzhmNzc5M2Y5N2E3YjYxZWM4ODZiMWQxYjI3NDFk
-    ODk3YTQwMWE3YTk4MGQwN2JjZDg0M2UwMzMzMzhlODliNDMwYjI=
-  data.tar.gz: !binary |-
-    ZTE1YTlmMWY4YmUwMGE3MThiM2M5ZWYzNmNkZGY4ZGZiNDI4OGM4Mzk2NzUz
-    NjlmMzNhYTQ2Y2YzMzVkYzcwZjJkYjJjYmRhYTU4NWRmYzFjZjdhN2ZiM2Vj
-    ZTZkYTVhYmEwOTQxNjI4YjU1ZTA1NTY3MGZiYjhkN2I0YjI4NDI=