merit 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d79f50b24ec0f6cf605b5b77fbd9d2b96c41f16
-  data.tar.gz: 862c1a7af32018b9344bdccb43d462b97d7339e0
+  metadata.gz: 73bf41bfadf2e0f5a4c6ee7e6577d506f60b3eaf
+  data.tar.gz: 767294bcaf7a2b004db246471df0294f5fa16105
 SHA512:
-  metadata.gz: 783a96fce0128b18e34eba63999a84675011576d8ca0031251d5c4fe5d967007488616b0afe07258b0df2ac1b5c3e853e95b10e712b35a3b93f2e943b94e7c65
-  data.tar.gz: 0453aa9d1395d6a6d1f86f11276d076ba1d07a2e13b4622b3e07e077cc445e5055c64e99103a5074af555ead4217d05c749f2fc2918d3c9f4e7b264ec1ff04dc
+  metadata.gz: 14f72b0cd12dca5f0f02cbb120d8088e2a30b9648de4763f32e891c8ec4f23cd06fe32a1008bd012a28ecab94551152d4be4bd812d08c7b1a83ffa3578c90d7a
+  data.tar.gz: 33d894f57a5e03b57abf0ce647c100ceaed2364e86ba6a95e8bf8f224c469faaa3a5b29269f647069288781cb1a5064737ac8e7f72251182c014f2f69c371412

data/NEWS.md

@@ -2,6 +2,12 @@
 
 User-visible changes worth mentioning.
 
+## 2.3.4
+
+- [#247] Fix Ruby warnings
+- [#252] Bug fix: `uninitialized constant Merit::PointRules (NameError)` while
+    installing merit.
+
 ## 2.3.3
 
 - [#215] Bug fix in API where a `BadgeSash` would be created without failures

data/README.md

@@ -89,8 +89,8 @@ Badge rules / conditions are defined in `app/models/merit/badge_rules.rb`
   * Can be `:itself`, in which case it badges the target object itself
     (`@model`).
   * Is `:action_user` by default, which means `current_user`.
-* `:model_name` define the controller's name if it's different from
-  the model's (e.g. `RegistrationsController` for the `User` model).
+* `:model_name` define the model's name if it's different from
+  the controller's (e.g. the `User` model for the `RegistrationsController`).
 * `:multiple` whether or not the badge may be granted multiple times. `false` by default.
 * `:temporary` whether or not the badge should be revoked if the condition no
   longer holds. `false` -badges are kept for ever- by default.

data/lib/merit.rb

@@ -90,7 +90,8 @@ module Merit
           include Merit::ControllerExtensions
         rescue NameError => e
           # Trap NameError if installing/generating files
-          raise e unless e.to_s =~ /uninitialized constant Merit::BadgeRules/
+          raise e unless
+            e.to_s =~ /uninitialized constant Merit::(BadgeRules|PointRules)/
         end
       end
     end

data/lib/merit/controller_extensions.rb

@@ -47,15 +47,23 @@ module Merit
     end
 
     def target_object
-      target_obj = instance_variable_get(:"@#{controller_name.singularize}")
-      if target_obj.nil?
-        str = '[merit] No object found, you might need a ' \
-          "'@#{controller_name.singularize}' variable in " \
-          "'#{controller_path}_controller' if no reputation is applied. " \
-          'If you are using `model_name` option in the rule this is ok.'
-        Rails.logger.warn str
+      variable_name = :"@#{controller_name.singularize}"
+      if instance_variable_defined?(variable_name)
+        if target_obj = instance_variable_get(variable_name)
+          target_obj
+        else
+          warn_no_object_found
+        end
       end
-      target_obj
+    end
+
+    def warn_no_object_found
+      str = '[merit] No object found, you might need a ' \
+        "'@#{controller_name.singularize}' variable in " \
+        "'#{controller_path}_controller' if no reputation is applied. " \
+        'If you are using `model_name` option in the rule this is ok.'
+      Rails.logger.warn str
+      nil
     end
 
     def target_id

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

data/test/dummy/app/models/merit/point_rules.rb

@@ -36,7 +36,7 @@ module Merit
         object.comment.to_i > 0
       end
 
-      score -5, to: :user, on: 'comments#destroy' do |comment|
+      score (-5), to: :user, on: 'comments#destroy' do |comment|
         comment.present?
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merit
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Tute Costa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ambry
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Reputation engine for Rails apps