maremma 3.5.8 → 3.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e82d176ef0ad595adb54b010b369d97ce43bcc2b
-  data.tar.gz: 6221f3df0fda35b927ec4af01be67081df4980dd
+  metadata.gz: 761979827b9a4878829a6d4f7cde1d12fddfbc62
+  data.tar.gz: f9166b84cc4b3596472749d18461b0f64378e084
 SHA512:
-  metadata.gz: 26ffa5dd38d8206e1f50ed7d612b29b516fa6bf44b16f72d2c3602cdd285180e377f119e92fdd06693e2450597b1392ce45639aa086787e8f6950f9e010990d5
-  data.tar.gz: 49655572b15b2d039be1d31a9f1049bfb467b18b8cee3c0a0530ef1d4bb763345883c2d8b058d949af37307682af912ce754411aa34edbad18218328043a15e0
+  metadata.gz: b57761a4876bf741ca2e9615187a24bbc627b36d31cd877477a719c3ea2a36ac600becb9eddde396fca2f89e6f67378a60656fc3b639a9333a1abfd8483f4f1a
+  data.tar.gz: b95b8bb38076976f803d8d50d600adda356bbbc144d32e8311ca709c11ca4bc5b638915913b9d021d762adb69b6b317f41c0999a0f575975b245c8681586f8f5

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    maremma (3.5.8)
-      activesupport (>= 4.2.5)
+    maremma (3.5.9)
+      activesupport (>= 4.2.5, < 6)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)
@@ -11,12 +11,12 @@ PATH
       faraday_middleware (~> 0.10.0)
       multi_json (~> 1.12)
       nokogiri (~> 1.6, >= 1.6.8)
-      oj (~> 2.18, >= 2.18.1)
+      oj (~> 3.3, >= 3.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.1)
+    activesupport (5.1.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -39,19 +39,19 @@ GEM
     faraday_middleware (0.10.1)
       faraday (>= 0.7.4, < 1.0)
     hashdiff (0.3.4)
-    i18n (0.8.4)
+    i18n (0.8.6)
     json (2.1.0)
     mini_portile2 (2.2.0)
-    minitest (5.10.2)
+    minitest (5.10.3)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
-    oj (2.18.5)
+    oj (3.3.2)
     public_suffix (2.0.5)
     rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
     rake (12.0.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
@@ -76,7 +76,7 @@ GEM
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     vcr (3.0.3)
-    webmock (1.24.6)
+    webmock (3.0.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -92,8 +92,8 @@ DEPENDENCIES
   rake
   rspec (~> 3.4)
   simplecov
-  vcr
-  webmock (~> 1.22, >= 1.22.3)
+  vcr (~> 3.0, >= 3.0.3)
+  webmock (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
-   1.12.5
+   1.15.3

data/lib/maremma.rb

@@ -33,6 +33,22 @@ module Maremma
     self.method(url, options.merge(method: "delete"))
   end
 
+  def self.put(url, options={})
+    options[:data] ||= {}
+    options[:headers] = set_request_headers(url, options)
+
+    conn = faraday_conn(options)
+
+    conn.options[:timeout] = options[:timeout] || DEFAULT_TIMEOUT
+
+    response = conn.put url, {}, options[:headers] do |request|
+      request.body = options[:data]
+    end
+    parse_success_response(response.body)
+  rescue *NETWORKABLE_EXCEPTIONS => error
+    rescue_faraday_error(error)
+  end
+
   def self.get(url, options={})
     self.method(url, options.merge(method: "get"))
   end
@@ -133,7 +149,7 @@ module Maremma
       # GitHub uses different format for token authentication
       headers["Authorization"] = "Token #{options[:github_token]}"
     elsif options[:username].present?
-      basic = Base64.encode64("#{options[:username]}:#{options[:password]}").rstrip
+      basic = Base64.strict_encode64("#{options[:username]}:#{options[:password]}")
       headers["Authorization"] = "Basic #{basic}"
     end
 

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "3.5.8"
+  VERSION = "3.5.9"
 end

data/maremma.gemspec

@@ -26,15 +26,15 @@ Gem::Specification.new do |s|
   s.add_dependency 'nokogiri', '~> 1.6', '>= 1.6.8'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
   s.add_dependency 'multi_json', '~> 1.12'
-  s.add_dependency 'oj', '~> 2.18', '>= 2.18.1'
-  s.add_dependency 'activesupport', '>= 4.2.5'
+  s.add_dependency 'oj', '~> 3.3', '>= 3.3.0'
+  s.add_dependency 'activesupport', '>= 4.2.5', '< 6'
   s.add_dependency 'addressable', '>= 2.3.6'
   s.add_development_dependency 'bundler', '~> 1.0'
   s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rack-test', '~> 0'
-  s.add_development_dependency 'vcr'
-  s.add_development_dependency 'webmock', '~> 1.22', '>= 1.22.3'
+  s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
+  s.add_development_dependency 'webmock', '~> 3.0', '>= 3.0.1'
   s.add_development_dependency 'codeclimate-test-reporter', "~> 1.0"
   s.add_development_dependency 'simplecov'
 end

data/spec/maremma_spec.rb

@@ -528,9 +528,14 @@ describe Maremma do
       expect(subject.set_request_headers(url, options)["Authorization"]).to eq("Token 12345")
     end
 
+    it 'github_token' do
+      options = { github_token: '12345' }
+      expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header, "Authorization"=>"Token 12345")
+    end
+
     it 'basic' do
       options = { username: 'foo', password: '12345' }
-      basic = Base64.encode64("foo:12345").rstrip
+      basic = Base64.strict_encode64("foo:12345")
       expect(subject.set_request_headers(url, options)["Authorization"]).to eq("Basic #{basic}")
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 3.5.8
+  version: 3.5.9
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-10 00:00:00.000000000 Z
+date: 2017-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -126,20 +126,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.18.1
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.18.1
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,6 +157,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -228,36 +234,42 @@ dependencies:
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.3
+        version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.3
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement