merit 0.9.0 → 0.9.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merit (0.8.1)
+    merit (0.9.1)
       ambry (~> 0.3.0)
 
 GEM
@@ -35,7 +35,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.7)
-    ambry (0.3.0)
+    ambry (0.3.1)
     arel (3.0.2)
     bson (1.6.2)
     bson_ext (1.6.2)

data/README.md

@@ -139,8 +139,6 @@ end
 
 # To-do list
 
-* Can infer params[:id] = instance_variable.id in create actions, for having
-  the object in the rule method parameter, so we don't need it in controllers.
 * add an error handler for inexistent badges.
 * rails g merit MODEL_NAME shouldn't create general migrations again.
 * Abstract User (rule.rb#51 for instance) into a Merit option.

data/UPGRADING.md

@@ -6,7 +6,7 @@ Adds `allow_multiple` boolean option to `Badge#grant_to` (defaults to
 `false`). If you used this method to grant a badge it will now grant only if
 resource doesn't have the badge.
 
-Use `grant_to resource, :allow_multiple => true` where needed.
+Use `badge.grant_to resource, :allow_multiple => true` where needed.
 
 ## to 0.8.0
 

data/lib/merit/controller_extensions.rb

@@ -9,12 +9,13 @@ module Merit
         badge_rules = BadgeRules.new
         point_rules = PointRules.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)
           target_object = instance_variable_get(:"@#{controller_name.singularize}")
+          # Set target_id from params or from current instance variable
+          target_id = params[:id] || target_object.try(:id)
           # id nil, or string (friendly_id); target_object found
           if target_object.present? && (target_id.nil? || !(target_id =~ /^[0-9]+$/))
-            target_id = target_object.try(:id)
+            target_id = target_object.id
           end
 
           # TODO: value should be configurable (now it's params[:value] set in the controller)

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.0"
+  s.version     = "0.9.1"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry',  '~> 0.3.0'

metadata

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