Apply rubocop rules (auto and manual fixes)

Author: 0x1eef

lib/webmachine/adapter.rb

@@ -1,10 +1,8 @@
 module Webmachine
-
   # The abstract class for definining a Webmachine adapter.
   #
   # @abstract Subclass and override {#run} to implement a custom adapter.
   class Adapter
-
     # @return [Webmachine::Application] returns the application
     attr_reader :application
 
@@ -25,6 +23,5 @@ def self.run(application)
     def run
       raise NotImplementedError
     end
-
   end
 end

lib/webmachine/adapters/lazy_request_body.rb

@@ -24,7 +24,7 @@ def empty?
       # @yield [chunk]
       # @yieldparam [String] chunk a chunk of the request body
       def each
-        @request.body {|chunk| yield chunk }
+        @request.body { |chunk| yield chunk }
       end
     end # class RequestBody
   end # module Adapters

lib/webmachine/adapters/rack_mapped.rb

@@ -21,7 +21,6 @@ module Adapters
     #     end
     #   end
     class RackMapped < Rack
-
       protected
 
       def routing_tokens(rack_req)

lib/webmachine/application.rb

@@ -43,7 +43,7 @@ class Application
     #   the Application instance being initialized
     def initialize(configuration = Configuration.default, dispatcher = Dispatcher.new)
       @configuration = configuration
-      @dispatcher    = dispatcher
+      @dispatcher = dispatcher
 
       yield self if block_given?
     end
@@ -73,7 +73,7 @@ def adapter_class
     #
     # @see Webmachine::Dispatcher#add_route
     def routes(&block)
-      if block_given?
+      if block
         dispatcher.instance_eval(&block)
         self
       else

lib/webmachine/chunked_body.rb

@@ -29,7 +29,7 @@ def initialize(body)
     # parameter.
     # Returns an {Enumerator} if no block is given.
     def each
-      return self.to_enum unless block_given?
+      return to_enum unless block_given?
 
       @body.each do |chunk|
         size = chunk.bytesize

lib/webmachine/decision/falsey.rb

@@ -7,4 +7,3 @@ def Falsey.===(other)
     end
   end
 end
-

lib/webmachine/dispatcher.rb

@@ -33,7 +33,7 @@ def add_route(*args, &block)
       @routes << route
       route
     end
-    alias :add :add_route
+    alias_method :add, :add_route
 
     # Dispatches a request to the appropriate {Resource} in the
     # dispatch list. If a matching resource is not found, a "404 Not
@@ -72,10 +72,11 @@ def find_resource(request, response)
     # Find the first route that matches an incoming request
     # @param [Request] request the request to match
     def find_route(request)
-      @routes.find {|r| r.match?(request) }
+      @routes.find { |r| r.match?(request) }
     end
 
     private
+
     def prepare_resource(route, request, response)
       route.apply(request)
       @resource_creator.call(route, request, response)

lib/webmachine/dispatcher/route.rb

@@ -43,6 +43,21 @@ def self.rfc3986_percent_decode(value)
         result
       end
 
+      # Decode a string using the scheme described in RFC 3986 2.1. Percent-Encoding (https://www.ietf.org/rfc/rfc3986.txt)
+      def self.rfc3986_percent_decode(value)
+        s = StringScanner.new(value)
+        result = ""
+        until s.eos?
+          encoded_val = s.scan(/%([0-9a-fA-F]){2}/)
+          result << if encoded_val.nil?
+            s.getch
+          else
+            [encoded_val[1..-1]].pack("H*")
+          end
+        end
+        result
+      end
+
       # Creates a new Route that will associate a pattern to a
       # {Resource}.
       #

lib/webmachine/etags.rb

@@ -10,7 +10,7 @@ class ETag
 
     def self.new(etag)
       return etag if ETag === etag
-      klass = etag =~ WEAK_ETAG ? WeakETag : self
+      klass = WEAK_ETAG.match?(etag) ? WeakETag : self
       klass.send(:allocate).tap do |obj|
         obj.send(:initialize, etag)
       end
@@ -53,6 +53,7 @@ def to_s
     end
 
     private
+
     def unquote(str)
       if str =~ WEAK_ETAG
         unescape_quotes $1

lib/webmachine/header_negotiation.rb

@@ -3,19 +3,18 @@
 module Webmachine
   module HeaderNegotiation
     def ensure_date_header(res)
-      if (200..499).include?(res.code)
+      if (200..499).cover?(res.code)
         res.headers[DATE] ||= Time.now.httpdate
       end
     end
 
     def ensure_content_length(res)
       body = res.body
-      case
-      when res.headers[TRANSFER_ENCODING]
-        return
-      when [204, 205, 304].include?(res.code)
+      if res.headers[TRANSFER_ENCODING]
+        nil
+      elsif [204, 205, 304].include?(res.code)
         res.headers.delete CONTENT_LENGTH
-      when body != nil
+      elsif !body.nil?
         res.headers[CONTENT_LENGTH] = body.respond_to?(:bytesize) ? body.bytesize.to_s : body.length.to_s
       else
         res.headers[CONTENT_LENGTH] = '0'