ldp 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 652e178917c335b0881ee4e23026d25dc32aa936
-  data.tar.gz: 20aa0d107df87615a4159ccc10074f7f8269f006
+  metadata.gz: aed769ef892aa0d5ba1e4c05b3800348191d64c9
+  data.tar.gz: e46dfc3a68c8028b857f9158c191d2bf953a630e
 SHA512:
-  metadata.gz: cc468961929d9774a534438c7ce2ed062b603f13dab4251d7fedb3012ccc0290bc188d038e48d142a7cd32505f46249d54b6e75e0b49415554c4fe68b326c5b1
-  data.tar.gz: 76423521a6ebf9327fda8ebb4d8526b95e84f038891cda7322c8ec1714c65da84e36f5b8212a6cf38c55cd411c1c0f87e8383881534e58c6da84f4a4fce5d846
+  metadata.gz: 21151cf14c58ab5901e02f487a04592909080b2edba9ad23c447ccf266e1d0a7085a6dd973dbdff932207c4d9f29af08796ab11d183ab0125623edbb3a284056
+  data.tar.gz: b4dd704c77df50f18d3420eff5ec4ce35671fc793ecef6e001abba69dc5cb7f8c11408c09a2fd801c48d2c1527f506a57d21bb1e38c697cdf3c17f90aa9d002a

data/LICENSE.txt

@@ -1,22 +1,13 @@
 Copyright (c) 2013 Chris Beer
 
-MIT License
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+    http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -49,3 +49,9 @@ Due to some discrepancies with alpha version of Fedora Commons, you may need to
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+# Project Hydra
+This software has been developed by and is brought to you by the Hydra community.  Learn more at the
+[Project Hydra website](http://projecthydra.org)
+
+![Project Hydra Logo](https://github.com/uvalib/libra-oa/blob/a6564a9e5c13b7873dc883367f5e307bf715d6cf/public/images/powered_by_hydra.png?raw=true)

data/ldp.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Linked Data Platform client library}
   spec.summary       = spec.description
   spec.homepage      = "https://github.com/cbeer/ldp"
-  spec.license       = "MIT"
+  spec.license       = "APACHE2"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/ldp/client/methods.rb

@@ -69,7 +69,7 @@ module Ldp::Client::Methods
     logger.debug "LDP: POST [#{url}]"
     resp = http.post do |req|
       req.url munge_to_relative_url(url)
-      req.headers = default_headers.merge headers
+      req.headers.merge!(default_headers).merge!(headers)
       req.body = body
       yield req if block_given?
     end
@@ -81,7 +81,7 @@ module Ldp::Client::Methods
     logger.debug "LDP: PUT [#{url}]"
     resp = http.put do |req|
       req.url munge_to_relative_url(url)
-      req.headers = default_headers.merge headers
+      req.headers.merge!(default_headers).merge!(headers)
       req.body = body
       yield req if block_given?
     end
@@ -93,7 +93,7 @@ module Ldp::Client::Methods
     logger.debug "LDP: PATCH [#{url}]"
     resp = http.patch do |req|
       req.url munge_to_relative_url(url)
-      req.headers = default_patch_headers.merge headers
+      req.headers.merge!(default_patch_headers).merge!(headers)
       req.body = body
       yield req if block_given?
     end

data/lib/ldp/resource/rdf_source.rb

@@ -17,7 +17,7 @@ module Ldp
 
     def create
       super do |req|
-        req.headers = { "Content-Type" => "text/turtle" }
+        req.headers["Content-Type"] = "text/turtle"
       end
     end
 

data/lib/ldp/version.rb

@@ -1,3 +1,3 @@
 module Ldp
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/lib/ldp/client_spec.rb

@@ -30,6 +30,7 @@ describe "Ldp::Client" do
       stub.delete("/a_resource") { [204] }
       stub.head('/a_container') { [200] }
       stub.post("/a_container") { [201, {"Location" => "http://example.com/a_container/subresource"}] }
+      stub.patch("/a_container") { [201, {"Location" => "http://example.com/a_container/subresource"}] }
       stub.get("/test:1") { [200] }
       stub.get("http://test:8080/abc") { [200] }
       stub.put("/mismatch_resource") { [412] }
@@ -132,13 +133,13 @@ describe "Ldp::Client" do
 
     it "should set default Content-type" do
       subject.post "a_container", 'foo' do |req|
-        expect(req.headers).to eq({ "Content-Type" => "text/turtle" })
+        expect(req.headers).to include({ "Content-Type" => "text/turtle" })
       end
     end
 
     it "should set headers" do
       subject.post "a_container", 'foo', {'Content-Type' => 'application/pdf'} do |req|
-        expect(req.headers).to eq({ "Content-Type" => "application/pdf" })
+        expect(req.headers).to include({ "Content-Type" => "application/pdf" })
       end
     end
 
@@ -150,6 +151,13 @@ describe "Ldp::Client" do
       expect { |b| subject.post "a_container", &b }.to yield_control
     end
 
+    it "should preserve basic auth headers" do
+      subject.http.basic_auth('Aladdin', 'open sesame')
+      subject.post "a_container", 'foo' do |req|
+        expect(req.headers).to include({ "Authorization" => "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" })
+      end
+    end
+
   end
 
   describe "put" do
@@ -164,7 +172,7 @@ describe "Ldp::Client" do
 
     it "should set headers" do
       subject.put "a_resource", 'payload', {'Content-Type' => 'application/pdf'} do |req|
-        expect(req.headers).to eq({ "Content-Type" => "application/pdf" })
+        expect(req.headers).to include({ "Content-Type" => "application/pdf" })
       end
     end
 
@@ -181,8 +189,26 @@ describe "Ldp::Client" do
         expect { subject.put "mismatch_resource", "some-payload" }.to raise_error Ldp::EtagMismatch
       end
     end
+
+    it "should preserve basic auth headers" do
+      subject.http.basic_auth('Aladdin', 'open sesame')
+      subject.put "a_resource", "some-payload" do |req|
+        expect(req.headers).to include({ "Authorization" => "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" })
+      end
+    end
+
   end
 
+  describe 'patch' do
+
+    it "should preserve basic auth headers" do
+      subject.http.basic_auth('Aladdin', 'open sesame')
+      subject.patch "a_container", 'foo' do |req|
+        expect(req.headers).to include({ "Authorization" => "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==" })
+      end
+    end
+
+  end
 
   describe "find_or_initialize" do
     it "should be a resource" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldp
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -149,7 +149,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/cbeer/ldp
 licenses:
-- MIT
+- APACHE2
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Linked Data Platform client library
@@ -180,4 +180,3 @@ test_files:
 - spec/lib/ldp/resource_spec.rb
 - spec/lib/ldp/response_spec.rb
 - spec/spec_helper.rb
-has_rdoc: