merit 2.4.0 → 4.0.0

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

data/test/unit/rule_unit_test.rb

@@ -11,40 +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' 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)
+      _(@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
-      @rule.badge.must_be :==, Merit::Badge.find(98)
+      _(@rule.badge).must_be :==, Merit::Badge.find(98)
     end
   end
 end

data/test/unit/rules_matcher_test.rb

@@ -5,29 +5,32 @@ describe Merit::RulesMatcher do
   describe 'rules actions are treated as a regexp' do
     it 'selects matching rules (suffix)' do
       matcher = Merit::RulesMatcher.new('comments', 'update')
-      matcher.select_from(
+      selected = matcher.select_from(
         'comments#update' => 'comments#update',
         'comments#up'     => 'comments#up',
         'comments#up$'   => 'comments#up$',
         'comments#up.+$' => 'comments#up.+$',
-      ).must_be :==, ['comments#update', 'comments#up.+$']
+      )
+      _(selected).must_be :==, ['comments#update', 'comments#up.+$']
 
       matcher = Merit::RulesMatcher.new('comments', 'up')
-      matcher.select_from(
+      selected = matcher.select_from(
         'comments#update' => 'comments#update',
         'comments#up'     => 'comments#up',
         'comments#up$'   => 'comments#up$',
         'comments#up.+$' => 'comments#up.+$',
-      ).must_be :==, ['comments#up', 'comments#up$']
+      )
+      _(selected).must_be :==, ['comments#up', 'comments#up$']
     end
 
     it 'selects matching rules (prefix)' do
       matcher = Merit::RulesMatcher.new('/posts/1/comments', 'create')
-      matcher.select_from(
+      selected = matcher.select_from(
         'comments#create' => 'comments#create',
         '^comments#create' => '^comments#create',
         '^.*/comments#create' => '^.*/comments#create',
-      ).must_be :==, ['^.*/comments#create']
+      )
+      _(selected).must_be :==, ['^.*/comments#create']
     end
   end
 

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 = Player.new
+    user_1 = User.new
     user_1.stubs(:_sash).returns(sash_1)
 
     sash_2 = Merit::Sash.new
-    user_2 = Player.new
+    user_2 = User.new
     user_2.stubs(:_sash).returns(sash_2)
 
     # TODO: With stub we are not exercising compact
@@ -20,8 +20,8 @@ describe Merit::SashFinder do
 
     Merit::SashFinder.stubs(:targets).returns(users)
     sashes = Merit::SashFinder.find(rule, action)
-    sashes.count.must_be :==, 2
-    sashes.must_include sash_1
-    sashes.must_include sash_2
+    _(sashes.count).must_be :==, 2
+    _(sashes).must_include sash_1
+    _(sashes).must_include sash_2
   end
 end

data/test/unit/score_test.rb

@@ -8,6 +8,6 @@ describe Merit::Score do
     point = Merit::Score::Point.new
     point.score = score
 
-    point.sash_id.must_be :==, score.sash_id
+    _(point.sash_id).must_be :==, score.sash_id
   end
 end

data/test/unit/target_finder_test.rb

@@ -17,14 +17,14 @@ describe Merit::TargetFinder do
 
         finder = Merit::TargetFinder.new(rule, action)
         collection = finder.find
-        collection.size.must_be :==, 1
-        collection.must_include comment
+        _(collection.size).must_be :==, 1
+        _(collection).must_include comment
       end
     end
 
     describe 'rule#to is :action_user' do
       before do
-        Merit.setup { |config| config.user_model_name = 'Player' }
+        Merit.setup { |config| config.user_model_name = 'User' }
       end
       after do
         Merit.setup { |config| config.user_model_name = 'User' }
@@ -34,14 +34,14 @@ describe Merit::TargetFinder do
         rule = Merit::Rule.new
         rule.to = :action_user
         action = Merit::Action.new(user_id: 22)
-        user = Player.new
+        user = User.new
 
-        Player.stubs(:find_by_id).with(22).returns(user)
+        User.stubs(:find_by_id).with(22).returns(user)
 
         finder = Merit::TargetFinder.new(rule, action)
         collection = finder.find
-        collection.size.must_be :==, 1
-        collection.must_include user
+        _(collection.size).must_be :==, 1
+        _(collection).must_include user
       end
 
       describe 'when user does not exist' do
@@ -50,9 +50,9 @@ describe Merit::TargetFinder do
           rule.to = :action_user
           action = Merit::Action.new(user_id: 22)
 
-          Rails.logger.expects(:warn).with('[merit] no Player found with id 22')
+          Rails.logger.expects(:warn).with('[merit] no User found with id 22')
           finder = Merit::TargetFinder.new(rule, action)
-          finder.find.must_be_empty
+          _(finder.find).must_be_empty
         end
       end
     end
@@ -64,15 +64,15 @@ describe Merit::TargetFinder do
         rule.model_name = 'comments'
         action = Merit::Action.new(target_id: 40)
 
-        user = Player.new
+        user = User.new
         comment = Comment.new
         comment.stubs(:user).returns(user)
         Comment.stubs(:find_by_id).with(40).returns(comment)
 
         finder = Merit::TargetFinder.new(rule, action)
         collection = finder.find
-        collection.size.must_be :==, 1
-        collection.must_include user
+        _(collection.size).must_be :==, 1
+        _(collection).must_include user
       end
 
       describe 'rule#to does not exist as a method on the original target' do
@@ -90,7 +90,7 @@ describe Merit::TargetFinder do
 
           Rails.logger.expects(:warn).with(str)
           finder = Merit::TargetFinder.new(rule, action)
-          finder.find.must_be_empty
+          _(finder.find).must_be_empty
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 5.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 5.1.6
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +112,16 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 description: Manage badges, points and rankings (reputation) in your Rails app.
 email: tutecosta@gmail.com
 executables: []
@@ -119,56 +133,50 @@ files:
 - MIT-LICENSE
 - NEWS.md
 - README.md
+- RELEASING.md
 - Rakefile
 - TESTING.txt
-- UPGRADING.md
-- app/models/merit/action.rb
 - app/models/merit/badge.rb
 - config/locales/en.yml
-- lib/generators/active_record/install_generator.rb
-- lib/generators/active_record/merit_generator.rb
-- lib/generators/active_record/remove_generator.rb
-- lib/generators/active_record/templates/add_merit_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
-- lib/generators/active_record/templates/create_sashes.rb
-- lib/generators/active_record/templates/create_scores_and_points.rb
-- lib/generators/active_record/templates/remove_merit_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
-- lib/generators/merit/templates/merit.rb
-- 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/badge_rules_methods.rb
 - lib/merit/base_target_finder.rb
+- lib/merit/class_methods.rb
 - lib/merit/controller_extensions.rb
+- lib/merit/generators/active_record/install_generator.rb
+- lib/merit/generators/active_record/merit_generator.rb
+- lib/merit/generators/active_record/remove_generator.rb
+- lib/merit/generators/active_record/templates/add_merit_fields_to_model.erb
+- lib/merit/generators/active_record/templates/create_badges_sashes.erb
+- lib/merit/generators/active_record/templates/create_merit_actions.erb
+- lib/merit/generators/active_record/templates/create_merit_activity_logs.erb
+- lib/merit/generators/active_record/templates/create_sashes.erb
+- lib/merit/generators/active_record/templates/create_scores_and_points.erb
+- lib/merit/generators/active_record/templates/remove_merit_fields_from_model.erb
+- lib/merit/generators/active_record/templates/remove_merit_tables.erb
+- lib/merit/generators/install_generator.rb
+- lib/merit/generators/merit_generator.rb
+- lib/merit/generators/remove_generator.rb
+- lib/merit/generators/templates/merit.erb
+- lib/merit/generators/templates/merit_badge_rules.erb
+- lib/merit/generators/templates/merit_point_rules.erb
+- lib/merit/generators/templates/merit_rank_rules.erb
 - lib/merit/judge.rb
-- lib/merit/model_additions.rb
-- lib/merit/models/active_record/merit/action.rb
-- lib/merit/models/active_record/merit/activity_log.rb
-- 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/action_concern.rb
+- lib/merit/models/active_record/action.rb
+- lib/merit/models/active_record/activity_log.rb
+- lib/merit/models/active_record/badges_sash.rb
+- lib/merit/models/active_record/sash.rb
+- lib/merit/models/active_record/score.rb
+- lib/merit/models/badges_sash_concern.rb
 - lib/merit/models/base/badges_sash.rb
 - lib/merit/models/base/sash.rb
-- lib/merit/models/mongoid/merit/action.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/models/sash_concern.rb
+- lib/merit/point_rules_methods.rb
+- lib/merit/rank_rules_methods.rb
 - lib/merit/reputation_change_observer.rb
 - lib/merit/rule.rb
-- lib/merit/rules_badge_methods.rb
 - lib/merit/rules_matcher.rb
-- lib/merit/rules_points_methods.rb
-- lib/merit/rules_rank_methods.rb
 - lib/merit/sash_finder.rb
 - lib/merit/target_finder.rb
 - merit.gemspec
@@ -202,9 +210,11 @@ files:
 - test/dummy/app/views/users/show.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
+- test/dummy/config/application_api_only.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
+- test/dummy/config/environment_api_only.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
@@ -212,6 +222,7 @@ files:
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/merit.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/new_framework_defaults.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/locales/en.yml
@@ -228,28 +239,17 @@ files:
 - 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
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/public/javascripts/application.js
-- test/dummy/public/javascripts/controls.js
-- test/dummy/public/javascripts/dragdrop.js
-- test/dummy/public/javascripts/effects.js
-- test/dummy/public/javascripts/prototype.js
-- test/dummy/public/javascripts/rails.js
 - test/dummy/public/rails.js
 - test/dummy/public/stylesheets/.gitkeep
 - 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
 - test/test_helper.rb
 - test/unit/action_test.rb
@@ -273,15 +273,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Reputation engine for Rails apps
@@ -316,9 +315,11 @@ test_files:
 - test/dummy/app/views/users/show.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
+- test/dummy/config/application_api_only.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
+- test/dummy/config/environment_api_only.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
@@ -326,6 +327,7 @@ test_files:
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/merit.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/new_framework_defaults.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/locales/en.yml
@@ -342,28 +344,17 @@ test_files:
 - 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
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/public/javascripts/application.js
-- test/dummy/public/javascripts/controls.js
-- test/dummy/public/javascripts/dragdrop.js
-- test/dummy/public/javascripts/effects.js
-- test/dummy/public/javascripts/prototype.js
-- test/dummy/public/javascripts/rails.js
 - test/dummy/public/rails.js
 - test/dummy/public/stylesheets/.gitkeep
 - 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
 - test/test_helper.rb
 - test/unit/action_test.rb