ldp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0192dec60a69549a92992ee9a8a17dc7a2e7bea
-  data.tar.gz: 9f1d63533db1609c91b7ca86d807e645a1148343
+  metadata.gz: 652e178917c335b0881ee4e23026d25dc32aa936
+  data.tar.gz: 20aa0d107df87615a4159ccc10074f7f8269f006
 SHA512:
-  metadata.gz: a2576375233b5f9c8fb7879e26c187c75a0cb30e740db682d084ebd57f88db616d81efaeb6c04d4289fcb10095fe34dca5199f7936ebc1c65028e08f56bae31d
-  data.tar.gz: 0bcd587f427cefcc0d4d702d57da18389a2b9c602b898a06708d829c28cbfd3a8cb8abff4ed195c7f51d25cd67584a77140d03fbb3f493f6609849bcef1427e6
+  metadata.gz: cc468961929d9774a534438c7ce2ed062b603f13dab4251d7fedb3012ccc0290bc188d038e48d142a7cd32505f46249d54b6e75e0b49415554c4fe68b326c5b1
+  data.tar.gz: 76423521a6ebf9327fda8ebb4d8526b95e84f038891cda7322c8ec1714c65da84e36f5b8212a6cf38c55cd411c1c0f87e8383881534e58c6da84f4a4fce5d846

data/.travis.yml

@@ -6,6 +6,7 @@ env:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
   - jruby-19mode

data/lib/ldp/response.rb

@@ -2,6 +2,7 @@ module Ldp
   module Response
     require 'ldp/response/paging'
 
+    TYPE = 'type'.freeze
     ##
     # Wrap the raw Faraday respone with our LDP extensions
     def self.wrap client, raw_resp
@@ -14,7 +15,7 @@ module Ldp
     # Extract the Link: headers from the HTTP resource
     def self.links response
       h = {}
-      Array(response.headers["Link"]).map { |x| x.split(", ") }.flatten.inject(h) do |memo, header|
+      Array(response.headers['Link'.freeze]).map { |x| x.split(', '.freeze) }.flatten.inject(h) do |memo, header|
         m = header.match(/<(?<link>.*)>;\s?rel="(?<rel>[^"]+)"/)
         if m
           memo[m[:rel]] ||= []
@@ -24,10 +25,10 @@ module Ldp
         memo
       end
     end
-    
+
     def self.applied_preferences headers
       h = {}
-      
+
       Array(headers).map { |x| x.split(",") }.flatten.inject(h) do |memo, header|
         m = header.match(/(?<key>[^=;]*)(=(?<value>[^;,]*))?(;\s*(?<params>[^,]*))?/)
         includes = (m[:params].match(/include="(?<include>[^"]+)"/)[:include] || "").split(" ")
@@ -40,7 +41,7 @@ module Ldp
     # Is the response an LDP resource?
 
     def self.resource? response
-      Array(links(response)["type"]).include? Ldp.resource.to_s
+      Array(links(response)[TYPE]).include? Ldp.resource.to_s
     end
 
     ##
@@ -50,23 +51,25 @@ module Ldp
         Ldp.basic_container,
         Ldp.direct_container,
         Ldp.indirect_container
-      ].any? { |x| Array(links(response)["type"]).include? x.to_s }
+      ].any? { |x| Array(links(response)[TYPE]).include? x.to_s }
     end
 
     ##
     # Is the response an LDP RDFSource?
     #   ldp:Container is a subclass of ldp:RDFSource
     def self.rdf_source? response
-      container?(response) || Array(links(response)["type"]).include?(Ldp.rdf_source)
+      container?(response) || Array(links(response)[TYPE]).include?(Ldp.rdf_source)
     end
 
     def dup
       super.tap do |new_resp|
         new_resp.send(:extend, Ldp::Response)
-        if ::RUBY_VERSION < '2.0'
-          new_resp.send(:remove_instance_variable, :@graph)
-        else
-          new_resp.remove_instance_variable(:@graph)
+        unless new_resp.instance_variable_get(:@graph).nil?
+          if ::RUBY_VERSION < '2.0'
+            new_resp.send(:remove_instance_variable, :@graph)
+          else
+            new_resp.remove_instance_variable(:@graph)
+          end
         end
       end
     end
@@ -96,7 +99,7 @@ module Ldp
     end
 
     def preferences
-      Ldp::Resource.applied_preferences(headers["Preference-Applied"])
+      Ldp::Resource.applied_preferences(headers['Preference-Applied'.freeze])
     end
     ##
     # Get the subject for the response
@@ -138,7 +141,7 @@ module Ldp
     ##
     # Extract the ETag for the resource
     def etag
-      @etag ||= headers['ETag']
+      @etag ||= headers['ETag'.freeze]
     end
 
     def etag=(val)
@@ -148,7 +151,7 @@ module Ldp
     ##
     # Extract the last modified header for the resource
     def last_modified
-      @last_modified ||= headers['Last-Modified']
+      @last_modified ||= headers['Last-Modified'.freeze]
     end
 
     def last_modified=(val)
@@ -158,17 +161,19 @@ module Ldp
     ##
     # Extract the Link: rel="type" headers for the resource
     def types
-      Array(links["type"])
+      Array(links[TYPE])
     end
-    
+
+    RETURN = 'return'.freeze
+
     def includes? preference
       key = Ldp.send("prefer_#{preference}") if Ldp.respond_to("prefer_#{preference}")
       key ||= preference
-      preferences["return"][:includes].include?(key) || !preferences["return"][:omits].include?(key) 
+      preferences[RETURN][:includes].include?(key) || !preferences["return"][:omits].include?(key)
     end
-    
+
     def minimal?
-      preferences["return"][:value] == "minimal"
+      preferences[RETURN][:value] == "minimal"
     end
   end
 end

data/lib/ldp/version.rb

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

data/spec/lib/ldp/response_spec.rb

@@ -19,29 +19,44 @@ describe Ldp::Response do
   end
 
   describe "#dup" do
-    let(:simple_container_graph) { "<> a <http://www.w3.org/ns/ldp#Container> ." }
-    let(:link) { ["<http://www.w3.org/ns/ldp#Resource>;rel=\"type\"","<http://www.w3.org/ns/ldp#BasicContainer>;rel=\"type\""] }
-
+    let(:mock_conn) { Faraday.new { |builder| builder.adapter :test, conn_stubs } }
+    let(:client) { Ldp::Client.new mock_conn }
+    let(:raw_response) { client.get "a_container" }
     let(:conn_stubs) do
       Faraday::Adapter::Test::Stubs.new do |stub|
-        stub.get('/a_container') { [200, {"Link" => link}, simple_container_graph] }
+        stub.get('/a_container') { [200, {"Link" => link}, body] }
       end
     end
-
-    let(:mock_conn) { Faraday.new { |builder| builder.adapter :test, conn_stubs } }
-    let(:client) { Ldp::Client.new mock_conn }
-    let(:raw_response) { client.get "a_container" }
-
     let(:response) { Ldp::Response.wrap mock_client, raw_response }
+
     subject { response.dup }
-    it { is_expected.to respond_to :links }
 
-    it "should not have duplicated the graph" do
-      expect(response.graph.object_id).not_to eq subject.graph.object_id
+    context "for a container resource" do
+      let(:body) { "<> a <http://www.w3.org/ns/ldp#Container> ." }
+      let(:link) { ["<http://www.w3.org/ns/ldp#Resource>;rel=\"type\"","<http://www.w3.org/ns/ldp#BasicContainer>;rel=\"type\""] }
+      it { is_expected.to respond_to :links }
+
+      it "should not have duplicated the graph" do
+        expect(response.graph.object_id).not_to eq subject.graph.object_id
+      end
+
+      it "should have duplicated the body" do
+        expect(response.body.object_id).to eq subject.body.object_id
+      end
     end
 
-    it "should have duplicated the body" do
-      expect(response.body.object_id).to eq subject.body.object_id
+    context "for a non-rdf resource" do
+      let(:body) { "This is only a test" }
+      let(:link) { ["<http://www.w3.org/ns/ldp#Resource>;rel=\"type\"","<http://www.w3.org/ns/ldp#NonRDFSource>;rel=\"type\""] }
+      it { is_expected.to respond_to :links }
+
+      it "should not have a graph" do
+        expect(response.instance_variable_get(:@graph)).to be_nil
+      end
+
+      it "should have duplicated the body" do
+        expect(response.body.object_id).to eq subject.body.object_id
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday