merit 0.10.1 → 1.0.0

data/Gemfile.lock

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

data/README.md

@@ -23,7 +23,7 @@ NOTE: Mongoid support is experimental.
 
 You may give badges to any resource on your application if some condition
 holds. Badges may have levels, and may be temporary. Define rules on
-`app/models/merit_badge_rules.rb`:
+`app/models/merit/badge_rules.rb`:
 
 `grant_on` accepts:
 
@@ -64,6 +64,12 @@ You may also grant badges "by hand" (optionally multiple times):
 Badge.find(3).grant_to(current_user, :allow_multiple => true)
 ```
 
+Similarly you can take back badges that have been granted:
+
+```ruby
+Badge.find(3).delete_from(current_user)
+```
+
 ---
 
 # Defining point rules
@@ -71,7 +77,7 @@ Badge.find(3).grant_to(current_user, :allow_multiple => true)
 Points are a simple integer value which are given to "meritable" resources.
 They are given on actions-triggered, either to the action user or to the
 method(s) defined in the `:to` option. Define rules on
-`app/models/merit_point_rules.rb`:
+`app/models/merit/point_rules.rb`:
 
 ## Examples
 
@@ -99,7 +105,7 @@ score 15, :on => 'reviews#create', :to => [:reviewer, :reviewed]
 5 stars is a common ranking use case. They are not given at specified actions
 like badges, you should define a cron job to test if ranks are to be granted.
 
-Define rules on `app/models/merit_rank_rules.rb`:
+Define rules on `app/models/merit/rank_rules.rb`:
 
 `set_rank` accepts:
 
@@ -134,20 +140,10 @@ end
 
 # To-do list
 
-* add an error handler for inexistent badges.
+* target_object should be configurable (now it's singularized controller name)
+* Translate comments from spanish in `rules_badge.rb`.
 * Should namespace app/models into Merit module.
-* rescue ActiveRecord::... should depend on ORM used
 * :value parameter (for star voting for example) should be configurable
   (depends on params[:value] on the controller).
 * Make fixtures for integration testing (now creating objects on test file!).
 * Rules should be cached? Calling *Rules.new more than once
-* Add badges_sashes timestamps
-
----
-
-# Contributors
-
-* [Tute Costa](https://github.com/tute)
-* [Juan Schwindt](https://github.com/jschwindt)
-* [Eric Knudtson](https://github.com/ek) ([Chef Surfing](https://chefsurfing.com/))
-* [A4bandas media](https://github.com/a4bandas)

data/TESTING.txt

@@ -12,5 +12,5 @@ rails server
 
 # or run tests
 cd ../..
-rake test
+rake
 ORM=mongoid rake test

data/UPGRADING.md

@@ -1,5 +1,49 @@
 # Upgrading
 
+## to 1.0.0
+
+Points granting history is now logged.
+
+* Attribute `points` and method `points=` don't exist anymore (method `points`
+  still works for querying number of points for a resource).
+* There are new methods `add_points(num_points, log_message)` and
+  `remove_points(num_points, log_message)` in meritable resources to manually
+  change their amount of points, keeping a history log.
+
+Run the following migration to have the new DB tables:
+
+    class UpgradeMerit < ActiveRecord::Migration
+      def self.up
+        create_table :merit_scores do |t|
+          t.references :sash
+          t.string :category, :default => 'default'
+        end
+
+        create_table :merit_score_points do |t|
+          t.references :score
+          t.integer :num_points, :default => 0
+          t.string :log
+        end
+      end
+
+      def self.down
+        drop_table :merit_scores
+        drop_table :merit_score_points
+      end
+    end
+
+    # This will create a single point entry log, with previous points granted
+    # to each meritable resource. Code example for a User class.
+    class UpgradeMeritableResources < ActiveRecord::Migration
+      def up
+        User.find_each do |user|
+          user.sash.scores << Merit::Score.create
+          user.add_points(user.points, 'Initial merit points import.')
+        end
+        remove_column :users, :points
+      end
+    end
+
 ## to 0.10.0
 
 `badges_sashes` table gets a primary key `id` column. Run the following migration:

data/app/models/badge.rb

@@ -26,29 +26,34 @@ class Badge
   # Grant badge to sash
   # Accepts :allow_multiple boolean option, defaults to false
   def grant_to(object_or_sash, *args)
-    object_or_sash.create_sash_if_none unless object_or_sash.kind_of?(Sash)
-    sash = object_or_sash.respond_to?(:sash) ? object_or_sash.sash : object_or_sash
-
     options = args.extract_options!
     options[:allow_multiple] ||= false
+    sash = sash_from(object_or_sash)
 
     if !sash.badge_ids.include?(id) || options[:allow_multiple]
       sash.add_badge(id)
-      return true
+      true
     else
-      return false
+      false
     end
   end
 
   # Take out badge from sash
   def delete_from(object_or_sash)
-    object_or_sash.create_sash_if_none unless object_or_sash.kind_of?(Sash)
-    sash = object_or_sash.respond_to?(:sash) ? object_or_sash.sash : object_or_sash
+    sash = sash_from(object_or_sash)
     if sash.badge_ids.include?(id)
       sash.rm_badge(id)
-      return true
+      true
+    else
+      false
+    end
+  end
+
+  def sash_from(object_or_sash)
+    if object_or_sash.kind_of?(Sash)
+      object_or_sash
     else
-      return false
+      object_or_sash.sash || object_or_sash.create_sash_and_scores
     end
   end
 end

data/app/models/merit_action.rb

@@ -1,7 +1,8 @@
 require "merit/models/#{Merit.orm}/merit_action"
 
 class MeritAction
-  attr_accessible :user_id, :action_method, :action_value, :had_errors, :target_model, :target_id, :processed, :log
+  attr_accessible :user_id, :action_method, :action_value, :had_errors,
+    :target_model, :target_id, :processed, :log
 
   # Check rules defined for a merit_action
   def check_rules
@@ -13,38 +14,44 @@ class MeritAction
   end
 
   def check_badge_rules
-    defined_rules = Merit::BadgeRules.new.defined_rules["#{target_model}\##{action_method}"]
-    return if defined_rules.nil?
-
-    defined_rules.each do |rule|
-      rule.grant_or_delete_badge(self)
-    end
+    return if badge_rules.nil?
+    badge_rules.each { |rule| rule.grant_or_delete_badge(self) }
   end
 
   def check_point_rules
-    actions_to_point = Merit::PointRules.new.actions_to_point["#{target_model}\##{action_method}"]
-    return if actions_to_point.nil?
+    return if point_rules.nil?
+    point_rules.each { |rule| rule.grant_points(self) }
+  end
+
+  def badge_rules
+    @badge_rules ||= Merit::BadgeRules.new.defined_rules[action_str] || []
+  end
+  def point_rules
+    @point_rules ||= Merit::PointRules.new.actions_to_point[action_str] || []
+  end
+  def action_str
+    "#{target_model}\##{action_method}"
+  end
+
+  def target(to)
+    @target ||= (to == :action_user) ? action_user : other_target(to)
+  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
 
-    actions_to_point.each do |point_rule|
-      point_rule[:to].each do |to|
-        if to == :action_user
-          target = Merit.user_model.find_by_id(user_id)
-          if target.nil?
-            Rails.logger.warn "[merit] no user found to grant points"
-            return
-          end
-        else
-          begin
-            target = target_object.send(to)
-          rescue NoMethodError
-            Rails.logger.warn "[merit] No target_object found on check_rules."
-            return
-          end
-        end
-        target.points += point_rule[:score]
-        target.save
-        log!("points_granted:#{point_rule[:score]}")
-      end
+  def other_target(to)
+    begin
+      target_object.send(to)
+    rescue NoMethodError
+      Rails.logger.warn "[merit] NoMethodError on '#{target_object.inspect}.#{to}' (called from MeritAction#other_target)"
+      return
     end
   end
 

data/lib/generators/active_record/install_generator.rb

@@ -20,6 +20,7 @@ module ActiveRecord
         migration_template 'create_merit_actions.rb', 'db/migrate/create_merit_actions.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/templates/add_fields_to_model.rb

@@ -1,15 +1,12 @@
 class AddFieldsTo<%= table_name.camelize %> < ActiveRecord::Migration
   def self.up
     add_column :<%= table_name %>, :sash_id, :integer
-    add_column :<%= table_name %>, :points, :integer, :default => 0
     add_column :<%= table_name %>, :level, :integer, :default => 0
     <%- resource = table_name.singularize -%>
-    <%= resource.camelize %>.all.each{|<%= resource %>| <%= resource %>.update_attribute(:points, 0) } # Update existing entries
   end
 
   def self.down
     remove_column :<%= table_name %>, :sash_id
-    remove_column :<%= table_name %>, :points
     remove_column :<%= table_name %>, :level
   end
-end
+end

data/lib/generators/active_record/templates/create_merit_actions.rb

@@ -16,4 +16,4 @@ class CreateMeritActions < ActiveRecord::Migration
   def self.down
     drop_table :merit_actions
   end
-end
+end

data/lib/generators/active_record/templates/create_sashes.rb

@@ -8,4 +8,4 @@ class CreateSashes < ActiveRecord::Migration
   def self.down
     drop_table :sashes
   end
-end
+end

data/lib/generators/active_record/templates/create_scores_and_points.rb

@@ -0,0 +1,19 @@
+class CreateScoresAndPoints < ActiveRecord::Migration
+  def self.up
+    create_table :merit_scores do |t|
+      t.references :sash
+      t.string :category, :default => 'default'
+    end
+
+    create_table :merit_score_points do |t|
+      t.references :score
+      t.integer :num_points, :default => 0
+      t.string :log
+    end
+  end
+
+  def self.down
+    drop_table :merit_scores
+    drop_table :merit_score_points
+  end
+end

data/lib/merit.rb

@@ -33,15 +33,18 @@ module Merit
     yield self
   end
 
+  class BadgeNotFound < Exception; end
+
   class Engine < Rails::Engine
     config.app_generators.orm Merit.orm
 
     initializer 'merit.controller' do |app|
       if Merit.orm == :active_record
-        require "merit/models/#{Merit.orm}/sash"
-        require "merit/models/#{Merit.orm}/badges_sash"
+        require 'merit/models/active_record/sash'
+        require 'merit/models/active_record/badges_sash'
+        require 'merit/models/active_record/merit/score'
       elsif Merit.orm == :mongoid
-        require "merit/models/#{Merit.orm}/sash"
+        require "merit/models/mongoid/sash"
       end
 
       ActiveSupport.on_load(:action_controller) do

data/lib/merit/controller_extensions.rb

@@ -9,21 +9,11 @@ module Merit
         badge_rules = BadgeRules.new
         point_rules = PointRules.new
         if badge_rules.defined_rules[action].present? || point_rules.actions_to_point[action].present?
-          # TODO: target_object should be configurable (now it's singularized controller name)
-          target_object = instance_variable_get(:"@#{controller_name.singularize}")
-          # Set target_id from params or from current instance variable
-          target_id = params[:id] || target_object.try(:id)
-          # id nil, or string (friendly_id); target_object found
-          if target_object.present? && (target_id.nil? || !(target_id =~ /^[0-9]+$/))
-            target_id = target_object.id
-          end
-
-          # TODO: value should be configurable (now it's params[:value] set in the controller)
           merit_action_id = MeritAction.create(
             :user_id       => send(Merit.current_user_method).try(:id),
             :action_method => action_name,
             :action_value  => params[:value],
-            :had_errors    => target_object.try(:errors).try(:present?),
+            :had_errors    => target_object.try(:errors).try(:present?) || false,
             :target_model  => controller_name,
             :target_id     => target_id
           ).id
@@ -31,19 +21,26 @@ module Merit
           # Check rules in after_filter?
           if Merit.checks_on_each_request
             badge_rules.check_new_actions
-
-            # Show flash msg?
-            if (log = MeritAction.find(merit_action_id).log)
-              # Badges granted to current_user
-              granted = log.split('|').select{|log| log =~ /badge_granted_to_action_user/ }
-              granted.each do |badge|
-                badge_id = badge.split(':').last.to_i
-                flash[:merit] = t('merit.flashs.badge_granted', :badge => t("badges.#{Badge.find(badge_id).name}.name"))
-              end
-            end
           end
         end
       end
     end
+
+    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'?")
+      end
+      target_obj
+    end
+
+    def target_id
+      target_id = params[:id] || target_object.try(:id)
+      # using friendly_id if id nil or string (), and target_object found
+      if target_object.present? && (target_id.nil? || !(target_id =~ /^[0-9]+$/))
+        target_id = target_object.id
+      end
+      target_id
+    end
   end
 end

data/lib/merit/model_additions.rb

@@ -17,25 +17,38 @@ module Merit
         field :sash_id
         field :points, :type => Integer, :default => 0
         field :level, :type => Integer, :default => 0
+        def find_by_id(id)
+          where(:_id => id).first
+        end
       end
     end
+  end
 
-    def find_by_id(id)
-      Merit.orm == :mongoid ? where(:_id => id).first : super(id)
+  # Delegate relationship methods from meritable models to their sash
+  %w(badge_ids badges points).each do |method|
+    define_method(method) do
+      _sash = sash || create_sash_and_scores
+      _sash.send method
     end
   end
 
-  def badges
-    create_sash_if_none
-    sash.badges
+  def add_points(num_points, log = 'Manually granted through `add_points`', category = 'default')
+    _sash = sash || create_sash_and_scores
+    _sash.add_points num_points, log, category
+  end
+  def substract_points(num_points, log = 'Manually granted through `add_points`', category = 'default')
+    _sash = sash || create_sash_and_scores
+    _sash.substract_points num_points, log, category
   end
 
   # Create sash if doesn't have
-  def create_sash_if_none
+  def create_sash_and_scores
     if self.sash.blank?
       self.sash = Sash.create
+      self.sash.scores << Merit::Score.create
       self.save(:validate => false)
     end
+    self.sash
   end
 end
 

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

@@ -0,0 +1,16 @@
+module Merit
+  class Score < ActiveRecord::Base
+    self.table_name = :merit_scores
+    belongs_to :sash
+    has_many :score_points, :dependent => :destroy, :class_name => 'Merit::Score::Point'
+
+    def points
+      score_points.group(:score_id).sum(:num_points).values.first || 0
+    end
+
+    class Point < ActiveRecord::Base
+      self.table_name = :merit_score_points
+      belongs_to :score, :class_name => 'Merit::Score'
+    end
+  end
+end

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

@@ -1,21 +1,36 @@
 class Sash < ActiveRecord::Base
   has_many :badges_sashes, :dependent => :destroy
+  has_many :scores, :dependent => :destroy, :class_name => 'Merit::Score'
 
   def badges
     badge_ids.collect { |b_id| Badge.find(b_id) }
   end
 
   def badge_ids
-    badges_sashes.collect(&:badge_id)
+    badges_sashes.map(&:badge_id)
   end
 
   def add_badge(badge_id)
     bs = BadgesSash.new
     bs.badge_id = badge_id
-    badges_sashes << bs
+    self.badges_sashes << bs
   end
 
   def rm_badge(badge_id)
     badges_sashes.find_by_badge_id(badge_id).try(:destroy)
   end
+
+  def points(category = 'default')
+    scores.where(:category => category).first.points
+  end
+
+  def add_points(num_points, log = 'Manually granted through `add_points`', category = 'default')
+    point = Merit::Score::Point.new
+    point.log = log
+    point.num_points = num_points
+    self.scores.where(:category => category).first.score_points << point
+  end
+  def substract_points(num_points, log = 'Manually granted through `add_points`', category = 'default')
+    add_points -num_points, log, category
+  end
 end

data/lib/merit/rule.rb

@@ -3,7 +3,8 @@ module Merit
   # and a temporary option.
   # Could split this class between badges and rankings functionality
   class Rule
-    attr_accessor :badge_name, :level, :to, :multiple, :temporary, :block, :model_name, :level_name
+    attr_accessor :badge_name, :level, :to, :model_name, :level_name,
+      :multiple, :temporary, :score, :block
 
     # Does this rule's condition block apply?
     def applies?(target_obj = nil)
@@ -12,13 +13,14 @@ module Merit
       case block.arity
       when 1 # Expects target object
         if target_obj.present?
-          return block.call(target_obj)
+          block.call(target_obj)
         else
+          # TODO RAISE ERROR
           Rails.logger.warn "[merit] no target_obj found on Rule#applies?"
-          return false
+          false
         end
       else # evaluates to boolean. block.arity returns 0 in Ruby 1.9.3 and -1 in Ruby 1.8.7
-        return block.call
+        block.call
       end
     end
 
@@ -28,7 +30,7 @@ module Merit
     # then remove it.
     def grant_or_delete_badge(action)
       unless (sash = sash_to_badge(action))
-        Rails.logger.warn "[merit] no sash found on Rule#grant_or_delete_badge"
+        Rails.logger.warn "[merit] no sash found on Rule#grant_or_delete_badge for action #{action.inspect}"
         return
       end
 
@@ -44,24 +46,30 @@ module Merit
       end
     end
 
+    def grant_points(action)
+      unless (sash = sash_to_badge(action))
+        Rails.logger.warn "[merit] no sash found on Rule#grant_points"
+        return
+      end
+
+      if applies? action.target_object(model_name)
+        sash.add_points self.score, action.inspect[0..240]
+        action.log!("points_granted:#{self.score}")
+      end
+    end
+
     # Subject to badge: source_user or target.user?
+    # Knows (law of demeter):
+    #  * Rule#model_name & Rule#to
+    #  * MeritAction#object & MeritAction#target_object
     def sash_to_badge(action)
-      target = case to
-               when :action_user
-                 Merit.user_model.find_by_id(action.user_id) # _by_id doens't raise ActiveRecord::RecordNotFound
-               when :itself
-                 action.target_object(model_name)
-               else
-                 begin
-                   action.target_object(model_name).send(to)
-                 rescue NoMethodError
-                   Rails.logger.warn "[merit] #{action.target_model.singularize.camelize}.find(#{action.target_id}) not found, no badges giving today"
-                   return
-                 end
-               end
+      if to == :itself
+        target = action.target_object(model_name)
+      else
+        target = action.target(to)
+      end
       if target
-        target.create_sash_if_none
-        target.sash
+        target.sash || target.create_sash_and_scores
       end
     end
 
@@ -71,7 +79,7 @@ module Merit
         badges = Badge.by_name(badge_name)
         badges = badges.by_level(level) unless level.nil?
         if !(@badge = badges.first)
-          raise "No badge '#{badge_name}'#{level.nil? ? '' : " with level #level"} found. Define it in 'config/initializers/merit.rb'."
+          raise BadgeNotFound, "No badge '#{badge_name}'#{level.nil? ? '' : " with level #level"} found. Define it in 'config/initializers/merit.rb'."
         end
       end
       @badge

data/lib/merit/rules_points.rb

@@ -9,12 +9,17 @@ module Merit
       options[:to] ||= [:action_user]
 
       actions = Array.wrap(options[:on])
-      actions.each do |action|
-        actions_to_point[action] ||= []
-        actions_to_point[action] << {
-          :score => points,
-          :to => Array.wrap(options[:to])
-        }
+
+      Array.wrap(options[:to]).each do |to|
+        rule = Rule.new
+        rule.score = points
+        rule.to    = to
+        rule.block = block
+
+        actions.each do |action|
+          actions_to_point[action] ||= []
+          actions_to_point[action] << rule
+        end
       end
     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     = '0.10.1'
+  s.version     = '1.0.0'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry',  '~> 0.3.0'

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

@@ -11,8 +11,7 @@ class User
   attr_accessible :name
 
   def show_badges
-    create_sash_if_none
-    badges_uniq = Badge.find_by_id(sash.badge_ids)
+    badges_uniq = Badge.find_by_id(badge_ids)
     badges_uniq.collect{|b| "#{b.name.capitalize}#{badge_status(b)}" }.join(', ')
   end
 

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

@@ -15,7 +15,13 @@ module Merit
       score 20, :on => [
         'comments#create',
         'registrations#update'
-      ]
+      ] do |object|
+        if object.class == Comment
+          object.name.length > 4
+        else
+          true
+        end
+      end
     end
   end
 end

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

@@ -6,8 +6,7 @@ class User < ActiveRecord::Base
   attr_accessible :name
 
   def show_badges
-    create_sash_if_none
-    badges_uniq = Badge.find_by_id(sash.badge_ids)
+    badges_uniq = Badge.find_by_id(badge_ids)
     badges_uniq.collect{|b| "#{b.name.capitalize}#{badge_status(b)}" }.join(', ')
   end
 

data/test/dummy/db/migrate/20120318022218_create_sashes.rb

@@ -8,4 +8,4 @@ class CreateSashes < ActiveRecord::Migration
   def self.down
     drop_table :sashes
   end
-end
+end

data/test/dummy/db/migrate/20120318022220_add_fields_to_users.rb

@@ -1,14 +1,11 @@
 class AddFieldsToUsers < ActiveRecord::Migration
   def self.up
     add_column :users, :sash_id, :integer
-    add_column :users, :points, :integer, :default => 0
     add_column :users, :level, :integer, :default => 0
-    User.all.each{|user| user.update_attribute(:points, 0) } # Update existing entries
   end
 
   def self.down
     remove_column :users, :sash_id
-    remove_column :users, :points
     remove_column :users, :level
   end
-end
+end

data/test/dummy/db/migrate/20121013174256_create_scores_and_points.rb

@@ -0,0 +1,19 @@
+class CreateScoresAndPoints < ActiveRecord::Migration
+  def self.up
+    create_table :merit_scores do |t|
+      t.references :sash
+      t.string :category, :default => 'default'
+    end
+
+    create_table :merit_score_points do |t|
+      t.references :score
+      t.integer :num_points, :default => 0
+      t.string :log
+    end
+  end
+
+  def self.down
+    drop_table :merit_scores
+    drop_table :merit_score_points
+  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 => 20120318022220) do
+ActiveRecord::Schema.define(:version => 20121013174256) do
 
   create_table "badges_sashes", :force => true do |t|
     t.integer  "badge_id"
@@ -46,6 +46,17 @@ ActiveRecord::Schema.define(:version => 20120318022220) do
     t.datetime "updated_at",                       :null => false
   end
 
+  create_table "merit_score_points", :force => true do |t|
+    t.integer "score_id"
+    t.integer "num_points", :default => 0
+    t.string  "log"
+  end
+
+  create_table "merit_scores", :force => true do |t|
+    t.integer "sash_id"
+    t.string  "category", :default => "default"
+  end
+
   create_table "sashes", :force => true do |t|
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
@@ -56,7 +67,6 @@ ActiveRecord::Schema.define(:version => 20120318022220) do
     t.datetime "created_at",                :null => false
     t.datetime "updated_at",                :null => false
     t.integer  "sash_id"
-    t.integer  "points",     :default => 0
     t.integer  "level",      :default => 0
   end
 

data/test/integration/navigation_test.rb

@@ -32,6 +32,14 @@ class NavigationTest < ActiveSupport::IntegrationCase
     end
     assert user.badges.empty?, 'Should not have badges'
 
+    assert_equal 0, user.points
+    assert_equal 0, Merit::Score::Point.count
+    user.add_points 15
+    assert_equal 15, user.points
+    user.substract_points 15
+    assert_equal 0, user.points
+    assert_equal 2, Merit::Score::Point.count
+
     # Make tenth comment, assert 10-commenter badge granted
     visit '/comments/new'
     fill_in 'Name', :with => 'Hi!'
@@ -100,7 +108,16 @@ class NavigationTest < ActiveSupport::IntegrationCase
     click_button('Create Comment')
 
     user = User.where(:name => 'a').first
-    assert_equal 40, user.points, 'Commenting should grant 20 points'
+    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
+    click_button('Create Comment')
+
+    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"
     user = User.first

data/test/merit_unit_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class MeritUnitTest < ActiveSupport::TestCase
-  test "Rule applies?" do
+  test "Rule#applies? should depend on provided block" do
     rule = Merit::Rule.new
     assert rule.applies?, 'empty conditions should make rule apply'
 
@@ -11,27 +11,41 @@ class MeritUnitTest < ActiveSupport::TestCase
 
     rule.block = lambda{|obj| obj.length >= 4 }
     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'
   end
 
-  test "BadgeSash knows it's related badge" do
-    # No BadgeSash model for Mongoid
-    return if ENV["ORM"] == "mongoid"
+  test "Rule#badge should get related badge or raise Merit exception" do
+    rule = Merit::Rule.new
+    rule.badge_name = 'inexistent'
+    assert_raise Merit::BadgeNotFound do
+      rule.badge
+    end
 
-    Badge.create(:id => 99, :name => 'test-badge')
-    badge_sash = BadgesSash.new
-    badge_sash.badge_id = 99
-    assert_equal Badge.find(99), badge_sash.badge
+    badge = Badge.create(:id => 98, :name => 'test-badge-98')
+    rule.badge_name = badge.name
+    assert_equal Badge.find(98), rule.badge
   end
 
+  # TODO: Test and refactor:
+  # Rule: grant_or_delete_badge(action), sash_to_badge
+  # Badge: delete_from
+  # MeritAction: target(to), action_user, other_target(to), target_object(model_name = nil)
+
+
   test "Badge#grant_to allow_multiple option" do
     badge = Badge.create(:id => 99, :name => 'test-badge')
     sash = Sash.create(:id => 99)
+
     assert_equal 0, sash.badge_ids.count
-    badge.grant_to sash
-    assert_equal 1, sash.reload.badge_ids.count
-    badge.grant_to sash
-    assert_equal 1, sash.reload.badge_ids.count
-    badge.grant_to sash, :allow_multiple => true
-    assert_equal 2, sash.reload.badge_ids.count
+
+    assert badge.grant_to(sash)
+    assert_equal 1, sash.badge_ids.count
+    assert !badge.grant_to(sash)
+    assert_equal 1, sash.badge_ids.count
+
+    assert badge.grant_to(sash, :allow_multiple => true)
+    assert_equal 2, sash.badge_ids.count
   end
 end

data/test/test_helper.rb

@@ -31,7 +31,6 @@ Capybara.default_driver   = :rack_test
 Capybara.default_selector = :css
 
 if ENV["ORM"] == "mongoid"
-  puts 'Testing with ORM Mongoid'
   class ActiveSupport::TestCase
     def teardown
       Mongoid.database.collections.each do |collection|
@@ -39,8 +38,7 @@ if ENV["ORM"] == "mongoid"
       end
     end
   end
-else
-  puts 'Testing with ORM ActiveRecord'
+else # ActiveRecord
   # Run any available migration
   ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -155,13 +155,13 @@ files:
 - UPGRADING.md
 - app/models/badge.rb
 - app/models/merit_action.rb
-- config/locales/en.yml
 - lib/generators/active_record/install_generator.rb
 - lib/generators/active_record/merit_generator.rb
 - lib/generators/active_record/templates/add_fields_to_model.rb
 - lib/generators/active_record/templates/create_badges_sashes.rb
 - lib/generators/active_record/templates/create_merit_actions.rb
 - lib/generators/active_record/templates/create_sashes.rb
+- lib/generators/active_record/templates/create_scores_and_points.rb
 - lib/generators/merit/install_generator.rb
 - lib/generators/merit/merit_generator.rb
 - lib/generators/merit/templates/merit.rb
@@ -172,6 +172,7 @@ files:
 - lib/merit/controller_extensions.rb
 - lib/merit/model_additions.rb
 - lib/merit/models/active_record/badges_sash.rb
+- lib/merit/models/active_record/merit/score.rb
 - lib/merit/models/active_record/merit_action.rb
 - lib/merit/models/active_record/sash.rb
 - lib/merit/models/mongo_mapper/merit_action.rb
@@ -279,6 +280,7 @@ files:
 - test/dummy/db/migrate/20120318022218_create_sashes.rb
 - 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/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/public/404.html
@@ -318,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: General reputation Rails engine.

data/config/locales/en.yml

@@ -1,4 +0,0 @@
-en:
-  merit:
-    flashs:
-      badge_granted: "Congratulations! You've just earned '%{badge}' badge."