ldp 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882fd676e2cd2aac5923a8f7a4b308228569607b
-  data.tar.gz: b94c819301cb2ab968085aa6ca371b4eec682e94
+  metadata.gz: 3a68882c3e0ea6d21e3819d632a92e88734bec0f
+  data.tar.gz: a3f31f5e16fc2a60b109bef5f7da218ad008e949
 SHA512:
-  metadata.gz: d4efcff3ae303486a051bc22477ce087e89ee197d2eba531aee9d8c9bbf9767d06f6949f0be830627539377c78828c4d542e08d7a81daaaec9714892e6831cdd
-  data.tar.gz: b3a69169e198f975e8cdb1b5be96e9d9aedbda161eda6c9deac37393ed4615949edb8a970d531c3b8faa7889eb53d62c254366643cb33d207c2da5b9895e72a8
+  metadata.gz: 4111cddaaccda626e39b8ba24619763ca217f97915855ba2fb936e7fcb7ba1f9d6afc78d268393f7c3a67128d6427a0a41f99b2d24d2f09d41e287e5aa1f1ae0
+  data.tar.gz: 173b2d3954e4aa0184a5d87916c637c8348fe185ad561b51cdc28b844d81c14bf820bcdac27551d097f6ccf348c35eaf5c49d20759741ce3cf64571f963dd133

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.storage

data/.travis.yml

@@ -1,3 +1,7 @@
+addons:
+  apt:
+    packages:
+    - libgmp-dev
 language: ruby
 cache: bundler
 sudo: false
@@ -5,6 +9,7 @@ env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 rvm:
-  - 2.1
-  - 2.2
-  - jruby
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
+  - jruby-9.0.5.0

data/Gemfile

@@ -4,5 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'slop', '~> 3.6' if RUBY_PLATFORM == "java"
-gem 'byebug', platforms: :mri_20
+gem 'byebug', platforms: [:mri]
 gem 'activesupport'
+gem 'capybara_discoball'
+gem 'derby'

data/ldp.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = spec.description
   spec.homepage      = "https://github.com/projecthydra/ldp"
   spec.license       = "APACHE2"
+  spec.required_ruby_version = '~> 2.0'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -20,9 +21,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday"
   spec.add_dependency "linkeddata", ">= 1.1"
+  spec.add_dependency "rdf-vocab"
   spec.add_dependency "http_logger"
+  spec.add_dependency "deprecation"
   spec.add_dependency "slop"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "simplecov"
 end

data/lib/ldp.rb

@@ -1,11 +1,14 @@
 require 'ldp/version'
 require 'linkeddata'
+require 'rdf/vocab/ldp'
 require 'logger'
 require 'singleton'
+require 'deprecation'
 
 module Ldp
   RDF::Graph.send(:include, RDF::Isomorphic)
 
+  require 'ldp/error'
   require 'ldp/client'
   require 'ldp/uri'
 
@@ -17,15 +20,6 @@ module Ldp
 
   autoload :Orm, 'ldp/orm'
 
-  class HttpError < RuntimeError; end
-  class BadRequest < HttpError; end # 400
-  class NotFound < HttpError; end # 404
-  class Conflict < HttpError; end # 409
-  class Gone < HttpError; end # 410
-  class EtagMismatch < HttpError; end # 412
-
-  class UnexpectedContentType < RuntimeError; end
-
   # Returned when there is no result (e.g. 404)
   class NoneClass
     include Singleton

data/lib/ldp/client.rb

@@ -7,24 +7,29 @@ module Ldp
     require 'ldp/client/prefer_headers'
     include Ldp::Client::Methods
 
-    def initialize *http_client
-      initialize_http_client *http_client
-    end
+    attr_reader :options
 
-    # Find or initialize a new LDP resource by URI
-    def find_or_initialize subject, options = {}
-      data = get(subject, options = {})
-
-      case
-      when !data.is_a?(Ldp::Response)
-        Resource::BinarySource.new self, subject, data
-      when data.container?
-        Ldp::Container.new_from_response self, subject, data
-      when data.resource?
-        Resource::RdfSource.new self, subject, data
+    def initialize(*args)
+      http_client, options = if args.length == 2
+        args
+      elsif args.length == 1 && args.first.is_a?(Faraday::Connection)
+        [args.first, {}]
+      elsif args.length == 1
+        [nil, args.first]
       else
-        Resource::BinarySource.new self, subject, data
+        raise ArgumentError
       end
+
+      @options = options
+
+      initialize_http_client(http_client || options)
+    end
+
+    # Find or initialize a new LDP resource by URI
+    def find_or_initialize(subject, options = {})
+      data = get(subject, options)
+
+      Ldp::Resource.for(self, subject, data)
     end
 
     def logger

data/lib/ldp/client/methods.rb

@@ -23,6 +23,8 @@ module Ldp::Client::Methods
       end
 
       check_for_errors(resp)
+
+      Ldp::Response.new(resp)
     end
   end
 
@@ -48,13 +50,9 @@ module Ldp::Client::Methods
         yield req if block_given?
       end
 
-      if Ldp::Response.resource? resp
-        Ldp::Response.wrap self, resp
-      else
-        resp
-      end
-
       check_for_errors(resp)
+
+      Ldp::Response.new(resp)
     end
   end
 

data/lib/ldp/container.rb

@@ -4,17 +4,27 @@ module Ldp
     require 'ldp/container/direct'
     require 'ldp/container/indirect'
 
-    def self.new_from_response client, subject, data
+    def self.for(client, subject, data)
       case
-      when data.types.include?(Ldp.indirect_container)
+      when data.types.include?(RDF::Vocab::LDP.IndirectContainer)
         Ldp::Container::Indirect.new client, subject, data
-      when data.types.include?(Ldp.direct_container)
+      when data.types.include?(RDF::Vocab::LDP.DirectContainer)
         Ldp::Container::Direct.new client, subject, data
       else
         Ldp::Container::Basic.new client, subject, data
       end
     end
 
+    class << self
+      alias new_from_response for
+    end
+
+    def contains
+      @contains ||= Hash[graph.query(predicate: RDF::Vocab::LDP.contains).map do |x|
+        [x.object, Ldp::Resource::RdfSource.new(client, x.object, contained_graph(x.object))]
+      end]
+    end
+
     ##
     # Add a new resource to the LDP container
     def add *args
@@ -32,7 +42,7 @@ module Ldp
         graph_or_content = args.first
       else
         slug = args.first
-        graph_or_content = RDF::Graph.new
+        graph_or_content = build_empty_graph
       end
 
       resp = client.post subject, (graph_or_content.is_a?(RDF::Enumerable) ? graph_or_content.dump(:ttl) : graph_or_content) do |req|
@@ -41,5 +51,21 @@ module Ldp
 
       client.find_or_initialize resp.headers['Location']
     end
+
+    private
+
+    def contained_graph subject
+      g = RDF::Graph.new
+      response_graph.query(subject: subject) do |stmt|
+        g << stmt
+      end
+      g
+    end
+
+    def rdf_source_for(object)
+      g = contained_graph(object)
+
+      Ldp::Resource::RdfSource.new(client, object, (g unless g.empty?))
+    end
   end
 end

data/lib/ldp/container/basic.rb

@@ -5,19 +5,10 @@ module Ldp
       contains.each { |k, x| yield x }
     end
 
-    def contains
-      @contains ||= Hash[get.graph.query(predicate: Ldp.contains).map do |x| 
-        [x.object, Ldp::Resource::RdfSource.new(client, x.object, contained_graph(x.object))]
-      end]
-    end
-    
-    private
-    def contained_graph subject
-      g = RDF::Graph.new
-      get.graph.query(subject: subject) do |stmt|
-        g << stmt
-      end
-      g
+    protected
+
+    def interaction_model
+      RDF::Vocab::LDP.BasicContainer
     end
   end
 end

data/lib/ldp/container/direct.rb

@@ -2,15 +2,20 @@ module Ldp
   class Container::Direct < Container::Basic
     def members
       return enum_for(:members) unless block_given?
-      
-      get.graph.query(subject: subject, predicate: member_relation).map do |x| 
-        yield contains[x.object] || Ldp::Resource::RdfSource.new(client, x.object)
+
+      response_graph.query(subject: subject, predicate: member_relation).map do |x|
+        yield rdf_source_for(x.object)
       end
     end
-    
+
     def member_relation
-      graph.first_object(predicate: Ldp.hasMemberRelation) || Ldp.member
+      response_graph.first_object(predicate: RDF::Vocab::LDP.hasMemberRelation) || RDF::Vocab::LDP.member
+    end
+
+    protected
+
+    def interaction_model
+      RDF::Vocab::LDP.DirectContainer
     end
-    
   end
 end

data/lib/ldp/container/indirect.rb

@@ -2,10 +2,16 @@ module Ldp
   class Container::Indirect < Container::Direct
     def members
       return enum_for(:members) unless block_given?
-      
-      get.graph.query(predicate: member_relation, object: subject).map do |x| 
-        yield contains[x.object] || Ldp::Resource::RdfSource.new(client, x.object)
+
+      response_graph.query(predicate: member_relation, object: subject).map do |x|
+        yield rdf_source_for(x.object)
       end
     end
+
+    protected
+
+    def interaction_model
+      RDF::Vocab::LDP.IndirectContainer
+    end
   end
 end

data/lib/ldp/error.rb

@@ -0,0 +1,20 @@
+module Ldp
+  class Error < StandardError; end
+  
+  class HttpError < RuntimeError; end
+  class BadRequest < HttpError; end # 400
+  class NotFound < HttpError; end # 404
+  class Conflict < HttpError; end # 409
+  class Gone < HttpError; end # 410
+  class EtagMismatch < HttpError; end # 412
+
+  class UnexpectedContentType < RuntimeError; end
+
+  class GraphDifferenceException < Ldp::Error
+    attr_reader :diff
+    def initialize message, diff
+      super(message)
+      @diff = diff
+    end
+  end
+end

data/lib/ldp/orm.rb

@@ -54,22 +54,19 @@ module Ldp
 
     def save
       Ldp.instrument 'save.orm.ldp', subject: subject_uri do
-        @last_response = resource.save
-        @last_response.success?
+        response = create_or_update
+
+        response.success?
       end
-    rescue Ldp::HttpError => e
-      @last_response = e
-      logger.debug e
+    rescue Ldp::HttpError
       false
     end
 
     def save!
-      result = save
+      result = create_or_update
 
       if result.is_a? RDF::Enumerable
-        raise GraphDifferenceException.new "", result
-      elsif !result
-        raise @last_response
+        raise Ldp::GraphDifferenceException, 'Graph failed to persist', result
       end
 
       result
@@ -81,26 +78,18 @@ module Ldp
       end
     end
 
-    def method_missing meth, *args, &block
-      super
-    end
+    private
 
-    def respond_to?(meth)
-      super
+    def create_or_update
+      @last_response = resource.save
+    rescue Ldp::HttpError => e
+      @last_response = e
+      logger.debug e
+      raise e
     end
 
-    private
-
     def logger
       Ldp.logger
     end
   end
-
-  class GraphDifferenceException < Exception
-    attr_reader :diff
-    def initialize message, diff
-      super(message)
-      @diff = diff
-    end
-  end
 end

data/lib/ldp/resource.rb

@@ -6,6 +6,17 @@ module Ldp
     attr_reader :client, :subject
     attr_accessor :content
 
+    def self.for(client, subject, response = nil)
+      case
+      when response.container?
+        Ldp::Container.for client, subject, response
+      when response.rdf_source?
+        Resource::RdfSource.new client, subject, response
+      else
+        Resource::BinarySource.new client, subject, response
+      end
+    end
+
     def initialize client, subject, response = nil, base_path = ''
       @client = client
       @subject = subject
@@ -67,10 +78,10 @@ module Ldp
     # Create a new resource at the URI
     # @return [RdfSource] the new representation
     def create &block
-      raise "Can't call create on an existing resource" unless new?
+      raise Ldp::Error, "Can't call create on an existing resource" 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
         yield req if block_given?
       end
 
@@ -103,14 +114,21 @@ module Ldp
         new_response.headers['Last-Modified'] == response.headers['Last-Modified']
     end
 
-    def update_cached_get response
-      Response.wrap(client, response)
+    def update_cached_get(response)
+      response = Response.new(response)
+
       if response.etag.nil? || response.last_modified.nil?
-        response = Response.wrap(client, client.head(subject))
+        response = client.head(subject)
       end
       @get.etag = response.etag
       @get.last_modified = response.last_modified
     end
 
+    protected
+
+    def interaction_model
+      nil
+    end
+
   end
 end

data/lib/ldp/resource/binary_source.rb

@@ -17,7 +17,9 @@ module Ldp
     end
 
     def described_by
-      client.find_or_initialize Array(Ldp::Response.links(self)["describedby"]).first
+      described_by = Array(head.links["describedby"]).first
+
+      client.find_or_initialize described_by if described_by
     end
 
     # Override inspect so that `content` is never shown. It is typically too big to be helpful
@@ -26,5 +28,11 @@ module Ldp
       fields = [:subject].map{|field| "#{field}=\"#{self.send(field)}\""}
       string << fields.join(", ") << ">"
     end
+
+    protected
+
+    def interaction_model
+      RDF::Vocab::LDP.NonRDFSource
+    end
   end
 end