merit 1.5.0 → 1.6.0

data/test/dummy/app/models/merit/point_rules.rb

@@ -8,15 +8,15 @@ module Merit
 
     def initialize
       # Thanks for voting point
-      score 1, :on => 'comments#vote'
+      score 1, on: 'comments#vote'
 
       # All user's comments earn points
-      score 2, :to => :user_comments, :on => 'comments#vote'
+      score 2, to: :user_comments, on: 'comments#vote'
 
       # Points to voted user
-      score 5, :to => :user, :on => 'comments#vote'
+      score 5, to: :user, on: 'comments#vote'
 
-      score 20, :on => [
+      score 20, on: [
         'comments#create',
         'registrations#update'
       ] do |object|

data/test/dummy/app/models/merit/rank_rules.rb

@@ -15,7 +15,7 @@ module Merit
     def initialize
       # i stars for i chars name
       (1..5).each do |i|
-        set_rank :level => i, :to => User do |user|
+        set_rank level: i, to: User do |user|
           user.name.length == i
         end
       end

data/test/dummy/app/models/user.rb

@@ -3,7 +3,9 @@ class User < ActiveRecord::Base
 
   has_many :comments
 
-  attr_accessible :name
+  if Rails.version < '4'
+    attr_accessible :name
+  end
 
   def show_badges
     badges_uniq = Badge.find_by_id(badge_ids)

data/test/dummy/app/views/admin/users/index.html.erb

@@ -16,7 +16,7 @@
     <td><%= user.points %></td>
     <td><%= link_to 'Show', user %>
     - <%= link_to 'Edit', edit_user_path(user) %>
-    - <%= link_to 'Destroy', user, :confirm => 'Are you sure?', :method => :delete %></td>
+    - <%= link_to 'Destroy', user, data: { :confirm => 'Are you sure?' }, :method => :delete %></td>
   </tr>
 <% end %>
 </table>

data/test/dummy/app/views/comments/index.html.erb

@@ -25,7 +25,7 @@
     </td>
     <td><%= link_to 'Show', comment %></td>
     <td><%= link_to 'Edit', edit_comment_path(comment) %></td>
-    <td><%= link_to 'Destroy', comment, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= link_to 'Destroy', comment, data: { :confirm => 'Are you sure?' }, :method => :delete %></td>
   </tr>
 <% end %>
 </table>

data/test/dummy/app/views/users/index.html.erb

@@ -16,7 +16,7 @@
     <td><%= user.points %></td>
     <td><%= link_to 'Show', user %>
     - <%= link_to 'Edit', edit_user_path(user) %>
-    - <%= link_to 'Destroy', user, :confirm => 'Are you sure?', :method => :delete %></td>
+    - <%= link_to 'Destroy', user, data: { :confirm => 'Are you sure?' }, :method => :delete %></td>
   </tr>
 <% end %>
 </table>

data/test/dummy/config/application.rb

@@ -14,7 +14,7 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-    config.active_record.whitelist_attributes = true
+    # config.active_record.whitelist_attributes = true
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"

data/test/dummy/config/environments/development.rb

@@ -6,9 +6,6 @@ Dummy::Application.configure do
   # since you don't have to restart the webserver when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -21,5 +18,7 @@ Dummy::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
+
+  config.eager_load = false
 end
 

data/test/dummy/config/environments/production.rb

@@ -46,4 +46,6 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  config.eager_load = true
 end

data/test/dummy/config/environments/test.rb

@@ -7,9 +7,6 @@ Dummy::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -32,4 +29,6 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.eager_load = false
 end

data/test/dummy/config/initializers/merit.rb

@@ -3,43 +3,46 @@ Merit.setup do |config|
   # Check rules on each request or in background
   # config.checks_on_each_request = true
 
-  # Define ORM. Could be :active_record (default), :mongo_mapper and :mongoid
+  # Define ORM. Could be:active_record (default), :mongo_mapper and :mongoid
   # config.orm = :active_record
 end
 
 # Create application badges (uses https://github.com/norman/ambry)
 badge_id = 0
 [{
-  :id => (badge_id = badge_id+1),
-  :name        => 'commenter',
-  :description => 'You\'ve participated good in our boards! (level 10)',
-  :level       => 10
+  id: (badge_id = badge_id+1),
+  name: 'commenter',
+  description: 'You\'ve participated good in our boards! (level 10)',
+  level: 10
 }, {
-  :id => (badge_id = badge_id+1),
-  :name        => 'commenter',
-  :description => 'You\'ve participated great in our boards!'
+  id: (badge_id = badge_id+1),
+  name: 'commenter',
+  description: 'You\'ve participated great in our boards!'
 }, {
-  :id => (badge_id = badge_id+1),
-  :name        => 'visited_admin',
-  :description => 'You sneaked in!'
+  id: (badge_id = badge_id+1),
+  name: 'visited_admin',
+  description: 'You sneaked in!'
 }, {
-  :id => (badge_id = badge_id+1),
-  :name        => 'has_commenter_friend',
-  :description => 'Testing badge granting in more than one rule per action, with different targets'
+  id: (badge_id = badge_id+1),
+  name: 'has_commenter_friend',
+  description: 'Testing badge granting in more than one rule per action, with different targets'
 }, {
-  :id => (badge_id = badge_id+1),
-  :name        => 'relevant-commenter',
-  :description => 'You\'ve received 5 votes on a comment.'
+  id: (badge_id = badge_id+1),
+  name: 'relevant-commenter',
+  description: 'You\'ve received 5 votes on a comment.'
 }, {
-  :id => (badge_id = badge_id+1),
-  :name        => 'autobiographer',
-  :description => 'You\'ve edited your name and it\'s above 4 characters! (?)'
+  id: (badge_id = badge_id+1),
+  name: 'autobiographer',
+  description: 'You\'ve edited your name and it\'s above 4 characters! (?)'
 }, {
-  :id => (badge_id = badge_id+1),
-  :name => 'just-registered'
+  id: (badge_id = badge_id+1),
+  name: 'just-registered'
 }, {
-  :id => (badge_id = badge_id+1),
-  :name => 'gossip'
+  id: (badge_id = badge_id+1),
+  name: 'wildcard_badge'
+}, {
+  id: (badge_id = badge_id+1),
+  name: 'gossip'
 }].each do |badge|
   Merit::Badge.create! badge
 end

data/test/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,9 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'f00fe8e4404331c84a9f1d877217c57399e0429ed948843f5d0b5db642cb2ab2c1dc28a17ef7daeecf64b1a4f2b61f7ae4886ab993fb0d7cf65d7b64ba5fbcb1'
+
+if Rails.version < '4'
+  Dummy::Application.config.secret_token = 'f00fe8e4404331c84a9f1d877217c57399e0429ed948843f5d0b5db642cb2ab2c1dc28a17ef7daeecf64b1a4f2b61f7ae4886ab993fb0d7cf65d7b64ba5fbcb1'
+else
+  Dummy::Application.config.secret_key_base = 'f00fe8e4404331c84a9f1d877217c57399e0429ed948843f5d0b5db642cb2ab2c1dc28a17ef7daeecf64b1a4f2b61f7ae4886ab993fb0d7cf65d7b64ba5fbcb1'
+end

data/test/dummy/config/routes.rb

@@ -1,12 +1,15 @@
 Dummy::Application.routes.draw do
   namespace :admin do
-    match '/users' => 'users#index'
+    get '/users' => 'users#index'
+  end
+  namespace :api do
+    get '/users' => 'users#index'
   end
   resources :users, :except => :update
   resources :registrations, :only => :update, :as => :registrations_user
   resources :comments
 
-  match '/comments/:id/vote/:value' => 'comments#vote', :id => /\d+/, :value => /\d+/
+  get '/comments/:id/vote/:value' => 'comments#vote', :id => /\d+/, :value => /\d+/
 
   root :to => 'users#index'
 end

data/test/integration/navigation_test.rb

@@ -3,17 +3,17 @@ require 'test_helper'
 class NavigationTest < ActiveSupport::IntegrationCase
   test 'user sign up should grant badge to itself' do
     visit '/users/new'
-    fill_in 'Name', :with => 'Jack'
+    fill_in 'Name', with: 'Jack'
     assert_difference('Merit::ActivityLog.count') do
       click_button('Create User')
     end
 
-    user = User.where(:name => 'Jack').first
+    user = User.where(name: 'Jack').first
     assert_equal [Merit::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')
+    user = User.create(name: 'test-user')
     assert_equal [], user.badges
 
     badge = Merit::Badge.first
@@ -27,40 +27,48 @@ class NavigationTest < ActiveSupport::IntegrationCase
   end
 
   test 'Remove inexistent badge should do nothing' do
-    user = User.create(:name => 'test-user')
+    user = User.create(name: 'test-user')
     assert_equal [], user.badges
     user.rm_badge 1
     assert_equal [], user.badges
   end
 
   test 'users#index should grant badge multiple times' do
-    user = User.create(:name => 'test-user')
-    visit '/users'
-    visit '/users'
-    visit '/users'
-    gossip = Merit::Badge.by_name('gossip').first
-    assert_equal 3, User.first.badges.count
-    assert_equal [gossip, gossip, gossip], User.first.badges
-
-    # Testing with namespaced controllers
-    visit '/admin/users'
-    visited_admin = Merit::Badge.by_name('visited_admin').first
-    assert_equal 4, User.first.badges.count
-    assert User.first.badges.include?(visited_admin)
+    user = User.create(name: 'test-user')
+
+    # Multiple rule
+    assert_difference 'badges_by_name(user, "gossip").count', 3 do
+      3.times { visit '/users' }
+    end
+
+    # Namespaced controller
+    assert_no_difference 'badges_by_name(user, "visited_admin").count' do
+      visit '/users'
+    end
+    assert_difference 'badges_by_name(user, "visited_admin").count' do
+      visit '/admin/users'
+    end
+
+    # Wildcard controllers
+    assert_difference 'badges_by_name(user, "wildcard_badge").count', 3 do
+      visit '/admin/users'
+      visit '/api/users'
+      visit '/users'
+    end
   end
 
   test 'user workflow should grant some badges at some times' do
     # Commented 9 times, no badges yet
-    user = User.create(:name => 'test-user')
+    user = User.create(name: 'test-user')
     # Create needed friend user object
-    friend = User.create(:name => 'friend')
+    friend = User.create(name: 'friend')
 
     (1..9).each do |i|
       Comment.create(
-        :name    => "Title #{i}",
-        :comment => "Comment #{i}",
-        :user_id => user.id,
-        :votes   => 8
+        name: "Title #{i}",
+        comment: "Comment #{i}",
+        user_id: user.id,
+        votes: 8
       )
     end
     assert user.badges.empty?, 'Should not have badges'
@@ -75,9 +83,9 @@ class NavigationTest < ActiveSupport::IntegrationCase
 
     # Make tenth comment, assert 10-commenter badge granted
     visit '/comments/new'
-    fill_in 'Name', :with => 'Hi!'
-    fill_in 'Comment', :with => 'Hi bro!'
-    fill_in 'User', :with => user.id
+    fill_in 'Name', with: 'Hi!'
+    fill_in 'Comment', with: 'Hi bro!'
+    fill_in 'User', with: user.id
     assert_difference('Merit::ActivityLog.count', 2) do
       click_button('Create Comment')
     end
@@ -86,79 +94,79 @@ class NavigationTest < ActiveSupport::IntegrationCase
     assert_equal [Merit::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
+    relevant_comment = user.comments.where(votes: 8).first
     visit '/comments'
     within("tr#c_#{relevant_comment.id}") do
       click_link '2'
     end
 
     relevant_badge = Merit::Badge.by_name('relevant-commenter').first
-    user_badges    = User.where(:name => 'test-user').first.badges
+    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 = User.where(name: 'test-user').first
     user_badges = user.badges
 
     visit "/users/#{user.id}/edit"
-    fill_in 'Name', :with => 'long_name!'
+    fill_in 'Name', with: 'long_name!'
     click_button('Update User')
 
-    user = User.where(:name => 'long_name!').first
+    user = User.where(name: 'long_name!').first
     autobiographer_badge = Merit::Badge.by_name('autobiographer').first
     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
     visit "/users/#{user.id}/edit"
-    fill_in 'Name', :with => 'abc'
+    fill_in 'Name', with: 'abc'
     assert_difference('Merit::ActivityLog.count', 2) do
       click_button('Update User')
     end
     # Last one is point granting, previous one is badge removing
     assert_equal 'removed', Merit::ActivityLog.all[-2].description
 
-    user = User.where(:name => 'abc').first
+    user = User.where(name: 'abc').first
     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
     User.delete_all
-    user = User.create(:name => 'test-user')
+    user = User.create(name: 'test-user')
     assert_equal 0, user.points, 'User should start with 0 points'
 
     visit "/users/#{user.id}/edit"
-    fill_in 'Name', :with => 'a'
+    fill_in 'Name', with: 'a'
     assert_difference('Merit::ActivityLog.count', 2) do
       click_button('Update User')
     end
 
-    user = User.where(:name => 'a').first
+    user = User.where(name: 'a').first
     assert_equal 20, user.points, 'Updating info should grant 20 points'
 
     visit '/comments/new'
     click_button('Create Comment')
 
-    user = User.where(:name => 'a').first
+    user = User.where(name: 'a').first
     assert_equal 20, user.points, 'Empty comment should grant no points'
 
     visit '/comments/new'
-    fill_in 'Name', :with => 'Hi!'
-    fill_in 'Comment', :with => 'Hi bro!'
-    fill_in 'User', :with => user.id
+    fill_in 'Name', with: 'Hi!'
+    fill_in 'Comment', with: 'Hi bro!'
+    fill_in 'User', with: user.id
     click_button('Create Comment')
 
-    user = User.where(:name => 'a').first
+    user = User.where(name: 'a').first
     assert_equal 20, user.points, 'Commenting should not grant 20 points if name.length <= 4'
 
     visit '/comments/new'
-    fill_in 'Name', :with => 'Hi there!'
-    fill_in 'Comment', :with => 'Hi bro!'
-    fill_in 'User', :with => user.id
+    fill_in 'Name', with: 'Hi there!'
+    fill_in 'Comment', with: 'Hi bro!'
+    fill_in 'User', with: user.id
     click_button('Create Comment')
 
-    user = User.where(:name => 'a').first
+    user = User.where(name: 'a').first
     assert_equal 40, user.points, 'Commenting should grant 20 points if name.length > 4'
 
     visit "/comments/#{Comment.last.id}/vote/4"
@@ -167,15 +175,15 @@ class NavigationTest < ActiveSupport::IntegrationCase
   end
 
   test 'user workflow should grant levels at some times' do
-    user = User.create(:name => 'test-user')
+    user = User.create(name: 'test-user')
     assert user.badges.empty?
 
     # Edit user's name by 2 chars name
     visit "/users/#{user.id}/edit"
-    fill_in 'Name', :with => 'ab'
+    fill_in 'Name', with: 'ab'
     click_button('Update User')
 
-    user = User.where(:name => 'ab').first
+    user = User.where(name: 'ab').first
     assert_equal 0, user.level, "User level should be 0."
     Merit::RankRules.new.check_rank_rules
     user.reload
@@ -183,29 +191,29 @@ class NavigationTest < ActiveSupport::IntegrationCase
 
     # Edit user's name by short name. Doesn't go back to previous rank.
     visit "/users/#{user.id}/edit"
-    fill_in 'Name', :with => 'a'
+    fill_in 'Name', with: 'a'
     click_button('Update User')
 
-    user = User.where(:name => 'a').first
+    user = User.where(name: 'a').first
     Merit::RankRules.new.check_rank_rules
     user.reload
     assert_equal 2, user.level, "User level should be 2."
 
     # Edit user's name by 5 chars name
     visit "/users/#{user.id}/edit"
-    fill_in 'Name', :with => 'abcde'
+    fill_in 'Name', with: 'abcde'
     click_button('Update User')
 
-    user = User.where(:name => 'abcde').first
+    user = User.where(name: 'abcde').first
     Merit::RankRules.new.check_rank_rules
     user.reload
     assert_equal 5, user.level, "User level should be 5."
   end
 
   test 'assigning points to a group of records' do
-    commenter = User.create(:name => 'commenter')
-    comment_1 = commenter.comments.create(:name => 'comment_1', :comment => 'a')
-    comment_2 = commenter.comments.create(:name => 'comment_2', :comment => 'b')
+    commenter = User.create(name: 'commenter')
+    comment_1 = commenter.comments.create(name: 'comment_1', comment: 'a')
+    comment_2 = commenter.comments.create(name: 'comment_2', comment: 'b')
 
     visit comments_path
     # Thanks for voting point, to voted user and it's comments
@@ -218,4 +226,8 @@ class NavigationTest < ActiveSupport::IntegrationCase
     comment_1.reload.points.must_be :==, 2
     comment_2.reload.points.must_be :==, 2
   end
+
+  def badges_by_name(user, name)
+    user.reload.badges.select{|b| b.name == name }
+  end
 end