merit 1.7.1 → 1.8.0

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

@@ -1,4 +1,19 @@
-class Comment < ActiveRecord::Base
+case Merit.orm
+when :active_record
+  class Comment < ActiveRecord::Base
+  end
+when :mongoid
+  class Comment
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    field :name, :type => String
+    field :comment, :type => String
+    field :votes, :type => Integer
+  end
+end
+
+class Comment
   has_merit
 
   belongs_to :user

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

@@ -0,0 +1,3 @@
+class DummyObserver
+  def update(*); end
+end

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

@@ -1,4 +1,17 @@
-class User < ActiveRecord::Base
+case Merit.orm
+when :active_record
+  class User < ActiveRecord::Base
+  end
+when :mongoid
+  class User
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    field :name, :type => String
+  end
+end
+
+class User
   has_merit
 
   has_many :comments

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

@@ -1,10 +1,9 @@
 # Use this hook to configure merit parameters
 Merit.setup do |config|
-  # Check rules on each request or in background
-  # config.checks_on_each_request = true
+  # Add application observers to get notifications any time merit changes reputation.
+  config.add_observer 'DummyObserver'
 
-  # Define ORM. Could be:active_record (default) and :mongoid
-  # config.orm = :active_record
+  config.orm = ENV['ORM'].try(:to_sym)
 end
 
 # Create application badges (uses https://github.com/norman/ambry)

data/test/dummy/config/mongoid.yml

@@ -0,0 +1,13 @@
+development:
+  sessions:
+    default:
+      database: mongoid_dev
+      hosts:
+        - localhost:27017
+
+test:
+  sessions:
+    default:
+      database: mongoid_test
+      hosts:
+        - localhost:27017

data/test/integration/navigation_test.rb

@@ -1,7 +1,12 @@
 require 'test_helper'
 
 class NavigationTest < ActiveSupport::IntegrationCase
+  def tear_down
+    DummyObserver.unstub(:update)
+  end
+
   test 'user sign up should grant badge to itself' do
+    DummyObserver.any_instance.expects(:update).times 1
     visit '/users/new'
     fill_in 'Name', with: 'Jack'
     assert_difference('Merit::ActivityLog.count') do
@@ -13,6 +18,8 @@ class NavigationTest < ActiveSupport::IntegrationCase
   end
 
   test 'User#add_badge should add one badge, #rm_badge should delete one' do
+    DummyObserver.any_instance.expects(:update).times 0
+
     user = User.create(name: 'test-user')
     assert_equal [], user.badges
 
@@ -27,6 +34,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
   end
 
   test 'Remove inexistent badge should do nothing' do
+    DummyObserver.any_instance.expects(:update).times 0
     user = User.create(name: 'test-user')
     assert_equal [], user.badges
     user.rm_badge 1
@@ -34,6 +42,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
   end
 
   test 'users#index should grant badge multiple times' do
+    DummyObserver.any_instance.expects(:update).times 14
     user = User.create(name: 'test-user')
 
     # Multiple rule
@@ -58,6 +67,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
   end
 
   test 'user workflow should grant some badges at some times' do
+    DummyObserver.any_instance.expects(:update).at_least_once
     # Commented 9 times, no badges yet
     user = User.create(name: 'test-user')
     # Create needed friend user object
@@ -124,14 +134,18 @@ class NavigationTest < ActiveSupport::IntegrationCase
     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
+
+    # Check created Merit::ActivityLogs
+    assert_equal 'granted commenter badge', Merit::ActivityLog.all[0].description
+    assert_equal 'granted 20 points', Merit::ActivityLog.all[-1].description
+    assert_equal 'removed autobiographer badge', 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."
   end
 
   test 'user workflow should add up points at some times' do
+    DummyObserver.any_instance.expects(:update).at_least_once
     User.delete_all
     user = User.create(name: 'test-user')
     assert_equal 0, user.points, 'User should start with 0 points'
@@ -184,6 +198,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
   end
 
   test 'user workflow should grant levels at some times' do
+    DummyObserver.any_instance.expects(:update).at_least_once
     user = User.create(name: 'test-user')
     assert user.badges.empty?
 
@@ -220,6 +235,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
   end
 
   test 'assigning points to a group of records' do
+    DummyObserver.any_instance.expects(:update).times 4
     commenter = User.create(name: 'commenter')
     comment_1 = commenter.comments.create(name: 'comment_1', comment: 'a')
     comment_2 = commenter.comments.create(name: 'comment_2', comment: 'b')
@@ -237,6 +253,7 @@ class NavigationTest < ActiveSupport::IntegrationCase
   end
 
   test 'api/comments#show should grant 1 point to user' do
+    DummyObserver.any_instance.expects(:update).times 1
     user = User.create(name: 'test-user')
     assert_equal 0, user.points
     comment = user.comments.create!(name: 'test-comment', comment: 'comment body')

data/test/unit/merit_unit_test.rb

@@ -78,4 +78,4 @@ class MeritUnitTest < ActiveSupport::TestCase
       custom_fields: { key_1: 'value1' })
     assert_equal 'value1', Merit::Badge.find(99).custom_fields[:key_1]
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
@@ -138,9 +152,14 @@ 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/mongoid/merit/action.rb
-- lib/merit/models/mongoid/sash.rb
-- lib/merit/observer.rb
+- lib/merit/models/mongoid/merit/activity_log.rb
+- lib/merit/models/mongoid/merit/badges_sash.rb
+- lib/merit/models/mongoid/merit/sash.rb
+- lib/merit/models/mongoid/merit/score.rb
+- lib/merit/reputation_change_observer.rb
 - lib/merit/rule.rb
 - lib/merit/rules_badge_methods.rb
 - lib/merit/rules_matcher.rb
@@ -149,58 +168,6 @@ files:
 - lib/merit/sash_finder.rb
 - lib/merit/target_finder.rb
 - merit.gemspec
-- test/dummy-mongoid/Rakefile
-- test/dummy-mongoid/app/controllers/application_controller.rb
-- test/dummy-mongoid/app/controllers/comments_controller.rb
-- test/dummy-mongoid/app/controllers/registrations_controller.rb
-- test/dummy-mongoid/app/controllers/users_controller.rb
-- test/dummy-mongoid/app/helpers/application_helper.rb
-- test/dummy-mongoid/app/models/comment.rb
-- test/dummy-mongoid/app/models/merit/badge_rules.rb
-- test/dummy-mongoid/app/models/merit/point_rules.rb
-- test/dummy-mongoid/app/models/merit/rank_rules.rb
-- test/dummy-mongoid/app/models/user.rb
-- test/dummy-mongoid/app/views/comments/_form.html.erb
-- test/dummy-mongoid/app/views/comments/edit.html.erb
-- test/dummy-mongoid/app/views/comments/index.html.erb
-- test/dummy-mongoid/app/views/comments/new.html.erb
-- test/dummy-mongoid/app/views/comments/show.html.erb
-- test/dummy-mongoid/app/views/layouts/application.html.erb
-- test/dummy-mongoid/app/views/users/_form.html.erb
-- test/dummy-mongoid/app/views/users/edit.html.erb
-- test/dummy-mongoid/app/views/users/index.html.erb
-- test/dummy-mongoid/app/views/users/new.html.erb
-- test/dummy-mongoid/app/views/users/show.html.erb
-- test/dummy-mongoid/config.ru
-- test/dummy-mongoid/config/application.rb
-- test/dummy-mongoid/config/boot.rb
-- test/dummy-mongoid/config/environment.rb
-- test/dummy-mongoid/config/environments/development.rb
-- test/dummy-mongoid/config/environments/production.rb
-- test/dummy-mongoid/config/environments/test.rb
-- test/dummy-mongoid/config/initializers/backtrace_silencers.rb
-- test/dummy-mongoid/config/initializers/inflections.rb
-- test/dummy-mongoid/config/initializers/merit.rb
-- test/dummy-mongoid/config/initializers/mime_types.rb
-- test/dummy-mongoid/config/initializers/secret_token.rb
-- test/dummy-mongoid/config/initializers/session_store.rb
-- test/dummy-mongoid/config/locales/en.yml
-- test/dummy-mongoid/config/mongoid.yml
-- test/dummy-mongoid/config/routes.rb
-- test/dummy-mongoid/db/seeds.rb
-- test/dummy-mongoid/public/404.html
-- test/dummy-mongoid/public/422.html
-- test/dummy-mongoid/public/500.html
-- test/dummy-mongoid/public/favicon.ico
-- test/dummy-mongoid/public/javascripts/application.js
-- test/dummy-mongoid/public/javascripts/controls.js
-- test/dummy-mongoid/public/javascripts/dragdrop.js
-- test/dummy-mongoid/public/javascripts/effects.js
-- test/dummy-mongoid/public/javascripts/prototype.js
-- test/dummy-mongoid/public/javascripts/rails.js
-- test/dummy-mongoid/public/stylesheets/.gitkeep
-- test/dummy-mongoid/public/stylesheets/scaffold.css
-- test/dummy-mongoid/script/rails
 - test/dummy/Rakefile
 - test/dummy/app/controllers/admin/users_controller.rb
 - test/dummy/app/controllers/api/comments_controller.rb
@@ -211,6 +178,7 @@ files:
 - test/dummy/app/controllers/users_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/models/comment.rb
+- test/dummy/app/models/dummy_observer.rb
 - test/dummy/app/models/merit/badge_rules.rb
 - test/dummy/app/models/merit/point_rules.rb
 - test/dummy/app/models/merit/rank_rules.rb
@@ -242,6 +210,7 @@ files:
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/locales/en.yml
+- test/dummy/config/mongoid.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20110421191249_create_users.rb
 - test/dummy/db/migrate/20110421191250_create_comments.rb

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

@@ -1,14 +0,0 @@
-class Sash
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  field :badge_ids, type: Array, default: []
-
-  def add_badge(badge_id)
-    self.push(:badge_ids, badge_id)
-  end
-
-  def rm_badge(badge_id)
-    self.pull(:badge_ids, badge_id)
-  end
-end

data/lib/merit/observer.rb

@@ -1,13 +0,0 @@
-module Merit
-  # TODO: Observer is a misleading name, there's no way to register other
-  # observers yet
-  module Observer
-    def notify_observers(action_id, related_change, description = '')
-      ActivityLog.create(
-        action_id: action_id,
-        related_change: related_change,
-        description: description
-      )
-    end
-  end
-end

data/test/dummy-mongoid/Rakefile

@@ -1,7 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-require 'rake'
-
-DummyMongoid::Application.load_tasks

data/test/dummy-mongoid/app/controllers/application_controller.rb

@@ -1,7 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-
-  def current_user
-    @current_user ||= User.first
-  end
-end

data/test/dummy-mongoid/app/controllers/comments_controller.rb

@@ -1,90 +0,0 @@
-class CommentsController < ApplicationController
-  # GET /comments
-  # GET /comments.xml
-  def index
-    @comments = Comment.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @comments }
-    end
-  end
-
-  # GET /comments/1
-  # GET /comments/1.xml
-  def show
-    @comment = Comment.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.xml  { render :xml => @comment }
-    end
-  end
-
-  # GET /comments/new
-  # GET /comments/new.xml
-  def new
-    @comment = Comment.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => @comment }
-    end
-  end
-
-  # GET /comments/1/edit
-  def edit
-    @comment = Comment.find(params[:id])
-  end
-
-  def vote
-    @comment = Comment.find(params[:id])
-    @comment.votes += params[:value].to_i
-    @comment.save
-    redirect_to(comments_url, :notice => 'Vote added!')
-  end
-
-  # POST /comments
-  # POST /comments.xml
-  def create
-    @comment = Comment.new(params[:comment])
-
-    respond_to do |format|
-      if @comment.save
-        format.html { redirect_to(@comment, :notice => 'Comment was successfully created.') }
-        format.xml  { render :xml => @comment, :status => :created, :location => @comment }
-      else
-        format.html { render "new" }
-        format.xml  { render :xml => @comment.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /comments/1
-  # PUT /comments/1.xml
-  def update
-    @comment = Comment.find(params[:id])
-
-    respond_to do |format|
-      if @comment.update_attributes(params[:comment])
-        format.html { redirect_to(@comment, :notice => 'Comment was successfully updated.') }
-        format.xml  { head :ok }
-      else
-        format.html { render "edit" }
-        format.xml  { render :xml => @comment.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /comments/1
-  # DELETE /comments/1.xml
-  def destroy
-    @comment = Comment.find(params[:id])
-    @comment.destroy
-
-    respond_to do |format|
-      format.html { redirect_to(comments_url) }
-      format.xml  { head :ok }
-    end
-  end
-end

data/test/dummy-mongoid/app/controllers/registrations_controller.rb

@@ -1,15 +0,0 @@
-class RegistrationsController < ApplicationController
-  def update
-    @user = User.find(params[:id])
-
-    respond_to do |format|
-      if @user.update_attributes(params[:user])
-        format.html { redirect_to(@user, :notice => 'User was successfully updated.') }
-        format.xml  { head :ok }
-      else
-        format.html { render "edit" }
-        format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-end