merit 1.1.2 → 1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merit (1.1.2)
+    merit (1.2.0)
       ambry (~> 0.3.0)
 
 GEM

data/README.md

@@ -51,7 +51,13 @@ grant_on ['users#create', 'users#update'], :badge => 'autobiographer', :temporar
 end
 ```
 
-## Grant manually
+### Check granted badges
+
+```ruby
+current_user.badges # Returns an array of badges
+```
+
+### Grant manually
 
 You may also grant badges "by hand":
 
@@ -96,7 +102,13 @@ score 20, :on => [
 score 15, :on => 'reviews#create', :to => [:reviewer, :reviewed]
 ```
 
-## Score manually
+### Check awarded points
+
+```ruby
+current_user.points # Returns an integer
+```
+
+### Score manually
 
 You may also change user points "by hand":
 

data/UPGRADING.md

@@ -1,6 +1,6 @@
 # Upgrading
 
-## to 1.2.0 (unreleased)
+## to 1.2.0
 
 * `Badge#grant_to(meritable_object)` no longer exists. Use
   `meritable_object.add_badge(badge_id)` (may add badges more than once).

data/lib/merit.rb

@@ -49,9 +49,9 @@ module Merit
       end
 
       ActiveSupport.on_load(:action_controller) do
-        # Load application defined rules
-        ::Merit::AppBadgeRules = BadgeRules.new.defined_rules
-        ::Merit::AppPointRules = PointRules.new.defined_rules
+        # Load application defined rules on application boot up
+        ::Merit::AppBadgeRules = ::Merit::BadgeRules.new.defined_rules
+        ::Merit::AppPointRules = ::Merit::PointRules.new.defined_rules
 
         include Merit::ControllerExtensions
       end

data/lib/merit/controller_extensions.rb

@@ -30,7 +30,7 @@ module Merit
     end
 
     def had_errors?
-      target_object.try(:errors).try(:present?) || false
+      target_object.respond_to?(:errors) && target_object.errors.try(:present?)
     end
 
     def target_object

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

data/test/integration/navigation_test.rb

@@ -7,27 +7,27 @@ class NavigationTest < ActiveSupport::IntegrationCase
     click_button('Create User')
 
     user = User.where(:name => 'Jack').first
-    assert_equal [Badge.by_name('just-registered').first], user.badges.to_a
+    assert_equal [Badge.by_name('just-registered').first], user.badges
   end
 
   test 'User#add_badge should add one badge, #rm_badge should delete one' do
     user = User.create(:name => 'test-user')
-    assert_equal [], user.badges.to_a
+    assert_equal [], user.badges
 
     badge = Badge.first
     user.add_badge badge.id
     user.add_badge badge.id
-    assert_equal [badge, badge], user.badges.to_a
+    assert_equal [badge, badge], user.badges
 
     user.rm_badge badge.id
-    assert_equal [badge], user.reload.badges.to_a
+    assert_equal [badge], user.reload.badges
   end
 
   test 'Remove inexistent badge should do nothing' do
     user = User.create(:name => 'test-user')
-    assert_equal [], user.badges.to_a
+    assert_equal [], user.badges
     user.rm_badge 1
-    assert_equal [], user.badges.to_a
+    assert_equal [], user.badges
   end
 
   test 'users#index should grant badge multiple times' do
@@ -70,8 +70,8 @@ class NavigationTest < ActiveSupport::IntegrationCase
     fill_in 'User', :with => user.id
     click_button('Create Comment')
 
-    assert_equal [Badge.by_name('commenter').by_level(10).first], user.reload.badges.to_a
-    assert_equal [Badge.by_name('has_commenter_friend').first], friend.reload.badges.to_a
+    assert_equal [Badge.by_name('commenter').by_level(10).first], user.reload.badges
+    assert_equal [Badge.by_name('has_commenter_friend').first], friend.reload.badges
 
     # Vote (to 5) a user's comment, assert relevant-commenter badge granted
     relevant_comment = user.comments.where(:votes => 8).first
@@ -81,13 +81,13 @@ class NavigationTest < ActiveSupport::IntegrationCase
     end
 
     relevant_badge = Badge.by_name('relevant-commenter').first
-    user_badges    = User.where(:name => 'test-user').first.badges.to_a
+    user_badges    = User.where(:name => 'test-user').first.badges
     assert user_badges.include?(relevant_badge), "User badges: #{user.badges.collect(&:name).inspect} should contain relevant-commenter badge."
 
     # Edit user's name by long name
     # tests ruby code in grant_on is being executed, and gives badge
     user = User.where(:name => 'test-user').first
-    user_badges = user.badges.to_a
+    user_badges = user.badges
 
     visit "/users/#{user.id}/edit"
     fill_in 'Name', :with => 'long_name!'
@@ -95,7 +95,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
 
     user = User.where(:name => 'long_name!').first
     autobiographer_badge = Badge.by_name('autobiographer').first
-    assert user.badges.to_a.include?(autobiographer_badge), "User badges: #{user.badges.collect(&:name).inspect} should contain autobiographer badge."
+    assert user.badges.include?(autobiographer_badge), "User badges: #{user.badges.collect(&:name).inspect} should contain autobiographer badge."
 
     # Edit user's name by short name
     # tests ruby code in grant_on is being executed, and removes badge
@@ -104,7 +104,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
     click_button('Update User')
 
     user = User.where(:name => 'abc').first
-    assert !user.badges.to_a.include?(autobiographer_badge), "User badges: #{user.badges.collect(&:name).inspect} should remove autobiographer badge."
+    assert !user.badges.include?(autobiographer_badge), "User badges: #{user.badges.collect(&:name).inspect} should remove autobiographer badge."
   end
 
   test 'user workflow should add up points at some times' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -321,9 +321,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: General reputation Rails engine.
 test_files: []
-has_rdoc: