lib/http_utilities/http/response.rb in http_utilities-1.2.5.3 vs lib/http_utilities/http/response.rb in http_utilities-1.2.6

@@ -3,27 +3,27 @@
     class Response
       include HttpUtilities::Http::Logger
 
       attr_accessor :body, :parsed_body, :page, :format, :request, :force_encoding
 
-      def initialize(response = nil, request = nil, options = {})
+      def initialize(response: nil, request: nil, options: {})
         self.body             =   (response && response.body) ? response.body : nil
         self.request          =   request
 
         self.parsed_body      =   nil
 
         self.format           =   options.fetch(:format, nil)
         self.force_encoding   =   options.fetch(:force_encoding, true)
 
-        encode if (self.force_encoding)
+        encode if self.force_encoding
         parse_response
       end
 
       def encode
         if self.body && self.body.is_a?(String)
           begin
-            self.body = self.body.force_encoding('UTF-8').encode("UTF-8", :invalid => :replace, :undef => :replace, :replace => "")
+            self.body = self.body.force_encoding('UTF-8').encode("UTF-8", invalid: :replace, undef: :replace, replace: '')
           rescue Exception => e
             log(:error, "[HttpUtilities::Http::Format] - Failed to convert response with String#encode. Error: #{e.class.name}. Message: #{e.message}.")
           end
         end
       end
@@ -31,24 +31,24 @@
       def parse_response
         self.send("as_#{self.format}".to_sym) if (self.body && self.format)
       end
       
       def as_html
-        self.parsed_body = (self.body && self.body != "") ? Nokogiri::HTML(self.body.to_s.force_encoding("utf-8"), nil, "utf-8") : nil
+        self.parsed_body = (self.body && !self.body.empty?) ? Nokogiri::HTML(self.body.to_s.force_encoding("utf-8"), nil, "utf-8") : nil
       end
 
       def as_xml
-        self.parsed_body = (self.body && self.body != "") ? Nokogiri::XML(self.body.to_s.force_encoding("utf-8"), nil, "utf-8") : nil
+        self.parsed_body = (self.body && !self.body.empty?) ? Nokogiri::XML(self.body.to_s.force_encoding("utf-8"), nil, "utf-8") : nil
       end
 
       def as_json
-        self.parsed_body = (self.body && self.body != "") ? self.body.to_s.force_encoding("utf-8").to_json : nil
+        self.parsed_body = (self.body && !self.body.empty?) ? self.body.to_s.force_encoding("utf-8").to_json : nil
       end
 
       def set_page(page)
-        self.page = page
+        self.page           =   page
 
-        if (self.page && self.page.parser)
+        if self.page && self.page.parser
           self.body         =   self.page.parser.content
           self.parsed_body  =   self.page.parser
         end
       end