ldpath 1.0.0 → 1.2.0

data/spec/ldpath_program_spec.rb

@@ -1,29 +1,33 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ldpath::Program do
   describe "Simple program" do
     subject do
-      Ldpath::Program.parse <<-EOF
-@prefix dcterms : <http://purl.org/dc/terms/> ;
-title = dcterms:title :: xsd:string ;
-parent_title = dcterms:isPartOf / dcterms:title :: 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 ;
-recursive = (dcterms:isPartOf)* ;
-en_description = dcterms:description[@en] ;
-conditional = dcterms:isPartOf[dcterms:title] ;
-conditional_false = dcterms:isPartOf[dcterms:description] ;
-int_value = <info:intProperty>[^^xsd:integer] :: xsd:integer ;
-numeric_value = <info:numericProperty> :: xsd:integer ;
-escaped_string = "\\"" :: xsd:string;
-and_test = .[dcterms:title & dcterms:gone] ;
-or_test = .[dcterms:title | dcterms:gone] ;
-is_test = .[dcterms:title is "Hello, world!"] ;
-is_not_test = .[!(dcterms:title is "Hello, world!")] ;
-EOF
+      Ldpath::Program.parse <<~EOF
+        @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] ;
+        conditional_false = dcterms:isPartOf[dcterms:description] ;
+        int_value = <info:intProperty>[^^xsd:integer] :: xsd:integer ;
+        numeric_value = <info:numericProperty> :: xsd:integer ;
+        escaped_string = "\\"" :: xsd:string;
+        and_test = .[dcterms:title & dcterms:gone] ;
+        or_test = .[dcterms:title | dcterms:gone] ;
+        is_test = .[dcterms:title is "Hello, world!"] ;
+        is_not_test = .[!(dcterms:title is "Hello, world!")] ;
+      EOF
     end
 
     let(:object) { RDF::URI.new("info:a") }
@@ -46,16 +50,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!"
@@ -73,24 +79,24 @@ EOF
 
   describe "functions" do
     let(:program) do
-      Ldpath::Program.parse <<-EOF
-@prefix dcterms : <http://purl.org/dc/terms/> ;
-ab = fn:concat("a", "b") ;
-title = fn:concat(dcterms:title, dcterms:description) ;
-title_mix = fn:concat("!", dcterms:title) ;
-title_missing = fn:concat("z", dcterms:genre) ;
-first_a = fn:first("a", "b") ;
-first_b = fn:first(dcterms:genre, "b") ;
-last_a = fn:last("a", dcterms:genre) ;
-last_b = fn:last("a", "b") ;
-count_5 = fn:count("a", "b", "c", "d", "e");
-count_3 = fn:count(dcterms:hasPart);
-count_still_3 = fn:count(dcterms:hasPart, dcterms:genre);
-eq_true = fn:eq("a", "a");
-eq_false = fn:eq("a", "b");
-eq_node_true = fn:eq(dcterms:description, "Description");
-xpath_test = fn:xpath("//title", "<root><title>xyz</title></root>");
-EOF
+      Ldpath::Program.parse <<~EOF
+        @prefix dcterms : <http://purl.org/dc/terms/> ;
+        ab = fn:concat("a", "b") ;
+        title = fn:concat(dcterms:title, dcterms:description) ;
+        title_mix = fn:concat("!", dcterms:title) ;
+        title_missing = fn:concat("z", dcterms:genre) ;
+        first_a = fn:first("a", "b") ;
+        first_b = fn:first(dcterms:genre, "b") ;
+        last_a = fn:last("a", dcterms:genre) ;
+        last_b = fn:last("a", "b") ;
+        count_5 = fn:count("a", "b", "c", "d", "e");
+        count_3 = fn:count(dcterms:hasPart);
+        count_still_3 = fn:count(dcterms:hasPart, dcterms:genre);
+        eq_true = fn:eq("a", "a");
+        eq_false = fn:eq("a", "b");
+        eq_node_true = fn:eq(dcterms:description, "Description");
+        xpath_test = fn:xpath("//title", "<root><title>xyz</title></root>");
+      EOF
     end
 
     let(:object) { RDF::URI.new("info:a") }
@@ -185,29 +191,66 @@ 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')
+    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
 
   describe "Predicate function" do
     subject do
-      Ldpath::Program.parse <<-EOF
-@prefix dcterms : <http://purl.org/dc/terms/> ;
-predicates = <http://xmlns.com/foaf/0.1/primaryTopic> / fn:predicates() :: xsd:string ;
-EOF
+      Ldpath::Program.parse <<~EOF
+        @prefix dcterms : <http://purl.org/dc/terms/> ;
+        predicates = <http://xmlns.com/foaf/0.1/primaryTopic> / fn:predicates() :: xsd:string ;
+      EOF
     end
 
     before do
@@ -239,11 +282,11 @@ EOF
     end
 
     subject do
-      Ldpath::Program.parse <<-EOF
-@prefix dcterms : <http://purl.org/dc/terms/> ;
-title = dcterms:title :: xsd:string ;
-child_title = dcterms:hasPart / dcterms:title :: xsd:string ;
-child_title_with_tap = dcterms:hasPart / ?<tap>fn:predicates() / dcterms:title :: xsd:string ;
+      Ldpath::Program.parse <<~EOF
+        @prefix dcterms : <http://purl.org/dc/terms/> ;
+        title = dcterms:title :: xsd:string ;
+        child_title = dcterms:hasPart / dcterms:title :: xsd:string ;
+        child_title_with_tap = dcterms:hasPart / ?<tap>fn:predicates() / dcterms:title :: xsd:string ;
       EOF
     end
 
@@ -270,11 +313,11 @@ child_title_with_tap = dcterms:hasPart / ?<tap>fn:predicates() / dcterms:title :
     end
 
     subject do
-      Ldpath::Program.parse <<-EOF
-@prefix dcterms : <http://purl.org/dc/terms/> ;
-@prefix dc: <http://purl.org/dc/elements/1.1/> ;
-title = dcterms:title :: xsd:string ;
-title_with_loose =  ~dc:title :: xsd:string ;
+      Ldpath::Program.parse <<~EOF
+        @prefix dcterms : <http://purl.org/dc/terms/> ;
+        @prefix dc: <http://purl.org/dc/elements/1.1/> ;
+        title = dcterms:title :: xsd:string ;
+        title_with_loose =  ~dc:title :: xsd:string ;
       EOF
     end
 
@@ -327,10 +370,10 @@ title_with_loose =  ~dc:title :: xsd:string ;
   describe '#evaluate' do
     context 'when passing limit_to_context' do
       subject do
-        Ldpath::Program.parse <<-EOF
-@prefix madsrdf : <http://www.loc.gov/mads/rdf/v1#> ;
-@prefix schema: <http://www.w3.org/2000/01/rdf-schema#> ;
-property = madsrdf:authoritativeLabel :: xsd:string ;
+        Ldpath::Program.parse <<~EOF
+          @prefix madsrdf : <http://www.loc.gov/mads/rdf/v1#> ;
+          @prefix schema: <http://www.w3.org/2000/01/rdf-schema#> ;
+          property = madsrdf:authoritativeLabel :: xsd:string ;
         EOF
       end
 
@@ -344,7 +387,7 @@ property = madsrdf:authoritativeLabel :: xsd:string ;
 
       before do
         stub_request(:get, 'http://id.loc.gov/authorities/names/n79021164')
-            .to_return(status: 200, body: webmock_fixture('loc_n79021164.nt'), headers: { 'Content-Type' => 'application/n-triples' })
+          .to_return(status: 200, body: webmock_fixture('loc_n79021164.nt'), headers: { 'Content-Type' => 'application/n-triples' })
       end
 
       context 'as false' do

data/spec/ldpath_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ldpath do

data/spec/ldpath_transform_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'pp'
 describe Ldpath::Transform do
@@ -98,7 +100,7 @@ describe Ldpath::Transform do
       selector = actual.first.selector
       expect(selector).to be_a_kind_of Ldpath::RecursivePathSelector
       expect(selector.property.property).to eq RDF::URI.new("info:a")
-      expect(selector.repeat).to eq 0..Ldpath::Transform::Infinity
+      expect(selector.repeat).to eq 0..Ldpath::Transform::INFINITY
     end
 
     it "is a 1-to-infinity matcher" do
@@ -107,7 +109,7 @@ describe Ldpath::Transform do
       selector = actual.first.selector
       expect(selector).to be_a_kind_of Ldpath::RecursivePathSelector
       expect(selector.property.property).to eq RDF::URI.new("info:a")
-      expect(selector.repeat).to eq 1..Ldpath::Transform::Infinity
+      expect(selector.repeat).to eq 1..Ldpath::Transform::INFINITY
     end
 
     it "is a 0 to 5 matcher" do
@@ -134,7 +136,7 @@ describe Ldpath::Transform do
       selector = actual.first.selector
       expect(selector).to be_a_kind_of Ldpath::RecursivePathSelector
       expect(selector.property.property).to eq RDF::URI.new("info:a")
-      expect(selector.repeat).to eq 2..Ldpath::Transform::Infinity
+      expect(selector.repeat).to eq 2..Ldpath::Transform::INFINITY
     end
   end
 

data/spec/lib/functions/list_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "LDPath list functions" do

data/spec/spec_helper.rb

@@ -1,30 +1,14 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'simplecov'
-SimpleCov.start
+# frozen_string_literal: true
 
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'ldpath'
 require 'rdf/reasoner'
 require 'webmock/rspec'
-
-require 'simplecov'
-require 'coveralls'
 require 'byebug' unless ENV['TRAVIS']
 
 RDF::Reasoner.apply(:rdfs)
 RDF::Reasoner.apply(:owl)
 
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start('rails') do
-  add_filter '/.internal_test_app'
-  add_filter '/lib/generators'
-  add_filter '/spec'
-  add_filter '/tasks'
-  add_filter '/lib/qa/version.rb'
-  add_filter '/lib/qa/engine.rb'
-end
-SimpleCov.command_name 'spec'
-Coveralls.wear!
-
 def webmock_fixture(fixture)
   File.new File.expand_path(File.join("../fixtures", fixture), __FILE__)
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ldpath
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Beer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-30 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
+- !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: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -25,33 +39,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: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bixby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rdf-reasoner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdf-reasoner
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,7 +178,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - cabeer@stanford.edu
 executables:
@@ -158,6 +186,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -176,6 +205,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
@@ -198,7 +231,7 @@ homepage: https://github.com/samvera-labs/ldpath
 licenses:
 - Apache 2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -206,16 +239,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Ruby implementation of LDPath
 test_files: