merit 1.4.0 → 1.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    merit (1.4.0)
+    merit (1.5.0)
       ambry (~> 0.3.0)
 
 GEM
@@ -101,7 +101,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.3.beta.1)
+    rake (10.0.4)
     rdoc (3.12)
       json (~> 1.4)
     rubyzip (0.9.8)

data/README.md

@@ -167,8 +167,7 @@ end
 
 # To-do list
 
-* 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"
+* `ActivityLog` should replace `add_points` `log` parameter
+* Extract logging from `Judge` to an Observer. See http://www.rubytapas.com/episodes/21-Domain-Model-Events
 * FIXMES and TODOS.

data/TESTING.txt

@@ -3,12 +3,9 @@ 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
-n
-n
-n
+rails g merit:install
 rails g merit user
+rails g merit comment
 rake db:migrate db:seed
 
 # see it in the browser

data/UPGRADING.md

@@ -1,14 +1,42 @@
 # Upgrading
 
+## 1.5.0
+
+* Adds `Merit::ActivityLog` join model between `Merit::Action` and
+  `Merit::BadgesSash` and `Merit::Score::Point` for logging purposes. Every
+  time a badge is granted or removed, or points are changed, a new
+  `ActivityLog` object gets created.
+* Namespaces `Badge`, `Sash` and `BadgesSash` into `Merit` module. If your app
+  uses any of those class names, you should add a `Merit::` prefix.
+* Removes undocumented `log:string` column from `merit_actions`.
+
+Run the following migration to upgrade from 1.4.0:
+
+```ruby
+class UpgradeMeritTo150 < ActiveRecord::Migration
+  def self.up
+    remove_column :merit_actions, :log
+    create_table "merit_activity_logs", :force => true do |t|
+      t.integer  "action_id"
+      t.string   "related_change_type"
+      t.integer  "related_change_id"
+      t.string   "description"
+      t.datetime "created_at"
+    end
+  end
+end
+```
+
 ## 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'
-  ```
+
+```ruby
+# All user's comments earn points
+score 2, to: :user_comments, on: 'comments#vote'
+```
 
 ## to 1.3.0
 

data/app/models/merit/action.rb

@@ -29,10 +29,6 @@ module Merit
       check_rules point_rules, :points
     end
 
-    def log_activity(str)
-      self.update_attribute :log, "#{self.log}#{str}|"[0,240]
-    end
-
     private
 
     def check_rules(rules_array, badges_or_points)

data/app/models/merit/badge.rb

@@ -0,0 +1,54 @@
+module Merit
+  require 'ambry'
+  require 'ambry/active_model'
+
+  class Badge
+    extend Ambry::Model
+    extend Ambry::ActiveModel
+
+    field :id, :name, :level, :image, :description
+
+    validates_presence_of :id, :name
+    validates_uniqueness_of :id
+
+    filters do
+      def find_by_id(ids)
+        ids = Array.wrap(ids)
+        find{|b| ids.include? b[:id] }
+      end
+      def by_name(name)
+        find{|b| b.name == name.to_s }
+      end
+      def by_level(level)
+        find{|b| b.level.to_s == level.to_s }
+      end
+    end
+
+    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
+
+      # 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
+end

data/lib/generators/active_record/install_generator.rb

@@ -14,6 +14,7 @@ module ActiveRecord
 
       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'

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

@@ -8,7 +8,6 @@ class CreateMeritActions < ActiveRecord::Migration
       t.string  :target_model
       t.integer :target_id
       t.boolean :processed, :default => false
-      t.string  :log, :default => nil
       t.timestamps
     end
   end

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

@@ -0,0 +1,15 @@
+class CreateMeritActivityLogs < ActiveRecord::Migration
+  def self.up
+    create_table :merit_activity_logs do |t|
+      t.integer  :action_id
+      t.string   :related_change_type
+      t.integer  :related_change_id
+      t.string   :description
+      t.datetime :created_at
+    end
+  end
+
+  def self.down
+    drop_table :merit_activity_logs
+  end
+end

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

@@ -14,7 +14,7 @@ Merit.setup do |config|
 end
 
 # Create application badges (uses https://github.com/norman/ambry)
-# Badge.create!({
+# Merit::Badge.create!({
 #   :id => 1,
 #   :name => 'just-registered'
 # })

data/lib/merit.rb

@@ -45,8 +45,9 @@ module Merit
 
     initializer 'merit.controller' do |app|
       if Merit.orm == :active_record
-        require 'merit/models/active_record/sash'
-        require 'merit/models/active_record/badges_sash'
+        require 'merit/models/active_record/merit/activity_log'
+        require 'merit/models/active_record/merit/badges_sash'
+        require 'merit/models/active_record/merit/sash'
         require 'merit/models/active_record/merit/score'
       elsif Merit.orm == :mongoid
         require "merit/models/mongoid/sash"

data/lib/merit/judge.rb

@@ -12,7 +12,7 @@ module Merit
     # then remove it.
     def apply_badges
       if rule_applies?
-        grant_badges if new_or_multiple?
+        grant_badges
       else
         remove_badges if @rule.temporary
       end
@@ -21,26 +21,41 @@ module Merit
     def apply_points
       return unless rule_applies?
       @sashes.each do |sash|
-        sash.add_points @rule.score, @action.inspect[0..240]
+        points = sash.add_points @rule.score
+        ActivityLog.create(
+          action_id: @action.id,
+          related_change: points
+        )
       end
-      @action.log_activity "points_granted:#{@rule.score}"
     end
 
     private
 
     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}"
+      @sashes.each do |sash|
+        next unless new_or_multiple?(sash)
+        badge_sash = sash.add_badge badge.id
+        ActivityLog.create(
+          action_id: @action.id,
+          related_change: badge_sash,
+          description: 'granted'
+        )
+      end
     end
 
     def remove_badges
-      @sashes.each { |sash| sash.rm_badge badge.id }
-      @action.log_activity "badge_removed:#{badge.id}"
+      @sashes.each do |sash|
+        badge_sash = sash.rm_badge badge.id
+        ActivityLog.create(
+          action_id: @action.id,
+          related_change: badge_sash,
+          description: 'removed'
+        )
+      end
     end
 
-    def new_or_multiple?
-      !@sashes.map(&:badge_ids).include?(badge.id) || @rule.multiple
+    def new_or_multiple?(sash)
+      !sash.badge_ids.include?(badge.id) || @rule.multiple
     end
 
     def rule_applies?

data/lib/merit/model_additions.rb

@@ -7,7 +7,7 @@ module Merit
       # That's why MeritableModel belongs_to Sash. Can't use
       # :dependent => destroy as it may raise FK constraint exceptions. See:
       # https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1079-belongs_to-dependent-destroy-should-destroy-self-before-assocation
-      belongs_to :sash
+      belongs_to :sash, class_name: 'Merit::Sash'
 
       _merit_orm_specific_config
       _merit_delegate_methods_to_sash

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

@@ -2,6 +2,8 @@ module Merit
   class Action < ActiveRecord::Base
     self.table_name = :merit_actions
 
+    has_many :activity_logs, class_name: Merit::ActivityLog
+
     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

@@ -0,0 +1,10 @@
+module Merit
+  class ActivityLog < ActiveRecord::Base
+    self.table_name = :merit_activity_logs
+
+    belongs_to :action, class_name: Merit::Action
+    belongs_to :related_change, polymorphic: true
+
+    attr_accessible :action_id, :related_change, :description, :created_at
+  end
+end

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

@@ -0,0 +1,20 @@
+module Merit
+  class BadgesSash < ActiveRecord::Base
+    belongs_to :sash
+    has_many :activity_logs, class_name: Merit::ActivityLog, as: :related_change
+
+    attr_accessible :badge_id
+
+    def self.last_granted(options = {})
+      options[:since_date] ||= 1.month.ago
+      options[:limit]      ||= 10
+      where("created_at > '#{options[:since_date]}'").
+        limit(options[:limit]).
+        map(&:badge)
+    end
+
+    def badge
+      Badge.find(badge_id)
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+module Merit
+  # Sash is a container for reputation data for meritable models. It's an
+  # indirection between meritable models and badges and scores (one to one
+  # relationship).
+  #
+  # It's existence make join models like badges_users and scores_users
+  # unnecessary. It should be transparent at the application.
+  class Sash < ActiveRecord::Base
+    has_many :badges_sashes, :dependent => :destroy
+    has_many :scores, :dependent => :destroy, :class_name => 'Merit::Score'
+
+    after_create :create_scores
+
+    def badges
+      badge_ids.collect { |b_id| Badge.find(b_id) }
+    end
+
+    def badge_ids
+      badges_sashes.map(&:badge_id)
+    end
+
+    def add_badge(badge_id)
+      bs = BadgesSash.new(badge_id: badge_id)
+      self.badges_sashes << bs
+      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
+      point
+    end
+
+    def substract_points(num_points, log = 'Manually granted through `add_points`', category = 'default')
+      add_points -num_points, log, category
+    end
+
+    private
+
+    def create_scores
+      self.scores << Merit::Score.create
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ 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'
+    has_many :score_points, :dependent => :destroy, class_name: 'Merit::Score::Point'
 
     # Meant to display a leaderboard. Accepts options :table_name (users by
     # default), :since_date (1.month.ago by default) and :limit (10 by
@@ -44,6 +44,7 @@ SQL
 
     class Point < ActiveRecord::Base
       belongs_to :score, :class_name => 'Merit::Score'
+      has_many :activity_logs, class_name: Merit::ActivityLog, as: :related_change
     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     = '1.4.0'
+  s.version     = '1.5.0'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 

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

@@ -1,5 +1,6 @@
 class Comment < ActiveRecord::Base
   has_merit
+
   belongs_to :user
 
   attr_accessible :name, :comment, :user_id, :votes

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

@@ -41,5 +41,5 @@ badge_id = 0
   :id => (badge_id = badge_id+1),
   :name => 'gossip'
 }].each do |badge|
-  Badge.create! badge
+  Merit::Badge.create! badge
 end

data/test/dummy/db/migrate/{20120318022217_create_merit_actions.rb → 20130329224406_create_merit_actions.rb}

@@ -4,11 +4,10 @@ class CreateMeritActions < ActiveRecord::Migration
       t.integer :user_id # source
       t.string  :action_method
       t.integer :action_value
-      t.boolean :had_errors
+      t.boolean :had_errors, :default => false
       t.string  :target_model
       t.integer :target_id
       t.boolean :processed, :default => false
-      t.string  :log, :default => nil
       t.timestamps
     end
   end

data/test/dummy/db/migrate/20130329224407_create_merit_activity_logs.rb

@@ -0,0 +1,15 @@
+class CreateMeritActivityLogs < ActiveRecord::Migration
+  def self.up
+    create_table :merit_activity_logs do |t|
+      t.integer  :action_id
+      t.string   :related_change_type
+      t.integer  :related_change_id
+      t.string   :description
+      t.datetime :created_at
+    end
+  end
+
+  def self.down
+    drop_table :merit_activity_logs
+  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 => 20130321082817) do
+ActiveRecord::Schema.define(:version => 20130329222238) do
 
   create_table "badges_sashes", :force => true do |t|
     t.integer  "badge_id"
@@ -39,15 +39,22 @@ ActiveRecord::Schema.define(:version => 20130321082817) do
     t.integer  "user_id"
     t.string   "action_method"
     t.integer  "action_value"
-    t.boolean  "had_errors"
+    t.boolean  "had_errors",    :default => false
     t.string   "target_model"
     t.integer  "target_id"
     t.boolean  "processed",     :default => false
-    t.string   "log"
     t.datetime "created_at",                       :null => false
     t.datetime "updated_at",                       :null => false
   end
 
+  create_table "merit_activity_logs", :force => true do |t|
+    t.integer  "action_id"
+    t.string   "related_change_type"
+    t.integer  "related_change_id"
+    t.string   "description"
+    t.datetime "created_at"
+  end
+
   create_table "merit_score_points", :force => true do |t|
     t.integer  "score_id"
     t.integer  "num_points", :default => 0

data/test/integration/navigation_test.rb

@@ -4,17 +4,19 @@ class NavigationTest < ActiveSupport::IntegrationCase
   test 'user sign up should grant badge to itself' do
     visit '/users/new'
     fill_in 'Name', :with => 'Jack'
-    click_button('Create User')
+    assert_difference('Merit::ActivityLog.count') do
+      click_button('Create User')
+    end
 
     user = User.where(:name => 'Jack').first
-    assert_equal [Badge.by_name('just-registered').first], user.badges
+    assert_equal [Merit::Badge.by_name('just-registered').first], user.badges
   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
 
-    badge = Badge.first
+    badge = Merit::Badge.first
     user.add_badge badge.id
     user.add_badge badge.id
     assert_equal [badge, badge], user.badges
@@ -36,13 +38,13 @@ class NavigationTest < ActiveSupport::IntegrationCase
     visit '/users'
     visit '/users'
     visit '/users'
-    gossip = Badge.by_name('gossip').first
+    gossip = Merit::Badge.by_name('gossip').first
     assert_equal 3, User.first.badges.count
     assert_equal [gossip, gossip, gossip], User.first.badges
 
     # Testing with namespaced controllers
     visit '/admin/users'
-    visited_admin = Badge.by_name('visited_admin').first
+    visited_admin = Merit::Badge.by_name('visited_admin').first
     assert_equal 4, User.first.badges.count
     assert User.first.badges.include?(visited_admin)
   end
@@ -76,10 +78,12 @@ class NavigationTest < ActiveSupport::IntegrationCase
     fill_in 'Name', :with => 'Hi!'
     fill_in 'Comment', :with => 'Hi bro!'
     fill_in 'User', :with => user.id
-    click_button('Create Comment')
+    assert_difference('Merit::ActivityLog.count', 2) do
+      click_button('Create Comment')
+    end
 
-    assert_equal [Badge.by_name('commenter').by_level(10).first], user.reload.badges
-    assert_equal [Badge.by_name('has_commenter_friend').first], friend.reload.badges
+    assert_equal [Merit::Badge.by_name('commenter').by_level(10).first], user.reload.badges
+    assert_equal [Merit::Badge.by_name('has_commenter_friend').first], friend.reload.badges
 
     # Vote (to 5) a user's comment, assert relevant-commenter badge granted
     relevant_comment = user.comments.where(:votes => 8).first
@@ -88,7 +92,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
       click_link '2'
     end
 
-    relevant_badge = Badge.by_name('relevant-commenter').first
+    relevant_badge = Merit::Badge.by_name('relevant-commenter').first
     user_badges    = User.where(:name => 'test-user').first.badges
     assert user_badges.include?(relevant_badge), "User badges: #{user.badges.collect(&:name).inspect} should contain relevant-commenter badge."
 
@@ -102,14 +106,18 @@ class NavigationTest < ActiveSupport::IntegrationCase
     click_button('Update User')
 
     user = User.where(:name => 'long_name!').first
-    autobiographer_badge = Badge.by_name('autobiographer').first
+    autobiographer_badge = Merit::Badge.by_name('autobiographer').first
     assert user.badges.include?(autobiographer_badge), "User badges: #{user.badges.collect(&:name).inspect} should contain autobiographer badge."
 
     # Edit user's name by short name
     # tests ruby code in grant_on is being executed, and removes badge
     visit "/users/#{user.id}/edit"
     fill_in 'Name', :with => 'abc'
-    click_button('Update User')
+    assert_difference('Merit::ActivityLog.count', 2) do
+      click_button('Update User')
+    end
+    # Last one is point granting, previous one is badge removing
+    assert_equal 'removed', Merit::ActivityLog.all[-2].description
 
     user = User.where(:name => 'abc').first
     assert !user.badges.include?(autobiographer_badge), "User badges: #{user.badges.collect(&:name).inspect} should remove autobiographer badge."
@@ -122,7 +130,9 @@ class NavigationTest < ActiveSupport::IntegrationCase
 
     visit "/users/#{user.id}/edit"
     fill_in 'Name', :with => 'a'
-    click_button('Update User')
+    assert_difference('Merit::ActivityLog.count', 2) do
+      click_button('Update User')
+    end
 
     user = User.where(:name => 'a').first
     assert_equal 20, user.points, 'Updating info should grant 20 points'
@@ -198,8 +208,11 @@ class NavigationTest < ActiveSupport::IntegrationCase
     comment_2 = commenter.comments.create(:name => 'comment_2', :comment => 'b')
 
     visit comments_path
-    within "tr#c_#{comment_2.id}" do
-      click_link '1'
+    # Thanks for voting point, to voted user and it's comments
+    assert_difference('Merit::ActivityLog.count', 4) do
+      within "tr#c_#{comment_2.id}" do
+        click_link '1'
+      end
     end
 
     comment_1.reload.points.must_be :==, 2

data/test/merit_unit_test.rb

@@ -21,18 +21,9 @@ class MeritUnitTest < ActiveSupport::TestCase
     rule.badge_name = 'inexistent'
     assert_raise(Merit::BadgeNotFound) { rule.badge }
 
-    badge = Badge.create(id: 98, name: 'test-badge-98')
+    badge = Merit::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(msg)
-
-    valid_lengths = msg.length > 240 && m.log.length <= 240
-    assert valid_lengths, 'Log shouldn\'t grow larger than 240 chars'
+    assert_equal Merit::Badge.find(98), rule.badge
   end
 
   test "extends only meritable ActiveRecord models" do
@@ -57,33 +48,33 @@ class MeritUnitTest < ActiveSupport::TestCase
       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'
+    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 = Sash.create
-    badge = Badge.create(id: 20, name: 'test-badge-21')
+    sash = Merit::Sash.create
+    badge = Merit::Badge.create(id: 20, name: 'test-badge-21')
     sash.add_badge badge.id
-    BadgesSash.last.update_attribute :created_at, 1.day.ago
+    Merit::BadgesSash.last.update_attribute :created_at, 1.day.ago
     sash.add_badge badge.id
-    BadgesSash.last.update_attribute :created_at, 8.days.ago
+    Merit::BadgesSash.last.update_attribute :created_at, 8.days.ago
     sash.add_badge badge.id
-    BadgesSash.last.update_attribute :created_at, 15.days.ago
+    Merit::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
-    assert_equal Badge.last_granted(since_date: 2.weeks.ago, limit: 1), [badge]
+    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 = Sash.create
+    sash_1 = Merit::Sash.create
     sash_1.add_points(10); sash_1.add_points(10)
-    sash_2 = Sash.create
+    sash_2 = Merit::Sash.create
     sash_2.add_points(5); sash_2.add_points(5)
 
     # Test method options

data/test/sash_finder_test.rb

@@ -3,11 +3,11 @@ require 'test_helper'
 describe Merit::SashFinder do
 
   it 'should return an array of sashes of the target objects' do
-    sash_1 = Sash.new
+    sash_1 = Merit::Sash.new
     user_1 = User.new(:_sash => sash_1)
     user_1.stubs(:_sash).returns(sash_1)
 
-    sash_2 = Sash.new
+    sash_2 = Merit::Sash.new
     user_2 = User.new
     user_2.stubs(:_sash).returns(sash_2)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -201,13 +201,14 @@ files:
 - Rakefile
 - TESTING.txt
 - UPGRADING.md
-- app/models/badge.rb
 - app/models/merit/action.rb
+- app/models/merit/badge.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
 - lib/generators/active_record/templates/create_badges_sashes.rb
 - lib/generators/active_record/templates/create_merit_actions.rb
+- lib/generators/active_record/templates/create_merit_activity_logs.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
@@ -221,10 +222,11 @@ files:
 - 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/activity_log.rb
+- 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/active_record/sash.rb
 - lib/merit/models/mongo_mapper/merit/action.rb
 - lib/merit/models/mongo_mapper/sash.rb
 - lib/merit/models/mongoid/merit/action.rb
@@ -331,12 +333,13 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20110421191249_create_users.rb
 - test/dummy/db/migrate/20110421191250_create_comments.rb
-- test/dummy/db/migrate/20120318022217_create_merit_actions.rb
-- 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/migrate/20130321082817_add_fields_to_comments.rb
+- test/dummy/db/migrate/20130329224406_create_merit_actions.rb
+- test/dummy/db/migrate/20130329224407_create_merit_activity_logs.rb
+- test/dummy/db/migrate/20130329224408_create_sashes.rb
+- test/dummy/db/migrate/20130329224409_create_badges_sashes.rb
+- test/dummy/db/migrate/20130329224410_create_scores_and_points.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/public/404.html

data/app/models/badge.rb

@@ -1,52 +0,0 @@
-require 'ambry'
-require 'ambry/active_model'
-
-class Badge
-  extend Ambry::Model
-  extend Ambry::ActiveModel
-
-  field :id, :name, :level, :image, :description
-
-  validates_presence_of :id, :name
-  validates_uniqueness_of :id
-
-  filters do
-    def find_by_id(ids)
-      ids = Array.wrap(ids)
-      find{|b| ids.include? b[:id] }
-    end
-    def by_name(name)
-      find{|b| b.name == name.to_s }
-    end
-    def by_level(level)
-      find{|b| b.level.to_s == level.to_s }
-    end
-  end
-
-  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
-
-    # 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/lib/merit/models/active_record/badges_sash.rb

@@ -1,15 +0,0 @@
-class BadgesSash < ActiveRecord::Base
-  belongs_to :sash
-
-  def self.last_granted(options = {})
-    options[:since_date] ||= 1.month.ago
-    options[:limit]      ||= 10
-    where("created_at > '#{options[:since_date]}'").
-      limit(options[:limit]).
-      map(&:badge)
-  end
-
-  def badge
-    Badge.find(badge_id)
-  end
-end

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

@@ -1,52 +0,0 @@
-# Sash is a container for reputation data for meritable models. It's an
-# indirection between meritable models and badges and scores (one to one
-# relationship).
-#
-# It's existence make join models like badges_users and scores_users
-# unnecessary. It should be transparent at the application.
-class Sash < ActiveRecord::Base
-  has_many :badges_sashes, :dependent => :destroy
-  has_many :scores, :dependent => :destroy, :class_name => 'Merit::Score'
-
-  after_create :create_scores
-
-  def badges
-    badge_ids.collect { |b_id| Badge.find(b_id) }
-  end
-
-  def badge_ids
-    badges_sashes.map(&:badge_id)
-  end
-
-  def add_badge(badge_id)
-    bs = BadgesSash.new
-    bs.badge_id = badge_id
-    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
-
-  private
-
-  def create_scores
-    self.scores << Merit::Score.create
-  end
-end