ldp 0.6.4 → 1.0.1

data/lib/ldp/orm.rb

@@ -1,6 +1,5 @@
 module Ldp
   class Orm
-
     attr_reader :resource
     attr_reader :last_response
 

data/lib/ldp/resource.rb

@@ -6,7 +6,7 @@ module Ldp
     attr_reader :client, :subject
     attr_accessor :content
 
-    def self.for(client, subject, response = nil)
+    def self.for(client, subject, response)
       case
       when response.container?
         Ldp::Container.for client, subject, response
@@ -57,8 +57,8 @@ module Ldp
     def head
       @head ||= begin
         @get || client.head(subject)
-      rescue Ldp::NotFound
-        None
+                rescue Ldp::NotFound
+                  None
       end
     end
 
@@ -79,7 +79,7 @@ module Ldp
     # @return [RdfSource] the new representation
     # @raise [Ldp::Conflict] if you attempt to call create on an existing resource
     def create &block
-      raise Ldp::Conflict, "Can't call create on an existing resource" unless new?
+      raise Ldp::Conflict, "Can't call create on an existing resource (#{subject})" unless new?
       verb = subject.nil? ? :post : :put
       resp = client.send(verb, (subject || @base_path), content) do |req|
         req.headers["Link"] = "<#{interaction_model}>;rel=\"type\"" if interaction_model
@@ -130,6 +130,5 @@ module Ldp
     def interaction_model
       nil
     end
-
   end
 end

data/lib/ldp/resource/binary_source.rb

@@ -2,16 +2,21 @@ module Ldp
   class Resource::BinarySource < Ldp::Resource
     attr_accessor :content
 
+    # @param client [Ldp::Client]
+    # @param subject [String] the URI for the resource
+    # @param content_or_response [String,Ldp::Response]
+    # @param base_path [String] ('')
     def initialize client, subject, content_or_response = nil, base_path = ''
       super
 
       case content_or_response
-      when Faraday::Response
+      when Ldp::Response
       else
         @content = content_or_response
       end
     end
 
+    # @return [Ldp::Response]
     def content
       @content ||= get.body
     end
@@ -25,7 +30,7 @@ module Ldp
     # Override inspect so that `content` is never shown. It is typically too big to be helpful
     def inspect
       string = "#<#{self.class.name}:#{self.object_id} "
-      fields = [:subject].map{|field| "#{field}=\"#{self.send(field)}\""}
+      fields = [:subject].map { |field| "#{field}=\"#{self.send(field)}\"" }
       string << fields.join(", ") << ">"
     end
 

data/lib/ldp/resource/rdf_source.rb

@@ -1,18 +1,17 @@
 require 'rdf/turtle'
 module Ldp
   class Resource::RdfSource < Ldp::Resource
-
     def initialize client, subject, graph_or_response = nil, base_path = ''
       super
 
       case graph_or_response
-        when RDF::Enumerable
-          @graph = graph_or_response
-        when Ldp::Response
-        when NilClass
-          #nop
-        else
-          raise ArgumentError, "Third argument to #{self.class}.new should be a RDF::Enumerable or a Ldp::Response. You provided #{graph_or_response.class}"
+      when RDF::Enumerable
+        @graph = graph_or_response
+      when Ldp::Response
+      when NilClass
+      # nop
+      else
+        raise ArgumentError, "Third argument to #{self.class}.new should be a RDF::Enumerable or a Ldp::Response. You provided #{graph_or_response.class}"
       end
     end
 
@@ -27,7 +26,17 @@ module Ldp
     end
 
     def graph
-      @graph ||= new? ? build_empty_graph : filtered_graph(response_graph)
+      @graph ||= begin
+                   if subject.nil?
+                     build_empty_graph
+                   else
+                     filtered_graph(response_graph)
+                   end
+                 rescue Ldp::NotFound
+                   # This is an optimization that lets us avoid doing HEAD + GET
+                   # when the object exists. We just need to handle the 404 case
+                   build_empty_graph
+                 end
     end
 
     def build_empty_graph
@@ -49,14 +58,6 @@ module Ldp
       @response_graph ||= response_as_graph(get)
     end
 
-    # Get the body and ensure it's UTF-8 encoded. Since Fedora 9.3 isn't
-    # returning a charset, then Net::HTTP is just returning ASCII-8BIT
-    # See https://github.com/ruby-rdf/rdf-turtle/issues/13
-    # See https://jira.duraspace.org/browse/FCREPO-1750
-    def body
-      body.force_encoding('utf-8')
-    end
-
     protected
 
     def interaction_model
@@ -64,41 +65,42 @@ module Ldp
     end
 
     private
-      ##
-      # @param [Faraday::Response] graph query response
-      # @return [RDF::Graph]
-      def response_as_graph(resp)
-        graph = build_empty_graph
-        resp.each_statement do |stmt|
-          graph << stmt
-        end
-        graph
+
+    ##
+    # @param [Faraday::Response] graph query response
+    # @return [RDF::Graph]
+    def response_as_graph(resp)
+      graph = build_empty_graph
+      resp.each_statement do |stmt|
+        graph << stmt
       end
+      graph
+    end
 
-      ##
-      # @param [RDF::Graph] original_graph The graph returned by the LDP server
-      # @return [RDF::Graph] A graph stripped of any inlined resources present in the original
-      def filtered_graph(original_graph)
-        inlined_resources = original_graph.query(predicate: RDF::Vocab::LDP.contains).map { |x| x.object }
-
-        # we want to scope this graph to just statements about this model, not contained relations
-        if inlined_resources.empty?
-          original_graph
-        else
-          graph_without_inlined_resources(original_graph, inlined_resources)
-        end
+    ##
+    # @param [RDF::Graph] original_graph The graph returned by the LDP server
+    # @return [RDF::Graph] A graph stripped of any inlined resources present in the original
+    def filtered_graph(original_graph)
+      inlined_resources = original_graph.query(predicate: RDF::Vocab::LDP.contains).map { |x| x.object }
+
+      # we want to scope this graph to just statements about this model, not contained relations
+      if inlined_resources.empty?
+        original_graph
+      else
+        graph_without_inlined_resources(original_graph, inlined_resources)
       end
+    end
 
-      def graph_without_inlined_resources(original_graph, inlined_resources)
-        new_graph = build_empty_graph
+    def graph_without_inlined_resources(original_graph, inlined_resources)
+      new_graph = build_empty_graph
 
-        original_graph.each_statement do |s|
-          unless inlined_resources.include? s.subject
-            new_graph << s
-          end
+      original_graph.each_statement do |s|
+        unless inlined_resources.include? s.subject
+          new_graph << s
         end
-
-        new_graph
       end
+
+      new_graph
+    end
   end
 end

data/lib/ldp/response.rb

@@ -10,6 +10,7 @@ module Ldp
 
     attr_writer :etag, :last_modified
 
+    # @param response [Faraday::Response]
     def initialize(response)
       @response = response
     end
@@ -78,10 +79,10 @@ module Ldp
     # Get the subject for the response
     def subject
       @subject ||= if has_page?
-        graph.first_object [page_subject, RDF::Vocab::LDP.pageOf, nil]
-      else
-        page_subject
-      end
+                     graph.first_object [page_subject, RDF::Vocab::LDP.pageOf, nil]
+                   else
+                     page_subject
+                   end
     end
 
     ##
@@ -154,7 +155,7 @@ module Ldp
     # Statements about the page
     def page
       @page_graph ||= begin
-        g = RDF::Graph.new  
+        g = RDF::Graph.new
 
         if resource?
           res = graph.query RDF::Statement.new(page_subject, nil, nil)
@@ -199,12 +200,21 @@ module Ldp
     end
 
     def content_disposition_filename
-      m = headers['Content-Disposition'].match(/filename="(?<filename>[^"]*)";/)
-      URI.decode(m[:filename]) if m
+      filename = content_disposition_attributes['filename']
+      URI.decode(filename) if filename
     end
 
     private
 
+    def content_disposition_attributes
+      parts = headers['Content-Disposition'].split(/;\s*/).collect { |entry| entry.split(/\s*=\s*/) }
+      entries = parts.collect do |part|
+        value = part[1].respond_to?(:sub) ? part[1].sub(%r{^"(.*)"$}, '\1') : part[1]
+        [part[0], value]
+      end
+      Hash[entries]
+    end
+
     def headers
       response.headers
     end

data/lib/ldp/version.rb

@@ -1,3 +1,3 @@
 module Ldp
-  VERSION = "0.6.4"
+  VERSION = "1.0.1"
 end

data/spec/lib/ldp/resource/binary_source_spec.rb

@@ -4,21 +4,26 @@ describe Ldp::Resource::BinarySource do
   let(:client) { instance_double(Ldp::Client) }
   let(:uri) { 'http://example.com/foo/bar' }
   let(:content) { 'somecontent' }
-  subject { described_class.new(client, uri, content) }
+  let(:instance) { described_class.new(client, uri, content) }
 
-  it "should not display content to inspect" do
-    expect(subject.inspect).to match /subject=\"http:\/\/example\.com\/foo\/bar\"/
-    expect(subject.inspect).not_to match /somecontent/
+  describe "#inspect" do
+    subject { instance.inspect }
+
+    it "does not display content" do
+      expect(subject).to match /subject=\"http:\/\/example\.com\/foo\/bar\"/
+      expect(subject).not_to match /somecontent/
+    end
   end
 
   describe '#described_by' do
+    subject { instance.described_by }
     context 'without a description' do
       before do
         allow(client).to receive(:head).and_return(instance_double(Ldp::Response, links: { }))
       end
 
       it 'retrieves the description object' do
-        expect(subject.described_by).to eq nil
+        expect(subject).to eq nil
       end
     end
 
@@ -31,8 +36,20 @@ describe Ldp::Resource::BinarySource do
       let(:desc) { double }
 
       it 'retrieves the description object' do
-        expect(subject.described_by).to eq desc
+        expect(subject).to eq desc
       end
     end
   end
+
+  describe "#content" do
+    context "when an Ldp::Response is passed in" do
+      let(:mock_response) { instance_double(Faraday::Response, headers: {}, env: { url: "info:a" }) }
+      let(:content) { Ldp::Response.new(mock_response) }
+      let(:client) { instance_double(Ldp::Client, get: double(body: 'retrieved value')) }
+      
+      subject { instance.content }
+
+      it { is_expected.to eq 'retrieved value' }
+    end
+  end
 end

data/spec/lib/ldp/resource/rdf_source_spec.rb

@@ -17,6 +17,7 @@ describe Ldp::Resource::RdfSource do
       stub.post("/") { [201]}
       stub.put("/abs_url_object") { [201]}
       stub.head("/abs_url_object") {[404]}
+      stub.get("/abs_url_object") {[404]}
       stub.head("/existing_object") {[200, {'Content-Type'=>'text/turtle'}]}
       stub.get("/existing_object") {[200, {'Content-Type'=>'text/turtle'}, simple_graph_source]}
     end
@@ -102,7 +103,7 @@ describe Ldp::Resource::RdfSource do
     end
     context 'for an existing object' do
       subject { Ldp::Resource::RdfSource.new mock_client, "http://my.ldp.server/existing_object" }
-      it do 
+      it do
         expect(subject.graph.size).to eql(1)
       end
     end

data/spec/lib/ldp/response_spec.rb

@@ -199,12 +199,16 @@ describe Ldp::Response do
   describe '#content_disposition_filename' do
     before do
       allow(mock_response).to receive(:headers).and_return(
-        'Content-Disposition' => 'filename="xyz.txt";'
+        { 'Content-Disposition' => 'filename="xyz.txt";' },
+        { 'Content-Disposition' => 'attachment; filename=xyz.txt' },
+        { 'Content-Disposition' => 'attachment; filename="xyz.txt"; size="12345"' },
+        { 'Content-Disposition' => 'attachment; filename=""; size="12345"' },
       )
     end
 
     it 'provides the filename from the content disposition header' do
-      expect(subject.content_disposition_filename).to eq 'xyz.txt'
+      3.times { expect(subject.content_disposition_filename).to eq 'xyz.txt' }
+      expect(subject.content_disposition_filename).to eq ''
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldp
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 1.0.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bixby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Linked Data Platform client library
 email:
 - chris@cbeer.info
@@ -214,13 +256,19 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".github_changelog_generator"
 - ".gitignore"
-- ".travis.yml"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- SUPPORT.md
 - bin/ldp
 - ldp.gemspec
 - lib/ldp.rb
@@ -267,8 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Linked Data Platform client library