merit 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81342bb2e6b393dca1eed04fb9918e964d7add7e4a5144da975deb98fa05651e
-  data.tar.gz: 6b942ef093394de05ad17ddc74b2c802ed3e4e648f4452b1497b0e1a3521eefb
+  metadata.gz: 80cd3f1c6e1d7bac792d556e3b5145c82f0e3db9bd5b07eb6487c2de7f029613
+  data.tar.gz: ba6e5ee3691603cf88f3871b23bd875bb755fe2206c24f790d3ce427f6c2430f
 SHA512:
-  metadata.gz: 9054350196c3dbb3d9a4542519a100f1ee1f34bc8bd2374de067fea912910afb1d795c78bd120e9b5007c2032dd0aecb4d113e21d7470232f00be15c2fe41c88
-  data.tar.gz: e86554c92ac022a624a911a2e5cdb81562cde41babc2c2fa195aa78e4c264ef389db106c5907ba05f7db6bb4f4ce9a276d57d49b34d78138eee6c633dbed655c
+  metadata.gz: 639a9e1f07a6c5505a41ee412fb4d8de43184c125ca254b941501863b92ebc15c9495f1714d4edba4f286166e895c4962b62ed249a546eddc9b1201b8154dfdb
+  data.tar.gz: ba40fb0d27815c0f1e523cf445eef9b44f5fa06682562e067405216bb4b56c748af0574baaa7e9d4b5d3ec935dd2f7002bb03fa0655eb6d73805acc568079097

data/NEWS.md

@@ -2,6 +2,14 @@
 
 User-visible changes worth mentioning.
 
+## 4.0.2
+
+- [#355, #356] Add index on merit_actions.processed column
+- [#354] Fix Rails autoloader deprecation warnings
+  Requires wrapping `Merit::Badge.create` with `Rails.application.reloader.to_prepare`
+- Test with Ruby 3 and Rails 6.1 (excludes Rails 5.2 with Ruby 3, that errors out)
+- [#288] Don’t send “removed badge” notifications when user doesn’t have the badge
+
 ## 4.0.1
 
 - [#351] Fix bug on generating migrations

data/README.md

@@ -58,12 +58,16 @@ Create badges in `config/initializers/merit.rb`
 ### Example
 
 ```ruby
-Merit::Badge.create!(
-  id: 1,
-  name: "year-member",
-  description: "Active member for a year",
-  custom_fields: { difficulty: :silver }
-)
+# config/initializers/merit.rb
+
+Rails.application.reloader.to_prepare do
+  Merit::Badge.create!(
+    id: 1,
+    name: "year-member",
+    description: "Active member for a year",
+    custom_fields: { difficulty: :silver }
+  )
+end
 ```
 
 ## Defining Rules
@@ -305,8 +309,8 @@ warning, with a comment to check the configuration for the rule.
 
 # Getting Notifications
 
-You can get observers notified any time merit changes reputation in your
-application.
+You can get observers notified any time merit automatically changes reputation
+in your application.
 
 It needs to implement the `update` method, which receives as parameter the
 following hash:
@@ -337,6 +341,9 @@ end
 config.add_observer 'ReputationChangeObserver'
 ```
 
+**NOTE:** Observers won’t get notified if you grant reputation with
+direct calls to `add_badge` or `add_point`.
+
 # I18n
 
 Merit uses default messages with I18n for notify alerts. To customize your app, you can set up your locale file:

data/lib/merit.rb

@@ -61,32 +61,22 @@ module Merit
     config.app_generators.orm Merit.orm
 
     initializer 'merit.controller' do |app|
-      extend_orm_with_has_merit
-      ActiveSupport.on_load(action_controller_hook) do
-        begin
-          # Load app rules on boot up
-          Merit::AppBadgeRules = Merit::BadgeRules.new.defined_rules
-          Merit::AppPointRules = Merit::PointRules.new.defined_rules
-          include Merit::ControllerExtensions
-        rescue NameError => e
-          # Trap NameError if installing/generating files
-          raise e unless
-            e.to_s =~ /uninitialized constant Merit::(BadgeRules|PointRules)/
+      config.to_prepare do
+        ActiveSupport.on_load(:active_record) { include Merit }
+        ActiveSupport.on_load(app.config.api_only ? :action_controller_api : :action_controller_base) do
+          begin
+            # Load app rules on boot up
+            Merit::AppBadgeRules = Merit::BadgeRules.new.defined_rules
+            Merit::AppPointRules = Merit::PointRules.new.defined_rules
+            include Merit::ControllerExtensions
+          rescue NameError => e
+            # Trap NameError if installing/generating files
+            raise e unless
+              e.to_s =~ /uninitialized constant Merit::(BadgeRules|PointRules)/
+          end
         end
       end
     end
-
-    def extend_orm_with_has_merit
-      ActiveRecord::Base.include(Merit)
-    end
-
-    def action_controller_hook
-      if Rails.application.config.api_only
-        :action_controller_api
-      else
-        :action_controller_base
-      end
-    end
   end
 end
 

data/lib/merit/generators/active_record/templates/create_merit_actions.erb

@@ -12,4 +12,6 @@ class CreateMeritActions < ActiveRecord::Migration<%= migration_version %>
       t.timestamps null: false
     end
   end
+
+  add_index :merit_actions, :processed
 end

data/lib/merit/generators/templates/merit.erb

@@ -17,14 +17,16 @@ Merit.setup do |config|
 end
 
 # Create application badges (uses https://github.com/norman/ambry)
-# badge_id = 0
-# [{
-#   id: (badge_id = badge_id+1),
-#   name: 'just-registered'
-# }, {
-#   id: (badge_id = badge_id+1),
-#   name: 'best-unicorn',
-#   custom_fields: { category: 'fantasy' }
-# }].each do |attrs|
-#   Merit::Badge.create! attrs
+# Rails.application.reloader.to_prepare do
+#   badge_id = 0
+#   [{
+#     id: (badge_id = badge_id+1),
+#     name: 'just-registered'
+#   }, {
+#     id: (badge_id = badge_id+1),
+#     name: 'best-unicorn',
+#     custom_fields: { category: 'fantasy' }
+#   }].each do |attrs|
+#     Merit::Badge.create! attrs
+#   end
 # end

data/lib/merit/judge.rb

@@ -50,11 +50,12 @@ module Merit
 
     def remove_badges
       sashes.each do |sash|
-        sash.rm_badge badge.id
-        notify_observers(
-          description: I18n.t("merit.removed_badge", badge_name: badge.name),
-          sash_id: sash.id
-        )
+        if sash.rm_badge badge.id
+          notify_observers(
+            description: I18n.t("merit.removed_badge", badge_name: badge.name),
+            sash_id: sash.id
+          )
+        end
       end
     end
 

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     = '4.0.1'
+  s.version     = '4.0.2'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 

data/test/dummy/db/migrate/20130329224406_create_merit_actions.rb

@@ -10,6 +10,8 @@ class CreateMeritActions < ActiveRecord::Migration[5.0]
       t.boolean :processed, :default => false
       t.timestamps null: false
     end
+
+    add_index :merit_actions, :processed
   end
 
   def self.down

data/test/dummy/db/schema.rb

@@ -49,6 +49,7 @@ ActiveRecord::Schema.define(version: 2014_08_19_133931) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.text "target_data"
+    t.index ["processed"], name: "index_merit_actions_on_processed"
   end
 
   create_table "merit_activity_logs", force: :cascade do |t|

data/test/integration/navigation_test.rb

@@ -180,7 +180,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
 
     visit "/users/#{user.id}/edit"
     fill_in 'Name', with: 'a'
-    assert_difference('Merit::ActivityLog.count', 2) do
+    assert_difference('Merit::ActivityLog.count', 1) do
       click_button('Update User')
     end
 

data/test/unit/sash_test.rb

@@ -6,6 +6,22 @@ class SashTest < ActiveSupport::TestCase
     @sash = Merit::Sash.create
   end
 
+  describe "#rm_badge" do
+    describe "when has badge" do
+      it "returns truthy" do
+        @sash.badges_sashes.create!(badge_id: 1)
+
+        assert_equal !!@sash.rm_badge(1), true
+      end
+    end
+
+    describe "when does NOT have badge" do
+      it "returns falsey" do
+        assert_equal !!@sash.rm_badge(0), false
+      end
+    end
+  end
+
   describe "#add_points" do
     describe "when category specified" do
       it "should create a new Point with specified category" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Tute Costa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-15 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Reputation engine for Rails apps