merit 1.3.1 → 1.4.0

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    merit (1.3.1)
+    merit (1.4.0)
       ambry (~> 0.3.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.2.3)
       actionpack (= 3.2.3)
@@ -63,7 +63,13 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    metaclass (0.0.1)
     mime-types (1.18)
+    minitest (4.7.0)
+    minitest-spec (0.0.2.1)
+      minitest (>= 3.0)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
     mongo (1.6.2)
       bson (~> 1.6.2)
     mongoid (2.0.2)
@@ -131,6 +137,9 @@ DEPENDENCIES
   capybara
   haml
   merit!
+  minitest
+  minitest-spec
+  mocha (= 0.13.3)
   mongoid (~> 2.0.0)
   rails (~> 3.2.3)
   simplecov

data/README.md

@@ -1,8 +1,9 @@
 # Merit Gem: Reputation rules (badges, points and rankings) for Rails applications
 
-![Merit](http://i567.photobucket.com/albums/ss118/DeuceBigglebags/th_nspot26_300.jpg)
+![Merit gem](http://i567.photobucket.com/albums/ss118/DeuceBigglebags/th_nspot26_300.jpg)
 
 [![Build Status](https://travis-ci.org/tute/merit.png?branch=master)](http://travis-ci.org/tute/merit)
+[![Code Climate](https://codeclimate.com/github/tute/merit.png)](https://codeclimate.com/github/tute/merit)
 
 # Installation
 
@@ -26,7 +27,7 @@ holds. Badges may have levels, and may be temporary. Define rules on
 * `'controller#action'` string (similar to Rails routes)
 * `:badge` for badge name
 * `:level` for badge level
-* `:to` method name over target_object which obtains object to badge
+* `:to` method name over target_object which obtains object(s) to badge
 * `:model_name` (string) define controller's name if it differs from
   the model (like `RegistrationsController` for `User` model).
 * `:multiple` (boolean) badge may be granted multiple times
@@ -67,6 +68,9 @@ Badge.last_granted
 
 # List 20 badge grants in the last week
 Badge.last_granted(since_date: 1.week.ago, limit: 20)
+
+# Get related entries of a given badge (unreleased)
+Badge.find(1).users
 ```
 
 ---
@@ -165,3 +169,6 @@ end
 
 * Should namespace Badge, BadgesSash and Sash into Merit module.
 * Move level from meritable model into Sash
+* Could have a Merit::Action - Activity - {BadgesSash|Merit::Score::Point}
+  join model with datetimes to serve as "log"
+* FIXMES and TODOS.

data/TESTING.txt

@@ -1,3 +1,7 @@
+# run tests
+rake
+
+# Or spin up self contained testing Rails application
 cd test/dummy
 rails g merit:install # n's for not overriding already defined badges & rules
 n
@@ -5,12 +9,7 @@ n
 n
 n
 rails g merit user
-rake db:migrate ; rake db:seed
+rake db:migrate db:seed
 
 # see it in the browser
 rails server
-
-# or run tests
-cd ../..
-rake
-ORM=mongoid rake test

data/UPGRADING.md

@@ -1,5 +1,15 @@
 # Upgrading
 
+## 1.4.0
+
+* Removed `BadgesSash#set_notified!` undocumented method from code base.
+* `:to` option for points and badges granting may now return an array of
+  objects. For instance:
+  ```ruby
+  # All user's comments earn points
+  score 2, to: :user_comments, on: 'comments#vote'
+  ```
+
 ## to 1.3.0
 
 Adds two methods meant to display a leaderboard.

data/app/models/badge.rb

@@ -23,19 +23,30 @@ class Badge
     end
   end
 
-  def self.find_by_name_and_level(name, level)
-    badges = Badge.by_name(name)
-    badges = badges.by_level(level) unless level.nil?
-    if !(badge = badges.first)
-      raise ::Merit::BadgeNotFound, "No badge '#{name}'#{level.nil? ? '' : " with level #{level}"} found. Define it in 'config/initializers/merit.rb'."
+  class << self
+    def find_by_name_and_level(name, level)
+      badges = Badge.by_name(name)
+      badges = badges.by_level(level) unless level.nil?
+      if !(badge = badges.first)
+        raise ::Merit::BadgeNotFound, "No badge '#{name}'#{level.nil? ? '' : " with level #{level}"} found. Define it in 'config/initializers/merit.rb'."
+      end
+      badge
+    end
+
+    # Last badges granted
+    def last_granted(options = {})
+      options[:since_date] ||= 1.month.ago
+      options[:limit]      ||= 10
+      BadgesSash.last_granted(options)
     end
-    badge
-  end
 
-  # Last badges granted
-  def self.last_granted(options = {})
-    options[:since_date] ||= 1.month.ago
-    options[:limit]      ||= 10
-    BadgesSash.last_granted(options)
+    # Defines Badge#meritable_models method, to get related
+    # entries with certain badge. For instance, Badge.find(3).users
+    def _define_related_entries_method(meritable_class_name)
+      define_method(:"#{meritable_class_name.underscore.pluralize}") do
+        sashes = BadgesSash.where(badge_id: self.id).pluck(:sash_id)
+        meritable_class_name.constantize.where(sash_id: sashes)
+      end
+    end
   end
 end

data/app/models/merit/action.rb

@@ -33,59 +33,24 @@ module Merit
       self.update_attribute :log, "#{self.log}#{str}|"[0,240]
     end
 
-    def target_object(model_name = nil)
-      # Grab custom model_name from Rule, or target_model from Merit::Action triggered
-      klass = model_name || target_model
-      klass.singularize.camelize.constantize.find_by_id(target_id)
-    rescue => e
-      Rails.logger.warn "[merit] no target_obj found: #{e}"
-    end
-
     private
 
     def check_rules(rules_array, badges_or_points)
       rules_array.each do |rule|
-        judge = Judge.new sash_to_badge(rule), rule, :action => self
+        judge = Judge.new sashes_to_badge(rule), rule, :action => self
         judge.send :"apply_#{badges_or_points}"
       end
     end
 
     # Subject to badge: source_user or target.user?
-    def sash_to_badge(rule)
-      if rule.to == :itself
-        target = target_object(rule.model_name)
-      else
-        target = target(rule.to)
-      end
-      target.try(:_sash)
-    end
-
-    def target(to)
-      (to == :action_user) ? action_user : other_target(to)
+    def sashes_to_badge(rule)
+      SashFinder.find(rule, self)
     end
 
     def action_str
       "#{target_model}\##{action_method}"
     end
 
-    def action_user
-      begin
-        Merit.user_model.find(user_id)
-      rescue ActiveRecord::RecordNotFound
-        Rails.logger.warn "[merit] no #{Merit.user_model} found with id #{user_id}"
-        return
-      end
-    end
-
-    def other_target(to)
-      begin
-        target_object.send(to)
-      rescue NoMethodError
-        Rails.logger.warn "[merit] NoMethodError on '#{target_object.inspect}.#{to}' (called from Merit::Action#other_target)"
-        return
-      end
-    end
-
     # Mark merit_action as processed
     def processed!
       self.processed = true

data/lib/merit/base_target_finder.rb

@@ -0,0 +1,22 @@
+module Merit
+  class BaseTargetFinder
+
+    def self.find(*args)
+      self.new(*args).find
+    end
+
+    def initialize(rule, action)
+      @rule = rule
+      @action = action
+    end
+
+    def find
+      klass_name = (@rule.model_name || @action.target_model).singularize
+      klass = klass_name.camelize.constantize
+      klass.find_by_id @action.target_id
+    rescue => e
+      Rails.logger.warn "[merit] no target found: #{e}. #{caller.first}"
+    end
+
+  end
+end

data/lib/merit/judge.rb

@@ -1,9 +1,9 @@
 module Merit
   class Judge
-    def initialize(sash, rule, options = {})
-      @sash = sash
+    def initialize(sashes, rule, options = {})
+      @sashes = sashes
       @rule = rule
-      # FIXME: Too much context:
+      # FIXME: Too much context?
       # A Judge should apply reputation independently of the action
       @action = options[:action]
     end
@@ -12,38 +12,40 @@ module Merit
     # then remove it.
     def apply_badges
       if rule_applies?
-        grant_badge if new_or_multiple?
+        grant_badges if new_or_multiple?
       else
-        remove_badge if @rule.temporary
+        remove_badges if @rule.temporary
       end
     end
 
     def apply_points
       return unless rule_applies?
-      @sash.add_points @rule.score, @action.inspect[0..240]
+      @sashes.each do |sash|
+        sash.add_points @rule.score, @action.inspect[0..240]
+      end
       @action.log_activity "points_granted:#{@rule.score}"
     end
 
     private
 
-    def grant_badge
-      @sash.add_badge(badge.id)
+    def grant_badges
+      @sashes.each { |sash| sash.add_badge badge.id }
       to_action_user = (@rule.to.to_sym == :action_user ? '_to_action_user' : '')
       @action.log_activity "badge_granted#{to_action_user}:#{badge.id}"
     end
 
-    def remove_badge
-      @sash.rm_badge(badge.id)
+    def remove_badges
+      @sashes.each { |sash| sash.rm_badge badge.id }
       @action.log_activity "badge_removed:#{badge.id}"
     end
 
     def new_or_multiple?
-      !@sash.badge_ids.include?(badge.id) || @rule.multiple
+      !@sashes.map(&:badge_ids).include?(badge.id) || @rule.multiple
     end
 
-    # FIXME: Too tightly coupled three objects
     def rule_applies?
-      @rule.applies? @action.target_object(@rule.model_name)
+      rule_object = BaseTargetFinder.find(@rule, @action)
+      @rule.applies? rule_object
     end
 
     def badge

data/lib/merit/model_additions.rb

@@ -11,6 +11,7 @@ module Merit
 
       _merit_orm_specific_config
       _merit_delegate_methods_to_sash
+      _merit_define_badge_related_entries_method
       _merit_sash_initializer
     end
 
@@ -38,6 +39,11 @@ module Merit
       end
     end
 
+    def _merit_define_badge_related_entries_method
+      meritable_class_name = caller[1][/`.*'/][8..-3]
+      Badge._define_related_entries_method(meritable_class_name)
+    end
+
     # _sash initializes a sash if doesn't have one yet.
     # From Rails 3.2 we can override association methods to do so
     # transparently, but merit supports Rails ~> 3.0.0. See:

data/lib/merit/models/active_record/badges_sash.rb

@@ -12,10 +12,4 @@ class BadgesSash < ActiveRecord::Base
   def badge
     Badge.find(badge_id)
   end
-
-  # To be used in the application, mark badge granting as notified to user
-  def set_notified!
-    self.notified_user = true
-    save
-  end
 end

data/lib/merit/sash_finder.rb

@@ -0,0 +1,11 @@
+module Merit
+  class SashFinder
+    def self.find(rule, action)
+      targets(rule, action).map(&:_sash)
+    end
+
+    def self.targets(rule, action)
+      TargetFinder.find(rule, action).compact
+    end
+  end
+end

data/lib/merit/target_finder.rb

@@ -0,0 +1,42 @@
+module Merit
+  class TargetFinder < Struct.new(:rule, :action)
+    def self.find(*args)
+      self.new(*args).find
+    end
+
+    def find
+      target = case rule.to
+               when :itself; base_target
+               when :action_user; action_user
+               else; other_target
+               end
+      Array.wrap(target)
+    end
+
+    private
+
+    def base_target
+      BaseTargetFinder.find rule, action
+    end
+
+    def action_user
+      user = Merit.user_model.find_by_id action.user_id
+      if user.nil?
+        user_model = Merit.user_model
+        message = "[merit] no #{user_model} found with id #{action.user_id}"
+        Rails.logger.warn message
+      end
+      user
+    end
+
+    def other_target
+      base_target.send rule.to
+    rescue NoMethodError
+      message = "[merit] NoMethodError on"
+      message << " `#{base_target.class.name}##{rule.to}`"
+      message << " (called from Merit::TargetFinder#other_target)"
+      Rails.logger.warn message
+    end
+
+  end
+end

data/lib/merit.rb

@@ -5,6 +5,9 @@ require 'merit/rules_rank_methods'
 require 'merit/controller_extensions'
 require 'merit/model_additions'
 require 'merit/judge'
+require 'merit/sash_finder'
+require 'merit/base_target_finder'
+require 'merit/target_finder'
 
 module Merit
   # Check rules on each request

data/merit.gemspec

@@ -4,15 +4,21 @@ 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.3.1'
+  s.version     = '1.4.0'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
+
+  s.required_ruby_version = '>= 1.9.2'
+
   s.add_dependency 'ambry',  '~> 0.3.0'
   s.add_development_dependency 'rails', '~> 3.2.3'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'haml'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest-spec'
+  s.add_development_dependency 'mocha', '0.13.3'
   # Testing with Mongoid
   s.add_development_dependency 'bson_ext'
   s.add_development_dependency 'mongoid', '~> 2.0.0'

data/test/base_target_finder_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+
+describe Merit::BaseTargetFinder do
+
+  describe '#find' do
+    describe 'rule has a model_name' do
+      it "should prioritize the rule's model name" do
+        rule = Merit::Rule.new
+        rule.to = :itself
+        rule.model_name = 'comment'
+        action = Merit::Action.new(target_model: 'users', target_id: 2)
+        comment = Comment.new
+
+        Comment.stubs(:find_by_id).with(2).returns(comment)
+
+        finder = Merit::BaseTargetFinder.new(rule, action)
+        collection = finder.find
+        collection.must_be :==, comment
+      end
+    end
+
+    describe 'rule has no model_name' do
+      it "should fall back to the action#target_model" do
+        rule = Merit::Rule.new
+        rule.to = :itself
+        action = Merit::Action.new(target_model: 'users', target_id: 3)
+        user = Comment.new(id: 3)
+
+        User.stubs(:find_by_id).with(3).returns(user)
+
+        finder = Merit::BaseTargetFinder.new(rule, action)
+        finder.find.must_be :==, user
+      end
+    end
+
+    describe 'when the targetted class is not meritable' do
+      it 'should warn and return' do
+        rule = Merit::Rule.new
+        rule.to = :itself
+        rule.model_name = 'registrations'
+        action = Merit::Action.new(target_model: 'users', target_id: 220)
+        comment = Comment.new
+
+        finder = Merit::BaseTargetFinder.new(rule, action)
+        Rails.logger.expects(:warn)
+        finder.find.must_be_nil
+      end
+    end
+  end
+
+end

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

@@ -1,10 +1,13 @@
 class Comment < ActiveRecord::Base
+  has_merit
   belongs_to :user
 
   attr_accessible :name, :comment, :user_id, :votes
 
   validates :name, :comment, :user_id, :presence => true
 
+  delegate :comments, :to => :user, :prefix => true
+
   def friend
     User.find_by_name('friend')
   end

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

@@ -9,6 +9,10 @@ module Merit
     def initialize
       # Thanks for voting point
       score 1, :on => 'comments#vote'
+
+      # All user's comments earn points
+      score 2, :to => :user_comments, :on => 'comments#vote'
+
       # Points to voted user
       score 5, :to => :user, :on => 'comments#vote'
 

data/test/dummy/db/migrate/20130321082817_add_fields_to_comments.rb

@@ -0,0 +1,11 @@
+class AddFieldsToComments < ActiveRecord::Migration
+  def self.up
+    add_column :comments, :sash_id, :integer
+    add_column :comments, :level, :integer, :default => 0
+  end
+
+  def self.down
+    remove_column :comments, :sash_id
+    remove_column :comments, :level
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121013174256) do
+ActiveRecord::Schema.define(:version => 20130321082817) do
 
   create_table "badges_sashes", :force => true do |t|
     t.integer  "badge_id"
@@ -31,6 +31,8 @@ ActiveRecord::Schema.define(:version => 20121013174256) do
     t.integer  "votes",      :default => 0
     t.datetime "created_at",                :null => false
     t.datetime "updated_at",                :null => false
+    t.integer  "sash_id"
+    t.integer  "level",      :default => 0
   end
 
   create_table "merit_actions", :force => true do |t|

data/test/integration/navigation_test.rb

@@ -18,6 +18,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
     user.add_badge badge.id
     user.add_badge badge.id
     assert_equal [badge, badge], user.badges
+    assert_equal [user], badge.users
 
     user.rm_badge badge.id
     assert_equal [badge], user.reload.badges
@@ -190,4 +191,18 @@ class NavigationTest < ActiveSupport::IntegrationCase
     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')
+
+    visit comments_path
+    within "tr#c_#{comment_2.id}" do
+      click_link '1'
+    end
+
+    comment_1.reload.points.must_be :==, 2
+    comment_2.reload.points.must_be :==, 2
+  end
 end

data/test/merit_unit_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class MeritUnitTest < ActiveSupport::TestCase
-  test "Rule#applies? should depend on provided block" do
+  test "Rule#applies? depends on provided block" do
     rule = Merit::Rule.new
     assert rule.applies?, 'empty conditions should make rule apply'
 
@@ -13,48 +13,56 @@ class MeritUnitTest < ActiveSupport::TestCase
     assert rule.applies?(str), 'block should make rule apply'
 
     rule.block = lambda{|obj| true }
-    assert !rule.applies?, 'block which expects object should return false if no argument'
+    assert !rule.applies?, 'block needs parameter for rule to pass'
   end
 
-  test "Rule#badge should get related badge or raise Merit::BadgeNotFound" do
+  test "Rule#badge gets related badge or raises exception" do
     rule = Merit::Rule.new
     rule.badge_name = 'inexistent'
-    assert_raise Merit::BadgeNotFound do
-      rule.badge
-    end
+    assert_raise(Merit::BadgeNotFound) { rule.badge }
 
-    badge = Badge.create(:id => 98, :name => 'test-badge-98')
+    badge = Badge.create(id: 98, name: 'test-badge-98')
     rule.badge_name = badge.name
     assert_equal Badge.find(98), rule.badge
   end
 
   test "Merit::Action#log_activity doesn't grow larger than 240 chars" do
+    msg = 'a' * 250
     m = Merit::Action.create
-    m.log_activity('a' * 250)
-    assert m.log.length <= 240, 'Log shouldn\'t grow larger than 240 chars'
+    m.log_activity(msg)
+
+    valid_lengths = msg.length > 240 && m.log.length <= 240
+    assert valid_lengths, 'Log shouldn\'t grow larger than 240 chars'
   end
 
-  test "Extends only meritable ActiveRecord models" do
-    class MeritableModel < ActiveRecord::Base
+  test "extends only meritable ActiveRecord models" do
+    class User < ActiveRecord::Base
       def self.columns; @columns ||= []; end
       has_merit
     end
-    class OtherModels < ActiveRecord::Base
+    class Fruit < ActiveRecord::Base
       def self.columns; @columns ||= []; end
     end
-    assert MeritableModel.method_defined?(:points), 'Meritable model should respond to merit methods'
-    assert !OtherModels.method_defined?(:points), 'Other models shouldn\'t respond to merit methods'
+
+    assert User.method_defined?(:points), 'has_merit adds methods'
+    assert !Fruit.method_defined?(:points), 'other models aren\'t extended'
   end
 
-  # Do we need this non-documented attribute?
-  test "BadgesSash#set_notified! sets boolean attribute" do
-    badge_sash = BadgesSash.new
-    assert !badge_sash.notified_user
-    badge_sash.set_notified!
-    assert badge_sash.notified_user
+  test "Badges get 'related_models' methods" do
+    class Soldier < ActiveRecord::Base
+      def self.columns; @columns ||= []; end
+      has_merit
+    end
+    class Player < ActiveRecord::Base
+      def self.columns; @columns ||= []; end
+      has_merit
+    end
+    assert Badge.method_defined?(:soldiers), 'Badge#soldiers should be defined'
+    assert Badge.method_defined?(:players), 'Badge#players should be defined'
   end
 
   test "Badge#last_granted returns recently granted badges" do
+    # Create sashes, badges and badges_sashes
     sash = Sash.create
     badge = Badge.create(id: 20, name: 'test-badge-21')
     sash.add_badge badge.id
@@ -64,6 +72,7 @@ class MeritUnitTest < ActiveSupport::TestCase
     sash.add_badge badge.id
     BadgesSash.last.update_attribute :created_at, 15.days.ago
 
+    # Test method options
     assert_equal Badge.last_granted(since_date: Time.now), []
     assert_equal Badge.last_granted(since_date: 1.week.ago), [badge]
     assert_equal Badge.last_granted(since_date: 2.weeks.ago).count, 2
@@ -71,24 +80,25 @@ class MeritUnitTest < ActiveSupport::TestCase
   end
 
   test "Merit::Score.top_scored returns scores leaderboard" do
+    # Create sashes and add points
     sash_1 = Sash.create
     sash_1.add_points(10); sash_1.add_points(10)
     sash_2 = Sash.create
     sash_2.add_points(5); sash_2.add_points(5)
 
+    # Test method options
     assert_equal Merit::Score.top_scored(table_name: :sashes),
-      [{"sash_id"=>1, "sum_points"=>20, 0=>1, 1=>20},
-       {"sash_id"=>2, "sum_points"=>10, 0=>2, 1=>10}]
+      [{"sash_id"=>sash_1.id, "sum_points"=>20, 0=>1, 1=>20},
+       {"sash_id"=>sash_2.id, "sum_points"=>10, 0=>2, 1=>10}]
     assert_equal Merit::Score.top_scored(table_name: :sashes, limit: 1),
-      [{"sash_id"=>1, "sum_points"=>20, 0=>1, 1=>20}]
+      [{"sash_id"=>sash_1.id, "sum_points"=>20, 0=>1, 1=>20}]
   end
 
-  test 'unknown ranking should raise merit exception' do
+  test 'unknown ranking raises exception' do
     class WeirdRankRules
       include Merit::RankRulesMethods
       def initialize
-        set_rank :level => 1, :to => User, :level_name => :clown do |user|
-        end
+        set_rank level: 1, to: User, level_name: :clown
       end
     end
     assert_raises Merit::RankAttributeNotDefined do

data/test/sash_finder_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+describe Merit::SashFinder do
+
+  it 'should return an array of sashes of the target objects' do
+    sash_1 = Sash.new
+    user_1 = User.new(:_sash => sash_1)
+    user_1.stubs(:_sash).returns(sash_1)
+
+    sash_2 = Sash.new
+    user_2 = User.new
+    user_2.stubs(:_sash).returns(sash_2)
+
+    object_without_sash = OpenStruct.new
+
+    # TODO: With stub we are not exercising compact
+    # users = [user_1, user_2, object_without_sash]
+    users = [user_1, user_2]
+
+    rule = Merit::Rule.new
+    action = Merit::Action.new
+
+    Merit::SashFinder.stubs(:targets).returns(users)
+    sashes = Merit::SashFinder.find(rule, action)
+    sashes.count.must_be :==, 2
+    sashes.must_include sash_1
+    sashes.must_include sash_2
+  end
+
+end

data/test/support/integration_case.rb

@@ -2,4 +2,4 @@
 class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
   include Capybara::DSL
   include Rails.application.routes.url_helpers
-end
+end

data/test/target_finder_test.rb

@@ -0,0 +1,94 @@
+require 'test_helper'
+
+describe Merit::TargetFinder do
+
+  describe '#find' do
+    describe 'rule#to is :itself' do
+      it 'should return the base target' do
+        rule = Merit::Rule.new
+        rule.to = :itself
+        action = Merit::Action.new
+
+        comment = Comment.new
+
+        Merit::BaseTargetFinder.
+          stubs(:find).with(rule, action).
+          returns(comment)
+
+        finder = Merit::TargetFinder.new(rule, action)
+        collection = finder.find
+        collection.size.must_be :==, 1
+        collection.must_include comment
+      end
+    end
+
+    describe 'rule#to is :action_user' do
+      it 'should return an array including user that executed the action' do
+        Merit.user_model_name = 'User'
+        rule = Merit::Rule.new
+        rule.to = :action_user
+        action = Merit::Action.new(user_id: 22)
+        user = User.new
+
+        User.stubs(:find_by_id).with(22).returns(user)
+
+        finder = Merit::TargetFinder.new(rule, action)
+        collection = finder.find
+        collection.size.must_be :==, 1
+        collection.must_include user
+      end
+
+      describe 'when user does not exist' do
+        it 'should return warn and return an empty array' do
+          Merit.user_model_name = 'User'
+          rule = Merit::Rule.new
+          rule.to = :action_user
+          action = Merit::Action.new(user_id: 22)
+
+          Rails.logger.expects(:warn).with("[merit] no User found with id 22")
+          finder = Merit::TargetFinder.new(rule, action)
+          finder.find.must_be_empty
+        end
+      end
+    end
+
+    describe 'rule#to is defined but neither :itself or :action_user' do
+      it 'should return the corresponding object on the original target' do
+        rule = Merit::Rule.new
+        rule.to = :user
+        rule.model_name = 'comments'
+        action = Merit::Action.new(target_id: 40)
+
+        user = User.new
+        comment = Comment.new
+        comment.stubs(:user).returns(user)
+        Comment.stubs(:find_by_id).with(40).returns(comment)
+
+        finder = Merit::TargetFinder.new(rule, action)
+        collection = finder.find
+        collection.size.must_be :==, 1
+        collection.must_include user
+      end
+
+      describe 'the rule#to does not exist as a method on the original target' do
+        it 'should warn and return an empty array' do
+          rule = Merit::Rule.new
+          rule.to = :non_existent
+          rule.model_name = 'comments'
+          action = Merit::Action.new(target_id: 40)
+
+          comment = Comment.new
+          Comment.stubs(:find_by_id).with(40).returns(comment)
+
+          message = "[merit] NoMethodError on `Comment#non_existent`"
+          message << " (called from Merit::TargetFinder#other_target)"
+
+          Rails.logger.expects(:warn).with(message)
+          finder = Merit::TargetFinder.new(rule, action)
+          finder.find.must_be_empty
+        end
+      end
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -30,6 +30,11 @@ require "capybara/rails"
 Capybara.default_driver   = :rack_test
 Capybara.default_selector = :css
 
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'minitest/mock'
+require "mocha/setup"
+
 if ENV["ORM"] == "mongoid"
   class ActiveSupport::TestCase
     def teardown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -107,6 +107,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-spec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.13.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +217,7 @@ files:
 - lib/generators/merit/templates/merit_point_rules.rb
 - lib/generators/merit/templates/merit_rank_rules.rb
 - lib/merit.rb
+- lib/merit/base_target_finder.rb
 - lib/merit/controller_extensions.rb
 - lib/merit/judge.rb
 - lib/merit/model_additions.rb
@@ -184,7 +233,10 @@ files:
 - lib/merit/rules_badge_methods.rb
 - lib/merit/rules_points_methods.rb
 - lib/merit/rules_rank_methods.rb
+- lib/merit/sash_finder.rb
+- lib/merit/target_finder.rb
 - merit.gemspec
+- test/base_target_finder_test.rb
 - test/dummy-mongoid/Rakefile
 - test/dummy-mongoid/app/controllers/application_controller.rb
 - test/dummy-mongoid/app/controllers/comments_controller.rb
@@ -284,6 +336,7 @@ files:
 - test/dummy/db/migrate/20120318022219_create_badges_sashes.rb
 - test/dummy/db/migrate/20120318022220_add_fields_to_users.rb
 - test/dummy/db/migrate/20121013174256_create_scores_and_points.rb
+- test/dummy/db/migrate/20130321082817_add_fields_to_comments.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/public/404.html
@@ -301,7 +354,9 @@ files:
 - test/dummy/script/rails
 - test/integration/navigation_test.rb
 - test/merit_unit_test.rb
+- test/sash_finder_test.rb
 - test/support/integration_case.rb
+- test/target_finder_test.rb
 - test/test_helper.rb
 homepage: http://github.com/tute/merit
 licenses: []
@@ -314,7 +369,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: