maremma 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad3e476013e011400f9cb2bc0cce7506edb73f1d
-  data.tar.gz: 8b82d6d99583631206cf98dd35f8fd918ec8b7a5
+  metadata.gz: 9123398e2a4985bd5cb51e8a5b4a2a32e9b49509
+  data.tar.gz: bbc8b74f4ab96d54a2829200c2e39a894477ec21
 SHA512:
-  metadata.gz: 8724f8d5520fa807b948343970745fd3fb8bfa04c1d2ad208b7d775fb811939bc5922d4d080a0f8dbb9381895e5183c667984bec0f4135a0600fc51a88ddc129
-  data.tar.gz: 002312c3ca9cb4889734ae4fa02f8edaba4e7822e99790068237414a41af3a0c304e59cf14c9db09e8839a28acd58740402a602d10f8151ed53398f17331c39b
+  metadata.gz: 85c44227f161562cbe438d419a29996ade8f5b9f666bb8d2067887f824f4140b064cce410d55bf80fb1d380a476335c05d23f3c691705da8efababc8d2a2d5cb
+  data.tar.gz: b0bb553f9ec0fe8ceec0746531475a9557626c28c6eafef51d20b909335fedd6709475f12826457cf83cc966cca1cf03d8e3039aba3ac1a77c1016bf1da64744

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (2.4.2)
+    maremma (2.4.3)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)
@@ -10,12 +10,12 @@ PATH
       faraday_middleware (~> 0.10.0)
       multi_json (~> 1.11.2)
       nokogiri (~> 1.6.7)
-      oj (~> 2.13.1)
+      oj (>= 2.18.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.8)
+    activesupport (4.2.9)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -36,20 +36,20 @@ GEM
       faraday
     faraday_middleware (0.10.1)
       faraday (>= 0.7.4, < 1.0)
-    hashdiff (0.3.4)
-    i18n (0.8.4)
+    hashdiff (0.3.5)
+    i18n (0.8.6)
     json (2.1.0)
     mini_portile2 (2.1.0)
-    minitest (5.10.2)
+    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 (2.13.1)
+    oj (3.3.4)
     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)
@@ -94,4 +94,4 @@ DEPENDENCIES
   webmock (~> 1.22, >= 1.22.3)
 
 BUNDLED WITH
-   1.12.5
+   1.15.3

data/lib/maremma.rb

@@ -107,9 +107,6 @@ module Maremma
       options[:headers]['Authorization'] = "Bearer #{options[:bearer]}"
     elsif options[:token].present?
       options[:headers]["Authorization"] = "Token token=#{options[:token]}"
-    elsif options[:github_token].present?
-      # GitHub uses different format for token authentication
-      options[:headers]["Authorization"] = "Token #{options[:github_token]}"
     elsif options[:username].present?
       basic = Base64.encode64("#{options[:username]}:#{options[:password].to_s}")
       options[:headers]["Authorization"] = "Basic #{basic}"

data/lib/maremma/version.rb

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

data/maremma.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'nokogiri', '~> 1.6.7'
   s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
   s.add_dependency 'multi_json', '~> 1.11.2'
-  s.add_dependency 'oj', '~> 2.13.1'
+  s.add_dependency 'oj', '>= 2.18.3'
   s.add_dependency 'activesupport', '~> 4.2', '>= 4.2.5'
   s.add_development_dependency 'bundler', '~> 1.0'
   s.add_development_dependency 'rspec', '~> 3.4'

data/spec/maremma_spec.rb

@@ -365,11 +365,6 @@ describe Maremma do
       expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header, "Authorization"=>"Token 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")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-10 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -118,16 +118,16 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: 2.18.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.13.1
+        version: 2.18.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement