merit 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80cd3f1c6e1d7bac792d556e3b5145c82f0e3db9bd5b07eb6487c2de7f029613
-  data.tar.gz: ba6e5ee3691603cf88f3871b23bd875bb755fe2206c24f790d3ce427f6c2430f
+  metadata.gz: 1163ea7681b5daca51eb89a7785bc648fe86ddbefff1a05cdc765c20c9b91973
+  data.tar.gz: 1329168f700f69f1d0eff4ca196ed511302b7839745eb8ed58bb5bb277cd5d51
 SHA512:
-  metadata.gz: 639a9e1f07a6c5505a41ee412fb4d8de43184c125ca254b941501863b92ebc15c9495f1714d4edba4f286166e895c4962b62ed249a546eddc9b1201b8154dfdb
-  data.tar.gz: ba40fb0d27815c0f1e523cf445eef9b44f5fa06682562e067405216bb4b56c748af0574baaa7e9d4b5d3ec935dd2f7002bb03fa0655eb6d73805acc568079097
+  metadata.gz: 2e112a21e6ada4964c86c7253c72bc4235f4ab478a876badfa27cf1d60d2cea3ec297f234219100bc9049e50ea859860a7d6c3f504dcca86b8424da3aa28e007
+  data.tar.gz: 39f8af732714702142e9b0f279c63b7aa528113fd81f39df99f94ae09ca0320e9a2f52b230dd919bedc9e42f5947aed9ad656df89c84c9bc09a56cdacd7e8438

data/NEWS.md

@@ -2,6 +2,12 @@
 
 User-visible changes worth mentioning.
 
+## 4.0.3
+
+- Add webrick as a development dependency
+- [#363] Fix: `warning: already initialized constant Merit::*` messages
+- [#357] Fix `merit_actions` migration template
+
 ## 4.0.2
 
 - [#355, #356] Add index on merit_actions.processed column

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

@@ -11,7 +11,7 @@ class CreateMeritActions < ActiveRecord::Migration<%= migration_version %>
       t.boolean :processed, default: false
       t.timestamps null: false
     end
-  end
 
-  add_index :merit_actions, :processed
+    add_index :merit_actions, :processed
+  end
 end

data/lib/merit.rb

@@ -35,6 +35,16 @@ module Merit
     @config.add_observer(class_name)
   end
 
+  # If the app is reloaded, avoid printing `warning: previous definition of AppBadgeRules was here`
+  def self.remove_badge_rules
+    remove_const(:AppBadgeRules) if self.const_defined?('AppBadgeRules')
+  end
+
+  # If the app is reloaded, avoid printing `warning: previous definition of AppPointRules was here`
+  def self.remove_point_rules
+    remove_const(:AppPointRules) if self.const_defined?('AppPointRules')
+  end
+
   class Configuration
     attr_accessor :checks_on_each_request, :orm, :user_model_name, :observers,
                   :current_user_method
@@ -65,6 +75,9 @@ module Merit
         ActiveSupport.on_load(:active_record) { include Merit }
         ActiveSupport.on_load(app.config.api_only ? :action_controller_api : :action_controller_base) do
           begin
+            # Remove previous definitions of constant if they are defined when app reloads
+            Merit.remove_badge_rules
+            Merit.remove_point_rules
             # Load app rules on boot up
             Merit::AppBadgeRules = Merit::BadgeRules.new.defined_rules
             Merit::AppPointRules = Merit::PointRules.new.defined_rules

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.2'
+  s.version     = '4.0.3'
   s.authors     = ["Tute Costa"]
   s.email       = 'tutecosta@gmail.com'
 
@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'minitest-rails'
   s.add_development_dependency 'mocha'
+  s.add_development_dependency 'webrick'
 end

data/test/dummy/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# 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
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/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.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Tute Costa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2022-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage badges, points and rankings (reputation) in your Rails app.
 email: tutecosta@gmail.com
 executables: []
@@ -280,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Reputation engine for Rails apps