merit 0.7.0 → 0.7.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merit (0.7.0)
+    merit (0.7.1)
       ambry
 
 GEM

data/lib/merit/controller_extensions.rb

@@ -12,7 +12,8 @@ module Merit
           target_id = params[:id]
           # TODO: target_object should be configurable (now it's singularized controller name)
           target_object = instance_variable_get(:"@#{controller_name.singularize}")
-          unless target_id =~ /^[0-9]+$/ # id nil, or string (friendly_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)
           end
 

data/lib/merit/rule.rb

@@ -57,7 +57,7 @@ module Merit
                  begin
                    action.target_object(model_name).send(to)
                  rescue NoMethodError
-                   Rails.logger.warn "[merit] #{action.target_model.singularize}.find(#{action.target_id}) not found, no badges giving today"
+                   Rails.logger.warn "[merit] #{action.target_model.singularize.camelize}.find(#{action.target_id}) not found, no badges giving today"
                    return
                  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.7.0"
+  s.version     = "0.7.1"
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-26 00:00:00.000000000 Z
+date: 2012-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
-  requirement: &70355964823460 !ruby/object:Gem::Requirement
+  requirement: &70152203180420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355964823460
+  version_requirements: *70152203180420
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70355964822720 !ruby/object:Gem::Requirement
+  requirement: &70152203179200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.3
   type: :development
   prerelease: false
-  version_requirements: *70355964822720
+  version_requirements: *70152203179200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70355964822080 !ruby/object:Gem::Requirement
+  requirement: &70152203178280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355964822080
+  version_requirements: *70152203178280
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70355964821480 !ruby/object:Gem::Requirement
+  requirement: &70152203177500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355964821480
+  version_requirements: *70152203177500
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70355964821060 !ruby/object:Gem::Requirement
+  requirement: &70152203176360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355964821060
+  version_requirements: *70152203176360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70355964820640 !ruby/object:Gem::Requirement
+  requirement: &70152203175780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355964820640
+  version_requirements: *70152203175780
 description: Manage badges, points and rankings (reputation) of resources in a Rails
   application.
 email: tutecosta@gmail.com