maremma 2.0.1 → 2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWY0MDBjYTExODVmNzhlMzQyOTM4ZDMxMjMzZjMxMzZmYzM1OWQ1Mg==
+    NDViZDYzNTdhY2FjNzhkZmFmMGE3OTY3OTMzYzg5NjI3YjEzYzVhZQ==
   data.tar.gz: !binary |-
-    NzY0MDIzMjk1OWRhODFjZTI2ZmQxOThlNjZlNzYzNWM1NWNlNjM1NQ==
+    MjI0MjhjNTY2YWY4NWM4N2UyMzZjMzBmODBiZGJmNTdhZjcyYzhjZQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2M0NWY1OTcxZTI4NDEwZTJiYzAwNDEyZTZmNGU3OTA1MTM5Y2I4YjVhNDE0
-    NTI4MmM5NGUyMDRkNzViMDg4NGI4Y2NjOTQxMzFjZjhiMzM2NWJlM2RlYmM4
-    ZmNjZjEzNzYxNWUzN2MxNmEyYTIyYzI4MTcwYzllMDBmMGZiODU=
+    Y2ZjZWNhN2JhYzUzMzQ4MzRjNGFiYWQzYTE2ZmJmZWIyN2I3MDUxNDE4ODlh
+    YTVjODZkOTczYjllOGRiZGI3MTAyM2Q4YmFiZWI5ZjA1NzVjYTFmMGMzYWNh
+    MWQ2ZTg0ZWQwZjdlODRlYWM2MGE1OWY0ODdjNDUxYTExNzY4ZDI=
   data.tar.gz: !binary |-
-    MzMxYzczOTYyOTNiMzVlMmI1MDY5OTNiZGY5M2U4Y2MzNjBiODBkNTQwZThh
-    MTNmNzJkMjQwODAxNmQyZDM3YTIwNzdmODY3Y2MzODdlNjI4MTU5Y2JiMWJl
-    ZDJhYzQ3ZTU5ZTQxYWJhMDM3ZjEwNWE2YjNlYTQxNzY2MDYwMTY=
+    MWRjNmVkMmUxNTdjMzVhMTNmYTgzM2VmMDY3ZDA0ZTEwMDRkOWYyMmZlZTU1
+    NjNmNWY4Yjc3MTc3ZTYzZTU1Yzk2OTU0ZWFlNzU4ZDM5ZWI0MDRlMmE3MDE3
+    OTQ3NTExMmUxZjMwODU4NmQwYmE1YjlhMzViNjc5ZmFjZTdjMjM=

data/CHANGELOG.md

@@ -1,12 +1,18 @@
+## v.2.1 (March 5, 2016)
+
+[maremma 2.1](https://github.com/datacite/maremma/releases/tag/v.2.1) was released on March 5, 2016:
+
+* fixed format for token authentication: `Token token=123` instead of `Token token="123"`
+
 ## v.2.0 (January 24, 2016)
 
-[maremma 2.0](https://github.com/datacite/maremma/releases/tag/v.2.0) was released on January 24, 2015:
+[maremma 2.0](https://github.com/datacite/maremma/releases/tag/v.2.0) was released on January 24, 2016:
 
 * return JSONAPI-friendly `errors` hash on errors, and `data` hash otherwise
 
 ## v.1.1.0 (January 5, 2016)
 
-[maremma 1.1](https://github.com/datacite/maremma/releases/tag/v.1.1.0) was released on January 5, 2015:
+[maremma 1.1](https://github.com/datacite/maremma/releases/tag/v.1.1.0) was released on January 5, 2016:
 
 * added support for rate-limiting headers (Twitter, Github)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (2.0.1)
+    maremma (2.1)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)
@@ -15,7 +15,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5.1)
+    activesupport (4.2.5.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -29,7 +29,7 @@ GEM
     excon (0.45.4)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    faraday-encoding (0.0.1)
+    faraday-encoding (0.0.2)
       faraday
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)

data/lib/maremma.rb

@@ -22,11 +22,9 @@ module Maremma
   def self.post(url, options={})
     options[:content_type] ||= 'json'
     options[:data] ||= {}
-    options[:headers] ||= {}
-    options[:headers]['Host'] = URI.parse(url).host
+    options[:headers] = set_headers(url, options)
 
     conn = faraday_conn(options[:content_type], options)
-    conn = auth_conn(conn, options)
 
     conn.options[:timeout] = options[:timeout] || DEFAULT_TIMEOUT
 
@@ -40,11 +38,9 @@ module Maremma
 
   def self.get(url, options={})
     options[:content_type] ||= 'json'
-    options[:headers] ||= {}
-    options[:headers]['Host'] = URI.parse(url).host
+    options[:headers] = set_headers(url, options)
 
     conn = faraday_conn(options[:content_type], options)
-    conn = auth_conn(conn, options)
 
     conn.options[:timeout] = options[:timeout] || DEFAULT_TIMEOUT
 
@@ -67,12 +63,14 @@ module Maremma
                       "json" => 'application/json' }
     accept_header = content_types.fetch(content_type, content_type)
 
+    user_agent = ENV['HOSTNAME'].present? ? "Maremma - http://#{ENV['HOSTNAME']}" : "Maremma - https://github.com/datacite/maremma"
+
     # redirect limit
     limit = options[:limit] || 10
 
     Faraday.new do |c|
       c.headers['Accept'] = accept_header
-      c.headers['User-Agent'] = "Maremma - http://#{ENV['HOSTNAME']}"
+      c.headers['User-Agent'] = user_agent
       c.use      FaradayMiddleware::FollowRedirects, limit: limit, cookie: :all
       c.request  :multipart
       c.request  :json if accept_header == 'application/json'
@@ -82,15 +80,20 @@ module Maremma
     end
   end
 
-  def self.auth_conn(conn, options)
-    if options[:bearer]
-      conn.authorization :Bearer, options[:bearer]
-    elsif options[:token]
-      conn.authorization :Token, token: options[:token]
-    elsif options[:username]
-      conn.basic_auth(options[:username], options[:password])
+  def self.set_headers(url, options)
+    options[:headers] ||= {}
+    options[:headers]['Host'] = URI.parse(url).host
+
+    if options[:bearer].present?
+      options[:headers]['Authorization'] = "Bearer #{options[:bearer]}"
+    elsif options[:token].present?
+      options[:headers]["Authorization"] = "Token token=#{options[:token]}"
+    elsif options[:username].present?
+      basic = Base64.encode64("#{options[:username]}:#{options[:password].to_s}")
+      options[:headers]["Authorization"] = "Basic #{basic}"
     end
-    conn
+
+    options[:headers]
   end
 
   def self.rescue_faraday_error(error)

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "2.0.1"
+  VERSION = "2.1"
 end

data/spec/maremma_spec.rb

@@ -199,6 +199,14 @@ describe Maremma do
       response = subject.get(url)
       expect(response).to eq("data"=>"Test")
     end
+
+    it "redirect limit 1" do
+      stub_request(:get, url).to_return(status: 301, headers: { location: redirect_url })
+      stub_request(:get, redirect_url).to_return(status: 301, headers: { location: redirect_url + "/x" })
+      stub_request(:get, redirect_url+ "/x").to_return(status: 301, headers: { location: redirect_url + "/y" })
+      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
   end
 
   context 'parse_error_response' do
@@ -239,4 +247,59 @@ describe Maremma do
       expect(subject.parse_success_response(string)).to eq("data"=>"fön")
     end
   end
+
+  context 'connection' do
+    it 'default' do
+      conn = subject.faraday_conn
+      expect(conn.headers).to eq("Accept"=>"application/json",
+                                 "User-Agent"=>"Maremma - https://github.com/datacite/maremma")
+    end
+
+    it 'json' do
+      conn = subject.faraday_conn('json')
+      expect(conn.headers).to eq("Accept"=>"application/json",
+                                 "User-Agent"=>"Maremma - https://github.com/datacite/maremma")
+    end
+
+    it 'xml' do
+      conn = subject.faraday_conn('xml')
+      expect(conn.headers).to eq("Accept"=>"application/xml",
+                                 "User-Agent"=>"Maremma - https://github.com/datacite/maremma")
+    end
+
+    it 'html' do
+      conn = subject.faraday_conn('html')
+      expect(conn.headers).to eq("Accept" => "text/html; charset=UTF-8",
+                                 "User-Agent" => "Maremma - https://github.com/datacite/maremma")
+    end
+
+    it 'other' do
+      conn = subject.faraday_conn('application/x-bibtex')
+      expect(conn.headers).to eq("Accept" => "application/x-bibtex",
+                                 "User-Agent" => "Maremma - https://github.com/datacite/maremma")
+    end
+  end
+
+  context 'authentication' do
+    it 'no auth' do
+      options = {}
+      expect(subject.set_headers(url, options)).to eq("Host"=>"example.org")
+    end
+
+    it 'bearer' do
+      options = { bearer: 'mF_9.B5f-4.1JqM' }
+      expect(subject.set_headers(url, options)).to eq("Host"=>"example.org", "Authorization"=>"Bearer mF_9.B5f-4.1JqM")
+    end
+
+    it 'token' do
+      options = { token: '12345' }
+      expect(subject.set_headers(url, options)).to eq("Host"=>"example.org", "Authorization"=>"Token token=12345")
+    end
+
+    it 'basic' do
+      options = { username: 'foo', password: '12345' }
+      basic = Base64.encode64("foo:12345")
+      expect(subject.set_headers(url, options)).to eq("Host"=>"example.org", "Authorization"=>"Basic #{basic}")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: '2.1'
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday