merit 3.0.3 → 4.0.0

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: 3.0.3
+  version: 4.0.0
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -24,6 +24,20 @@ 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
@@ -122,54 +136,47 @@ files:
 - 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
@@ -232,26 +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_models/active_record.rb
-- test/orm_models/mongoid.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
 - test/unit/action_test.rb
@@ -282,8 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Reputation engine for Rails apps
@@ -347,26 +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_models/active_record.rb
-- test/orm_models/mongoid.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
 - test/unit/action_test.rb

data/UPGRADING.md

@@ -1,256 +0,0 @@
-# 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
-  `Merit::Score.top_scored`.
-* Removes `add_points` `log` parameter.
-* Adds points category option.
-
-## 1.9.0
-
-* Deprecates `Merit::Badge.last_granted` and `Merit::Score.top_scored`.
-  Code can be readded to client applications following instructions in:
-  https://github.com/tute/merit/wiki/How-to-show-a-points-leaderboard
-  https://github.com/tute/merit/wiki/How-to-show-last-granted-badges
-* Deprecates `add_points` `log` parameter.
-
-## 1.8.0
-
-* Completes implementation of observer patter for getting reputation grant
-  notifications to the client app. See: https://github.com/tute/merit#getting-
-  notifications.
-* Work on mongoid adapter (not yet ready), and other internals polishing.
-
-## 1.7.0
-
-* Adds support for dynamic scoring
-* `substract_points` is deprecated in favor of `subtract_points`. Careless
-  computers didn't mind my misspellings. ;-)
-* JRuby and Rubinius compatibility
-
-## 1.6.0
-
-* Rails 4 ready.
-* Adds ability to wildcard controllers like:
-```ruby
-grant_on '.*search#index', badge: 'searcher', multiple: true
-```
-* Allows custom fields to be defined on badges [97c998f]. Example:
-  Merit::Badge.create!({
-    id: 1,
-    name: 'best-unicorn',
-    custom_fields: { category: 'fantasy' }
-  })
-
-## 1.5.0
-
-* Adds `Merit::ActivityLog` join model between `Merit::Action` and
-  `Merit::BadgesSash` and `Merit::Score::Point` for logging purposes. Every
-  time a badge is granted or removed, or points are changed, a new
-  `ActivityLog` object gets created.
-* Namespaces `Badge`, `Sash` and `BadgesSash` into `Merit` module. If your app
-  uses any of those class names, you should add a `Merit::` prefix.
-* Removes undocumented `log:string` column from `merit_actions`.
-
-Run the following migration to upgrade from 1.4.0:
-
-```ruby
-class UpgradeMeritTo150 < ActiveRecord::Migration
-  def self.up
-    remove_column :merit_actions, :log
-    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"
-      t.datetime "created_at"
-    end
-  end
-end
-```
-
-## 1.4.0
-
-* Removed `BadgesSash#set_notified!` undocumented method from code base.
-* `:to` option for points and badges granting may now return an array of
-  objects. For instance:
-
-```ruby
-# All user's comments earn points
-score 2, to: :user_comments, on: 'comments#vote'
-```
-
-## to 1.3.0
-
-Adds two methods meant to display a leaderboard.
-
-* `Badge.last_granted(options = {})`. Accepts options:
-  * `:since_date` (`1.month.ago` by default)
-  * `:limit` (10 by default).
-
-  It lists last 10 badge grants in the last month, unless you change query
-  parameters.
-
-* `Merit::Score.top_scored(options = {})`. Accepts options:
-  * `:table_name` (`users` by default)
-  * `:since_date` (`1.month.ago` by default)
-  * `:limit` (10 by default).
-
-  It lists top 10 scored objects in the last month, unless you change query
-  parameters.
-
-## to 1.2.0
-
-* `Badge#grant_to(meritable_object)` no longer exists. Use
-  `meritable_object.add_badge(badge_id)` (may add badges more than once).
-* `Badge#delete_from(meritable_object)` no longer exists. Use
-  `meritable_object.rm_badge(badge_id)`.
-
-## to 1.1.0
-
-Code refactorings. Support for Ruby 1.8.7 has been dropped.
-
-## to 1.0.1
-
-Adds `Merit::Point#created_at` (`merit_score_points` table) attribute.
-May already be added if upgrading from merit < 1).
-
-## to 1.0.0
-
-Points granting history is now logged.
-
-* Attribute `points` and method `points=` don't exist anymore (method `points`
-  still works for querying number of points for a resource).
-* There are new methods `add_points(num_points, log_message)` and
-  `remove_points(num_points, log_message)` in meritable resources to manually
-  change their amount of points, keeping a history log.
-
-Run the following migration to have the new DB tables:
-
-    class UpgradeMerit < ActiveRecord::Migration
-      def self.up
-        create_table :merit_scores do |t|
-          t.references :sash
-          t.string :category, :default => 'default'
-        end
-
-        create_table :merit_score_points do |t|
-          t.references :score
-          t.integer :num_points, :default => 0
-          t.string :log
-          t.datetime :created_at
-        end
-      end
-
-      def self.down
-        drop_table :merit_scores
-        drop_table :merit_score_points
-      end
-    end
-
-    # This will create a single point entry log, with previous points granted
-    # to each meritable resource. Code example for a User class.
-
-    class UpgradeMeritableResources < ActiveRecord::Migration
-      def up
-        User.find_each do |user|
-          unless user.sash
-            user.sash = Sash.create!
-            user.save
-          end
-
-          user.sash.scores << Merit::Score.create
-          user.add_points(user.read_attribute(:points), 'Initial merit points import.')
-        end
-        remove_column :users, :points
-      end
-    end
-
-If you get an `ActiveRecord::DangerousAttributeError: points` exception, you
-may need to temporarily tweak your meritable model, as explained in
-http://stackoverflow.com/a/1515571/356060.
-
-
-## to 0.10.0
-
-`badges_sashes` table gets a primary key `id` column. Run the following migration:
-
-    class AddIdToBadgesSashes < ActiveRecord::Migration
-      def self.up
-        add_column :badges_sashes, :id, :primary_key
-      end
-
-      def self.down
-        remove_column :badges_sashes, :id
-      end
-    end
-
-`set_notified!(badge = nil, sash = nil)` no longer exists, just call `set_notified!`
-over the `badge_sash` object, with no parameters.
-
-## to 0.9.0
-
-Adds `allow_multiple` boolean option to `Badge#grant_to` (defaults to
-`false`). If you used this method to grant a badge it will now grant only if
-resource doesn't have the badge.
-
-Use `badge.grant_to resource, :allow_multiple => true` where needed.
-
-## to 0.8.0
-
-No changes needed. Adds Mongoid support.
-
-## to 0.7.0
-
-No changes needed. Adds `:multiple` boolean option to `grant_on` to grant
-badge multiple times.
-
-## to 0.6.0
-
-<tt>MeritBadgeRules</tt>, <tt>MeritPointRules</tt> and <tt>MeritRankRules</tt>
-are now namespaced into Merit module. Move and change:
-
-<pre>
-app/models/merit_{badge|point|rank}_rules.rb -> app/models/merit/{badge|point|rank}_rules.rb
-</pre>
-<pre>
--class Merit{Badge|Point|Rank}Rules
--  include Merit::{Badge|Point|Rank}Rules
-+module Merit
-+  class {Badge|Point|Rank}Rules
-+  include Merit::{Badge|Point|Rank}RulesMethods
-</pre>
-
-## to 0.5.0
-
-Add <tt>log:string</tt> column to <tt>merit_actions</tt> table.
-
-## to 0.4.0
-
-Rankings are now integer attributes (<tt>level</tt>), they are not badges
-anymore. <tt>set_rank</tt> doesn't accept <tt>badge_name</tt> anymore.
-
-## to 0.3.0
-
-Badges data is now stored in <tt>config/initializers/merit.rb</tt> using
-<tt>ambry</tt> syntax (not in the DB anymore, as that table needed to be in
-sync in all development environments).
-
-## to 0.2.0
-
-Added <tt>had_errors</tt> boolean attribute to <tt>merit_actions</tt> table.