merit 3.0.0 → 4.0.1

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

@@ -33,7 +33,7 @@ class CommentsController < ApplicationController
 
   def update
     @comment = Comment.find(params[:id])
-    if @comment.update_attributes(comment_params)
+    if @comment.update(comment_params)
       redirect_to(@comment, :notice => 'Comment was successfully updated.')
     else
       render "edit"

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

@@ -3,7 +3,7 @@ class RegistrationsController < ApplicationController
     @user = User.find(params[:id])
 
     respond_to do |format|
-      if @user.update_attributes(user_params)
+      if @user.update(user_params)
         format.html { redirect_to(@user, :notice => 'User was successfully updated.') }
         format.xml  { head :ok }
       else

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

@@ -1,14 +1,3 @@
-case Merit.orm
-when :active_record
-  class Address < ActiveRecord::Base
-  end
-when :mongoid
-  class Address
-    include Mongoid::Document
-    include Mongoid::Timestamps
-  end
-end
-
-class Address
+class Address < ActiveRecord::Base
   belongs_to :user
 end

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

@@ -1,34 +1,12 @@
-case Merit.orm
-when :active_record
-  class Comment < ActiveRecord::Base
-    def friend
-      User.find_by_name('friend')
-    end
+class Comment < ActiveRecord::Base
+  def friend
+    User.find_by_name('friend')
   end
-when :mongoid
-  class Comment
-    include Mongoid::Document
-    include Mongoid::Timestamps
 
-    field :name, :type => String
-    field :comment, :type => String
-    field :votes, :type => Integer, :default => 0
-
-    def friend
-      User.find_by(name: 'friend')
-    end
-  end
-end
-
-class Comment
   has_merit
 
   belongs_to :user
 
-  if show_attr_accessible?
-    attr_accessible :name, :comment, :user_id, :votes
-  end
-
   validates :name, :comment, :user_id, :presence => true
 
   delegate :comments, :to => :user, :prefix => true

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

@@ -1,26 +1,9 @@
-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
+class User < ActiveRecord::Base
   has_merit
 
   has_many :addresses
   has_many :comments
 
-  if show_attr_accessible?
-    attr_accessible :name
-  end
-
   def model_with_no_reputation
     addresses.first || addresses.create
   end

data/test/dummy/config/application.rb

@@ -10,19 +10,17 @@ Bundler.require
 require "merit"
 
 module Dummy
-  class Application < Rails::Application
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-    # config.active_record.whitelist_attributes = true
+  class Application < ::Rails::Application
+    if Rails.version.match? "5.2.+"
+      config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
 
-    # http://stackoverflow.com/questions/20361428/rails-i18n-validation-deprecation-warning
-    config.i18n.enforce_available_locales = true
+    if Rails.version.match? "6.0.+"
+      config.load_defaults "6.0"
+    end
 
-    # Configure the default encoding used in templates for Ruby 1.9.
+    config.i18n.enforce_available_locales = true
     config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
   end
 end

data/test/dummy/config/application_api_only.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative "boot"
+
+require "rails"
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_view/railtie"
+require "action_mailer/railtie"
+
+# require "sprockets/railtie"
+require "rails/test_unit/railtie"
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require
+require "merit"
+
+module Dummy
+  class Application < ::Rails::Application
+    config.load_defaults 5.2 if ENV["RAILS_VERSION"] =~ /^5.2/
+    config.api_only = true
+    config.i18n.enforce_available_locales = true
+    config.encoding = "utf-8"
+  end
+end

data/test/dummy/config/environment_api_only.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Load the rails application
+require File.expand_path("application_api_only", __dir__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

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

@@ -0,0 +1,3 @@
+if Rails.version >= "5.1"
+  Rails.application.config.active_record.belongs_to_required_by_default = true
+end

data/test/dummy/db/schema.rb

@@ -1,93 +1,89 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# 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).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140906225844) do
+ActiveRecord::Schema.define(version: 2014_08_19_133931) do
 
-  create_table "addresses", force: true do |t|
+  create_table "addresses", force: :cascade do |t|
     t.integer "user_id"
+    t.index ["user_id"], name: "index_addresses_on_user_id"
   end
 
-  create_table "badges_sashes", force: true do |t|
-    t.integer  "badge_id"
-    t.integer  "sash_id"
-    t.boolean  "notified_user", default: false
+  create_table "badges_sashes", force: :cascade do |t|
+    t.integer "badge_id"
+    t.integer "sash_id"
+    t.boolean "notified_user", default: false
     t.datetime "created_at"
+    t.index ["badge_id", "sash_id"], name: "index_badges_sashes_on_badge_id_and_sash_id"
+    t.index ["badge_id"], name: "index_badges_sashes_on_badge_id"
+    t.index ["sash_id"], name: "index_badges_sashes_on_sash_id"
   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"
-
-  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  "sash_id"
-    t.integer  "level",      default: 0
+  create_table "comments", force: :cascade 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 "sash_id"
+    t.integer "level", default: 0
   end
 
-  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.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.text     "target_data"
+  create_table "merit_actions", force: :cascade do |t|
+    t.integer "user_id"
+    t.string "action_method"
+    t.integer "action_value"
+    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.text "target_data"
   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"
+  create_table "merit_activity_logs", force: :cascade 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
-    t.string   "log"
+  create_table "merit_score_points", force: :cascade do |t|
+    t.integer "score_id"
+    t.integer "num_points", default: 0
+    t.string "log"
     t.datetime "created_at"
+    t.index ["score_id"], name: "index_merit_score_points_on_score_id"
   end
 
-  create_table "merit_scores", force: true do |t|
-    t.integer "sash_id"
-    t.string  "category", default: "default"
-  end
-
-  create_table "players", force: true do |t|
+  create_table "merit_scores", force: :cascade do |t|
     t.integer "sash_id"
-    t.integer "level",   default: 0
+    t.string "category", default: "default"
+    t.index ["sash_id"], name: "index_merit_scores_on_sash_id"
   end
 
-  create_table "sashes", force: true do |t|
+  create_table "sashes", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "users", force: true do |t|
-    t.string   "name"
-    t.datetime "created_at",             null: false
-    t.datetime "updated_at",             null: false
-    t.integer  "sash_id"
-    t.integer  "level",      default: 0
+  create_table "users", force: :cascade do |t|
+    t.string "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "sash_id"
+    t.integer "level", default: 0
   end
 
 end

data/test/integration/navigation_test.rb

@@ -305,8 +305,8 @@ class NavigationTest < ActionDispatch::IntegrationTest
       end
     end
 
-    comment_1.reload.points.must_be :==, 2
-    comment_2.reload.points.must_be :==, 2
+    _(comment_1.reload.points).must_be :==, 2
+    _(comment_2.reload.points).must_be :==, 2
   end
 
   test 'api/comments#show should grant 1 point to user' do

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 # Configure Rails Envinronment
 ENV['RAILS_ENV'] = 'test'
-RUBYOPT="-w $RUBYOPT"
+RUBYOPT = "-w $RUBYOPT".freeze
 
 if ENV["COVERAGE"]
   require 'coveralls'
@@ -13,16 +13,21 @@ if ENV["COVERAGE"]
     # https://github.com/colszowka/simplecov/pull/104
     add_group 'Merit', 'lib'
     add_group 'DummyApp', 'test/dummy'
+    add_filter 'lib/generators'
     add_filter 'test/dummy/config/initializers'
   end
   SimpleCov.start 'rubygem'
 end
 
-require File.expand_path('../dummy/config/environment.rb', __FILE__)
-require 'rails/test_help'
-require 'minitest/rails'
-require 'mocha/mini_test'
-require "orm/#{Merit.orm}"
+if ARGV.include?("-api-only")
+  require File.expand_path("dummy/config/environment_api_only.rb", __dir__)
+else
+  require File.expand_path("dummy/config/environment.rb", __dir__)
+end
+
+require "rails/test_help"
+require "minitest/rails"
+require "mocha/minitest"
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -33,9 +38,3 @@ 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

data/test/unit/base_target_finder_test.rb

@@ -14,7 +14,7 @@ describe Merit::BaseTargetFinder do
 
         finder = Merit::BaseTargetFinder.new(rule, action)
         collection = finder.find
-        collection.must_be :==, comment
+        _(collection).must_be :==, comment
       end
     end
 
@@ -22,13 +22,13 @@ 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: 'players', target_id: 3)
-        user = Player.new(id: 3)
+        action = Merit::Action.new(target_model: 'users', target_id: 3)
+        user = User.new(id: 3)
 
-        Player.stubs(:find_by_id).with(3).returns(user)
+        User.stubs(:find_by_id).with(3).returns(user)
 
         finder = Merit::BaseTargetFinder.new(rule, action)
-        finder.find.must_be :==, user
+        _(finder.find).must_be :==, user
       end
     end
 
@@ -41,7 +41,7 @@ describe Merit::BaseTargetFinder do
 
         finder = Merit::BaseTargetFinder.new(rule, action)
         Rails.logger.expects(:warn)
-        finder.find.must_be_nil
+        _(finder.find).must_be_nil
       end
     end
 
@@ -57,26 +57,7 @@ describe Merit::BaseTargetFinder do
                                    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
+        _(finder.find.name).must_be :==, 'the comment name'
       end
     end
   end

data/test/unit/merit_unit_test.rb

@@ -1,31 +1,27 @@
 require 'test_helper'
 
-# TODO: Split different objects tests in it's own files
 class MeritUnitTest < ActiveSupport::TestCase
-  require "orm_models/#{Merit.orm}"
-
   test 'extends only meritable models' do
-    assert Player.method_defined?(:points), 'has_merit adds methods'
-    assert !Fruit.method_defined?(:points), 'other models aren\'t extended'
+    assert User.method_defined?(:points), 'has_merit adds methods'
+    assert !Address.method_defined?(:points), 'other models aren\'t extended'
   end
 
   test 'Badges get "related_models" methods' do
-    assert Merit::Badge.method_defined?(:soldiers), 'Badge#soldiers should be defined'
-    assert Merit::Badge.method_defined?(:players), 'Badge#players should be defined'
+    Comment.new; User.new # load meritable classes
+    assert Merit::Badge.method_defined?(:comments), 'Badge#comments should be defined'
+    assert Merit::Badge.method_defined?(:users), 'Badge#users should be defined'
   end
 
-  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
+  test 'unknown ranking raises exception' do
+    class WeirdRankRules
+      include Merit::RankRulesMethods
+      def initialize
+        set_rank level: 1, to: User, level_name: :clown
       end
     end
+    assert_raises Merit::RankAttributeNotDefined do
+      WeirdRankRules.new.check_rank_rules
+    end
   end
 
   test 'Badge#custom_fields_hash saves correctly' do