merit 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2cbaa14467c3e05f09615f1fccf0fb0b504246ed8e11320245d9c160f2f81c9
-  data.tar.gz: 940d31167c9bd59cd1ecaa96055cbf87f6e5bf6e7e1fbb3b433215b0d27d3291
+  metadata.gz: a847a60ecad264aa85e3118fa9e26a974de2e08142577fe134c12e48c4989faf
+  data.tar.gz: 7f219282c0e6c4f33e10f2b77040ef19dbec9874e11140c47cc216fb17c9665b
 SHA512:
-  metadata.gz: db2f9a9d70500a9e11985d7dd54d8fc5a891b69a940a72ce8fea8a465d733ae4ab1e197ad1eb11b50f6699321d9d55cffc36f5f1da2ad3c5deebb9d41414380c
-  data.tar.gz: 9230dda9fe83d1b137dd5105134b4ed41614d2323308a40ae87f98302931f1309e87f00a13c8f893b8dae8c732b4e23e7d22c3ec8353a49a83a465bfd852579c
+  metadata.gz: 8b2714cb9b1c672ba79a1d1034ac6f53bf66c544d568d358c2fe98f3a42801589db9a1213c7eb36abe03a51f8392b4929d52db06549d8786d6b7bfe125e48486
+  data.tar.gz: 2c062006a8352ad9bc7bce01db34851a30e4b7b8fce7de19c6dc4377366e743832ad0507e88b498ba1ed9f6f498e787ebddbb6f2c27577d1870c2dd08d0e6679

data/Gemfile

@@ -2,12 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-version = ENV['RAILS_VERSION']
-if version =~ /^5.2/
-  gem 'rails', github: "rails/rails", branch: "5-2-stable"
-else
-  gem 'rails', version
-end
+gem 'rails', "~> #{ENV.fetch('RAILS_VERSION', 6.0)}"
 
 case ENV['ORM']
 when 'active_record'
@@ -18,7 +13,7 @@ end
 
 group :development, :test do
   gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.4'
 end
 
 gem 'coveralls', require: false

data/NEWS.md

@@ -2,6 +2,13 @@
 
 User-visible changes worth mentioning.
 
+## 3.0.3
+
+- Test against Ruby 2.6 and Rails 6
+- Use `find_each` in favor of `map` in `Merit::Action.check_unprocessed`
+- Allow finding badges defined with symbol names
+- Remove `Badge#last_granted` method (deprecated in merit <2.0)
+
 ## 3.0.2
 
 - [#287] Make Sash an optional dependency, fixing issues in Rails 5.1.

data/Rakefile

@@ -8,7 +8,11 @@ end
 require 'rake/testtask'
 
 desc 'Default: run tests for all ORMs.'
-task default: [:test, :api_test]
+task default: [:setup, :test, :api_test]
+
+task :setup do
+  system "cd test/dummy && rake db:migrate && rake db:test:prepare"
+end
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'

data/app/models/merit/action.rb

@@ -15,7 +15,7 @@ require_dependency "merit/models/#{Merit.orm}/merit/action"
 module Merit
   class Action
     def self.check_unprocessed
-      where(processed: false).map(&:check_all_rules)
+      where(processed: false).find_each(&:check_all_rules)
     end
 
     # Check rules defined for a merit_action

data/app/models/merit/badge.rb

@@ -18,7 +18,7 @@ module Merit
       end
 
       def by_name(name)
-        find { |b| b.name == name.to_s }
+        find { |b| b.name.to_s == name.to_s }
       end
 
       def by_level(level)
@@ -45,15 +45,6 @@ module Merit
         badge
       end
 
-      # DEPRECATED: `last_granted` will be removed from merit, please refer to:
-      # https://github.com/tute/merit/wiki/How-to-show-last-granted-badges
-      def last_granted(options = {})
-        warn '[merit] [DEPRECATION] `last_granted` will be removed from merit, please refer to: https://github.com/tute/merit/wiki/How-to-show-last-granted-badges'
-        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
       # orm-specified

data/lib/merit/model_additions.rb

@@ -8,7 +8,6 @@ module Merit
       # 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, class_name: 'Merit::Sash', inverse_of: nil, optional: true
-      attr_accessible :sash if show_attr_accessible?
 
       send :"_merit_#{Merit.orm}_specific_config"
       _merit_delegate_methods_to_sash
@@ -38,11 +37,6 @@ module Merit
       Merit::Badge._define_related_entries_method(meritable_class_name)
     end
 
-    def show_attr_accessible?
-      defined?(ProtectedAttributes) ||
-        !defined?(ActionController::StrongParameters)
-    end
-
     # _sash initializes a sash if doesn't have one yet.
     # From Rails 3.2 we can override association methods to do so
     # transparently, but merit supports Rails ~> 3.0.0. See:
@@ -50,7 +44,7 @@ module Merit
     def _merit_sash_initializer
       define_method(:_sash) do
         # TODO: reload.sash is not regression tested
-        sash || reload.sash || update_attributes(sash: Sash.create)
+        sash || reload.sash || update(sash: Sash.create)
         sash
       end
     end

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

@@ -3,10 +3,5 @@ module Merit
     self.table_name = :merit_actions
 
     has_many :activity_logs, class_name: 'Merit::ActivityLog'
-
-    if show_attr_accessible?
-      attr_accessible :user_id, :action_method, :action_value, :had_errors,
-                      :target_model, :target_id, :processed, :log, :target_data
-    end
   end
 end

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

@@ -5,9 +5,5 @@ module Merit
     belongs_to :action, class_name: 'Merit::Action'
     belongs_to :related_change, polymorphic: true, optional: true
     has_one :sash, through: :related_change
-
-    if show_attr_accessible?
-      attr_accessible :action_id, :related_change, :description, :created_at
-    end
   end
 end

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

@@ -7,7 +7,5 @@ module Merit
              as: :related_change
 
     validates_presence_of :badge_id, :sash
-
-    attr_accessible :badge_id if show_attr_accessible?
   end
 end

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

@@ -6,8 +6,6 @@ module Merit
 
     field :badge_id,      type: Integer
 
-    attr_accessible :badge_id if show_attr_accessible?
-
     belongs_to :sash, class_name: 'Merit::Sash'
     has_many :activity_logs, class_name: 'Merit::ActivityLog', as: :related_change
 

data/merit.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n").reject{|f| f =~ /^\./ }
   s.test_files  = `git ls-files -- test/*`.split("\n")
   s.license     = 'MIT'
-  s.version     = '3.0.2'
+  s.version     = '3.0.3'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 

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/comment.rb

@@ -25,10 +25,6 @@ class Comment
 
   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

@@ -17,10 +17,6 @@ class User
   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

@@ -11,7 +11,7 @@ require "merit"
 
 module Dummy
   class Application < Rails::Application
-    if Rails.version >= "5.2"
+    if Rails.version.match? "5.2.+"
       config.active_record.sqlite3.represent_boolean_as_integer = true
     end
 

data/test/dummy/db/schema.rb

@@ -1,93 +1,94 @@
-# 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_09_06_225844) 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|
+  create_table "merit_scores", force: :cascade do |t|
     t.integer "sash_id"
-    t.string  "category", default: "default"
+    t.string "category", default: "default"
+    t.index ["sash_id"], name: "index_merit_scores_on_sash_id"
   end
 
-  create_table "players", force: true do |t|
+  create_table "players", force: :cascade do |t|
     t.integer "sash_id"
-    t.integer "level",   default: 0
+    t.integer "level", default: 0
   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/test_helper.rb

@@ -13,6 +13,7 @@ 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'
@@ -27,7 +28,6 @@ end
 require "rails/test_help"
 require "minitest/rails"
 require "mocha/minitest"
-require "orm/#{Merit.orm}"
 
 Rails.backtrace_cleaner.remove_silencers!
 
@@ -40,7 +40,3 @@ Capybara.default_selector = :css
 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/merit_unit_test.rb

@@ -14,18 +14,16 @@ class MeritUnitTest < ActiveSupport::TestCase
     assert Merit::Badge.method_defined?(:players), 'Badge#players 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: Player, 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

data/test/unit/rule_unit_test.rb

@@ -35,12 +35,19 @@ describe Merit::Rule do
       -> { @rule.badge }.must_raise Merit::BadgeNotFound
     end
 
-    it 'finds related badge by name' do
+    it 'finds related badge by name, when the name is a string' do
       Merit::Badge.create(id: 98, name: 'test-badge-98')
       @rule.badge_name = "test-badge-98"
       @rule.badge.must_be :==, Merit::Badge.find(98)
     end
 
+    it 'finds related badge by name, when the name is a symbol' do
+      Merit::Badge.create(id: 100, name: :testbadge)
+      @rule.badge_name = 'testbadge'
+      @rule.badge.must_be :==, Merit::Badge.find(100)
+      @rule.badge
+    end
+
     it 'finds related badge by name' do
       Merit::Badge.create(id: 98, name: 'test-badge-98')
       @rule.badge_id = 98

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -250,8 +250,6 @@ files:
 - test/dummy/public/stylesheets/scaffold.css
 - test/dummy/script/rails
 - test/integration/navigation_test.rb
-- test/orm/active_record.rb
-- test/orm/mongoid.rb
 - test/orm_models/active_record.rb
 - test/orm_models/mongoid.rb
 - test/support/integration_case.rb
@@ -285,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Reputation engine for Rails apps
@@ -367,8 +365,6 @@ test_files:
 - test/dummy/public/stylesheets/scaffold.css
 - test/dummy/script/rails
 - test/integration/navigation_test.rb
-- test/orm/active_record.rb
-- test/orm/mongoid.rb
 - test/orm_models/active_record.rb
 - test/orm_models/mongoid.rb
 - test/support/integration_case.rb

data/test/orm/active_record.rb

@@ -1,8 +0,0 @@
-# Place orm-dependent test preparation here
-migrations = File.expand_path("../../dummy/db/migrate/", __FILE__)
-
-if Rails.version >= "5.2"
-  ActiveRecord::MigrationContext.new(migrations).migrate
-else
-  ActiveRecord::Migrator.migrate migrations
-end

data/test/orm/mongoid.rb

@@ -1,6 +0,0 @@
-# Place orm-dependent test preparation here
-class ActiveSupport::TestCase
-  setup do
-    Mongoid.purge!
-  end
-end