merit 1.1.1 → 1.1.2

data/Gemfile.lock

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

data/README.md

@@ -53,16 +53,16 @@ end
 
 ## Grant manually
 
-You may also grant badges "by hand" (optionally multiple times):
+You may also grant badges "by hand":
 
 ```ruby
-Badge.find(3).grant_to(current_user, :allow_multiple => true)
+current_user.add_badge(badge.id)
 ```
 
-Similarly you can take back badges that have been granted:
+Similarly you can remove badges that have been granted:
 
 ```ruby
-Badge.find(3).delete_from(current_user)
+current_user.rm_badge(badge.id)
 ```
 
 ---
@@ -144,11 +144,7 @@ set_rank :level => 3, :to => Commiter.active do |commiter|
 end
 ```
 
----
 
 # To-do list
 
-* target_object should be configurable (now it's singularized controller name)
-* Should namespace app/models into Merit module.
-* :value parameter (for star voting for example) should be configurable
-  (depends on params[:value] on the controller).
+* Should namespace Badge, BadgesSash and Sash into Merit module.

data/UPGRADING.md

@@ -1,5 +1,12 @@
 # Upgrading
 
+## to 1.2.0 (unreleased)
+
+* `Badge#grant_to(meritable_object)` no longer exists. Use
+  `meritable_object.add_badge(badge_id)` (may add badges more than once).
+* `Badge#delete_from(meritable_object)` no longer exists. Use
+  `meritable_object.rm_badge(badge_id)`.
+
 ## to 1.1.0
 
 Code refactorings. Support for Ruby 1.8.7 has been dropped.

data/app/models/badge.rb

@@ -31,40 +31,4 @@ class Badge
     end
     badge
   end
-
-  # Grant badge to sash
-  # Accepts :allow_multiple boolean option, defaults to false
-  def grant_to(object_or_sash, *args)
-    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)
-      true
-    else
-      false
-    end
-  end
-
-  # Take out badge from sash
-  def delete_from(object_or_sash)
-    sash = sash_from(object_or_sash)
-    if sash.badge_ids.include?(id)
-      sash.rm_badge(id)
-      true
-    else
-      false
-    end
-  end
-
-  private
-
-  def sash_from(object_or_sash)
-    if object_or_sash.kind_of?(Sash)
-      object_or_sash
-    else
-      object_or_sash._sash
-    end
-  end
 end

data/app/models/merit/action.rb

@@ -0,0 +1,98 @@
+require "merit/models/#{Merit.orm}/merit/action"
+
+# Merit::Action general schema
+#   ______________________________________________________________
+#   source  | action       | target
+#   user_id | method,value | model,id | processed
+#   ______________________________________________________________
+#   1 | comment nil | List 8  | true
+#   1 | vote 3      | List 12 | true
+#   3 | follow nil  | User 1  | false
+#   X | create nil  | User #{generated_id} | false
+#   ______________________________________________________________
+#
+# Rules relate to merit_actions by action name ('controller#action' string)
+module Merit
+  class Action
+    attr_accessible :user_id, :action_method, :action_value, :had_errors,
+      :target_model, :target_id, :processed, :log
+
+    def self.check_unprocessed_rules
+      where(:processed => false).map &:check_all_rules
+    end
+
+    # Check rules defined for a merit_action
+    def check_all_rules
+      processed!
+      return if had_errors
+
+      badge_rules = ::Merit::AppBadgeRules[action_str] || []
+      point_rules = ::Merit::AppPointRules[action_str] || []
+      check_rules badge_rules, :badges
+      check_rules point_rules, :points
+    end
+
+    def log_activity(str)
+      self.update_attribute :log, "#{self.log}#{str}|"
+    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.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)
+    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
+      self.save
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# Be sure to restart your server when you modify this file.
+#
 # +grant_on+ accepts:
 # * Nothing (always grants)
 # * A block which evaluates to boolean (recieves the object as parameter)

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

@@ -1,3 +1,5 @@
+# Be sure to restart your server when you modify this file.
+#
 # Points are a simple integer value which are given to "meritable" resources
 # according to rules in +app/models/merit/point_rules.rb+. They are given on
 # actions-triggered, either to the action user or to the method (or array of

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

@@ -1,3 +1,5 @@
+# Be sure to restart your server when you modify this file.
+#
 # 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.

data/lib/merit.rb

@@ -4,6 +4,7 @@ require 'merit/rules_points_methods'
 require 'merit/rules_rank_methods'
 require 'merit/controller_extensions'
 require 'merit/model_additions'
+require 'merit/judge'
 
 module Merit
   # Check rules on each request

data/lib/merit/controller_extensions.rb

@@ -7,7 +7,7 @@ module Merit
       base.after_filter do |controller|
         return unless rules_defined?
 
-        MeritAction.create(
+        Merit::Action.create(
           :user_id       => send(Merit.current_user_method).try(:id),
           :action_method => action_name,
           :action_value  => params[:value],
@@ -17,7 +17,7 @@ module Merit
         ).id
 
         if Merit.checks_on_each_request
-          MeritAction.check_unprocessed_rules
+          Merit::Action.check_unprocessed_rules
         end
       end
     end

data/lib/merit/judge.rb

@@ -0,0 +1,53 @@
+module Merit
+  class Judge
+    def initialize(sash, rule, options = {})
+      @sash = sash
+      @rule = rule
+      # FIXME: Too much context:
+      # A Judge should apply reputation independently of the action
+      @action = options[:action]
+    end
+
+    # Grant badge if rule applies. If it doesn't, and the badge is temporary,
+    # then remove it.
+    def apply_badges
+      if rule_applies?
+        grant_badge if new_or_multiple?
+      else
+        remove_badge if @rule.temporary
+      end
+    end
+
+    def apply_points
+      return unless rule_applies?
+      @sash.add_points @rule.score, @action.inspect[0..240]
+      @action.log_activity "points_granted:#{@rule.score}"
+    end
+
+    private
+
+    def grant_badge
+      @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)
+      @action.log_activity "badge_removed:#{badge.id}"
+    end
+
+    def new_or_multiple?
+      !@sash.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)
+    end
+
+    def badge
+      @rule.badge
+    end
+  end
+end

data/lib/merit/model_additions.rb

@@ -28,7 +28,7 @@ module Merit
       # From Rails 3.2 we can override association methods to do so
       # transparently, but merit supports Rails ~> 3.0.0. See:
       # http://blog.hasmanythrough.com/2012/1/20/modularized-association-methods-in-rails-3-2
-      %w(badge_ids badges points add_points substract_points).each do |method|
+      %w(badge_ids badges points add_badge rm_badge add_points substract_points).each do |method|
         delegate method, to: :_sash
       end
       define_method(:_sash) do

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

@@ -0,0 +1,5 @@
+module Merit
+  class Action < ActiveRecord::Base
+    self.table_name = :merit_actions
+  end
+end

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

@@ -28,6 +28,7 @@ class Sash < ActiveRecord::Base
     badges_sashes.find_by_badge_id(badge_id).try(:destroy)
   end
 
+
   def points(category = 'default')
     scores.where(:category => category).first.points
   end
@@ -38,6 +39,7 @@ class Sash < ActiveRecord::Base
     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

data/lib/merit/models/mongo_mapper/merit/action.rb

@@ -0,0 +1,15 @@
+module Merit
+  class Action
+    include MongoMapper::Document
+
+    key :user_id, String
+    key :action_method, String
+    key :action_value, Integer
+    key :had_errors, Boolean
+    key :target_model, String
+    key :target_id, String
+    key :processed, Boolean, :default => false
+    key :log, String
+    timestamps!
+  end
+end

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

@@ -0,0 +1,15 @@
+module Merit
+  class Action
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    belongs_to :user
+    field :action_method
+    field :action_value, :type => Integer
+    field :had_errors, :type => Boolean
+
+    belongs_to :target, :polymorphic => true
+    field :processed, :type => Boolean, :default => false
+    field :log
+  end
+end

data/lib/merit/rule.rb

@@ -15,62 +15,14 @@ module Merit
         if target_obj.present?
           block.call(target_obj)
         else
-          # TODO RAISE ERROR
           Rails.logger.warn "[merit] no target_obj found on Rule#applies?"
           false
         end
-      else # evaluates to boolean. block.arity returns 0 in Ruby 1.9.3 and -1 in Ruby 1.8.7
+      when 0
         block.call
       end
     end
 
-    def temporary?; self.temporary; end
-
-    # Grant badge if rule applies. If it doesn't, and the badge is temporary,
-    # then remove it.
-    def apply_badges(action)
-      unless (sash = sash_to_badge(action))
-        Rails.logger.warn "[merit] no sash found on Rule#apply_badges for action #{action.inspect}"
-        return
-      end
-
-      if applies? action.target_object(model_name)
-        if badge.grant_to(sash, :allow_multiple => self.multiple)
-          to_action_user = (to.to_sym == :action_user ? '_to_action_user' : '')
-          action.log_activity "badge_granted#{to_action_user}:#{badge.id}"
-        end
-      elsif temporary?
-        if badge.delete_from(sash)
-          action.log_activity "badge_removed:#{badge.id}"
-        end
-      end
-    end
-
-    def apply_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_activity "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)
-      if to == :itself
-        target = action.target_object(model_name)
-      else
-        target = action.target(to)
-      end
-      target._sash if target
-    end
-
     # Get rule's related Badge.
     def badge
       @badge ||= Badge.find_by_name_and_level(badge_name, level)

data/lib/merit/rules_points_methods.rb

@@ -6,7 +6,7 @@ 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] ||= :action_user
 
       actions = Array.wrap(options[:on])
 

data/merit.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.description = "Manage badges, points and rankings (reputation) of resources in a Rails application."
   s.homepage    = "http://github.com/tute/merit"
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
-  s.version     = '1.1.1'
+  s.version     = '1.1.2'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
   s.add_dependency 'ambry',  '~> 0.3.0'

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

@@ -4,4 +4,8 @@ class Comment < ActiveRecord::Base
   attr_accessible :name, :comment, :user_id, :votes
 
   validates :name, :comment, :user_id, :presence => true
+
+  def friend
+    User.find_by_name('friend')
+  end
 end

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

@@ -33,6 +33,10 @@ module Merit
       grant_on 'comments#create', :badge => 'commenter', :level => 10 do |comment|
         comment.user.comments.count >= 10
       end
+      # Testing badge granting in more than one rule per action with different targets
+      grant_on 'comments#create', :badge => 'has_commenter_friend', :to => :friend do |comment|
+        comment.user.comments.count >= 10
+      end
 
       # If it has at least 10 votes, grant relevant-commenter badge
       grant_on 'comments#vote', :badge => 'relevant-commenter', :to => :user do |comment|

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

@@ -12,12 +12,16 @@ badge_id = 0
 [{
   :id => (badge_id = badge_id+1),
   :name        => 'commenter',
-  :description => 'You\'ve participated good in our boards!',
+  :description => 'You\'ve participated good in our boards! (level 10)',
   :level       => 10
 }, {
   :id => (badge_id = badge_id+1),
   :name        => 'commenter',
   :description => 'You\'ve participated great in our boards!'
+}, {
+  :id => (badge_id = badge_id+1),
+  :name        => 'has_commenter_friend',
+  :description => 'Testing badge granting in more than one rule per action, with different targets'
 }, {
   :id => (badge_id = badge_id+1),
   :name        => 'relevant-commenter',

data/test/dummy/db/seeds.rb

@@ -1,6 +1,8 @@
 commenter = User.create(:name => 'the-commenter-guy')
 social = User.create(:name => 'social-skilled-man')
-bored  = User.create(:name => 'bored-or-speechless')
+
+User.create(:name => 'bored-or-speechless')
+User.create(:name => 'friend')
 
 (1..9).each do |i|
   Comment.create(

data/test/integration/navigation_test.rb

@@ -10,6 +10,26 @@ class NavigationTest < ActiveSupport::IntegrationCase
     assert_equal [Badge.by_name('just-registered').first], user.badges.to_a
   end
 
+  test 'User#add_badge should add one badge, #rm_badge should delete one' do
+    user = User.create(:name => 'test-user')
+    assert_equal [], user.badges.to_a
+
+    badge = Badge.first
+    user.add_badge badge.id
+    user.add_badge badge.id
+    assert_equal [badge, badge], user.badges.to_a
+
+    user.rm_badge badge.id
+    assert_equal [badge], user.reload.badges.to_a
+  end
+
+  test 'Remove inexistent badge should do nothing' do
+    user = User.create(:name => 'test-user')
+    assert_equal [], user.badges.to_a
+    user.rm_badge 1
+    assert_equal [], user.badges.to_a
+  end
+
   test 'users#index should grant badge multiple times' do
     user = User.create(:name => 'test-user')
     visit '/users'
@@ -22,6 +42,9 @@ class NavigationTest < ActiveSupport::IntegrationCase
   test 'user workflow should grant some badges at some times' do
     # Commented 9 times, no badges yet
     user = User.create(:name => 'test-user')
+    # Create needed friend user object
+    friend = User.create(:name => 'friend')
+
     (1..9).each do |i|
       Comment.create(
         :name    => "Title #{i}",
@@ -47,8 +70,8 @@ class NavigationTest < ActiveSupport::IntegrationCase
     fill_in 'User', :with => user.id
     click_button('Create Comment')
 
-    user = User.where(:name => 'test-user').first
-    assert_equal [Badge.by_name('commenter').by_level(10).first], user.badges.to_a
+    assert_equal [Badge.by_name('commenter').by_level(10).first], user.reload.badges.to_a
+    assert_equal [Badge.by_name('has_commenter_friend').first], friend.reload.badges.to_a
 
     # Vote (to 5) a user's comment, assert relevant-commenter badge granted
     relevant_comment = user.comments.where(:votes => 8).first
@@ -85,6 +108,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
   end
 
   test 'user workflow should add up points at some times' do
+    User.delete_all
     user = User.create(:name => 'test-user')
     assert_equal 0, user.points, 'User should start with 0 points'
 

data/test/merit_unit_test.rb

@@ -16,7 +16,7 @@ class MeritUnitTest < ActiveSupport::TestCase
     assert !rule.applies?, 'block which expects object should return false if no argument'
   end
 
-  test "Rule#badge should get related badge or raise Merit exception" do
+  test "Rule#badge should get related badge or raise Merit::BadgeNotFound" do
     rule = Merit::Rule.new
     rule.badge_name = 'inexistent'
     assert_raise Merit::BadgeNotFound do
@@ -28,13 +28,16 @@ class MeritUnitTest < ActiveSupport::TestCase
     assert_equal Badge.find(98), rule.badge
   end
 
-  test "Extending only certain ActiveRecord models" do
+  test "Extends only meritable ActiveRecord models" do
     class MeritableModel < ActiveRecord::Base
       def self.columns; @columns ||= []; end
       has_merit
     end
+    class OtherModels < ActiveRecord::Base
+      def self.columns; @columns ||= []; end
+    end
     assert MeritableModel.method_defined?(:points), 'Meritable model should respond to merit methods'
-    assert !ActiveRecord::Base.method_defined?(:points), 'ActiveRecord::Base shouldn\'t respond to merit methods'
+    assert !OtherModels.method_defined?(:points), 'Other models shouldn\'t respond to merit methods'
   end
 
   # Do we need this non-documented attribute?
@@ -44,19 +47,4 @@ class MeritUnitTest < ActiveSupport::TestCase
     badge_sash.set_notified!
     assert badge_sash.notified_user
   end
-
-  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
-
-    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -154,7 +154,7 @@ files:
 - TESTING.txt
 - UPGRADING.md
 - app/models/badge.rb
-- app/models/merit_action.rb
+- app/models/merit/action.rb
 - lib/generators/active_record/install_generator.rb
 - lib/generators/active_record/merit_generator.rb
 - lib/generators/active_record/templates/add_fields_to_model.rb
@@ -170,14 +170,15 @@ files:
 - lib/generators/merit/templates/merit_rank_rules.rb
 - lib/merit.rb
 - lib/merit/controller_extensions.rb
+- lib/merit/judge.rb
 - lib/merit/model_additions.rb
 - lib/merit/models/active_record/badges_sash.rb
+- lib/merit/models/active_record/merit/action.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
+- lib/merit/models/mongo_mapper/merit/action.rb
 - lib/merit/models/mongo_mapper/sash.rb
-- lib/merit/models/mongoid/merit_action.rb
+- lib/merit/models/mongoid/merit/action.rb
 - lib/merit/models/mongoid/sash.rb
 - lib/merit/rule.rb
 - lib/merit/rules_badge_methods.rb

data/app/models/merit_action.rb

@@ -1,87 +0,0 @@
-require "merit/models/#{Merit.orm}/merit_action"
-
-# MeritAction general schema
-#   ______________________________________________________________
-#   source  | action       | target
-#   user_id | method,value | model,id | processed
-#   ______________________________________________________________
-#   1 | comment nil | List 8  | true
-#   1 | vote 3      | List 12 | true
-#   3 | follow nil  | User 1  | false
-#   X | create nil  | User #{generated_id} | false
-#   ______________________________________________________________
-#
-# Rules relate to merit_actions by action name ('controller#action' string)
-class MeritAction
-  attr_accessible :user_id, :action_method, :action_value, :had_errors,
-    :target_model, :target_id, :processed, :log
-
-  def self.check_unprocessed_rules
-    where(:processed => false).map &:check_rules
-  end
-
-  # Check rules defined for a merit_action
-  def check_rules
-    unless had_errors
-      check_badge_rules
-      check_point_rules
-    end
-    processed!
-  end
-
-  def target(to)
-    @target ||= (to == :action_user) ? action_user : other_target(to)
-  end
-
-  def target_object(model_name = nil)
-    # Grab custom model_name from Rule, or target_model from MeritAction triggered
-    klass = model_name || target_model
-    klass.singularize.camelize.constantize.find_by_id(target_id)
-  rescue => e
-    Rails.logger.warn "[merit] no target_object found: #{e}"
-  end
-
-  def log_activity(str)
-    self.update_attribute :log, "#{self.log}#{str}|"
-  end
-
-  private
-
-  def check_badge_rules
-    rules = AppBadgeRules[action_str] || []
-    rules.each { |rule| rule.apply_badges(self) }
-  end
-
-  def check_point_rules
-    rules = AppPointRules[action_str] || []
-    rules.each { |rule| rule.apply_points(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 MeritAction#other_target)"
-      return
-    end
-  end
-
-  # Mark merit_action as processed
-  def processed!
-    self.processed = true
-    self.save
-  end
-end

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

@@ -1,2 +0,0 @@
-class MeritAction < ActiveRecord::Base
-end

data/lib/merit/models/mongo_mapper/merit_action.rb

@@ -1,13 +0,0 @@
-class MeritAction
-  include MongoMapper::Document
-
-  key :user_id, String
-  key :action_method, String
-  key :action_value, Integer
-  key :had_errors, Boolean
-  key :target_model, String
-  key :target_id, String
-  key :processed, Boolean, :default => false
-  key :log, String
-  timestamps!
-end

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

@@ -1,13 +0,0 @@
-class MeritAction
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  belongs_to :user
-  field :action_method
-  field :action_value, :type => Integer
-  field :had_errors, :type => Boolean
-
-  belongs_to :target, :polymorphic => true
-  field :processed, :type => Boolean, :default => false
-  field :log
-end