merit 0.4.0 → 0.4.1

data/{README.markdown → README.md}

@@ -48,6 +48,12 @@ holds. Badges may have levels, and may be temporary. Define rules on
       user.name.present? && user.address.present?
     end
 
+## Grant manually
+
+You may also grant badges "by hand":
+
+    Badge.find(3).grant_to(current_user)
+
 ---
 
 # Defining point rules
@@ -106,14 +112,6 @@ Check for rules on a rake task executed in background like:
 
 ---
 
-# Grant manually
-
-You may also add badges "by hand" from controller actions:
-
-    Badge.find(3).grant_to(current_user)
-
----
-
 # MongoMapper support (experimental)
 
 You may use <tt>merit</tt> with <tt>mongo_mapper</tt> ORM by calling
@@ -123,32 +121,10 @@ installation, and configuring <tt>config.orm = :mongo_mapper</tt> in
 
 ---
 
-# Notes on upgrades
-
-## to 0.4.0
-
-Rankings are now integer attributes on "meritable" models ("<tt>level</tt>"),
-they are not badges anymore. <tt>set_rank</tt> now doesn't accept
-<tt>badge_name</tt>.
-
-## to 0.3.0
-
-Badges data is now stored in <tt>config/initializers/merit.rb</tt> using
-<tt>ambry</tt> syntax (not in the DB anymore, as that table needed to be in
-sync in all development environments).
-
-## to 0.2.0
-
-Added <tt>had_errors</tt> boolean attribute to <tt>merit_actions</tt> table.
-
----
-
 # To-do list
 
 * rescue ActiveRecord::... should depend on ORM used (MongoMapper?)
 * Why 1.8.7 tests are not passing?
-* Ranking should not be badges, so .badges doesn't return them (2-stars
-  shouldn't be badge).
 * :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!).

data/Rakefile

@@ -24,6 +24,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Merit'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/UPGRADING.md

@@ -0,0 +1,16 @@
+# Upgrading
+
+## to 0.4.0
+
+Rankings are now integer attributes (<tt>level</tt>), they are not badges
+anymore. <tt>set_rank</tt> doesn't accept <tt>badge_name</tt> anymore.
+
+## to 0.3.0
+
+Badges data is now stored in <tt>config/initializers/merit.rb</tt> using
+<tt>ambry</tt> syntax (not in the DB anymore, as that table needed to be in
+sync in all development environments).
+
+## to 0.2.0
+
+Added <tt>had_errors</tt> boolean attribute to <tt>merit_actions</tt> table.

data/app/models/merit_action.rb

@@ -26,7 +26,7 @@ class MeritAction
           else
             begin
               target = target_object.send(to)
-            rescue ActiveRecord::RecordNotFound
+            rescue NoMethodError
               Rails.logger.warn "[merit] No target_object found on check_rules."
               return
             end

data/lib/merit/rule.rb

@@ -49,7 +49,7 @@ module Merit
                else
                  begin
                    action.target_object(model_name).send(to)
-                 rescue ActiveRecord::RecordNotFound
+                 rescue NoMethodError
                    Rails.logger.warn "[merit] #{action.target_model.singularize}.find(#{action.target_id}) not found, no badges giving today"
                    return
                  end

data/merit.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.summary     = "General reputation Rails engine."
   s.description = "General reputation Rails engine."
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
-  s.version     = "0.4.0"
+  s.version     = "0.4.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.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
-  requirement: &70321858339760 !ruby/object:Gem::Requirement
+  requirement: &70347082614520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321858339760
+  version_requirements: *70347082614520
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70321858339140 !ruby/object:Gem::Requirement
+  requirement: &70347082613580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321858339140
+  version_requirements: *70347082613580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70321858337900 !ruby/object:Gem::Requirement
+  requirement: &70347082612740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321858337900
+  version_requirements: *70347082612740
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70321858336840 !ruby/object:Gem::Requirement
+  requirement: &70347082371420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321858336840
+  version_requirements: *70347082371420
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70321858330240 !ruby/object:Gem::Requirement
+  requirement: &70347082370560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321858330240
+  version_requirements: *70347082370560
 description: General reputation Rails engine.
 email: tutecosta@gmail.com
 executables: []
@@ -75,8 +75,9 @@ files:
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
-- README.markdown
+- README.md
 - Rakefile
+- UPGRADING.md
 - app/models/badge.rb
 - app/models/merit_action.rb
 - lib/generators/active_record/merit_generator.rb