merit 0.9.4 → 0.9.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merit (0.9.4)
+    merit (0.9.5)
       ambry (~> 0.3.0)
 
 GEM

data/README.md

@@ -4,11 +4,6 @@
 
 [![Build Status](https://secure.travis-ci.org/tute/merit.png?branch=master)](http://travis-ci.org/tute/merit)
 
-
-# Requirements
-
-* ActiveRecord or Mongoid
-
 # Installation
 
 1. Add `gem 'merit'` to your `Gemfile`
@@ -79,9 +74,7 @@ method(s) defined in the `:to` option. Define rules on
 ## Examples
 
 ```ruby
-score 10, :on => [
-  'users#update'
-]
+score 10, :to => :post_creator, :on => 'comments#create'
 
 score 20, :on => [
   'comments#create',
@@ -145,6 +138,7 @@ end
 * :value parameter (for star voting for example) should be configurable
   (depends on params[:value] on the controller).
 * Make fixtures for integration testing (now creating objects on test file!).
+* Rules should be cached? Calling *Rules.new more than once
 
 ---
 

data/app/models/merit_action.rb

@@ -4,44 +4,48 @@ class MeritAction
   attr_accessible :user_id, :action_method, :action_value, :had_errors, :target_model, :target_id, :processed, :log
 
   # Check rules defined for a merit_action
-  def check_rules(defined_rules)
-    action_name = "#{target_model}\##{action_method}"
-
+  def check_rules
     unless had_errors
-      # Check Badge rules
-      if defined_rules[action_name].present?
-        defined_rules[action_name].each do |rule|
-          rule.grant_or_delete_badge(self)
-        end
-      end
+      check_badge_rules
+      check_point_rules
+    end
+    processed!
+  end
+
+  def check_badge_rules
+    defined_rules = Merit::BadgeRules.new.defined_rules["#{target_model}\##{action_method}"]
+    return if defined_rules.nil?
 
-      # Check Point rules
-      actions_to_point = Merit::PointRules.new.actions_to_point
-      if actions_to_point[action_name].present?
-        point_rule = actions_to_point[action_name]
-        point_rule[:to].each do |to|
-          if to == :action_user
-            target = Merit.user_model.find_by_id(user_id)
-            if target.nil?
-              Rails.logger.warn "[merit] no user found to grant points"
-              return
-            end
-          else
-            begin
-              target = target_object.send(to)
-            rescue NoMethodError
-              Rails.logger.warn "[merit] No target_object found on check_rules."
-              return
-            end
+    defined_rules.each do |rule|
+      rule.grant_or_delete_badge(self)
+    end
+  end
+
+  def check_point_rules
+    actions_to_point = Merit::PointRules.new.actions_to_point["#{target_model}\##{action_method}"]
+    return if actions_to_point.nil?
+
+    actions_to_point.each do |point_rule|
+      point_rule[:to].each do |to|
+        if to == :action_user
+          target = Merit.user_model.find_by_id(user_id)
+          if target.nil?
+            Rails.logger.warn "[merit] no user found to grant points"
+            return
+          end
+        else
+          begin
+            target = target_object.send(to)
+          rescue NoMethodError
+            Rails.logger.warn "[merit] No target_object found on check_rules."
+            return
           end
-          target.points += point_rule[:score]
-          target.save
-          log!("points_granted:#{point_rule[:score]}")
         end
+        target.points += point_rule[:score]
+        target.save
+        log!("points_granted:#{point_rule[:score]}")
       end
     end
-
-    processed!
   end
 
   # Action's target object

data/lib/merit/rules_badge.rb

@@ -54,7 +54,7 @@ module Merit
     # Check non processed actions and grant badges if applies
     def check_new_actions
       MeritAction.where(:processed => false).each do |merit_action|
-        merit_action.check_rules(defined_rules)
+        merit_action.check_rules
       end
     end
 

data/lib/merit/rules_points.rb

@@ -6,14 +6,14 @@ module Merit
     # Define rules on certaing actions for giving points
     def score(points, *args, &block)
       options = args.extract_options!
-
-      actions = options[:on].kind_of?(Array) ? options[:on] : [options[:on]]
       options[:to] ||= [:action_user]
-      targets = options[:to].kind_of?(Array) ? options[:to] : [options[:to]]
+
+      actions = Array.wrap(options[:on])
       actions.each do |action|
-        actions_to_point[action] = {
-          :to => targets,
-          :score => points
+        actions_to_point[action] ||= []
+        actions_to_point[action] << {
+          :score => points,
+          :to => Array.wrap(options[:to])
         }
       end
     end
@@ -23,4 +23,4 @@ module Merit
       @actions_to_point ||= {}
     end
   end
-end
+end

data/merit.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.description = "Manage badges, points and rankings (reputation) of resources in a Rails application."
   s.homepage    = "http://github.com/tute/merit"
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
-  s.version     = "0.9.4"
+  s.version     = "0.9.5"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry',  '~> 0.3.0'

data/test/dummy/app/models/merit/point_rules.rb

@@ -7,9 +7,10 @@ module Merit
     include Merit::PointRulesMethods
 
     def initialize
-      score 5, :to => :user, :on => [
-        'comments#vote'
-      ]
+      # Thanks for voting point
+      score 1, :on => 'comments#vote'
+      # Points to voted user
+      score 5, :to => :user, :on => 'comments#vote'
 
       score 20, :on => [
         'comments#create',

data/test/integration/navigation_test.rb

@@ -104,7 +104,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
 
     visit "/comments/#{Comment.last.id}/vote/4"
     user = User.first
-    assert_equal 45, user.points, 'Voting comments should grant 5 points'
+    assert_equal 46, user.points, 'Voting comments should grant 5 points for voted, and 1 point for voting'
   end
 
   test 'user workflow should grant levels at some times' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry