rubocop-mirego 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 092aa7b1f465b752fe8c6416f871767fb643f3ac
-  data.tar.gz: b836c8a3674b77bf3be615b4cb4016ff13c7900b
+  metadata.gz: fbf7f57cdcbd4350c84b2dc8169dab68d71cc012
+  data.tar.gz: 1d0eba62dc357fe5ea8261d96188241a533ef98d
 SHA512:
-  metadata.gz: e2f3a991ac5820e2a8a46fe545337688bc7f53099fd596584da84a736dc3e83c22493c686701c96948aba823d652e0b1732e3409443db120161ddc5a86aa7fe3
-  data.tar.gz: faf7cfb1f81200f7b2d24b12af3e121d5fef1b9b7e4d9ec2ea8d864cffb5592b1797a3b7428ed47b67aa30e8b1a413324fddc2149f653b0173ba37d32dee7b4e
+  metadata.gz: a8078e6e5435412b24c3b0df36e0ab77a835cbd7a593477d5bb0b80b1aa82529a31b5c9c6d7d14253da18aae3a176e7b61003c6715b83eea6ffd15f9f18bb802
+  data.tar.gz: f26636adaf0edd7f0d4f363f820a0cae460e45b76ca254eb334de882ab976c2d394c40e714e013607ae8a067e4643ce68a60b225481fc06eacc86cb5cac7a488

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-mirego (0.0.2)
+    rubocop-mirego (0.0.3)
       rubocop (= 0.39.0)
 
 GEM
@@ -49,4 +49,4 @@ DEPENDENCIES
   rubocop-rspec (~> 1.4, >= 1.4.1)
 
 BUNDLED WITH
-   1.11.2
+   1.13.7

data/lib/rubocop/cop/mirego/explicit_return_value.rb

@@ -20,10 +20,20 @@ module RuboCop
           expressions = *node
           return nil unless node
 
-          if return_node_type(node: node)
-            check_return_node(node: node, children: node.children)
-          elsif expressions.last && return_node_type(node: expressions.last)
-            check_return_node(node: node, children: expressions.last.to_a)
+          if expressions.empty?
+            validate_expression(expression: node)
+          else
+            expressions.compact.each { |expression| validate_expression(expression: expression) }
+          end
+        end
+
+        def validate_expression(expression:)
+          if return_node_type(node: expression)
+            check_return_node(node: expression, children: expression.children)
+          elsif expression.respond_to?(:children)
+            children = expression.children.compact
+
+            check_return_node(node: expression, children: children.last.to_a) if children.last && return_node_type(node: children.last)
           end
         end
 

data/lib/rubocop/mirego/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module Mirego
-    VERSION = '0.0.3'.freeze
+    VERSION = '0.0.4'.freeze
   end
 end

data/spec/rubocop/cop/mirego/explicit_return_value_spec.rb

@@ -26,7 +26,7 @@ describe RuboCop::Cop::Mirego::ExplicitReturnValue do
     end
   end
 
-  describe 'with a return missing a value with a conditional' do
+  describe 'with a return missing a value with a `unless` conditional' do
     let(:source) { 'def test; return unless bool; end' }
 
     specify do
@@ -35,6 +35,24 @@ describe RuboCop::Cop::Mirego::ExplicitReturnValue do
     end
   end
 
+  describe 'with a return missing a value with a `if` conditional' do
+    let(:source) { 'def test; return unless bool; end' }
+
+    specify do
+      expect(cop.offenses.size).to eql(1)
+      expect(cop.offenses.first.cop_name).to eql('Mirego/ExplicitReturnValue')
+    end
+  end
+
+  describe 'with a return missing a value with a expression after the return' do
+    let(:source) { 'def test; return unless bool; foobar end' }
+
+    specify do
+      expect(cop.offenses.size).to eql(1)
+      expect(cop.offenses.first.cop_name).to eql('Mirego/ExplicitReturnValue')
+    end
+  end
+
   describe 'with a implicit return' do
     let(:source) { 'def test; test; end' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-mirego
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jean-François Chaput
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop