merit 1.2.0 → 1.2.1

data/Gemfile.lock

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

data/lib/merit/controller_extensions.rb

@@ -1,7 +1,7 @@
 module Merit
   # Sets up an app-wide after_filter, and inserts merit_action entries if
   # there are defined rules (for badges or points) for current
-  # 'controller_name#action_name'
+  # 'controller_path#action_name'
   module ControllerExtensions
     def self.included(base)
       base.after_filter do |controller|
@@ -12,7 +12,7 @@ module Merit
           :action_method => action_name,
           :action_value  => params[:value],
           :had_errors    => had_errors?,
-          :target_model  => controller_name,
+          :target_model  => controller_path,
           :target_id     => target_id
         ).id
 
@@ -25,7 +25,7 @@ module Merit
     private
 
     def rules_defined?
-      action = "#{controller_name}\##{action_name}"
+      action = "#{controller_path}\##{action_name}"
       AppBadgeRules[action].present? || AppPointRules[action].present?
     end
 
@@ -36,7 +36,7 @@ module Merit
     def target_object
       target_obj = instance_variable_get(:"@#{controller_name.singularize}")
       if target_obj.nil?
-        Rails.logger.warn("[merit] No object found, maybe you need a '@#{controller_name.singularize}' variable in '#{controller_name}_controller'?")
+        Rails.logger.warn("[merit] No object found, maybe you need a '@#{controller_name.singularize}' variable in '#{controller_path}_controller'?")
       end
       target_obj
     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     = '1.2.0'
+  s.version     = '1.2.1'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry',  '~> 0.3.0'

data/test/dummy/app/controllers/admin/users_controller.rb

@@ -0,0 +1,9 @@
+class Admin::UsersController < ApplicationController
+  def index
+    @users = User.all
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @users }
+    end
+  end
+end

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

@@ -29,6 +29,9 @@ module Merit
       # Example rule for multiple badge granting
       grant_on 'users#index', :badge => 'gossip', :multiple => true
 
+      # Example rule for badge granting in namespaced controllers
+      grant_on 'admin/users#index', :badge => 'visited_admin'
+
       # If it has 10 comments, grant commenter-10 badge
       grant_on 'comments#create', :badge => 'commenter', :level => 10 do |comment|
         comment.user.comments.count >= 10

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

@@ -0,0 +1,26 @@
+<h1>Listing users from Admin</h1>
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th>#Comments</th>
+    <th>Badges</th>
+    <th>Points</th>
+  </tr>
+
+<% @users.each do |user| %>
+  <tr>
+    <td><%= user.name %></td>
+    <td><%= user.comments.count %></td>
+    <td><%= user.show_badges %></td>
+    <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>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New User', new_user_path %>

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

@@ -18,6 +18,10 @@ badge_id = 0
   :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        => 'has_commenter_friend',

data/test/dummy/config/routes.rb

@@ -1,4 +1,7 @@
 Dummy::Application.routes.draw do
+  namespace :admin do
+    match '/users' => 'users#index'
+  end
   resources :users, :except => :update
   resources :registrations, :only => :update, :as => :registrations_user
   resources :comments

data/test/integration/navigation_test.rb

@@ -35,8 +35,15 @@ class NavigationTest < ActiveSupport::IntegrationCase
     visit '/users'
     visit '/users'
     visit '/users'
-    visit '/users'
+    gossip = 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 = Badge.by_name('visited_admin').first
     assert_equal 4, User.first.badges.count
+    assert User.first.badges.include?(visited_admin)
   end
 
   test 'user workflow should grant some badges at some times' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -238,6 +238,7 @@ files:
 - test/dummy-mongoid/public/stylesheets/scaffold.css
 - test/dummy-mongoid/script/rails
 - test/dummy/Rakefile
+- test/dummy/app/controllers/admin/users_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/comments_controller.rb
 - test/dummy/app/controllers/registrations_controller.rb
@@ -248,6 +249,7 @@ files:
 - test/dummy/app/models/merit/point_rules.rb
 - test/dummy/app/models/merit/rank_rules.rb
 - test/dummy/app/models/user.rb
+- test/dummy/app/views/admin/users/index.html.erb
 - test/dummy/app/views/comments/_form.html.erb
 - test/dummy/app/views/comments/edit.html.erb
 - test/dummy/app/views/comments/index.html.erb