maremma 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab2e7075facc4988175f758e582800b7479f3554
-  data.tar.gz: 99b3bf7a5d806867588e8e3384a003c2233ded50
+  metadata.gz: 53bc14a971c53267ff46eb19933dac01c69b4a0b
+  data.tar.gz: 07bd47197a25322f7e661b655caae1478692cac9
 SHA512:
-  metadata.gz: b98eb05622984eab0c819f0650341127f93b1b58b83ccadaf121af8535227a54b6924a364e8e36d52bd1dce726d5d4307c2481644c8ac06f9ad2f9dcc697665a
-  data.tar.gz: 130bdf89a39c65dec55c9c3b48fd5ed8b8f9f10ac8ca63662b9ae44e72d152aaca3e7a6a7f54ba95afea47cc5ae03f6c8caa5a4e5ed7c0a6bd1599962cbca3a2
+  metadata.gz: 2483a2aa0dd96578dd01cb96c12133b835e6419b6de8e97329123f597cb1cc282c425c7589bdd177af931cb3687018b0e78d10403ae1f6d78ce9328ef9ce71eb
+  data.tar.gz: 95ec7ee526586c93b775242b01fedb6f95c89af4f8af88c97c07b288057708d66210378ae5b1c4688bdda408652851d94422bb19f71bc44dbdba2ad27b2e636a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v.3.1.2 (January 29, 2017)
+
+[maremma 3.1.2](https://github.com/datacite/maremma/releases/tag/v.3.1.2) was released on January 29, 2017:
+
+* raise error if invalid URL is provided
+
 ## v.3.1.1 (January 2, 2017)
 
 [maremma 3.1.1](https://github.com/datacite/maremma/releases/tag/v.3.1.1) was released on January 2, 2017:

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    maremma (3.1.1)
+    maremma (3.1.2)
       activesupport (~> 4.2, >= 4.2.5)
+      addressable (~> 2.5)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)
       faraday (~> 0.9.2)
@@ -23,12 +24,12 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    builder (3.2.2)
-    codeclimate-test-reporter (1.0.3)
+    builder (3.2.3)
+    codeclimate-test-reporter (1.0.5)
       simplecov
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     excon (0.45.4)
     faraday (0.9.2)
@@ -37,9 +38,9 @@ GEM
       faraday
     faraday_middleware (0.10.1)
       faraday (>= 0.7.4, < 1.0)
-    hashdiff (0.3.1)
+    hashdiff (0.3.2)
     i18n (0.7.0)
-    json (1.8.3)
+    json (1.8.6)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     multi_json (1.11.3)
@@ -47,7 +48,7 @@ GEM
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
     oj (2.13.1)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -66,7 +67,7 @@ GEM
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     safe_yaml (1.0.4)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)

data/lib/maremma.rb

@@ -6,6 +6,7 @@ require 'faraday_middleware'
 require 'faraday/encoding'
 require 'excon'
 require 'uri'
+require 'addressable/uri'
 
 DEFAULT_TIMEOUT = 60
 NETWORKABLE_EXCEPTIONS = [Faraday::ClientError,
@@ -20,6 +21,8 @@ NETWORKABLE_EXCEPTIONS = [Faraday::ClientError,
 
 module Maremma
   def self.post(url, options={})
+    is_valid_url?(url)
+
     options[:data] ||= {}
     options[:headers] = set_request_headers(url, options)
 
@@ -40,6 +43,8 @@ module Maremma
   end
 
   def self.put(url, options={})
+    is_valid_url?(url)
+
     options[:data] ||= {}
     options[:headers] = set_request_headers(url, options)
 
@@ -60,6 +65,8 @@ module Maremma
   end
 
   def self.delete(url, options={})
+    is_valid_url?(url)
+
     options[:data] ||= {}
     options[:headers] = set_request_headers(url, options)
 
@@ -79,6 +86,8 @@ module Maremma
   end
 
   def self.get(url, options={})
+    is_valid_url?(url)
+
     options[:headers] = set_request_headers(url, options)
 
     conn = faraday_conn(options)
@@ -146,6 +155,11 @@ module Maremma
     end
   end
 
+  def self.is_valid_url?(url)
+    parsed = Addressable::URI.parse(url)
+    raise TypeError, "Invalid URL: #{url}" unless %w(http https).include?(parsed.scheme)
+  end
+
   def self.set_request_headers(url, options={})
     options[:headers] ||= {}
 

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "3.1.1"
+  VERSION = "3.1.2"
 end

data/maremma.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'multi_json', '~> 1.11.2'
   s.add_dependency 'oj', '~> 2.13.1'
   s.add_dependency 'activesupport', '~> 4.2', '>= 4.2.5'
+  s.add_dependency 'addressable', '~> 2.5'
   s.add_development_dependency 'bundler', '~> 1.0'
   s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'rake'

data/spec/maremma_spec.rb

@@ -32,26 +32,6 @@ describe Maremma do
       expect(stub).to have_been_requested
     end
 
-    it "head html" do
-      stub = stub_request(:head, url).to_return(:body => data.to_s, :status => 200, :headers => { "Content-Type" => "text/html" })
-      response = subject.head(url, accept: 'html')
-      expect(response.body).to be_nil
-      expect(response.headers).to eq("Content-Type"=>"text/html")
-      expect(stub).to have_been_requested
-    end
-
-    it "post xml" do
-      stub = stub_request(:post, url).with(:body => post_data.to_xml).to_return(:body => data.to_xml, :status => 200, :headers => { "Content-Type" => "text/html" })
-      subject.post(url, accept: 'xml', data: post_data.to_xml) { |response| expect(Hash.from_xml(response.body.to_s)["hash"]).to eq(data) }
-      expect(stub).to have_been_requested
-    end
-
-    it "put xml" do
-      stub = stub_request(:put, url).with(:body => post_data.to_xml).to_return(:body => data.to_xml, :status => 200, :headers => { "Content-Type" => "text/html" })
-      subject.put(url, accept: 'xml', data: post_data.to_xml) { |response| expect(Hash.from_xml(response.body.to_s)["hash"]).to eq(data) }
-      expect(stub).to have_been_requested
-    end
-
     it "get json with params", vcr: true do
       params = { q: "*:*",
                  fl: "doi,title,description,publisher,publicationYear,resourceType,resourceTypeGeneral,rightsURI,datacentre_symbol,xml,minted,updated",
@@ -88,6 +68,44 @@ describe Maremma do
     end
   end
 
+  context "head" do
+    it "head html" do
+      stub = stub_request(:head, url).to_return(:body => data.to_s, :status => 200, :headers => { "Content-Type" => "text/html" })
+      response = subject.head(url, accept: 'html')
+      expect(response.body).to be_nil
+      expect(response.headers).to eq("Content-Type"=>"text/html")
+      expect(stub).to have_been_requested
+    end
+  end
+
+  context "post" do
+    it "post json" do
+      stub = stub_request(:post, url).with(:body => post_data.to_json).to_return(:body => data.to_json, :status => 200, :headers => { "Content-Type" => "application/json" })
+      subject.post(url, content_type: 'json', data: post_data.to_json) { |response| expect(response.body).to eq(2) }
+      expect(stub).to have_been_requested
+    end
+
+    it "post xml" do
+      stub = stub_request(:post, url).with(:body => post_data.to_xml).to_return(:body => data.to_xml, :status => 200, :headers => { "Content-Type" => "text/html" })
+      subject.post(url, content_type: 'xml', data: post_data.to_xml) { |response| expect(Hash.from_xml(response.body.to_s)["hash"]).to eq(data) }
+      expect(stub).to have_been_requested
+    end
+  end
+
+  context "put" do
+    it "put json" do
+      stub = stub_request(:put, url).with(:body => post_data.to_json).to_return(:body => data.to_json, :status => 200, :headers => { "Content-Type" => "application/json" })
+      subject.put(url, content_type: 'json', data: post_data.to_json) { |response| expect(JSON.parse(response.body.to_s)).to eq(data) }
+      expect(stub).to have_been_requested
+    end
+
+    it "put xml" do
+      stub = stub_request(:put, url).with(:body => post_data.to_xml).to_return(:body => data.to_xml, :status => 200, :headers => { "Content-Type" => "text/html" })
+      subject.put(url, content_type: 'xml', data: post_data.to_xml) { |response| expect(Hash.from_xml(response.body.to_s)["hash"]).to eq(data) }
+      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" })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -148,6 +148,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement