merit 0.2.0 → 0.2.1

data/README.rdoc

@@ -28,6 +28,8 @@ Define rules on +app/models/merit_badge_rules.rb+:
 * :+to+: method name over target_object which obtains user to badge.
 * :+temporary+ (boolean): if the condition doesn't hold and the receiver had
   the badge, it gets removed. +false+ by default (badges are kept forever).
+* :+model_name+ (string): when controller's name differs from the model being
+  worked (like RegistrationsController for User model).
 * &+block+
   * empty (always grants)
   * a block which evaluates to boolean (recieves target object as parameter)
@@ -125,6 +127,8 @@ To run the test application inside this gem follow:
 = To-do list
 
 * Test points granting with different options.
+* Test model_name attribute for badge_rules.
+* Add model_name option on rank and point rules.
 * Ranking should not be badges, so .badges doesn't return them (2-stars shouldn't be badge).
 * grep -r 'FIXME\|TODO' .
 * :value parameter (for star voting for example) should be configurable (depends

data/app/models/merit_action.rb

@@ -38,9 +38,10 @@ class MeritAction < ActiveRecord::Base
   end
 
   # Action's target object
-  def target_object
-    klass = target_model.singularize.camelize.constantize
-    klass.find_by_id(target_id)
+  def target_object(model_name = nil)
+    # Grab custom model_name from Rule, or target_model from MeritAction triggered
+    klass = model_name || target_model.singularize
+    klass.camelize.constantize.find_by_id(target_id)
   end
 
   # Mark merit_action as processed

data/lib/generators/merit/templates/merit_badge_rules.rb

@@ -33,7 +33,7 @@ class MeritBadgeRules
     # end
 
     # Changes his name by one wider than 4 chars (arbitrary ruby code case)
-    # grant_on 'users#update', :badge => 'autobiographer', :temporary => true do |user|
+    # grant_on 'registrations#update', :badge => 'autobiographer', :temporary => true, :model_name => 'User' do |user|
     #   user.name.length > 4
     # end
   end

data/lib/merit/controller_extensions.rb

@@ -10,7 +10,7 @@ module Merit
         point_rules = ::MeritPointRules.new
         if badge_rules.defined_rules[action].present? || point_rules.actions_to_point[action].present?
           target_id = params[:id]
-          # TODO: target_object should be configurable (now it's singularized controller name)
+          # TODO: target_object should be configurable (now it's singularized controller name) // Should be using model_name? Only for badges now
           target_object = instance_variable_get(:"@#{controller_name.singularize}")
           unless target_id =~ /^[0-9]+$/ # id nil, or string (friendly_id)?
             target_id = target_object.try(:id)

data/lib/merit/rule.rb

@@ -2,7 +2,7 @@ module Merit
   # Rules has a badge name and level, a target to badge, a conditions block
   # and a temporary option.
   class Rule
-    attr_accessor :badge_name, :level, :to, :temporary, :block
+    attr_accessor :badge_name, :level, :to, :temporary, :block, :model_name
 
     # Does this rule's condition block apply?
     def applies?(target_obj = nil)
@@ -38,7 +38,7 @@ module Merit
     # then remove it.
     def grant_or_delete_badge(action)
       if sash = sash_to_badge(action)
-        if applies? action.target_object
+        if applies? action.target_object(model_name)
           badge.grant_to sash
         elsif temporary?
           badge.delete_from sash
@@ -54,10 +54,10 @@ module Merit
                when :action_user
                  User.find_by_id(action.user_id) # _by_id doens't raise ActiveRecord::RecordNotFound
                when :itself
-                 action.target_object
+                 action.target_object(model_name)
                else
                  begin
-                   action.target_object.send(to)
+                   action.target_object(model_name).send(to)
                  rescue
                    Rails.logger.warn "[merit] #{action.target_model.singularize}.find(#{action.target_id}) not found, no badges giving today"
                    return

data/lib/merit/rules_badge.rb

@@ -40,6 +40,7 @@ module Merit
       rule.level      = options[:level]
       rule.to         = options[:to] || :action_user
       rule.temporary  = options[:temporary] || false
+      rule.model_name = options[:model_name] || action.split('#')[0]
       rule.block      = block
 
       actions = action.kind_of?(String) ? [action] : action

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000 Z
 dependencies: []
 description: General reputation Rails engine.
 email: tutecosta@gmail.com