maremma 2.1.1 → 2.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmViMTFhMmVkNTczYTJmNmJkN2VkZWIzMTJhNTM3M2Q0NjlhM2QxYw==
+    MmI3OWViNmU5ZTMyYTNiYzU5ZTg0MzJkNjY3Nzc3MmU2ZGJkN2NhNQ==
   data.tar.gz: !binary |-
-    NGFkMDVkNWEzODdhNDExOWY5ZTE0ZjA1OGM0ZjJkYjY4MjI4ZTg2Nw==
+    YWFhNmNmNjkxOGI4ODQxOWQwMjYxNWQzOWVmYzBlZWVlNGYwMDdhNw==
 SHA512:
   metadata.gz: !binary |-
-    ZWNkZjkyNjUzOWRmOTQ2NjcwZTk4MTRmNTQzZjQ0NTA4ZGNjZDAxMDNmMGI3
-    MzcwMDAxMDEyYTc1ZWRhOGYxNDY4Nzg4NTQzOWYzNWY0YmYyMDdiNjVkMmQ5
-    NzRjMWViZTQ2MDc3ZWIxMTgyYTg1NTVmMTkxMTk4YzIzYzIzMmM=
+    NWMxMjVjMGJlMDZmZGJhOTg5MjYwY2IyMTEzMjgzNDA0YTBmYzE1N2QzNWEx
+    YTBjODQ0ZTFjMjIxNjU5N2I2MGNjYmNkYjhjNjkyMGIxMDVlMTNhZDFmMjNl
+    YzlmN2MyZWVjODRjMzQ2ZTYyMDc5NWU5YzkwM2I4ZTM3ODcxZTM=
   data.tar.gz: !binary |-
-    MTQ0NDhhMzc3ODIzOTI5YjRmZjliNzRlNDZjMTc1OWRlOWQxMjViMTBlNDhj
-    ODQzNGY5OGY1ZDYwOGU5MWQxNGRhYTUzZWZjMTU4ZmRmYzViODcyNGExZTM1
-    NWNlYjEzNzJmNTE4NjYyOGI4Yzg1MDQwNDVmNDAyOTA1ODA2ZTI=
+    OWZhNjRmMDliYmRhOTI1YWEyOWMxNDBjYjhiMGZmOWFmODQyNTY3ZGUyNjMy
+    ZGRmNzUxMzdhYzVmYjMzNzlhN2RhMGE2YzA2YTNlZTQ4MWU5Y2ZjODFmNDhl
+    NjY2NTRjYTRlMDE0M2I3OTg0OGM0ZmEzMjcwMDM4NDhmODFmMTE=

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- 2.2
+- 2.2.4
 install:
 - travis_retry bundle install
 script: bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v.2.2 (July 1, 2016)
+
+[maremma 2.2](https://github.com/datacite/maremma/releases/tag/v.2.2) was released on July 1, 2016:
+
+* use `Faraday::FlatParamsEncoder` to enable sending the same URL parameter multiple times with different values
+
 ## 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:

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    maremma (2.1.1)
+    maremma (2.2.1)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)
-      faraday (~> 0.9.0)
+      faraday (~> 0.9.2)
       faraday-encoding (~> 0.0.1)
       faraday_middleware (~> 0.10.0)
       multi_json (~> 1.11.2)
@@ -15,13 +15,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5.1)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.4.0)
     builder (3.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -29,34 +29,36 @@ GEM
     excon (0.45.4)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    faraday-encoding (0.0.1)
+    faraday-encoding (0.0.3)
       faraday
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
-    hashdiff (0.2.3)
+    hashdiff (0.3.0)
     i18n (0.7.0)
     json (1.8.3)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    multi_json (1.11.2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    multi_json (1.11.3)
     multipart-post (2.0.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     oj (2.13.1)
-    rack (1.6.4)
+    pkg-config (1.1.7)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.4.2)
+    rake (11.2.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
@@ -64,9 +66,9 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    vcr (3.0.1)
-    webmock (1.22.5)
-      addressable (< 2.4.0)
+    vcr (3.0.3)
+    webmock (1.24.6)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
 
@@ -81,3 +83,6 @@ DEPENDENCIES
   rspec (~> 3.4)
   vcr
   webmock (~> 1.22, >= 1.22.3)
+
+BUNDLED WITH
+   1.12.5

data/lib/maremma.rb

@@ -44,7 +44,9 @@ module Maremma
 
     conn.options[:timeout] = options[:timeout] || DEFAULT_TIMEOUT
 
-    response = conn.get url, {}, options[:headers]
+    response = conn.get url, {}, options[:headers] do |request|
+      request.options.params_encoder = Faraday::FlatParamsEncoder
+    end
 
     # return error if we are close to the rate limit, if supported in headers
     if get_rate_limit_remaining(response.headers) < 10

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "2.1.1"
+  VERSION = "2.2.1"
 end

data/maremma.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Declary dependencies here, rather than in the Gemfile
-  s.add_dependency 'faraday', '~> 0.9.0'
+  s.add_dependency 'faraday', '~> 0.9.2'
   s.add_dependency 'faraday_middleware', '~> 0.10.0'
   s.add_dependency 'faraday-encoding', '~> 0.0.1'
   s.add_dependency 'excon', '~> 0.45.0'

data/spec/maremma_spec.rb

@@ -33,6 +33,23 @@ describe Maremma do
       subject.post(url, content_type: 'xml', data: post_data.to_xml) { |response| expect(Hash.from_xml(response.to_s)["hash"]).to eq(data) }
       expect(stub).to have_been_requested
     end
+
+    it "get json with params" do
+      params = { q: "*:*",
+                 fl: "doi,title,description,publisher,publicationYear,resourceType,resourceTypeGeneral,rightsURI,datacentre_symbol,xml,minted,updated",
+                 fq: %w(has_metadata:true is_active:true),
+                 facet: "true",
+                 'facet.field' => %w(resourceType_facet publicationYear datacentre_facet),
+                 'facet.limit' => 10,
+                 'f.resourceType_facet.facet.limit' => 15,
+                 wt: "json" }.compact
+      url = "http://example.org?" + URI.encode_www_form(params)
+      stub = stub_request(:get, url).to_return(:body => data.to_json, :status => 200, :headers => { "Content-Type" => "application/json" })
+      response = subject.get(url)
+      expect(response).to eq("data" => data)
+      expect(stub).to have_been_requested
+      expect(url).to eq("http://example.org?q=*%3A*&fl=doi%2Ctitle%2Cdescription%2Cpublisher%2CpublicationYear%2CresourceType%2CresourceTypeGeneral%2CrightsURI%2Cdatacentre_symbol%2Cxml%2Cminted%2Cupdated&fq=has_metadata%3Atrue&fq=is_active%3Atrue&facet=true&facet.field=resourceType_facet&facet.field=publicationYear&facet.field=datacentre_facet&facet.limit=10&f.resourceType_facet.facet.limit=15&wt=json")
+    end
   end
 
   context "empty response" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement