merit 3.0.3 → 4.0.0

data/lib/merit/models/active_record/{merit/action.rb → action.rb}

@@ -1,7 +1,11 @@
-module Merit
+module Merit::Models::ActiveRecord
   class Action < ActiveRecord::Base
+    include Merit::Models::ActionConcern
+
     self.table_name = :merit_actions
 
     has_many :activity_logs, class_name: 'Merit::ActivityLog'
   end
 end
+
+class Merit::Action < Merit::Models::ActiveRecord::Action; end

data/lib/merit/models/active_record/{merit/activity_log.rb → activity_log.rb}

@@ -1,4 +1,4 @@
-module Merit
+module Merit::Models::ActiveRecord
   class ActivityLog < ActiveRecord::Base
     self.table_name = :merit_activity_logs
 
@@ -7,3 +7,5 @@ module Merit
     has_one :sash, through: :related_change
   end
 end
+
+class Merit::ActivityLog < Merit::Models::ActiveRecord::ActivityLog; end

data/lib/merit/models/active_record/{merit/badges_sash.rb → badges_sash.rb}

@@ -1,6 +1,6 @@
-module Merit
+module Merit::Models::ActiveRecord
   class BadgesSash < ActiveRecord::Base
-    include Base::BadgesSash
+    include Merit::Models::BadgesSashConcern
 
     has_many :activity_logs,
              class_name: 'Merit::ActivityLog',
@@ -9,3 +9,5 @@ module Merit
     validates_presence_of :badge_id, :sash
   end
 end
+
+class Merit::BadgesSash < Merit::Models::ActiveRecord::BadgesSash; end

data/lib/merit/models/active_record/{merit/sash.rb → sash.rb}

@@ -1,4 +1,4 @@
-module Merit
+module Merit::Models::ActiveRecord
   # 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).
@@ -6,7 +6,8 @@ module Merit
   # It's existence make join models like badges_users and scores_users
   # unnecessary. It should be transparent at the application.
   class Sash < ActiveRecord::Base
-    include Base::Sash
+    include Merit::Models::SashConcern
+
     has_many :badges_sashes, dependent: :destroy
     has_many :scores, dependent: :destroy, class_name: 'Merit::Score'
 
@@ -27,3 +28,5 @@ module Merit
     end
   end
 end
+
+class Merit::Sash < Merit::Models::ActiveRecord::Sash; end

data/lib/merit/models/active_record/{merit/score.rb → score.rb}

@@ -1,4 +1,4 @@
-module Merit
+module Merit::Models::ActiveRecord
   class Score < ActiveRecord::Base
     self.table_name = :merit_scores
     belongs_to :sash
@@ -20,3 +20,6 @@ module Merit
     end
   end
 end
+
+class Merit::Score < Merit::Models::ActiveRecord::Score; end
+class Merit::Score::Point < Merit::Models::ActiveRecord::Score::Point; end

data/lib/merit/models/badges_sash_concern.rb

@@ -0,0 +1,13 @@
+module Merit::Models
+  module BadgesSashConcern
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :sash
+    end
+
+    def badge
+      Merit::Badge.find(badge_id)
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 module Merit
-  module Base
+  module Models::Base
     module BadgesSash
       extend ActiveSupport::Concern
 

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

@@ -1,5 +1,5 @@
 module Merit
-  module Base
+  module Models::Base
     module Sash
       def badges
         badge_ids.map { |id| Merit::Badge.find id }

data/lib/merit/models/sash_concern.rb

@@ -0,0 +1,53 @@
+module Merit::Models
+  module SashConcern
+    def badges
+      badge_ids.map { |id| Merit::Badge.find id }
+    end
+
+    def badge_ids
+      badges_sashes.map(&:badge_id)
+    end
+
+    def add_badge(badge_id)
+      bs = Merit::BadgesSash.new(badge_id: badge_id.to_i)
+      badges_sashes << bs
+      bs
+    end
+
+    def rm_badge(badge_id)
+      badges_sashes.where(badge_id: badge_id.to_i).first.try(:destroy)
+    end
+
+    # Retrieve the number of points from a category
+    # By default all points are summed up
+    # @param category [String] The category
+    # @return [Integer] The number of points
+    def points(options = {})
+      if (category = options[:category])
+        scores.where(category: category).first.try(:points) || 0
+      else
+        scores.reduce(0) { |sum, score| sum + score.points }
+      end
+    end
+
+    def add_points(num_points, options = {})
+      point = Merit::Score::Point.new
+      point.num_points = num_points
+      scores
+        .where(category: options[:category] || 'default')
+        .first_or_create
+        .score_points << point
+      point
+    end
+
+    def subtract_points(num_points, options = {})
+      add_points(-num_points, options)
+    end
+
+    private
+
+    def create_scores
+      scores << Merit::Score.create
+    end
+  end
+end

data/lib/merit/{rules_rank_methods.rb → rank_rules_methods.rb}

@@ -44,30 +44,15 @@ module Merit
     private
 
     def grant_when_applies(scoped_model, rule, level)
-      scope_to_promote(scoped_model, rule.level_name, level).each do |object|
+      scoped_model.where("#{rule.level_name} < #{level}").each do |object|
         next unless rule.applies?(object)
+
         object.update_attribute rule.level_name, level
       end
-    rescue rank_exception
+    rescue ActiveRecord::StatementInvalid
       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)
-      else
-        scope.where("#{level_name} < #{level}")
-      end
-    end
   end
 end

data/merit.gemspec

@@ -6,13 +6,15 @@ 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.3'
+  s.version     = '4.0.0'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 
   s.required_ruby_version = '>= 2.3.0'
 
-  s.add_dependency 'ambry', '~> 1.0.0'
+  s.add_runtime_dependency 'ambry', '~> 1.0.0'
+  s.add_runtime_dependency 'zeitwerk'
+
   s.add_development_dependency 'rails', '>= 5.1.6'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'simplecov'

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,26 +1,8 @@
-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

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

@@ -1,17 +1,4 @@
-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

data/test/dummy/config/application.rb

@@ -10,11 +10,15 @@ Bundler.require
 require "merit"
 
 module Dummy
-  class Application < Rails::Application
+  class Application < ::Rails::Application
     if Rails.version.match? "5.2.+"
       config.active_record.sqlite3.represent_boolean_as_integer = true
     end
 
+    if Rails.version.match? "6.0.+"
+      config.load_defaults "6.0"
+    end
+
     config.i18n.enforce_available_locales = true
     config.encoding = "utf-8"
     config.filter_parameters += [:password]

data/test/dummy/config/application_api_only.rb

@@ -19,7 +19,7 @@ Bundler.require
 require "merit"
 
 module Dummy
-  class Application < Rails::Application
+  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

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2014_09_06_225844) do
+ActiveRecord::Schema.define(version: 2014_08_19_133931) do
 
   create_table "addresses", force: :cascade do |t|
     t.integer "user_id"
@@ -73,11 +73,6 @@ ActiveRecord::Schema.define(version: 2014_09_06_225844) do
     t.index ["sash_id"], name: "index_merit_scores_on_sash_id"
   end
 
-  create_table "players", force: :cascade do |t|
-    t.integer "sash_id"
-    t.integer "level", default: 0
-  end
-
   create_table "sashes", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false

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

@@ -38,5 +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?

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,24 +1,22 @@
 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
 
   test 'unknown ranking raises exception' do
     class WeirdRankRules
       include Merit::RankRulesMethods
       def initialize
-        set_rank level: 1, to: Player, level_name: :clown
+        set_rank level: 1, to: User, level_name: :clown
       end
     end
     assert_raises Merit::RankAttributeNotDefined do

data/test/unit/rule_unit_test.rb

@@ -11,47 +11,47 @@ describe Merit::Rule do
     end
 
     it 'truthy block should make rule apply' do
-      @rule.applies?('str').must_be :==, true
+      _(@rule.applies?('str')).must_be :==, true
     end
 
     it 'falsy block should make rule fail' do
-      @rule.applies?('string').must_be :==, false
+      _(@rule.applies?('string')).must_be :==, false
     end
 
     it 'block needs parameter for rule to pass' do
-      @rule.applies?.must_be :==, false
+      _(@rule.applies?).must_be :==, false
     end
   end
 
   describe '#applies (without block)' do
     it 'empty condition should make rule apply' do
-      @rule.applies?.must_be :==, true
+      _(@rule.applies?).must_be :==, true
     end
   end
 
   describe '#badge' do
     it 'raises exception on inexistent badge' do
       @rule.badge_name = 'inexistent'
-      -> { @rule.badge }.must_raise Merit::BadgeNotFound
+      _(-> { @rule.badge }).must_raise Merit::BadgeNotFound
     end
 
     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)
+      _(@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).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
-      @rule.badge.must_be :==, Merit::Badge.find(98)
+      _(@rule.badge).must_be :==, Merit::Badge.find(98)
     end
   end
 end