merit 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c7ff1372bb3ca30c5c71a235ebfbaa285be9a6
-  data.tar.gz: 93f9531439ccb6efd93c8a3092e46016d328283e
+  metadata.gz: bceef6c4f4123e4b5aa45f35c90f51779803eccb
+  data.tar.gz: f64bea2e08e184c8b413e5410c02424f51b44c35
 SHA512:
-  metadata.gz: 66770fcab721991a7c18ecc53d6e0bbb7190775404db8ceddd39605d32e300c1d6b1c61fa16d07a9075718777f3d093dbd72a4b1873901c367a1111fdab8713c
-  data.tar.gz: 7f4b0660da679fb7551208aa268121c9f41bd91967fed1963a2972081f8dee27941bcf6b20d97c6c37776e81f84a7ac30af33d9a5de18f3fcaaaac7c85f3cdf3
+  metadata.gz: 22924df6b8915eb8dde70a0360141d2551eaf42d21cc8c45fbd8375354ff5897bd8e68433963cf426265be38eac3adfe4487c7c95376739b43f93d7d297bc075
+  data.tar.gz: 9d1324c2c32759030bb54e7aa9b37face51cf7e82da3ab53462b818a200e1efbb9d05d83fb896345cb112dfab21047c38bcd1c348e7175de72337df67b6f4007

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.2.0
+
+- [#181] Rescue `ActiveRecord` only if constant is defined (doesn't trigger
+  errors in other ORMs).
+- [#184] Namespaces `Badge` calls inside of `Merit::`. Prevents errors if the
+  app using merit has a model named Badge
+- [#189] Fixes issue when objects needed to grant reputation are already deleted
+  from the database. Before, merit was either failing with exceptions or
+  ignoring reputation changes; now it works as expected.
+
 ## 2.1.2
 
 - Improves observer API.

data/Gemfile

@@ -2,15 +2,17 @@ source 'https://rubygems.org'
 
 gemspec
 
-version = ENV['RAILS_VERSION'] || '3.2'
+version = ENV['RAILS_VERSION'] || '4.1'
 rails = case version
 when 'master'
   { github: 'rails/rails' }
 when '4.0-protected-attributes'
   gem 'protected_attributes'
+  "~> 4.0.0"
+when /4\.0|4\.1/
   "~> #{version}.0"
-when '4.0'
-  "~> #{version}.0"
+when /4\.2/
+  "~> #{version}.0.beta1"
 when '3.2'
   gem 'strong_parameters'
   "~> #{version}.0"
@@ -22,7 +24,7 @@ case ENV['ORM']
 when 'active_record'
   gem 'activerecord'
 when 'mongoid'
-  gem 'mongoid', '3.1.0'
+  gem 'mongoid'
 end
 
 group :development, :test do
@@ -32,6 +34,7 @@ end
 
 platforms :rbx do
   gem 'rubysl', '~> 2.0'
+  gem 'psych'
   gem 'racc'
   gem 'minitest'
   gem 'rubinius-developer_tools'

data/Rakefile

@@ -1,27 +1,24 @@
 # encoding: UTF-8
-require 'rubygems'
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rake'
-
 require 'rake/testtask'
 
+desc 'Default: run tests for all ORMs.'
+task default: :test
+
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+  t.verbose = true
 end
 
-task :default => :test
-
 begin
   require 'rdoc/task'
-
   Rake::RDocTask.new(:rdoc) do |rdoc|
     rdoc.rdoc_dir = 'rdoc'
     rdoc.title    = 'Merit'

data/UPGRADING.md

@@ -1,5 +1,19 @@
 # Main Changes / Upgrading Notes
 
+## 2.1.0
+
+Adds serialisation of destroyed target models so that reputation can be awarded
+when the item is already deleted from the DB. For this to work you need a new
+column, to add it you can run:
+
+```
+rails generate merit:upgrade
+rake db:migrate
+```
+
+This is a backwards compatible addition, so if you don't add the column but
+upgrade, your application should continue to work well, without the new feature.
+
 ## 2.0.0
 
 * Removes deprecated methods: `Merit::Badge.last_granted` and

data/app/models/merit/badge.rb

@@ -36,7 +36,7 @@ module Merit
 
     class << self
       def find_by_name_and_level(name, level)
-        badges = Badge.by_name(name)
+        badges = Merit::Badge.by_name(name)
         badges = badges.by_level(level) unless level.nil?
         if (badge = badges.first).nil?
           str = "No badge '#{name}' found. Define it in initializers/merit.rb"

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

@@ -0,0 +1,5 @@
+class AddTargetDataToMeritActions < ActiveRecord::Migration
+  def change
+    add_column :merit_actions, :target_data, :text
+  end
+end

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

@@ -7,6 +7,7 @@ class CreateMeritActions < ActiveRecord::Migration
       t.boolean :had_errors, default: false
       t.string  :target_model
       t.integer :target_id
+      t.text    :target_data
       t.boolean :processed, default: false
       t.timestamps
     end

data/lib/generators/active_record/upgrade_generator.rb

@@ -0,0 +1,36 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class UpgradeGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+
+      source_root File.expand_path('../templates', __FILE__)
+      desc 'Makes Active Record migrations to handle upgrades between versions'
+
+      def self.next_migration_number(path)
+        ActiveRecord::Generators::Base.next_migration_number(path)
+      end
+
+      def copy_migrations_and_model
+        if merit_actions_exists? && target_data_column_doesnt_exist?
+          migration_template 'add_target_data_to_merit_actions.rb',
+                             'db/migrate/add_target_data_to_merit_actions.rb'
+        end
+      end
+
+      private
+
+      def target_data_column_doesnt_exist?
+        !ActiveRecord::Base.connection.column_exists?(:merit_actions,
+                                                      :target_data)
+      end
+
+      # Might be foolishly running this before install. Ugly error if we don't
+      # check.
+      def merit_actions_exists?
+        ActiveRecord::Base.connection.table_exists? :merit_actions
+      end
+    end
+  end
+end

data/lib/generators/merit/upgrade_generator.rb

@@ -0,0 +1,7 @@
+module Merit
+  module Generators
+    class UpgradeGenerator < Rails::Generators::Base
+      hook_for :orm
+    end
+  end
+end

data/lib/merit.rb

@@ -49,6 +49,11 @@ module Merit
     @config.add_observer(class_name)
   end
 
+  def self.upgrade_target_data_warning
+    Rails.logger.warn '[merit] Missing column: target_data. Run `rails ' \
+                      'generate merit:upgrade` and `rake db:migrate` to add it.'
+  end
+
   class Configuration
     attr_accessor :checks_on_each_request, :orm, :user_model_name, :observers,
                   :current_user_method
@@ -68,8 +73,8 @@ module Merit
   setup
   add_observer('Merit::ReputationChangeObserver')
 
-  class BadgeNotFound < Exception; end
-  class RankAttributeNotDefined < Exception; end
+  class BadgeNotFound < StandardError; end
+  class RankAttributeNotDefined < StandardError; end
 
   class Engine < Rails::Engine
     config.app_generators.orm Merit.orm

data/lib/merit/base_target_finder.rb

@@ -10,11 +10,27 @@ module Merit
     end
 
     def find
-      klass_name = (@rule.model_name || @action.target_model).singularize
-      klass = klass_name.camelize.constantize
-      klass.find_by_id @action.target_id
+      get_target_from_database || reanimate_target_from_action
     rescue => e
       Rails.logger.warn "[merit] no target found: #{e}. #{caller.first}"
     end
+
+    def get_target_from_database
+      model_class.find_by_id(@action.target_id)
+    end
+
+    def model_class
+      klass_name = (@rule.model_name || @action.target_model).singularize
+      klass_name.camelize.constantize
+    end
+
+    def reanimate_target_from_action
+      if @action.respond_to? :target_data
+        YAML.load(@action.target_data)
+      else
+        Merit.upgrade_target_data_warning
+        nil
+      end
+    end
   end
 end

data/lib/merit/controller_extensions.rb

@@ -15,14 +15,27 @@ module Merit
     private
 
     def log_merit_action
-      Merit::Action.create(
+      Merit::Action.create(merit_action_hash)
+    end
+
+    def merit_action_hash
+      {
         user_id:       send(Merit.current_user_method).try(:id),
         action_method: action_name,
         action_value:  params[:value],
         had_errors:    had_errors?,
         target_model:  controller_path,
-        target_id:     target_id
-      ).id
+        target_id:     target_id,
+      }.merge(target_data_hash)
+    end
+
+    def target_data_hash
+      if Merit::Action.new.respond_to? :target_data
+        { target_data: target_object.to_yaml }
+      else
+        Merit.upgrade_target_data_warning
+        {}
+      end
     end
 
     def rules_defined?

data/lib/merit/model_additions.rb

@@ -35,7 +35,7 @@ module Merit
 
     def _merit_define_badge_related_entries_method
       meritable_class_name = name.demodulize
-      Badge._define_related_entries_method(meritable_class_name)
+      Merit::Badge._define_related_entries_method(meritable_class_name)
     end
 
     def show_attr_accessible?

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

@@ -6,7 +6,7 @@ module Merit
 
     if show_attr_accessible?
       attr_accessible :user_id, :action_method, :action_value, :had_errors,
-                      :target_model, :target_id, :processed, :log
+                      :target_model, :target_id, :processed, :log, :target_data
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Merit
       end
 
       def badge
-        Badge.find(badge_id)
+        Merit::Badge.find(badge_id)
       end
     end
   end

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

@@ -11,6 +11,7 @@ module Merit
     field :had_errors,              type: Boolean
     field :target_model
     field :target_id
+    field :target_data
     field :processed,               type: Boolean, default: false
     field :log
   end

data/lib/merit/rule.rb

@@ -25,7 +25,7 @@ module Merit
 
     # Get rule's related Badge.
     def badge
-      @badge ||= Badge.find_by_name_and_level(badge_name, level)
+      @badge ||= Merit::Badge.find_by_name_and_level(badge_name, level)
     end
   end
 end

data/lib/merit/rules_rank_methods.rb

@@ -48,11 +48,20 @@ module Merit
         next unless rule.applies?(object)
         object.update_attribute rule.level_name, level
       end
-    rescue ActiveRecord::StatementInvalid
-      str = "Add #{rule.level_name} column to #{scoped_model.class.name}"
+    rescue rank_exception
+      str = "Error while granting rankings. Probably you need to add
+        #{rule.level_name} column to #{scoped_model.class.name}."
       raise RankAttributeNotDefined, str
     end
 
+    def rank_exception
+      if defined? ActiveRecord
+        ActiveRecord::StatementInvalid
+      else
+        Exception
+      end
+    end
+
     def scope_to_promote(scope, level_name, level)
       if Merit.orm == :mongoid
         scope.where(:"#{level_name}".lt => level)

data/lib/merit/sash_finder.rb

@@ -2,6 +2,10 @@ module Merit
   class SashFinder
     def self.find(rule, action)
       targets(rule, action).map(&:_sash)
+    rescue NoMethodError
+      Rails.logger.warn "[merit] Couldn't find model to grant reputation to. " \
+                        "Refer to https://github.com/tute/merit/issues/171#issuecomment-44185696."
+      []
     end
 
     def self.targets(rule, action)

data/lib/merit/target_finder.rb

@@ -35,9 +35,8 @@ module Merit
     def other_target
       base_target.send rule.to
     rescue NoMethodError
-      str = '[merit] NoMethodError on'
-      str << " `#{base_target.class.name}##{rule.to}`"
-      str << ' (called from Merit::TargetFinder#other_target)'
+      str = "[merit] NoMethodError on `#{base_target.class.name}##{rule.to}`" \
+            ' (called from Merit::TargetFinder#other_target)'
       Rails.logger.warn str
     end
   end

data/merit.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/tute/merit"
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
   s.license     = 'MIT'
-  s.version     = '2.1.2'
+  s.version     = '2.2.0'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 
@@ -13,10 +13,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'ambry',  '~> 0.3.0'
   s.add_development_dependency 'rails', '>= 3.2.0'
-  s.add_development_dependency 'jquery-rails', '~> 2.1'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'minitest-rails'
-  s.add_development_dependency 'mocha', '0.14'
+  s.add_development_dependency 'mocha', '1.1.0'
 end

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

@@ -35,6 +35,10 @@ module Merit
       score lambda { |comment| comment.comment.to_i }, to: :user, on: 'comments#create' do |object|
         object.comment.to_i > 0
       end
+
+      score -5, to: :user, on: 'comments#destroy' do |comment|
+        comment.present?
+      end
     end
   end
 end

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

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

data/test/dummy/app/views/layouts/application.html.erb

@@ -3,7 +3,6 @@
 <head>
   <meta charset="utf-8" />
   <title>Merit Dummy app</title>
-  <%= stylesheet_link_tag :all %>
   <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
   <script src="/rails.js"></script>
   <%= csrf_meta_tag %>

data/test/dummy/db/migrate/20140819133931_add_target_data_to_merit_actions.rb

@@ -0,0 +1,5 @@
+class AddTargetDataToMeritActions < ActiveRecord::Migration
+  def change
+    add_column :merit_actions, :target_data, :text
+  end
+end

data/test/dummy/db/migrate/20140906225844_create_players.rb

@@ -0,0 +1,8 @@
+class CreatePlayers < ActiveRecord::Migration
+  def change
+    create_table :players do |t|
+      t.integer :sash_id
+      t.integer :level, default: 0
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -9,49 +9,50 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140211144001) do
+ActiveRecord::Schema.define(version: 20140906225844) do
 
-  create_table "addresses", :force => true do |t|
+  create_table "addresses", force: true do |t|
     t.integer "user_id"
   end
 
-  create_table "badges_sashes", :force => true do |t|
+  create_table "badges_sashes", force: true do |t|
     t.integer  "badge_id"
     t.integer  "sash_id"
-    t.boolean  "notified_user", :default => false
+    t.boolean  "notified_user", default: false
     t.datetime "created_at"
   end
 
-  add_index "badges_sashes", ["badge_id", "sash_id"], :name => "index_badges_sashes_on_badge_id_and_sash_id"
-  add_index "badges_sashes", ["badge_id"], :name => "index_badges_sashes_on_badge_id"
-  add_index "badges_sashes", ["sash_id"], :name => "index_badges_sashes_on_sash_id"
+  add_index "badges_sashes", ["badge_id", "sash_id"], name: "index_badges_sashes_on_badge_id_and_sash_id"
+  add_index "badges_sashes", ["badge_id"], name: "index_badges_sashes_on_badge_id"
+  add_index "badges_sashes", ["sash_id"], name: "index_badges_sashes_on_sash_id"
 
-  create_table "comments", :force => true do |t|
+  create_table "comments", force: true do |t|
     t.string   "name"
     t.text     "comment"
     t.integer  "user_id"
-    t.integer  "votes",      :default => 0
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
+    t.integer  "votes",      default: 0
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
     t.integer  "sash_id"
-    t.integer  "level",      :default => 0
+    t.integer  "level",      default: 0
   end
 
-  create_table "merit_actions", :force => true do |t|
+  create_table "merit_actions", force: true do |t|
     t.integer  "user_id"
     t.string   "action_method"
     t.integer  "action_value"
-    t.boolean  "had_errors",    :default => false
+    t.boolean  "had_errors",    default: false
     t.string   "target_model"
     t.integer  "target_id"
-    t.boolean  "processed",     :default => false
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
+    t.boolean  "processed",     default: false
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
+    t.text     "target_data"
   end
 
-  create_table "merit_activity_logs", :force => true do |t|
+  create_table "merit_activity_logs", force: true do |t|
     t.integer  "action_id"
     t.string   "related_change_type"
     t.integer  "related_change_id"
@@ -59,29 +60,34 @@ ActiveRecord::Schema.define(:version => 20140211144001) do
     t.datetime "created_at"
   end
 
-  create_table "merit_score_points", :force => true do |t|
+  create_table "merit_score_points", force: true do |t|
     t.integer  "score_id"
-    t.integer  "num_points", :default => 0
+    t.integer  "num_points", default: 0
     t.string   "log"
     t.datetime "created_at"
   end
 
-  create_table "merit_scores", :force => true do |t|
+  create_table "merit_scores", force: true do |t|
     t.integer "sash_id"
-    t.string  "category", :default => "default"
+    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
+  create_table "players", force: true do |t|
+    t.integer "sash_id"
+    t.integer "level",   default: 0
+  end
+
+  create_table "sashes", force: true do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "users", :force => true do |t|
+  create_table "users", force: true do |t|
     t.string   "name"
-    t.datetime "created_at",                :null => false
-    t.datetime "updated_at",                :null => false
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
     t.integer  "sash_id"
-    t.integer  "level",      :default => 0
+    t.integer  "level",      default: 0
   end
 
 end

data/test/integration/navigation_test.rb

@@ -1,16 +1,16 @@
 require 'test_helper'
 
-class NavigationTest < ActiveSupport::IntegrationCase
-  def tear_down
+class NavigationTest < ActionDispatch::IntegrationTest
+  def teardown
     DummyObserver.unstub(:update)
   end
 
   test 'user sign up should grant badge to itself' do
     DummyObserver.any_instance.expects(:update).times(1).with do |hash|
-        hash[:description] == 'granted just-registered badge' &&
-          hash[:sash_id] == user('Jack').sash_id &&
-          hash[:granted_at].to_date == Date.today
-      end
+      hash[:description] == 'granted just-registered badge' &&
+        hash[:sash_id] == user('Jack').sash_id &&
+        hash[:granted_at].to_date == Time.now.utc.to_date
+    end
 
     visit '/users/new'
     fill_in 'Name', with: 'Jack'
@@ -48,18 +48,16 @@ class NavigationTest < ActiveSupport::IntegrationCase
 
   test 'users#index should grant badge multiple times' do
     DummyObserver.any_instance.expects(:update).times(1).with do |hash|
-        hash[:description] == 'granted visited_admin badge' &&
-        hash[:sash_id] == user.sash_id
-      end
+      hash[:description] == 'granted visited_admin badge' &&
+      hash[:sash_id] == user.sash_id
+    end
     DummyObserver.any_instance.expects(:update).times(5).with do |hash|
-        hash[:description] == 'granted gossip badge' &&
-        hash[:sash_id] == user.sash_id
-      end
-    8.times do |merit_action_id|
-      DummyObserver.any_instance.expects(:update).times(1).with do |hash|
-          hash[:description] == 'granted wildcard_badge badge' &&
-          hash[:sash_id] == user.sash_id
-        end
+      hash[:description] == 'granted gossip badge' &&
+      hash[:sash_id] == user.sash_id
+    end
+    DummyObserver.any_instance.expects(:update).times(8).with do |hash|
+      hash[:description] == 'granted wildcard_badge badge' &&
+      hash[:sash_id] == user.sash_id
     end
 
     # Multiple rule
@@ -221,6 +219,15 @@ class NavigationTest < ActiveSupport::IntegrationCase
     user = User.where(name: 'a').first
     assert_equal 51, user.points, 'Commenting should grant the integer in
       comment points if comment is an integer'
+
+    # Destroying a comment should remove points from the comment creator.
+    comment_to_destroy = user.comments.last
+    visit '/comments'
+    assert_difference lambda { user.reload.points }, -5 do
+      within("tr#c_#{comment_to_destroy.id}") do
+        click_link 'Destroy'
+      end
+    end
   end
 
   test 'user workflow should grant levels at some times' do
@@ -262,21 +269,21 @@ class NavigationTest < ActiveSupport::IntegrationCase
 
   test 'assigning points to a group of records' do
     DummyObserver.any_instance.expects(:update).times(2).with do |hash|
-        hash[:description] == 'granted 1 points' &&
-        hash[:sash_id] == user('commenter').sash_id
-      end
+      hash[:description] == 'granted 1 points' &&
+      hash[:sash_id] == user('commenter').sash_id
+    end
     DummyObserver.any_instance.expects(:update).times(1).with do |hash|
-        hash[:description] == 'granted 2 points' &&
-        hash[:sash_id] == user('commenter').comments.first.sash_id
-      end
+      hash[:description] == 'granted 2 points' &&
+      hash[:sash_id] == user('commenter').comments.first.sash_id
+    end
     DummyObserver.any_instance.expects(:update).times(1).with do |hash|
-        hash[:description] == 'granted 2 points' &&
-        hash[:sash_id] == user('commenter').comments.last.sash_id
-      end
+      hash[:description] == 'granted 2 points' &&
+      hash[:sash_id] == user('commenter').comments.last.sash_id
+    end
     DummyObserver.any_instance.expects(:update).times(1).with do |hash|
-        hash[:description] == 'granted 5 points' &&
-        hash[:sash_id] == user('commenter').sash_id
-      end
+      hash[:description] == 'granted 5 points' &&
+      hash[:sash_id] == user('commenter').sash_id
+    end
 
     comment_1 = user('commenter').comments.create(name: 'a', comment: 'a')
     comment_2 = user('commenter').comments.create(name: 'b', comment: 'b')
@@ -296,9 +303,9 @@ class NavigationTest < ActiveSupport::IntegrationCase
 
   test 'api/comments#show should grant 1 point to user' do
     DummyObserver.any_instance.expects(:update).times(1).with do |hash|
-        hash[:description] == 'granted 1 points' &&
-        hash[:sash_id] == user.sash_id
-      end
+      hash[:description] == 'granted 1 points' &&
+      hash[:sash_id] == user.sash_id
+    end
 
     assert_equal 0, user.points
     comment = user.comments.create!(name: 'test-comment', comment: 'comment body')

data/test/orm_models/active_record.rb

@@ -1,9 +1,5 @@
 require 'test_helper'
 
-class User < ActiveRecord::Base
-  has_merit
-end
-
 class Fruit < ActiveRecord::Base
 end
 

data/test/orm_models/mongoid.rb

@@ -1,10 +1,5 @@
 require 'test_helper'
 
-class User
-  include Mongoid::Document
-  has_merit
-end
-
 class Fruit
   include Mongoid::Document
 end

data/test/support/integration_case.rb

@@ -1,5 +1,5 @@
 # Define a bare test case to use with Capybara
-class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
+class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
   include Capybara::DSL
   include Rails.application.routes.url_helpers
 end

data/test/test_helper.rb

@@ -2,11 +2,12 @@
 ENV['RAILS_ENV'] = 'test'
 RUBYOPT="-w $RUBYOPT"
 
-require 'coveralls'
-Coveralls.wear!('rails')
-
 if ENV["COVERAGE"]
+  require 'coveralls'
   require 'simplecov'
+
+  Coveralls.wear!('rails')
+
   SimpleCov.adapters.define 'rubygem' do
     # Add app to Merit group
     # https://github.com/colszowka/simplecov/pull/104
@@ -17,10 +18,10 @@ if ENV["COVERAGE"]
   SimpleCov.start 'rubygem'
 end
 
-
 require File.expand_path('../dummy/config/environment.rb', __FILE__)
 require 'rails/test_help'
 require 'minitest/rails'
+require "orm/#{Merit.orm}"
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -29,17 +30,11 @@ require 'capybara/rails'
 Capybara.default_driver   = :rack_test
 Capybara.default_selector = :css
 
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
 Merit.orm = :active_record if Merit.orm.nil?
 
 def active_record_orm?
   Merit.orm == :active_record
 end
-
-def mongoid_orm?
-  Merit.orm == :mongoid
-end
-
-require "orm/#{Merit.orm}"
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/test/unit/action_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+describe Merit::Action do
+  it 'saves correctly with a serialised model' do
+    comment = Comment.new(name: 'the comment name')
+    action = Merit::Action.create(target_model: 'comment',
+                                  target_id: 2,
+                                  target_data: comment.to_yaml)
+    comment_yaml = Merit::Action.find(action.id).target_data
+    assert_equal comment.name, YAML::load(comment_yaml).name
+  end
+end

data/test/unit/base_target_finder_test.rb

@@ -22,17 +22,17 @@ describe Merit::BaseTargetFinder do
       it 'should fall back to the action#target_model' do
         rule = Merit::Rule.new
         rule.to = :itself
-        action = Merit::Action.new(target_model: 'users', target_id: 3)
-        user = Comment.new(id: 3)
+        action = Merit::Action.new(target_model: 'players', target_id: 3)
+        user = Player.new(id: 3)
 
-        User.stubs(:find_by_id).with(3).returns(user)
+        Player.stubs(:find_by_id).with(3).returns(user)
 
         finder = Merit::BaseTargetFinder.new(rule, action)
         finder.find.must_be :==, user
       end
     end
 
-    describe 'when the targetted class is not meritable' do
+    describe 'when the targeted class is not meritable' do
       it 'should warn and return' do
         rule = Merit::Rule.new
         rule.to = :itself
@@ -44,5 +44,40 @@ describe Merit::BaseTargetFinder do
         finder.find.must_be_nil
       end
     end
+
+    describe 'target was destroyed' do
+      it 'gets the object from the JSON data in the merit_actions table' do
+        comment = Comment.new(name: 'the comment name')
+
+        rule = Merit::Rule.new
+        rule.to = :itself
+        rule.model_name = 'comment'
+        action = Merit::Action.new(target_model: 'comment',
+                                   target_id: 2,
+                                   target_data: comment.to_yaml)
+
+        finder = Merit::BaseTargetFinder.new(rule, action)
+        finder.find.name.must_be :==, 'the comment name'
+      end
+    end
+
+    describe 'warns when the target_data column has not been created' do
+      it 'sends a message to the logger' do
+        comment = Comment.new(name: 'the comment name')
+
+        rule = Merit::Rule.new
+        rule.to = :itself
+        rule.model_name = 'comment'
+        action = Merit::Action.new(target_model: 'comment',
+                                   target_id: 2,
+                                   target_data: comment.to_yaml)
+        action.stubs(:respond_to?).with(:target_data).returns(false)
+
+        Rails.logger.expects(:warn)
+
+        finder = Merit::BaseTargetFinder.new(rule, action)
+        finder.reanimate_target_from_action
+      end
+    end
   end
 end

data/test/unit/merit_unit_test.rb

@@ -5,7 +5,7 @@ class MeritUnitTest < ActiveSupport::TestCase
   require "orm_models/#{Merit.orm}"
 
   test 'extends only meritable models' do
-    assert User.method_defined?(:points), 'has_merit adds methods'
+    assert Player.method_defined?(:points), 'has_merit adds methods'
     assert !Fruit.method_defined?(:points), 'other models aren\'t extended'
   end
 
@@ -14,17 +14,19 @@ class MeritUnitTest < ActiveSupport::TestCase
     assert Merit::Badge.method_defined?(:players), 'Badge#players should be defined'
   end
 
-  test 'unknown ranking raises exception' do
-    class WeirdRankRules
-      include Merit::RankRulesMethods
-      def initialize
-        set_rank level: 1, to: User, level_name: :clown
+  if active_record_orm?
+    test 'unknown ranking raises exception' do
+      class WeirdRankRules
+        include Merit::RankRulesMethods
+        def initialize
+          set_rank level: 1, to: Player, level_name: :clown
+        end
+      end
+      assert_raises Merit::RankAttributeNotDefined do
+        WeirdRankRules.new.check_rank_rules
       end
     end
-    assert_raises Merit::RankAttributeNotDefined do
-      WeirdRankRules.new.check_rank_rules
-    end
-  end if active_record_orm?
+  end
 
   test 'Badge#custom_fields_hash saves correctly' do
     Merit::Badge.create(id: 99,

data/test/unit/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 = Merit::Sash.new
-    user_1 = User.new
+    user_1 = Player.new
     user_1.stubs(:_sash).returns(sash_1)
 
     sash_2 = Merit::Sash.new
-    user_2 = User.new
+    user_2 = Player.new
     user_2.stubs(:_sash).returns(sash_2)
 
     # TODO: With stub we are not exercising compact

data/test/unit/score_test.rb

@@ -2,11 +2,11 @@ require 'test_helper'
 
 describe Merit::Score do
   it 'Point#sash_id delegates to Score' do
-    score = mock()
-    score.stubs(:sash_id).returns(33)
+    score = Merit::Score.new
+    score.sash_id = 33
 
     point = Merit::Score::Point.new
-    point.stubs(:score).returns(score)
+    point.score = score
 
     point.sash_id.must_be :==, score.sash_id
   end

data/test/unit/target_finder_test.rb

@@ -23,16 +23,20 @@ describe Merit::TargetFinder do
     end
 
     describe 'rule#to is :action_user' do
+      before do
+        Merit.setup { |config| config.user_model_name = 'Player' }
+      end
+      after do
+        Merit.setup { |config| config.user_model_name = 'User' }
+      end
+
       it 'should return an array including user that executed the action' do
-        Merit.setup do |config|
-          config.user_model_name = 'User'
-        end
         rule = Merit::Rule.new
         rule.to = :action_user
         action = Merit::Action.new(user_id: 22)
-        user = User.new
+        user = Player.new
 
-        User.stubs(:find_by_id).with(22).returns(user)
+        Player.stubs(:find_by_id).with(22).returns(user)
 
         finder = Merit::TargetFinder.new(rule, action)
         collection = finder.find
@@ -42,14 +46,11 @@ describe Merit::TargetFinder do
 
       describe 'when user does not exist' do
         it 'should return warn and return an empty array' do
-          Merit.setup do |config|
-            config.user_model_name = 'User'
-          end
           rule = Merit::Rule.new
           rule.to = :action_user
           action = Merit::Action.new(user_id: 22)
 
-          Rails.logger.expects(:warn).with('[merit] no User found with id 22')
+          Rails.logger.expects(:warn).with('[merit] no Player found with id 22')
           finder = Merit::TargetFinder.new(rule, action)
           finder.find.must_be_empty
         end
@@ -63,7 +64,7 @@ describe Merit::TargetFinder do
         rule.model_name = 'comments'
         action = Merit::Action.new(target_id: 40)
 
-        user = User.new
+        user = Player.new
         comment = Comment.new
         comment.stubs(:user).returns(user)
         Comment.stubs(:find_by_id).with(40).returns(comment)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 1.1.0
 description: Manage badges, points and rankings (reputation) of resources in a Rails
   application.
 email: tutecosta@gmail.com
@@ -142,6 +128,7 @@ files:
 - lib/generators/active_record/merit_generator.rb
 - lib/generators/active_record/remove_generator.rb
 - lib/generators/active_record/templates/add_fields_to_model.rb
+- lib/generators/active_record/templates/add_target_data_to_merit_actions.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
@@ -149,6 +136,7 @@ files:
 - lib/generators/active_record/templates/create_scores_and_points.rb
 - lib/generators/active_record/templates/remove_fields_from_model.rb
 - lib/generators/active_record/templates/remove_merit_tables.rb
+- lib/generators/active_record/upgrade_generator.rb
 - lib/generators/merit/install_generator.rb
 - lib/generators/merit/merit_generator.rb
 - lib/generators/merit/remove_generator.rb
@@ -156,6 +144,7 @@ files:
 - lib/generators/merit/templates/merit_badge_rules.rb
 - lib/generators/merit/templates/merit_point_rules.rb
 - lib/generators/merit/templates/merit_rank_rules.rb
+- lib/generators/merit/upgrade_generator.rb
 - lib/merit.rb
 - lib/merit/base_target_finder.rb
 - lib/merit/controller_extensions.rb
@@ -237,6 +226,8 @@ files:
 - test/dummy/db/migrate/20130329224409_create_badges_sashes.rb
 - test/dummy/db/migrate/20130329224410_create_scores_and_points.rb
 - test/dummy/db/migrate/20140211144001_create_addresses.rb
+- test/dummy/db/migrate/20140819133931_add_target_data_to_merit_actions.rb
+- test/dummy/db/migrate/20140906225844_create_players.rb
 - test/dummy/db/schema.rb
 - test/dummy/db/seeds.rb
 - test/dummy/public/404.html
@@ -260,6 +251,7 @@ files:
 - test/orm_models/mongoid.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
+- test/unit/action_test.rb
 - test/unit/base_target_finder_test.rb
 - test/unit/merit_unit_test.rb
 - test/unit/rule_unit_test.rb
@@ -288,9 +280,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: General reputation Rails engine.
 test_files: []
-has_rdoc: