maremma 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9123398e2a4985bd5cb51e8a5b4a2a32e9b49509
-  data.tar.gz: bbc8b74f4ab96d54a2829200c2e39a894477ec21
+  metadata.gz: 18e454d0ed90bc2186a43110f85c09f029c37401
+  data.tar.gz: 4255d3ebb492bb1ab77788a7c8b3ecc0436478b1
 SHA512:
-  metadata.gz: 85c44227f161562cbe438d419a29996ade8f5b9f666bb8d2067887f824f4140b064cce410d55bf80fb1d380a476335c05d23f3c691705da8efababc8d2a2d5cb
-  data.tar.gz: b0bb553f9ec0fe8ceec0746531475a9557626c28c6eafef51d20b909335fedd6709475f12826457cf83cc966cca1cf03d8e3039aba3ac1a77c1016bf1da64744
+  metadata.gz: b5d1b13e6ff0fadb96cf23ae84fba0db57f77ab3f980bb3771e0caa31efe0dc35622ad5948808eacd91cd117920a44fc546adecbcc912d146504a692fcdff4dc
+  data.tar.gz: df0e246ca404b8ec7d3b604cba494a84110910d5c9750aa233874809e6ae0a7db40cac4386613d402ce4910bd2afc861b7948343a2c95f212f9e89e901fb9570

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (2.4.3)
+    maremma (2.4.4)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)
@@ -9,7 +9,7 @@ PATH
       faraday-encoding (~> 0.0.1)
       faraday_middleware (~> 0.10.0)
       multi_json (~> 1.11.2)
-      nokogiri (~> 1.6.7)
+      nokogiri (~> 1.6, >= 1.6.8)
       oj (>= 2.18.3)
 
 GEM
@@ -39,13 +39,13 @@ GEM
     hashdiff (0.3.5)
     i18n (0.8.6)
     json (2.1.0)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.2.0)
     minitest (5.10.3)
     multi_json (1.11.3)
     multipart-post (2.0.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    oj (3.3.4)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    oj (3.3.5)
     public_suffix (2.0.5)
     rack (2.0.3)
     rack-test (0.7.0)
@@ -69,7 +69,7 @@ GEM
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)

data/lib/maremma.rb

@@ -54,6 +54,25 @@ module Maremma
     rescue_faraday_error(error)
   end
 
+  def self.head(url, options={})
+    options[:headers] = set_request_headers(url, options)
+
+    conn = faraday_conn(options)
+
+    conn.options[:timeout] = options[:timeout] || DEFAULT_TIMEOUT
+
+    response = conn.head url, {}, options[:headers]
+
+    # return error if we are close to the rate limit, if supported in headers
+    if get_rate_limit_remaining(response.headers) < 10
+      return { 'errors' => [{ 'status' => 429, 'title' => "Too many requests" }] }
+    end
+
+    response.headers
+  rescue *NETWORKABLE_EXCEPTIONS => error
+    rescue_faraday_error(error)
+  end
+
   def self.faraday_conn(options = {})
     # make sure we have headers
     options[:headers] ||= {}
@@ -66,7 +85,7 @@ module Maremma
       c.headers['Content-type'] = options[:headers]['Content-type'] if options[:headers]['Content-type'].present?
       c.headers['Accept'] = options[:headers]['Accept']
       c.headers['User-Agent'] = options[:headers]['User-Agent']
-      c.use      FaradayMiddleware::FollowRedirects, limit: limit, cookie: :all
+      c.use      FaradayMiddleware::FollowRedirects, limit: limit, cookie: :all if limit > 0
       c.request  :multipart
       c.request  :json if options[:headers]['Accept'] == 'application/json'
       c.use      Faraday::Response::RaiseError

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "2.4.3"
+  VERSION = "2.4.4"
 end

data/maremma.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday_middleware', '~> 0.10.0'
   s.add_dependency 'faraday-encoding', '~> 0.0.1'
   s.add_dependency 'excon', '~> 0.45.0'
-  s.add_dependency 'nokogiri', '~> 1.6.7'
+  s.add_dependency 'nokogiri', '~> 1.6', '>= 1.6.8'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
   s.add_dependency 'multi_json', '~> 1.11.2'
   s.add_dependency 'oj', '>= 2.18.3'

data/spec/maremma_spec.rb

@@ -54,6 +54,15 @@ describe Maremma do
     end
   end
 
+  context "head" do
+    it "head html" do
+      stub = stub_request(:head, url).to_return(:status => 200, :headers => { "Content-Type" => "text/html" })
+      response = subject.head(url, accept: 'html')
+      expect(response).to eq("Content-Type"=>"text/html")
+      expect(stub).to have_been_requested
+    end
+  end
+
   context "empty response" do
     it "get json" do
       stub = stub_request(:get, url).to_return(:body => nil, :status => 200, :headers => { "Content-Type" => "application/json" })
@@ -255,6 +264,12 @@ describe Maremma do
       response = subject.get(url, limit: 1)
       expect(response).to eq("errors"=>[{"status"=>400, "title"=>"too many redirects; last one to: http://www.example.org/redirect/x"}])
     end
+
+    it "redirect limit 0 head" do
+      stub_request(:head, url).to_return(status: 301, headers: { location: redirect_url })
+      response = subject.head(url, limit: 0)
+      expect(response["Location"]).to eq("http://www.example.org/redirect")
+    end
   end
 
   context "content negotiation" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -72,14 +72,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement