merit 1.9.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: debce052338bde9db1f6ad4a50b88cbad2cdd466
-  data.tar.gz: 3c41c3c3ce1df213836fdb4f708425cc83fb9ec6
+  metadata.gz: c0822239c7421032c0da3487684baadd738b4805
+  data.tar.gz: 44eb5162425fc37edb09615e7f95f112d6b8cf04
 SHA512:
-  metadata.gz: ccb24cf9023b3aa519e9e265379a57864176019a63cfde2253fc145b82a58fe402fc0ffe2963b7f43ec9ab5242d26819d10e7814743c62e2aa435e2a91b427d3
-  data.tar.gz: e77bf853ca0b6ca140f57a04fe32d3e0c6499cc13027e4a413514967afabb3544d6dc7bb9babd5fe84b5cf382bfe242a0bff222a2121be543ae13fdb08af27cd
+  metadata.gz: 5379050b40dd4b93083443c349cf0726ee7fa436708cb2d8a4456f86b1a2b6de5c0b2dae51205613bca4b39fb5ea6bd9afded0d45d07fbfa962654284b31c08c
+  data.tar.gz: 346cf4cd10a20c4bfb07b1579cf16291ec77b6906b1f22999444bc7950b797d3fc372dfc4a63e8e393c56117b211e33ca571d8bacd1a8c7c3de5209c4130f8d9

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 2.0.0
+
+- [#146] Fixes loading paths
+- [#140] Points Categories feature
+- Removes deprecated methods
+
+## 1.9.0
+
+- [#134] Bug fix: find sashes only when rules apply.
+- Adds deprecation warnings.
+
 ## 1.8.0
 
 - [#128] Finishes Observer implementation so client applications can be

data/README.md

@@ -28,7 +28,6 @@ and Rankings.
     - [Displaying Rankings](#displaying-rankings)
 - [Getting Notifications](#getting-notifications)
 - [Uninstalling Merit](#uninstalling-merit)
-- [To-do List](#to-do-list)
 
 
 # Installation
@@ -159,6 +158,7 @@ action user or to the method(s) defined in the `:to` option. Define rules on
 * `:model_name` (optional) to specify the model name if it cannot be guessed
   from the controller. (e.g. `model_name: 'User'` for `RegistrationsController`,
   or `model_name: 'Comment'` for `Api::CommentsController`)
+* `:category` (optional) to categorize earned points. `default` is used by default.
 * `&block`
   * empty (always scores)
   * a block which evaluates to boolean (recieves target object as parameter)
@@ -167,7 +167,7 @@ action user or to the method(s) defined in the `:to` option. Define rules on
 
 ```ruby
 # app/models/merit/point_rules.rb
-score 10, to: :post_creator, on: 'comments#create' do |comment|
+score 10, to: :post_creator, on: 'comments#create', category: 'comment_activity' do |comment|
   comment.title.present?
 end
 
@@ -186,13 +186,13 @@ score proc, on: 'photos#create'
 
 ```ruby
 # Score manually
-current_user.add_points(20)
-current_user.subtract_points(10)
+current_user.add_points(20, category: 'Optional category')
+current_user.subtract_points(10, category: 'Optional category')
 ```
 
 ```ruby
 # Query awarded points since a given date
-score_points = current_user.sash.scores.first.score_points
+score_points = current_user.score_points(category: 'Optional category')
 score_points.where("created_at > '#{1.month.ago}'").sum(:num_points)
 ```
 
@@ -201,9 +201,14 @@ score_points.where("created_at > '#{1.month.ago}'").sum(:num_points)
 Meritable models have a `points` method which returns an integer:
 
 ```erb
-<%= current_user.points %>
+<%= current_user.points(category: 'Optional category') %>
 ```
 
+If `category` left empty, it will return the sum of points for every category.
+
+```erb
+<%= current_user.points %>
+```
 
 # Rankings
 
@@ -287,10 +292,3 @@ config.add_observer 'ReputationChangeObserver'
 3. Run `rails g merit:remove MODEL_NAME` (e.g. `user`)
 4. Run `rake db:migrate`
 5. Remove `merit` from your Gemfile
-
-
-# To-do List
-
-## Pre 2.0.0
-
-* Move level from meritable model into Sash

data/UPGRADING.md

@@ -1,6 +1,13 @@
 # Main Changes / Upgrading Notes
 
-## 1.9.0 (not released yet)
+## 2.0.0
+
+* Removes deprecated methods: `Merit::Badge.last_granted` and
+  `Merit::Score.top_scored`.
+* Removes `add_points` `log` parameter.
+* Adds points category option.
+
+## 1.9.0
 
 * Deprecates `Merit::Badge.last_granted` and `Merit::Score.top_scored`.
   Code can be readded to client applications following instructions in:

data/lib/generators/active_record/install_generator.rb

@@ -13,11 +13,20 @@ module ActiveRecord
       end
 
       def copy_migrations_and_model
-        migration_template 'create_merit_actions.rb', 'db/migrate/create_merit_actions.rb'
-        migration_template 'create_merit_activity_logs.rb', 'db/migrate/create_merit_activity_logs.rb'
-        migration_template 'create_sashes.rb', 'db/migrate/create_sashes.rb'
-        migration_template 'create_badges_sashes.rb', 'db/migrate/create_badges_sashes.rb'
-        migration_template 'create_scores_and_points.rb', 'db/migrate/create_scores_and_points.rb'
+        migration_template 'create_merit_actions.rb',
+                           'db/migrate/create_merit_actions.rb'
+
+        migration_template 'create_merit_activity_logs.rb',
+                           'db/migrate/create_merit_activity_logs.rb'
+
+        migration_template 'create_sashes.rb',
+                           'db/migrate/create_sashes.rb'
+
+        migration_template 'create_badges_sashes.rb',
+                           'db/migrate/create_badges_sashes.rb'
+
+        migration_template 'create_scores_and_points.rb',
+                           'db/migrate/create_scores_and_points.rb'
       end
     end
   end

data/lib/generators/active_record/merit_generator.rb

@@ -13,7 +13,8 @@ module ActiveRecord
       end
 
       def copy_migrations_and_model
-        migration_template 'add_fields_to_model.rb', "db/migrate/add_fields_to_#{table_name}"
+        migration_template 'add_fields_to_model.rb',
+                           "db/migrate/add_fields_to_#{table_name}"
       end
     end
   end

data/lib/generators/active_record/remove_generator.rb

@@ -13,8 +13,11 @@ module ActiveRecord
       end
 
       def copy_migrations_and_model
-        migration_template 'remove_merit_tables.rb', 'db/migrate/remove_merit_tables.rb'
-        migration_template 'remove_fields_from_model.rb', "db/migrate/remove_fields_from_#{table_name}"
+        migration_template 'remove_merit_tables.rb',
+                           'db/migrate/remove_merit_tables.rb'
+
+        migration_template 'remove_fields_from_model.rb',
+                           "db/migrate/remove_fields_from_#{table_name}"
       end
     end
   end

data/lib/generators/merit/merit_generator.rb

@@ -5,7 +5,9 @@ module Merit
       hook_for :orm
 
       def inject_merit_content
-        inject_into_class(model_path, class_name, "  has_merit\n\n") if model_exists?
+        if model_exists?
+          inject_into_class(model_path, class_name, "  has_merit\n\n")
+        end
       end
 
       private

data/lib/generators/merit/templates/merit_badge_rules.rb

@@ -4,7 +4,7 @@
 # * Nothing (always grants)
 # * A block which evaluates to boolean (recieves the object as parameter)
 # * A block with a hash composed of methods to run on the target object with
-#   expected values (+:votes => 5+ for instance).
+#   expected values (+votes: 5+ for instance).
 #
 # +grant_on+ can have a +:to+ method name, which called over the target object
 # should retrieve the object to badge (could be +:user+, +:self+, +:follower+,
@@ -23,20 +23,24 @@ module Merit
     def initialize
       # If it creates user, grant badge
       # Should be "current_user" after registration for badge to be granted.
-      # grant_on 'users#create', :badge => 'just-registered', :to => :itself
+      # grant_on 'users#create', badge: 'just-registered', to: :itself
 
       # If it has 10 comments, grant commenter-10 badge
-      # grant_on 'comments#create', :badge => 'commenter', :level => 10 do |comment|
+      # grant_on 'comments#create', badge: 'commenter', level: 10 do |comment|
       #   comment.user.comments.count == 10
       # end
 
       # If it has 5 votes, grant relevant-commenter badge
-      # grant_on 'comments#vote', :badge => 'relevant-commenter', :to => :user do |comment|
+      # grant_on 'comments#vote', badge: 'relevant-commenter',
+      #   to: :user do |comment|
+      #
       #   comment.votes.count == 5
       # end
 
       # Changes his name by one wider than 4 chars (arbitrary ruby code case)
-      # grant_on 'registrations#update', :badge => 'autobiographer', :temporary => true, :model_name => 'User' do |user|
+      # grant_on 'registrations#update', badge: 'autobiographer',
+      #   temporary: true, model_name: 'User' do |user|
+      #
       #   user.name.length > 4
       # end
     end

data/lib/merit.rb

@@ -10,6 +10,8 @@ require 'merit/reputation_change_observer'
 require 'merit/sash_finder'
 require 'merit/base_target_finder'
 require 'merit/target_finder'
+require 'merit/models/base/sash'
+require 'merit/models/base/badges_sash'
 
 module Merit
   def self.setup
@@ -70,9 +72,9 @@ module Merit
 
   class Engine < Rails::Engine
     config.app_generators.orm Merit.orm
+    config.eager_load_paths << File.expand_path("../merit/models/#{Merit.orm}", __FILE__)
 
     initializer 'merit.controller' do |app|
-      require_models
       extend_orm_with_has_merit
       ActiveSupport.on_load(:action_controller) do
         begin
@@ -87,15 +89,6 @@ module Merit
       end
     end
 
-    def require_models
-      require 'merit/models/base/merit/sash'
-      require 'merit/models/base/merit/badges_sash'
-      require "merit/models/#{Merit.orm}/merit/activity_log"
-      require "merit/models/#{Merit.orm}/merit/badges_sash"
-      require "merit/models/#{Merit.orm}/merit/sash"
-      require "merit/models/#{Merit.orm}/merit/score"
-    end
-
     def extend_orm_with_has_merit
       if Object.const_defined?('ActiveRecord')
         ActiveRecord::Base.send :include, Merit

data/lib/merit/judge.rb

@@ -25,7 +25,7 @@ module Merit
     def apply_points
       return unless rule_applies?
       sashes.each do |sash|
-        point = sash.add_points points
+        point = sash.add_points points, category: category
         notify_observers(
           description: "granted #{points} points",
           merit_object: point,
@@ -79,6 +79,10 @@ module Merit
       end
     end
 
+    def category
+      @rule.category
+    end
+
     def sashes
       @sashes ||= SashFinder.find @rule, @action
     end

data/lib/merit/model_additions.rb

@@ -9,7 +9,7 @@ module Merit
       # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1079-belongs_to-dependent-destroy-should-destroy-self-before-assocation
       belongs_to :sash, class_name: 'Merit::Sash'
 
-      _merit_orm_specific_config
+      send :"_merit_#{Merit.orm}_specific_config"
       _merit_delegate_methods_to_sash
       _merit_define_badge_related_entries_method
       _merit_sash_initializer
@@ -18,21 +18,17 @@ module Merit
     # Delegate methods from meritable models to their sash
     def _merit_delegate_methods_to_sash
       methods = %w(badge_ids badges points add_badge rm_badge
-                   add_points substract_points subtract_points)
+                   add_points subtract_points score_points)
       methods.each { |method| delegate method, to: :_sash }
     end
 
-    def _merit_orm_specific_config
-      if Merit.orm == :mongo_mapper
-        plugin Merit
-        key :sash_id, String
-        key :points, Integer, default: 0
-        key :level, Integer, default: 0
-      elsif Merit.orm == :mongoid
-        field :level, type: Integer, default: 0
-        def find_by_id(id)
-          where(_id: id).first
-        end
+    def _merit_active_record_specific_config
+    end
+
+    def _merit_mongoid_specific_config
+      field :level, type: Integer, default: 0
+      def find_by_id(id)
+        where(_id: id).first
       end
     end
 
@@ -41,6 +37,11 @@ module Merit
       Badge._define_related_entries_method(meritable_class_name)
     end
 
+    def show_attr_accessible?
+      defined?(ProtectedAttributes) ||
+        !defined?(ActionController::StrongParameters)
+    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/merit/action.rb

@@ -2,9 +2,9 @@ module Merit
   class Action < ActiveRecord::Base
     self.table_name = :merit_actions
 
-    has_many :activity_logs, class_name: Merit::ActivityLog
+    has_many :activity_logs, class_name: 'Merit::ActivityLog'
 
-    if defined?(ProtectedAttributes) || !defined?(ActionController::StrongParameters)
+    if show_attr_accessible?
       attr_accessible :user_id, :action_method, :action_value, :had_errors,
                       :target_model, :target_id, :processed, :log
     end

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

@@ -2,11 +2,11 @@ module Merit
   class ActivityLog < ActiveRecord::Base
     self.table_name = :merit_activity_logs
 
-    belongs_to :action, class_name: Merit::Action
+    belongs_to :action, class_name: 'Merit::Action'
     belongs_to :related_change, polymorphic: true
     has_one :sash, through: :related_change
 
-    if defined?(ProtectedAttributes) || !defined?(ActionController::StrongParameters)
+    if show_attr_accessible?
       attr_accessible :action_id, :related_change, :description, :created_at
     end
   end

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

@@ -2,22 +2,9 @@ module Merit
   class BadgesSash < ActiveRecord::Base
     include Base::BadgesSash
     has_many :activity_logs,
-             class_name: Merit::ActivityLog,
+             class_name: 'Merit::ActivityLog',
              as: :related_change
 
-    if defined?(ProtectedAttributes) || !defined?(ActionController::StrongParameters)
-      attr_accessible :badge_id
-    end
-
-    # DEPRECATED: `last_granted` will be removed from merit, please refer to:
-    # https://github.com/tute/merit/wiki/How-to-show-last-granted-badges
-    def self.last_granted(options = {})
-      warn '[merit] [DEPRECATION] `last_granted` will be removed from merit, please refer to: https://github.com/tute/merit/wiki/How-to-show-last-granted-badges'
-      options[:since_date] ||= 1.month.ago
-      options[:limit]      ||= 10
-      where("created_at > '#{options[:since_date]}'")
-        .limit(options[:limit])
-        .map(&:badge)
-    end
+    attr_accessible :badge_id if show_attr_accessible?
   end
 end

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

@@ -6,41 +6,6 @@ module Merit
              dependent: :destroy,
              class_name: 'Merit::Score::Point'
 
-    # DEPRECATED: `top_scored` will be removed from merit, please refer to:
-    # https://github.com/tute/merit/wiki/How-to-show-a-points-leaderboard
-    def self.top_scored(options = {})
-      warn '[merit] [DEPRECATION] `top_scored` will be removed from merit, please refer to: https://github.com/tute/merit/wiki/How-to-show-a-points-leaderboard'
-      options[:table_name] ||= :users
-      options[:since_date] ||= 1.month.ago
-      options[:limit]      ||= 10
-
-      alias_id_column = "#{options[:table_name].to_s.singularize}_id"
-      if options[:table_name] == :sashes
-        sash_id_column = "#{options[:table_name]}.id"
-      else
-        sash_id_column = "#{options[:table_name]}.sash_id"
-      end
-
-      # MeritableModel - Sash -< Scores -< ScorePoints
-      sql_query = <<SQL
-SELECT
-  #{options[:table_name]}.id AS #{alias_id_column},
-  SUM(num_points) as sum_points
-FROM #{options[:table_name]}
-  LEFT JOIN merit_scores ON merit_scores.sash_id = #{sash_id_column}
-  LEFT JOIN merit_score_points ON merit_score_points.score_id = merit_scores.id
-WHERE merit_score_points.created_at > '#{options[:since_date]}'
-GROUP BY #{options[:table_name]}.id, merit_scores.sash_id
-ORDER BY sum_points DESC
-LIMIT #{options[:limit]}
-SQL
-      results = ActiveRecord::Base.connection.execute(sql_query)
-      results.map do |h|
-        h.keep_if { |k, v| (k == alias_id_column) || (k == 'sum_points') }
-      end
-      results
-    end
-
     def points
       score_points.group(:score_id).sum(:num_points).values.first || 0
     end
@@ -49,7 +14,7 @@ SQL
       belongs_to :score, class_name: 'Merit::Score'
       has_one :sash, through: :score
       has_many :activity_logs,
-               class_name: Merit::ActivityLog,
+               class_name: 'Merit::ActivityLog',
                as: :related_change
     end
   end

data/lib/merit/models/base/sash.rb

@@ -0,0 +1,59 @@
+module Merit
+  module Base
+    module Sash
+      def badges
+        badge_ids.map { |id| Merit::Badge.find id }
+      end
+
+      def badge_ids
+        badges_sashes.map(&:badge_id)
+      end
+
+      # Retrieve the number of points from a category
+      # By default all points are summed up
+      # @param category [String] The category
+      # @return [Integer] The number of points
+      def points(options = {})
+        if (category = options[:category])
+          scores.where(category: category).first.try(:points) || 0
+        else
+          scores.reduce(0) { |sum, score| sum + score.points }
+        end
+      end
+
+      # Retrieve all points from a category or none if category doesn't exist
+      # By default retrieve all Points
+      # @param category [String] The category
+      # @return [ActiveRecord::Relation] containing the points
+      def score_points(options = {})
+        scope = Merit::Score::Point
+                  .includes(:score)
+                  .where('merit_scores.sash_id = ?', id)
+        if (category = options[:category])
+          scope = scope.where('merit_scores.category = ?', category)
+        end
+        scope
+      end
+
+      def add_points(num_points, options = {})
+        point = Merit::Score::Point.new
+        point.num_points = num_points
+        scores
+          .where(category: options[:category] || 'default')
+          .first_or_create
+          .score_points << point
+        point
+      end
+
+      def subtract_points(num_points, options = {})
+        add_points(-num_points, options)
+      end
+
+      private
+
+      def create_scores
+        scores << Merit::Score.create
+      end
+    end
+  end
+end

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

@@ -5,7 +5,9 @@ module Merit
     include Base::BadgesSash
 
     field :badge_id,      type: Integer
-    attr_accessible :badge_id
+
+    attr_accessible :badge_id if show_attr_accessible?
+
     has_many :activity_logs, class_name: 'Merit::ActivityLog', as: :related_change
 
     def self.last_granted(options = {})

data/lib/merit/rule.rb

@@ -4,7 +4,7 @@ module Merit
   # Could split this class between badges and rankings functionality
   class Rule
     attr_accessor :badge_name, :level, :to, :model_name, :level_name,
-                  :multiple, :temporary, :score, :block
+                  :multiple, :temporary, :score, :block, :category
 
     # Does this rule's condition block apply?
     def applies?(target_obj = nil)

data/lib/merit/rules_points_methods.rb

@@ -6,15 +6,16 @@ module Merit
     # Define rules on certaing actions for giving points
     def score(points, *args, &block)
       options = args.extract_options!
-      options[:to] ||= :action_user
+      options_to = options.fetch(:to) { :action_user }
 
       actions = Array.wrap(options[:on])
 
-      Array.wrap(options[:to]).each do |to|
+      Array.wrap(options_to).each do |to|
         rule = Rule.new
         rule.score = points
         rule.to    = to
         rule.block = block
+        rule.category = options.fetch(:category) { :default }
         rule.model_name = options[:model_name] if options[:model_name]
 
         actions.each do |action|

data/merit.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/tute/merit"
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
   s.license     = 'MIT'
-  s.version     = '1.9.0'
+  s.version     = '2.0.0'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 

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

@@ -18,7 +18,7 @@ class Comment
 
   belongs_to :user
 
-  if defined?(ProtectedAttributes) || !defined?(ActionController::StrongParameters)
+  if show_attr_accessible?
     attr_accessible :name, :comment, :user_id, :votes
   end
 

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

@@ -14,7 +14,7 @@ module Merit
       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', category: 'vote'
 
       # Example rule for using model_name in the case of namespaced controllers
       score 1, to: :user, model_name: 'Comment', on: 'api/comments#show'

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

@@ -17,7 +17,7 @@ class User
   has_many :addresses
   has_many :comments
 
-  if defined?(ProtectedAttributes) || !defined?(ActionController::StrongParameters)
+  if show_attr_accessible?
     attr_accessible :name
   end
 

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

@@ -14,6 +14,7 @@
     <td><%= user.comments.count %></td>
     <td><%= user.show_badges %></td>
     <td><%= user.points %></td>
+    <td><%= user.points(category: 'vote') %></td>
     <td><%= link_to 'Show', user %>
     - <%= link_to 'Edit', edit_user_path(user) %>
     - <%= link_to 'Destroy', user, data: { :confirm => 'Are you sure?' }, :method => :delete %></td>

data/test/integration/navigation_test.rb

@@ -186,6 +186,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
     visit "/comments/#{Comment.last.id}/vote/4"
     user = User.first
     assert_equal 46, user.points, 'Voting comments should grant 5 points for voted, and 1 point for voting'
+    assert_equal 5, user.points(category: 'vote'), 'Voting comments should grant 5 points for voted in vote category'
 
     visit '/comments/new'
     fill_in 'Name', with: 'Hi'

data/test/test_helper.rb

@@ -28,5 +28,10 @@ Capybara.default_selector = :css
 
 ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
 
+require "merit/models/#{Merit.orm}/merit/activity_log"
+require "merit/models/#{Merit.orm}/merit/badges_sash"
+require "merit/models/#{Merit.orm}/merit/sash"
+require "merit/models/#{Merit.orm}/merit/score"
+
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/test/unit/base_target_finder_test.rb

@@ -1,7 +1,6 @@
 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
@@ -39,7 +38,6 @@ describe Merit::BaseTargetFinder do
         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)
@@ -47,5 +45,4 @@ describe Merit::BaseTargetFinder do
       end
     end
   end
-
 end

data/test/unit/merit_unit_test.rb

@@ -4,11 +4,9 @@ require 'test_helper'
 class MeritUnitTest < ActiveSupport::TestCase
   test 'extends only meritable ActiveRecord models' do
     class User < ActiveRecord::Base
-      def self.columns; @columns ||= []; end
       has_merit
     end
     class Fruit < ActiveRecord::Base
-      def self.columns; @columns ||= []; end
     end
 
     assert User.method_defined?(:points), 'has_merit adds methods'
@@ -17,50 +15,15 @@ class MeritUnitTest < ActiveSupport::TestCase
 
   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 Merit::Badge.method_defined?(:soldiers), 'Badge#soldiers should be defined'
     assert Merit::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 = Merit::Sash.create
-    badge = Merit::Badge.create(id: 20, name: 'test-badge-21')
-    sash.add_badge badge.id
-    Merit::BadgesSash.last.update_attribute :created_at, 1.day.ago
-    sash.add_badge badge.id
-    Merit::BadgesSash.last.update_attribute :created_at, 8.days.ago
-    sash.add_badge badge.id
-    Merit::BadgesSash.last.update_attribute :created_at, 15.days.ago
-
-    # Test method options
-    assert_equal Merit::Badge.last_granted(since_date: Time.now), []
-    assert_equal Merit::Badge.last_granted(since_date: 1.week.ago), [badge]
-    assert_equal Merit::Badge.last_granted(since_date: 2.weeks.ago).count, 2
-    assert_equal Merit::Badge.last_granted(since_date: 2.weeks.ago, limit: 1), [badge]
-  end
-
-  test 'Merit::Score.top_scored returns scores leaderboard' do
-    # Create sashes and add points
-    sash_1 = Merit::Sash.create
-    sash_1.add_points(10); sash_1.add_points(10)
-    sash_2 = Merit::Sash.create
-    sash_2.add_points(5); sash_2.add_points(5)
-
-    # Test method options
-    assert_equal [{'sash_id'=>sash_1.id, 'sum_points'=>20},
-      {'sash_id'=>sash_2.id, 'sum_points'=>10}],
-      Merit::Score.top_scored(table_name: :sashes)
-    assert_equal  [{'sash_id'=>sash_1.id, 'sum_points'=>20}],
-      Merit::Score.top_scored(table_name: :sashes, limit: 1)
-  end
-
   test 'unknown ranking raises exception' do
     class WeirdRankRules
       include Merit::RankRulesMethods
@@ -74,8 +37,9 @@ class MeritUnitTest < ActiveSupport::TestCase
   end
 
   test 'Badge#custom_fields_hash saves correctly' do
-    Merit::Badge.create(id: 99, name: 'test-badge',
-      custom_fields: { key_1: 'value1' })
+    Merit::Badge.create(id: 99,
+                        name: 'test-badge',
+                        custom_fields: { key_1: 'value1' })
     assert_equal 'value1', Merit::Badge.find(99).custom_fields[:key_1]
   end
-end
+end

data/test/unit/rule_unit_test.rb

@@ -32,7 +32,7 @@ describe Merit::Rule do
   describe '#badge' do
     it 'raises exception on inexistent badge' do
       @rule.badge_name = 'inexistent'
-      ->{ @rule.badge }.must_raise Merit::BadgeNotFound
+      -> { @rule.badge }.must_raise Merit::BadgeNotFound
     end
 
     it 'finds related badge' do

data/test/unit/rules_matcher_test.rb

@@ -5,29 +5,29 @@ describe Merit::RulesMatcher do
   describe 'rules actions are treated as a regexp' do
     it 'selects matching rules (suffix)' do
       matcher = Merit::RulesMatcher.new('comments', 'update')
-      matcher.select_from({
+      matcher.select_from(
         'comments#update' => 'comments#update',
         'comments#up'     => 'comments#up',
         'comments#up$'   => 'comments#up$',
         'comments#up.+$' => 'comments#up.+$',
-      }).must_be :==, ['comments#update', 'comments#up.+$']
+      ).must_be :==, ['comments#update', 'comments#up.+$']
 
       matcher = Merit::RulesMatcher.new('comments', 'up')
-      matcher.select_from({
+      matcher.select_from(
         'comments#update' => 'comments#update',
         'comments#up'     => 'comments#up',
         'comments#up$'   => 'comments#up$',
         'comments#up.+$' => 'comments#up.+$',
-      }).must_be :==, ['comments#up', 'comments#up$']
+      ).must_be :==, ['comments#up', 'comments#up$']
     end
 
     it 'selects matching rules (prefix)' do
       matcher = Merit::RulesMatcher.new('/posts/1/comments', 'create')
-      matcher.select_from({
+      matcher.select_from(
         'comments#create' => 'comments#create',
         '^comments#create' => '^comments#create',
         '^.*/comments#create' => '^.*/comments#create',
-      }).must_be :==, ['^.*/comments#create']
+      ).must_be :==, ['^.*/comments#create']
     end
   end
 

data/test/unit/sash_finder_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 describe Merit::SashFinder do
-
   it 'should return an array of sashes of the target objects' do
     sash_1 = Merit::Sash.new
     user_1 = User.new
@@ -11,9 +10,8 @@ describe Merit::SashFinder do
     user_2 = User.new
     user_2.stubs(:_sash).returns(sash_2)
 
-    object_without_sash = OpenStruct.new
-
     # TODO: With stub we are not exercising compact
+    # object_without_sash = OpenStruct.new
     # users = [user_1, user_2, object_without_sash]
     users = [user_1, user_2]
 
@@ -26,5 +24,4 @@ describe Merit::SashFinder do
     sashes.must_include sash_1
     sashes.must_include sash_2
   end
-
 end

data/test/unit/sash_test.rb

@@ -0,0 +1,104 @@
+require 'test_helper'
+
+class SashTest < ActiveSupport::TestCase
+  before do
+    @custom_category = 'custom_category'
+    @sash = Merit::Sash.create
+  end
+
+  describe "#add_points" do
+    describe "when category specified" do
+      it "should create a new Point with specified category" do
+        @sash.add_points 5, category: @custom_category
+        score = Merit::Score.last
+        point = score.score_points.last
+
+        assert_equal point.num_points, 5
+        assert_equal score.category, @custom_category
+      end
+    end
+
+    it "should create a new Point in category default with specified number of points" do
+      assert_difference("Merit::Score::Point.count", 1) do
+        @sash.add_points 5
+      end
+      score = Merit::Score.last
+      point = score.score_points.last
+
+      assert_equal point.num_points, 5
+      assert_equal score.category, 'default'
+    end
+  end
+
+  describe "#subtract_points" do
+    describe "when category specified" do
+      it "should create a new Point with specified category" do
+        @sash.subtract_points 5, category: @custom_category
+        score = Merit::Score.last
+        point = score.score_points.last
+
+        assert_equal point.num_points, -5
+        assert_equal score.category, @custom_category
+      end
+    end
+
+    it "should create a new Point in category default with inverse of specified number of points" do
+      assert_difference("Merit::Score::Point.count", 1) do
+        @sash.subtract_points 5
+      end
+      score = Merit::Score.last
+      point = score.score_points.last
+
+      assert_equal point.num_points, -5
+      assert_equal score.category, 'default'
+    end
+  end
+
+  describe "#points" do
+    before do
+      @sash.add_points 5, category: @custom_category
+      @sash.add_points 7
+    end
+
+    describe "when category specified" do
+      it "should retrieve the number of points of the category" do
+        assert_equal 5, @sash.points(category: @custom_category)
+      end
+    end
+
+    it "should retrieve the sum of points of all categories" do
+      assert_equal 12, @sash.points
+    end
+  end
+
+  describe "#score_points" do
+    before do
+      @point1 = @sash.add_points 5, category: @custom_category
+      @point2 = @sash.add_points 7
+    end
+
+    describe "when category specified" do
+      it "should return the points of the category" do
+        assert_equal 1, @sash.score_points(category: @custom_category).size
+        scores = @sash.score_points(category: @custom_category)
+        assert scores.include? @point1
+        assert !scores.include?(@point2)
+      end
+
+      it "should return no Points if category doesn't exist" do
+        assert_equal 0, @sash.score_points(category: 'non-existing').size
+      end
+    end
+
+    it "should return all points" do
+      assert_equal 2, @sash.score_points.size
+      assert @sash.score_points.include? @point1
+      assert @sash.score_points.include? @point2
+    end
+
+    it "should return no Points if no points found" do
+      @sash1 = Merit::Sash.create
+      assert_equal 0, @sash1.score_points.size
+    end
+  end
+end

data/test/unit/target_finder_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 describe Merit::TargetFinder do
-
   describe '#find' do
     describe 'rule#to is :itself' do
       it 'should return the base target' do
@@ -11,9 +10,10 @@ describe Merit::TargetFinder do
 
         comment = Comment.new
 
-        Merit::BaseTargetFinder.
-          stubs(:find).with(rule, action).
-          returns(comment)
+        Merit::BaseTargetFinder
+          .stubs(:find)
+          .with(rule, action)
+          .returns(comment)
 
         finder = Merit::TargetFinder.new(rule, action)
         collection = finder.find
@@ -94,5 +94,4 @@ describe Merit::TargetFinder do
       end
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -152,8 +152,8 @@ files:
 - lib/merit/models/active_record/merit/badges_sash.rb
 - lib/merit/models/active_record/merit/sash.rb
 - lib/merit/models/active_record/merit/score.rb
-- lib/merit/models/base/merit/badges_sash.rb
-- lib/merit/models/base/merit/sash.rb
+- lib/merit/models/base/badges_sash.rb
+- lib/merit/models/base/sash.rb
 - lib/merit/models/mongoid/merit/action.rb
 - lib/merit/models/mongoid/merit/activity_log.rb
 - lib/merit/models/mongoid/merit/badges_sash.rb
@@ -246,6 +246,7 @@ files:
 - test/unit/rule_unit_test.rb
 - test/unit/rules_matcher_test.rb
 - test/unit/sash_finder_test.rb
+- test/unit/sash_test.rb
 - test/unit/target_finder_test.rb
 homepage: http://github.com/tute/merit
 licenses:

data/lib/merit/models/base/merit/sash.rb

@@ -1,45 +0,0 @@
-module Merit
-  module Base
-    module Sash
-      # Methods that are common between both the active_record and mongoid sash model
-      def badges
-        badge_ids.map { |id| Merit::Badge.find id }
-      end
-
-      def badge_ids
-        badges_sashes.map(&:badge_id)
-      end
-
-      def points(category = 'default')
-        scores.where(category: category).first.points
-      end
-
-      def add_points(num_points, log = 'Manually granted', category = 'default')
-        if log != 'Manually granted'
-          warn '[merit] [DEPRECATION] `add_points` `log` parameter is deprecated'
-        end
-        point = Merit::Score::Point.new
-        point.log = log
-        point.num_points = num_points
-        scores.where(category: category).first.score_points << point
-        point
-      end
-
-      # DEPRECATED: Please use <tt>subtract_points</tt> instead.
-      def substract_points(num_points, log = 'Manually granted', category = 'default')
-        warn '[merit] [DEPRECATION] `substract_points` is deprecated.  Please use `subtract_points` instead.'
-        subtract_points num_points, log, category
-      end
-
-      def subtract_points(num_points, log = 'Manually granted', category = 'default')
-        add_points(-num_points, log, category)
-      end
-
-      private
-
-      def create_scores
-        scores << Merit::Score.create
-      end
-    end
-  end
-end