httply 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a9a2b6ebd2873064c17ff349e01c280258cf3672aa3efa9fc4d9552d4d64852
-  data.tar.gz: 304af45cd9cf5870fb14e1883d44fb8306cd01cb28b397f456a35d52736767f6
+  metadata.gz: 3b2dced2e5c3b300465476bf4949695bd38df27ab1bbef68af874e2ee9aeecf3
+  data.tar.gz: ceecd02689a32bcd6691f0bfd1a0da986076425cbc5bdc2b73c59c03dae481d9
 SHA512:
-  metadata.gz: 2276fbddf8538d72109e60498cdac15f6e3ce0a595b1a37a126b19965d2e1b244965c8a86df0f2c78196c68a267dc3d14dbebfac1bf01e6e91935e19003a8bdd
-  data.tar.gz: bdfad9a05aa7b634193faf62f3768e80414591719bf0a7a06f9e8449378ca4d378e9684146672ae9550f58ba022fc9294148ede57570989f917065029fc478a2
+  metadata.gz: 98ec1ac47349f35f2243c2cbe9cf6c103f73b7e34547a8b8984574291663959fb03c1d8328df865ae6622f46c8c8afdffb35ae7bd14d758fc7e7eb88112adc16
+  data.tar.gz: 157483ba68c30fe7475076e4de37ddeb62ce1b5c3f06d0d87669d5dc5310cb72833011bbb8faadf34b287edf055c227ca81e9c1c6cf8aa1354da064097f5e299

data/.gitignore

@@ -9,6 +9,8 @@
 
 /spec/data/
 
+.ruby-version
+
 /bin/.pry_history
 .pry_history
 

data/Gemfile.lock

@@ -1,56 +1,56 @@
 PATH
   remote: .
   specs:
-    httply (0.1.4)
-      agents (>= 0.1.4)
-      faraday (>= 0.15.4)
-      faraday_middleware (>= 0.13.1)
+    httply (0.1.9)
+      agents (~> 0.1.4)
+      faraday (~> 1.0, >= 1.0.1)
+      faraday_middleware (~> 1.0)
+      multi_xml (~> 0.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     agents (0.1.4)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    faraday (0.15.4)
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
-    method_source (0.9.2)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    method_source (1.0.0)
     mini_portile2 (2.4.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.3)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2.1, >= 2.1.4)
   httply!
-  multi_xml (~> 0.6.0)
-  nokogiri (~> 1.10)
-  pry (~> 0.12.2)
-  rake (~> 10.0)
-  rspec (~> 3.0)
+  nokogiri (~> 1.10, >= 1.10.10)
+  pry (~> 0.13.1)
+  rake (~> 13.0, >= 13.0.1)
+  rspec (~> 3.9)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/httply.gemspec

@@ -23,16 +23,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   
-  spec.add_dependency "faraday",                ">= 0.15.4"
-  spec.add_dependency "faraday_middleware",     ">= 0.13.1"
-  spec.add_dependency "agents",                 ">= 0.1.4"
+  spec.add_dependency 'faraday', '~> 1.0', '>= 1.0.1'
+  spec.add_dependency 'faraday_middleware', '~> 1.0'
+  spec.add_dependency 'agents', '~> 0.1.4'
+  spec.add_dependency 'multi_xml', '~> 0.6.0'
 
-  spec.add_development_dependency "bundler",    "~> 1.17"
-  spec.add_development_dependency "rake",       "~> 10.0"
-  spec.add_development_dependency "rspec",      "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 2.1', '>= 2.1.4'
+  spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
+  spec.add_development_dependency 'rspec', '~> 3.9'
   
-  spec.add_development_dependency "pry",        "~> 0.12.2"
+  spec.add_development_dependency 'pry', '~> 0.13.1'
   
-  spec.add_development_dependency "nokogiri",   "~> 1.10"
-  spec.add_development_dependency "multi_xml",  "~> 0.6.0"
+  spec.add_development_dependency 'nokogiri', '~> 1.10', '>= 1.10.10'
 end

data/lib/httply.rb

@@ -33,8 +33,9 @@ module Httply
     end
     
     [:get, :head, :post, :put, :patch, :delete].each do |http_verb|
-      define_method(http_verb) do |path, args|
-        ::Httply::Client.new.send(http_verb, path, **args)
+      define_method(http_verb) do |path, *args|
+        args    =   args.any? ? args.flatten.first : {}
+        ::Httply::Client.new.send(http_verb, path, args)
       end
     end
     

data/lib/httply/client.rb

@@ -16,31 +16,31 @@ module Httply
       self.connection     ||=   configure(host: host, headers: headers, options: options)
     end
     
-    def get(path, parameters: {}, headers: {}, options: {})
-      request path, method: :get, parameters: parameters, headers: headers, options: options
+    def get(path, parameters: {}, headers: {}, options: {}, format: nil)
+      request path, method: :get, parameters: parameters, headers: headers, options: options, format: format
     end
     
-    def head(path, parameters: {}, headers: {}, options: {})
-      request path, method: :head, parameters: parameters, headers: headers, options: options
+    def head(path, parameters: {}, headers: {}, options: {}, format: nil)
+      request path, method: :head, parameters: parameters, headers: headers, options: options, format: format
     end
 
-    def post(path, parameters: {}, data: {}, headers: {}, options: {})
-      request path, method: :post, parameters: parameters, data: data, headers: headers, options: options
+    def post(path, parameters: {}, data: {}, headers: {}, options: {}, format: nil)
+      request path, method: :post, parameters: parameters, data: data, headers: headers, options: options, format: format
     end
     
-    def put(path, parameters: {}, data: {}, headers: {}, options: {})
-      request path, method: :put, parameters: parameters, data: data, headers: headers, options: options
+    def put(path, parameters: {}, data: {}, headers: {}, options: {}, format: nil)
+      request path, method: :put, parameters: parameters, data: data, headers: headers, options: options, format: format
     end
     
-    def patch(path, parameters: {}, data: {}, headers: {}, options: {})
-      request path, method: :patch, parameters: parameters, data: data, headers: headers, options: options
+    def patch(path, parameters: {}, data: {}, headers: {}, options: {}, format: nil)
+      request path, method: :patch, parameters: parameters, data: data, headers: headers, options: options, format: format
     end
     
-    def delete(path, parameters: {}, data: {}, headers: {}, options: {})
-      request path, method: :delete, parameters: parameters, data: data, headers: headers, options: options
+    def delete(path, parameters: {}, data: {}, headers: {}, options: {}, format: nil)
+      request path, method: :delete, parameters: parameters, data: data, headers: headers, options: options, format: format
     end
     
-    def request(path, method: :get, parameters: {}, data: {}, headers: {}, options: {})
+    def request(path, method: :get, parameters: {}, data: {}, headers: {}, options: {}, format: nil)
       host                      =   !self.host.to_s.empty? ? self.host : ::Httply::Utilities::Uri.parse_host(path)
       path                      =   ::Httply::Utilities::Uri.to_path(path)
       connection                =   self.memoize ? setup(host: host, headers: headers, options: options) : configure(host: host, headers: headers, options: options)
@@ -64,6 +64,21 @@ module Httply
           end
       end
       
+      response                  =   force_format(response, format) unless format.to_s.empty?
+      
+      return response
+    end
+    
+    def force_format(response, format)
+      case format.to_sym
+        when :json
+          response.body         =   ::JSON.parse(response.body)
+        when :xml
+          response.body         =   ::MultiXml.parse(response.body)
+        when :html
+          response.body         =   ::Nokogiri::HTML(response.body, nil, "utf-8")
+      end
+      
       return response
     end
     
@@ -87,14 +102,14 @@ module Httply
         builder.request  :json        if request_options.fetch(:json, false)
         
         builder.response :logger      if self.configuration.verbose
-        builder.response :xml,  content_type: /\bxml$/
-        builder.response :json, content_type: /\bjson$/
+        builder.response :xml,      content_type: /\bxml$/
+        builder.response :json,     content_type: /\bjson$/
         builder.use ::Httply::Middlewares::ParseHtml, content_type: /\btext\/html$/
         
         builder.use ::FaradayMiddleware::FollowRedirects, limit: redirects if redirects && redirects > 0
         
-        if proxy
-          builder.proxy         =   generate_faraday_proxy(proxy)
+        if proxy && !proxy.empty?
+          builder.proxy         =   proxy
           log("Will use proxy: #{builder.proxy.inspect}")
         end
     

data/lib/httply/proxies.rb

@@ -19,6 +19,10 @@ module Httply
         elsif proxy_model_defined? && options.is_a?(::Proxy)
           proxy                     =   proxy_from_object(options, proxy)
         end
+        
+        if proxy && !proxy.empty?
+          proxy                     =   proxy.has_key?(:uri) ? proxy : generate_faraday_proxy(proxy)
+        end
       end
       
       return proxy
@@ -37,25 +41,28 @@ module Httply
     end
     
     def proxy_from_hash(options, proxy)
-      host                          =   options.fetch(:host, nil)
-      port                          =   options.fetch(:port, nil)
-      
-      username                      =   options.fetch(:username, nil)
-      password                      =   options.fetch(:password, nil)
-      
-      randomize                     =   options.fetch(:randomize, true)
+      randomize                     =   options.fetch(:randomize, false)
       type                          =   options.fetch(:type, :all)
-      protocol                      =   options.fetch(:protocol, :all)
+      protocol                      =   options.fetch(:protocol, :http)
       
       if randomize && proxy_model_defined?
         proxy_object                =   ::Proxy.get_random_proxy(protocol: protocol, proxy_type: type)
         proxy                       =   proxy_from_object(proxy_object, proxy)
       else
-        if host && port
-          proxy[:host]              =   host
-          proxy[:port]              =   port
+        uri                         =   options.fetch(:uri, nil)
+        
+        if uri.to_s.empty?
+          host                      =   options.fetch(:host, nil)
+          port                      =   options.fetch(:port, nil)
+      
+          username                  =   options.fetch(:username, nil)
+          password                  =   options.fetch(:password, nil)
           
-          proxy                     =   set_credentials(username, password, proxy)
+          if !host.to_s.empty? && !port.to_s.empty?
+            proxy[:host]            =   host
+            proxy[:port]            =   port
+            proxy                   =   set_credentials(username, password, proxy)
+          end
         end
       end
       

data/lib/httply/version.rb

@@ -1,3 +1,3 @@
 module Httply
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,141 +1,165 @@
 --- !ruby/object:Gem::Specification
 name: httply
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Sebastian Johnsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: agents
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
+        version: 0.6.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
-  name: multi_xml
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.10
 description: Httply is a lightweight wrapper around Faraday to support automatic randomization
   of proxies and user agents, amongst other things.
 email:
@@ -146,7 +170,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -183,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Httply - lightweight Faraday wrapper

data/.ruby-version

@@ -1 +0,0 @@
-2.6.3