merit 0.2.2 → 0.2.4

data/README.rdoc

@@ -26,10 +26,10 @@ Define rules on +app/models/merit_badge_rules.rb+:
 * :+badge+ for badge name
 * :+level+ for badge level
 * :+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).
+* :+temporary+ (boolean): if the condition doesn't hold and the receiver had
+  the badge, it gets removed. +false+ by default (badges are kept forever).
 * &+block+
   * empty (always grants)
   * a block which evaluates to boolean (recieves target object as parameter)
@@ -117,11 +117,11 @@ Added +had_errors+ boolean attribute to +merit_actions+ table.
 = Test application
 
 To run the test application inside this gem follow:
-1. cd test/dummy
-2. rails g merit:install
-3. rails g merit user
-4. rake db:migrate ; rake db:seed
-5. rails s
+  cd test/dummy
+  rails g merit:install
+  rails g merit user
+  rake db:migrate ; rake db:seed
+  rails s
 
 
 = To-do list

data/lib/merit/rules_badge.rb

@@ -35,15 +35,16 @@ module Merit
     def grant_on(action, *args, &block)
       options = args.extract_options!
 
+      actions = action.kind_of?(String) ? [action] : action
+
       rule = Rule.new
       rule.badge_name = options[:badge]
       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.model_name = options[:model_name] || actions[0].split('#')[0]
       rule.block      = block
 
-      actions = action.kind_of?(String) ? [action] : action
       actions.each do |action|
         defined_rules[action] ||= []
         defined_rules[action] << rule
@@ -62,4 +63,4 @@ module Merit
       @defined_rules ||= {}
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors: