Merge pull request #1378 from ochagata/fix_double_negation_violations

Fix double negation violations

Author: dblock

.rubocop_todo.yml

@@ -1,16 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-04-26 16:12:14 -0400 using RuboCop version 0.39.0.
+# on 2016-04-27 13:48:11 -0500 using RuboCop version 0.39.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Lint/IneffectiveAccessModifier:
-  Exclude:
-    - 'lib/grape/router.rb'
-
 # Offense count: 39
 Metrics/AbcSize:
   Max: 44
@@ -22,19 +17,19 @@ Metrics/BlockNesting:
 # Offense count: 7
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 267
+  Max: 264
 
 # Offense count: 24
 Metrics/CyclomaticComplexity:
   Max: 14
 
-# Offense count: 871
+# Offense count: 874
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 215
 
-# Offense count: 49
+# Offense count: 48
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 34
@@ -66,14 +61,6 @@ Style/BlockDelimiters:
 Style/Documentation:
   Enabled: false
 
-# Offense count: 6
-Style/DoubleNegation:
-  Exclude:
-    - 'lib/grape/api.rb'
-    - 'lib/grape/middleware/versioner/accept_version_header.rb'
-    - 'lib/grape/middleware/versioner/header.rb'
-    - 'lib/grape/path.rb'
-
 # Offense count: 14
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, exploded

lib/grape/api.rb

@@ -123,8 +123,8 @@ def call(env)
     # errors from reaching upstream. This is effectivelly done by unsetting
     # X-Cascade. Default :cascade is true.
     def cascade?
-      return !!self.class.namespace_inheritable(:cascade) if self.class.inheritable_setting.namespace_inheritable.keys.include?(:cascade)
-      return !!self.class.namespace_inheritable(:version_options)[:cascade] if self.class.namespace_inheritable(:version_options) && self.class.namespace_inheritable(:version_options).key?(:cascade)
+      return self.class.namespace_inheritable(:cascade) if self.class.inheritable_setting.namespace_inheritable.keys.include?(:cascade)
+      return self.class.namespace_inheritable(:version_options)[:cascade] if self.class.namespace_inheritable(:version_options) && self.class.namespace_inheritable(:version_options).key?(:cascade)
       true
     end
 

lib/grape/middleware/versioner/accept_version_header.rb

@@ -50,7 +50,7 @@ def strict?
         # this behavior, and not add the `X-Cascade` header, one can set the `:cascade` option to `false`.
         def cascade?
           if options[:version_options] && options[:version_options].key?(:cascade)
-            !!options[:version_options][:cascade]
+            options[:version_options][:cascade]
           else
             true
           end

lib/grape/middleware/versioner/header.rb

@@ -159,7 +159,7 @@ def version_options
         # header, one can set the `:cascade` option to `false`.
         def cascade?
           if version_options && version_options.key?(:cascade)
-            !!version_options[:cascade]
+            version_options[:cascade]
           else
             true
           end

lib/grape/path.rb

@@ -22,11 +22,19 @@ def root_prefix
     end
 
     def uses_specific_format?
-      !!(settings[:format] && Array(settings[:content_types]).size == 1)
+      if settings.key?(:format) && settings.key?(:content_types)
+        (settings[:format] && Array(settings[:content_types]).size == 1)
+      else
+        false
+      end
     end
 
     def uses_path_versioning?
-      !!(settings[:version] && settings[:version_options][:using] == :path)
+      if settings.key?(:version) && settings[:version_options] && settings[:version_options].key?(:using)
+        (settings[:version] && settings[:version_options][:using] == :path)
+      else
+        false
+      end
     end
 
     def namespace?

lib/grape/router.rb

@@ -11,6 +11,14 @@ def initialize(pattern, attributes = {})
       end
     end
 
+    def self.normalize_path(path)
+      path = "/#{path}"
+      path.squeeze!('/')
+      path.sub!(%r{/+\Z}, '')
+      path = '/' if path == ''
+      path
+    end
+
     def initialize
       @neutral_map = []
       @map = Hash.new { |hash, key| hash[key] = [] }
@@ -149,13 +157,5 @@ def routes_for(method)
     def string_for(input)
       self.class.normalize_path(input)
     end
-
-    def self.normalize_path(path)
-      path = "/#{path}"
-      path.squeeze!('/')
-      path.sub!(%r{/+\Z}, '')
-      path = '/' if path == ''
-      path
-    end
   end
 end