easy_http 0.1.2 → 0.1.5

data/lib/easy_http/response.rb

@@ -3,25 +3,38 @@
 module EasyHTTP
   class Response
 
-    attr_reader :url, :status, :status_message, :body, :headers, :charset
+    # Requested URL
+    attr_reader :url
+    # Response status code
+    attr_reader :status
+    # Response status text
+    attr_reader :status_message
+    # Response body
+    attr_reader :body
+    # Parsed response headers
+    attr_reader :headers
+    # Response charset
+    attr_reader :charset
 
     def initialize url, response, default_charset = nil
       default_charset = "ASCII-8BIT" unless default_charset
       @url = url
-
       @status = response.code.to_i
       @status_message = response.message
-
+      if response["content-type"]
+        @charset = determine_charset(response['content-type'], response.body) || default_charset
+      end
+      @charset = default_charset if @charset.nil?
       @body = response.body
-      @body = @body.encode default_charset if String.method_defined? :encode
 
-      @headers = {}
-      response.each_header { |k, v| @headers[k] = v}
-      if response['Content-type'].nil?
-        @charset =  default_charset
-      else
-        @charset = determine_charset(response['Content-type'], response.body) || default_charset
+      if response["content-type"] && response["content-type"][0, 5] == "text/"
+        convert_to_default_encoding! @body
       end
+
+      @headers = {}
+      response.each_header { |k, v| @headers[k] = v }
+
+      self
     end
 
     def inspect
@@ -29,7 +42,6 @@ module EasyHTTP
     end
 
     private
-
     def determine_charset(header_data, body)
       header_data.match(charset_regex) || (body && body.match(charset_regex))
       $1
@@ -39,5 +51,11 @@ module EasyHTTP
       /(?:charset|encoding)="?([a-z0-9-]+)"?/i
     end
 
+    def convert_to_default_encoding!(str)
+      if str.respond_to?(:encode) && Encoding.default_internal
+        str.force_encoding(charset).encode!(Encoding.default_internal)
+      end
+    end
+
   end
 end

data/lib/easy_http/session.rb

@@ -26,6 +26,9 @@ module EasyHTTP
     # Default request charset
     attr_accessor :default_response_charset
 
+    # Control redirects
+    attr_accessor :max_redirs
+
     def initialize url, options = {}
       @cookies = nil # Initialize cookies store to nil
       @default_headers = {
@@ -46,6 +49,8 @@ module EasyHTTP
 
       @uri = URI(@base_url) # Parse URI Object
 
+      @max_redirs = options[:max_redirs] || 5
+
       create_ua
     end
 
@@ -83,7 +88,7 @@ module EasyHTTP
     end
 
     # Send an HTTP request
-    def send_request action, path, headers, request_options = {}
+    def send_request action, path, headers, request_options = {}, redir = 0
       # Parse path to prevent errors
       path = "/#{path}" unless path.match(/^"\/"/)
 
@@ -125,8 +130,23 @@ module EasyHTTP
         unless response.nil?
           # Store cookies if have enabled store it
           handle_cookies response unless @cookies.nil?
-          # Generate and return response
-          return Response.new "#{base_url}#{path}", response, @default_response_charset
+
+          # Generate and return response or follow redir
+          case response
+          when Net::HTTPSuccess
+            return Response.new "#{base_url}#{path}", response, @default_response_charset
+          when Net::HTTPRedirection
+            if redir == @max_redirs
+              return Response.new "#{base_url}#{path}", response, @default_response_charset
+            else
+              puts "redir (#{redir}) from #{path} to #{response['location']}"
+              return send_request action, URI.parse(response['location']).path, headers, request_options, redir + 1
+
+            end
+          else
+            return Response.new "#{base_url}#{path}", response, @default_response_charset
+          end
+
         end
       end
     end
@@ -156,13 +176,13 @@ module EasyHTTP
         # Store the cookies
         parsed_cookies.each do |k,v|
           cookie_parts  = v.to_s.split(";")[0].split("=")
-          @cookies[cookie_parts[0]] = cookie_parts[1]
+          @cookies[k] = URI.unescape(cookie_parts[1]) unless cookie_parts[1].nil?
         end
       end
     end
 
     def format_cookies
-      (@cookies.collect{ |k,v| "#{k}=#{URI.unescape(v)}"}).join("; ")
+      (@cookies.collect{ |k,v| "#{k}=#{v}"}).join("; ")
     end
   end
 end

data/lib/easy_http/version.rb

@@ -5,7 +5,7 @@ module EasyHTTP
   module Version
     MAJOR = 0
     MINOR = 1
-    TINY  = 2
+    TINY  = 5
   end
 
   PROGRAM_NAME     = "EasyHTTP"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: easy_http
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Tomas J. Sahagun
@@ -15,42 +14,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-28 00:00:00 Z
+date: 2013-01-13 00:00:00 +01:00
+default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 5
-        - 5
-        version: 1.5.5
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 0
         - 9
         - 2
         version: 0.9.2
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 description: |-
-  EasyHTTP 0.1.2
+  EasyHTTP 0.1.5
   2012, Tomas J. Sahagun <113.seattle@gmail.com>
 email: 113.seattle@gmail.com
 executables: []
@@ -64,6 +46,7 @@ files:
 - lib/easy_http/response.rb
 - lib/easy_http/session.rb
 - lib/easy_http/version.rb
+has_rdoc: true
 homepage: https://github.com/seattle/EasyHTTP
 licenses: []
 
@@ -73,27 +56,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple wrapper for Net:HTTP