pincers 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13800946bd226e0d1901e8f2ca9602d3093263b7
-  data.tar.gz: 15bb77962be50cfde06c890a8eb788443d12c4e2
+  metadata.gz: 6da332a1a2cd06206a29878abce0860c7dd9714a
+  data.tar.gz: 77a17252be6f58e1e76adcd04158c2ce94c3cbd3
 SHA512:
-  metadata.gz: 03255eba9a8a32ac3a3c509fd5be6cae8e0bd0e3e34b09478bde052d48077e04d057aec40a733ae1d35a6e3fcd5d438480f3cad1baefae40278c94fdf6ac49e8
-  data.tar.gz: 72996ed5cd0fba1cb6f7174864bdc8a29e0c31593b8830ea4446ce34748dee0c8e3dc7dbed0d0723cfb39c914ed258734fe0c6a9f2cb310c2e13d0d26270651a
+  metadata.gz: e34c26b569947c44307c280864268f6e7cbe855f35c9c265b188ef585a87d96e98b82973fc05230b679fbdbfb93c7a7bb9a95e688b55f7df4dd889ae0d5a34ec
+  data.tar.gz: 01c3d5999f23c5351a14aaeab86a516d11006f8f93ec963af24d6a5c39e655d9ea422c9808a949d10ab5a27acee83842feb0cd3e8dede0aff6e8c2aadbd7d7ca

data/lib/pincers/chenso/html_page_request.rb

@@ -33,12 +33,18 @@ module Pincers::Chenso
     end
 
     def execute(_client)
-      _client.send(@method, @uri) do |request|
-        request.headers.merge DEFAULT_HEADERS
-        request.set_form_data(@data, @encoding) unless @data.nil?
+      response = begin
+        _client.send(@method, @uri) do |request|
+          request.headers.merge DEFAULT_HEADERS
+          request.set_form_data(@data, @encoding) unless @data.nil?
+        end
+
+        _client
+      rescue Pincers::Http::RequestError => exc
+        exc
       end
 
-      BrowsingState.new _client.uri, ::Nokogiri::HTML(_client.content)
+      BrowsingState.new response.uri, ::Nokogiri::HTML(response.content)
     end
   end
 end

data/lib/pincers/http/client.rb

@@ -4,7 +4,6 @@ require 'net/http'
 require 'pincers/http/utils'
 require 'pincers/http/session'
 require 'pincers/http/request'
-require 'pincers/http/response_document'
 require 'pincers/http/errors'
 
 module Pincers::Http
@@ -127,7 +126,7 @@ module Pincers::Http
 
     def perform_in_session(_request)
       begin
-        new_document = ResponseDocument.new @session.perform _request
+        new_document = @session.perform _request
       rescue
         @document = nil unless frozen
         raise

data/lib/pincers/http/errors.rb

@@ -2,7 +2,7 @@ module Pincers::Http
   class RequestError < StandardError
     extend Forwardable
 
-    def_delegators :@response, :code, :body
+    def_delegators :@response, :code, :uri, :content
 
     attr_reader :response
 

data/lib/pincers/http/{response_document.rb → response.rb}

@@ -1,16 +1,19 @@
-require 'pincers/http/base_document'
-
 module Pincers::Http
-  class ResponseDocument < BaseDocument
+  class Response
 
-    attr_reader :response
+    attr_reader :uri, :response
 
-    def initialize(_response)
+    def initialize(_uri, _response)
       @response = _response
+      @uri = _uri
+    end
+
+    def code
+      @response.code
     end
 
-    def uri
-      @response.uri
+    def message
+      @response.message
     end
 
     def content_type

data/lib/pincers/http/session.rb

@@ -1,5 +1,6 @@
 require 'pincers/http/errors'
 require 'pincers/http/cookie_jar'
+require 'pincers/http/response'
 
 module Pincers::Http
   class Session
@@ -66,15 +67,14 @@ module Pincers::Http
       update_cookies(uri, http_response)
 
       case http_response
-      when Net::HTTPSuccess then
-        http_response.uri = uri # uri is not always set by net/http
-        http_response
-      when Net::HTTPRedirection then
+      when Net::HTTPSuccess
+        Response.new(uri, http_response)
+      when Net::HTTPRedirection
         location = Utils.parse_uri(http_response['location'])
         location = URI.join(uri, location) if location.relative?
         perform_recursive(_request, _limit - 1, location)
       else
-        handle_error_response http_response
+        handle_error_response Response.new(uri, http_response)
       end
     end
 

data/lib/pincers/version.rb

@@ -1,3 +1,3 @@
 module Pincers
-  VERSION = "0.7.6"
+  VERSION = "0.7.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pincers
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -252,13 +252,12 @@ files:
 - lib/pincers/extension/labs.rb
 - lib/pincers/extension/queries.rb
 - lib/pincers/factory.rb
-- lib/pincers/http/base_document.rb
 - lib/pincers/http/client.rb
 - lib/pincers/http/cookie.rb
 - lib/pincers/http/cookie_jar.rb
 - lib/pincers/http/errors.rb
 - lib/pincers/http/request.rb
-- lib/pincers/http/response_document.rb
+- lib/pincers/http/response.rb
 - lib/pincers/http/session.rb
 - lib/pincers/http/utils.rb
 - lib/pincers/nokogiri/backend.rb

data/lib/pincers/http/base_document.rb

@@ -1,20 +0,0 @@
-module Pincers::Http
-  class BaseDocument
-
-    def uri
-      raise NotImplementedError
-    end
-
-    def content_type
-      raise NotImplementedError
-    end
-
-    def content
-      raise NotImplementedError
-    end
-
-    def save(_path)
-      File.write _path, content
-    end
-  end
-end