ldpath 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e53eb301f84470c0c8d0456bf6df5a22353ebae4
-  data.tar.gz: 01a7107da855d02ba8b986a46307b9f6ecf15592
+  metadata.gz: 2392ccdedd0caa14ab3a6a9be74043156d66cda1
+  data.tar.gz: 25c171de64758510a076c32ee3fce37434707deb
 SHA512:
-  metadata.gz: b7696726fe30696485975e88d86a694f497b9c9bf734c969734d934ceccd4c5b87db30e0ebfc495aa32a4b51d8b271b8f6d06f7f99bf92ce9a44ce58770c2fcb
-  data.tar.gz: 405272b9be017a205da44e17e545aaf918184f5cc7dc42b9696ec197a5c23a3513eba089a3a3e5939623a067af32e245ca4e8e98edd1df9209956b005d0daea6
+  metadata.gz: 7fb33a6e0fe7af743f164ea41cee703c8a36f95ea216258297afd256b62e90da5d0b82c8c3aaf98eac4892118d6665abd647d68ff2f471874eb57cb108b0b924
+  data.tar.gz: 9b2f191ee2bdf62d775d3110d07752914a00b4b4aa48d9886b16d6d84acd6c702e25367760f61a87b5776b7d1766ee9446334e4a871d82b8ddddab995e2a52a3

data/.travis.yml

@@ -3,4 +3,6 @@ rvm:
   - 2.4.5
   - 2.5.3
 before_install:
-  - gem update --system
+  # cause ruby 2.5 doesn't come with bundler 2.x, which our
+  # gemspec now asks for.
+  - gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.1.0 (2020-01-21)
+
+* replace linkeddata dependency with rdf and nokogiri
+* update dependency on bundler to ~> 2.0
+
 ### 1.0.1 (2019-04-23)
 
 * remove version restriction for linkeddata dependency

data/README.md

@@ -8,6 +8,8 @@ This is a ruby implementation of [LDPath](http://marmotta.apache.org/ldpath/lang
 
 ## Installation
 
+### Required gem installation
+
 Add this line to your application's Gemfile:
 
     gem 'ldpath'
@@ -20,6 +22,10 @@ Or install it yourself as:
 
     $ gem install ldpath
 
+### Additional gem installations
+
+To support RDF serializations, you will need to either install the [linkeddata gem](https://github.com/ruby-rdf/linkeddata) which installs a large set of RDF serializations or, in order to have a smaller dependency footprint, install gems for only the serializations your plan to use in your app.  The list of serializations are in the [README](https://github.com/ruby-rdf/linkeddata/blob/develop/README.md#features) for the linkeddata gem.
+
 ## Usage
 
 ```ruby
@@ -35,10 +41,10 @@ uri = RDF::URI.new "info:a"
 context = RDF::Graph.new << [uri, RDF::Vocab::DC.title, "Some Title"]
 
 program = Ldpath::Program.parse my_program
-output = program.evaluate uri, context
+output = program.evaluate uri, context: context
 # => { ... }
 ```
- 
+
 ## Compatibility
 
 * Ruby 2.5 or the latest 2.4 version is recommended.  Later versions may also work.

data/ldpath.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "parslet"
-  spec.add_dependency "linkeddata"
+  spec.add_dependency "rdf", '~> 3.0'
+  spec.add_dependency "nokogiri", "~> 1.8"
 
   # spec.add_development_dependency "bixby", "~> 1.0.0"
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/lib/ldpath.rb

@@ -1,6 +1,11 @@
 require "ldpath/version"
-require 'linkeddata'
 require 'logger'
+require 'nokogiri'
+require 'rdf'
+# require rdf/ntriples may not be necessary, may only really be necessary
+# for ldpath_program_spec.rb tests, but I'm not certain, and I don't think it hurts
+# to do it here.
+require 'rdf/ntriples'
 
 module Ldpath
   require 'ldpath/field_mapping'
@@ -11,6 +16,7 @@ module Ldpath
   require 'ldpath/functions'
   require 'ldpath/program'
   require 'ldpath/result'
+  require 'ldpath/loaders'
 
   class << self
     attr_writer :logger

data/lib/ldpath/loaders.rb

@@ -0,0 +1,5 @@
+class Ldpath::Loaders
+  require 'ldpath/loaders/direct'
+  require 'ldpath/loaders/graph'
+  require 'ldpath/loaders/linked_data_fragment'
+end

data/lib/ldpath/loaders/direct.rb

@@ -0,0 +1,11 @@
+class Ldpath::Loaders::Direct
+  def load(uri)
+    Ldpath.logger.debug "Loading #{uri.inspect}"
+
+    reader_types = RDF::Format.reader_types.reject { |t| t.to_s =~ /html/ }.map do |t|
+      t.to_s =~ %r{text/(?:plain|html)} ? "#{t};q=0.5" : t
+    end
+
+    RDF::Graph.load(uri, headers: { 'Accept' => reader_types.join(", ") })
+  end
+end

data/lib/ldpath/loaders/graph.rb

@@ -0,0 +1,9 @@
+class Ldpath::Loaders::Graph
+  def initialize(graph:)
+    @graph = graph
+  end
+
+  def load(uri)
+    @graph
+  end
+end

data/lib/ldpath/loaders/linked_data_fragment.rb

@@ -0,0 +1,25 @@
+require 'cgi'
+
+class Ldpath::Loaders::LinkedDataFragment
+  NEXT_PAGE = RDF::URI('http://www.w3.org/ns/hydra/core#nextPage')
+
+  def initialize(endpoint)
+    @endpoint = endpoint
+  end
+
+  def load(uri)
+    Ldpath.logger.debug "Loading LDF data for #{uri.inspect}"
+
+    graph = RDF::Graph.new
+    request_uri = RDF::URI("#{@endpoint}?subject=#{CGI::escape(uri)}")
+
+    while request_uri
+      Ldpath.logger.debug " -- querying #{request_uri}"
+      request_graph = RDF::Graph.load(request_uri)
+      graph.insert_statements(request_graph)
+      request_uri = request_graph.first_object([request_uri, NEXT_PAGE, nil])
+    end
+
+    graph
+  end
+end

data/lib/ldpath/program.rb

@@ -26,11 +26,14 @@ module Ldpath
       end
     end
 
-    attr_reader :mappings, :prefixes, :filters
-    def initialize(mappings, options = {})
+    attr_reader :mappings, :prefixes, :filters, :default_loader, :loaders
+    def initialize(mappings, default_loader: Ldpath::Loaders::Direct.new, prefixes: {}, filters: [], loaders: {})
       @mappings ||= mappings
-      @prefixes = options[:prefixes] || {}
-      @filters = options[:filters] || []
+      @default_loader = default_loader
+      @loaders = loaders
+      @prefixes = prefixes
+      @filters = filters
+
     end
 
     def evaluate(uri, context: nil, limit_to_context: false)
@@ -41,5 +44,12 @@ module Ldpath
 
       result.to_hash
     end
+
+    def load(uri)
+      loader = loaders.find { |k, v| uri =~ k }&.last
+      loader ||= default_loader
+
+      loader.load(uri)
+    end
   end
 end

data/lib/ldpath/result.rb

@@ -22,13 +22,7 @@ module Ldpath
 
     def load_graph(uri)
       cache[uri] ||= begin
-        Ldpath.logger.debug "[#{object_id}] Loading #{uri.inspect}"
-
-        reader_types = RDF::Format.reader_types.reject { |t| t.to_s =~ /html/ }.map do |t|
-          t.to_s =~ %r{text/(?:plain|html)} ? "#{t};q=0.5" : t
-        end
-
-        RDF::Graph.load(uri, headers: { 'Accept' => reader_types.join(", ") }).tap { loaded[uri] = true }
+        program.load(uri).tap { loaded[uri] = true }
       end
     end
 

data/lib/ldpath/tests.rb

@@ -8,11 +8,14 @@ module Ldpath
     end
 
     def evaluate(program, uris, context)
+      return to_enum(:evaluate, program, uris, context) unless block_given?
+
       entries = delegate.evaluate program, uris, context
       entries.select do |uri|
-        enum_wrap(test.evaluate(program, uri, context)).any? do |x|
+        result = enum_wrap(test.evaluate(program, uri, context)).any? do |x|
           x
         end
+        yield uri if result
       end
     end
   end
@@ -26,7 +29,7 @@ module Ldpath
     def evaluate(_program, uri, _context)
       return unless uri.literal?
 
-      uri if (lang == "none" && !uri.has_language?) || uri.language == lang
+      uri if (lang.to_s == "none" && !uri.has_language?) || uri.language.to_s == lang.to_s
     end
   end
 

data/lib/ldpath/version.rb

@@ -1,3 +1,3 @@
 module Ldpath
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/spec/ldpath_program_spec.rb

@@ -7,11 +7,13 @@ describe Ldpath::Program do
 @prefix dcterms : <http://purl.org/dc/terms/> ;
 title = dcterms:title :: xsd:string ;
 parent_title = dcterms:isPartOf / dcterms:title :: xsd:string ;
+parent_title_en = dcterms:isPartOf / dcterms:title[@en] :: xsd:string ;
 titles = dcterms:title | (dcterms:isPartOf / dcterms:title) | (^dcterms:isPartOf / dcterms:title) :: xsd:string ;
 no_titles = dcterms:title & (dcterms:isPartOf / dcterms:title) & (^dcterms:isPartOf / dcterms:title) :: xsd:string ;
 self = . :: xsd:string ;
 wildcard = * ::xsd:string ;
 child_title = ^dcterms:isPartOf / dcterms:title :: xsd:string ;
+child_description_en = ^dcterms:isPartOf / dcterms:description[@en] :: xsd:string ;
 recursive = (dcterms:isPartOf)* ;
 en_description = dcterms:description[@en] ;
 conditional = dcterms:isPartOf[dcterms:title] ;
@@ -46,16 +48,18 @@ EOF
       graph << [parent, RDF::Vocab::DC.title, "Parent title"]
       graph << [child, RDF::Vocab::DC.isPartOf, object]
       graph << [child, RDF::Vocab::DC.title, "Child title"]
+      graph << [parent, RDF::Vocab::DC.title, RDF::Literal.new("Parent English!", language: "en")]
+      graph << [parent, RDF::Vocab::DC.title, RDF::Literal.new("Parent French!", language: "fr")]
       graph << [parent, RDF::Vocab::DC.isPartOf, grandparent]
 
       result = subject.evaluate object, context: graph
-
       expect(result["title"]).to match_array "Hello, world!"
-      expect(result["parent_title"]).to match_array "Parent title"
+      expect(result["parent_title"]).to match_array ["Parent title", "Parent English!", "Parent French!"]
+      expect(result["parent_title_en"]).to match_array "Parent English!"
       expect(result["self"]).to match_array(object)
       expect(result["wildcard"]).to include "Hello, world!", parent
       expect(result["child_title"]).to match_array "Child title"
-      expect(result["titles"]).to match_array ["Hello, world!", "Parent title", "Child title"]
+      expect(result["titles"]).to match_array ["Hello, world!", "Parent title", "Child title", "Parent English!", "Parent French!"]
       expect(result["no_titles"]).to be_empty
       expect(result["recursive"]).to match_array [parent, grandparent]
       expect(result["en_description"].first.to_s).to eq "English!"
@@ -185,20 +189,56 @@ EOF
 
   describe "Data loading" do
     subject do
-      Ldpath::Program.parse <<-EOF
-@prefix dcterms : <http://purl.org/dc/terms/> ;
-title = foaf:primaryTopic / dc:title :: xsd:string ;
-EOF
+      Ldpath::Program.parse <<-EOF, context
+        @prefix dcterms : <http://purl.org/dc/terms/> ;
+        title = foaf:primaryTopic / dc:title :: xsd:string ;
+        EOF
     end
+    let(:context) { {} }
 
-    before do
-      stub_request(:get, 'http://www.bbc.co.uk/programmes/b0081dq5')
-          .to_return(status: 200, body: webmock_fixture('bbc_b0081dq5.nt'), headers: { 'Content-Type' => 'application/n-triples' })
+    context 'with direct loading' do
+      let(:context) { { default_loader: Ldpath::Loaders::Direct.new }}
+
+      before do
+        stub_request(:get, 'http://www.bbc.co.uk/programmes/b0081dq5')
+            .to_return(status: 200, body: webmock_fixture('bbc_b0081dq5.nt'), headers: { 'Content-Type' => 'application/n-triples' })
+      end
+
+      it "should work" do
+        result = subject.evaluate RDF::URI.new("http://www.bbc.co.uk/programmes/b0081dq5")
+        expect(result["title"]).to match_array "Huw Stephens"
+      end
     end
 
-    it "should work" do
-      result = subject.evaluate RDF::URI.new("http://www.bbc.co.uk/programmes/b0081dq5")
-      expect(result["title"]).to match_array "Huw Stephens"
+    context 'with an existing graph' do
+      let(:graph) { RDF::Graph.new }
+      let(:graph_loader) { Ldpath::Loaders::Graph.new graph: graph }
+      let(:context) { { default_loader: graph_loader }}
+
+      before do
+        graph << [RDF::URI('http://www.bbc.co.uk/programmes/b0081dq5'), RDF::URI('http://xmlns.com/foaf/0.1/primaryTopic'), RDF::URI('info:some_uri')]
+        graph << [RDF::URI('info:some_uri'), RDF::URI('http://purl.org/dc/elements/1.1/title'), 'Local Huw Stephens']
+      end
+
+      it "should work" do
+        result = subject.evaluate RDF::URI.new("http://www.bbc.co.uk/programmes/b0081dq5")
+        expect(result["title"]).to match_array "Local Huw Stephens"
+      end
+    end
+
+    context 'with linked data fragments' do
+      let(:graph_loader) { Ldpath::Loaders::LinkedDataFragment.new('http://example.com/ldf') }
+      let(:context) { { default_loader: graph_loader }}
+
+      before do
+        stub_request(:get, 'http://example.com/ldf?subject=http://www.bbc.co.uk/programmes/b0081dq5')
+            .to_return(status: 200, body: webmock_fixture('bbc_b0081dq5.nt'), headers: { 'Content-Type' => 'application/n-triples' })
+      end
+
+      it "should work" do
+        result = subject.evaluate RDF::URI.new("http://www.bbc.co.uk/programmes/b0081dq5")
+        expect(result["title"]).to match_array "Huw Stephens"
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldpath
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -25,33 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: linkeddata
+  name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +190,10 @@ files:
 - lib/ldpath.rb
 - lib/ldpath/field_mapping.rb
 - lib/ldpath/functions.rb
+- lib/ldpath/loaders.rb
+- lib/ldpath/loaders/direct.rb
+- lib/ldpath/loaders/graph.rb
+- lib/ldpath/loaders/linked_data_fragment.rb
 - lib/ldpath/parser.rb
 - lib/ldpath/program.rb
 - lib/ldpath/result.rb