ldpath 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 154cc858a4b03022c48012acdb9e897c105a7c3f
-  data.tar.gz: 5c99156666f615486d5b8134bcd869e0f9b44590
+  metadata.gz: feb1911da55e6e56d33cb8bccea249060b59f7da
+  data.tar.gz: 87eab8d2813362a18c9ff45707325542f45ec657
 SHA512:
-  metadata.gz: 6a9879ef3a8345d8c0a5c82ab79b048c9143cd1da9c33b5d53e8940d54187666723c9c67f5114efa9d7e2485aa4c28e8d63c2d43919571f8f955169485106fb2
-  data.tar.gz: 81f9a84ff7d8a761327c833b8acd6a1ff96403c3e512c02fa6c060755817aab69d9382bcaa3782048a2d1d6c7c983528a155b2554a961c71fe4bb711d0fb7d6b
+  metadata.gz: 111dbf2d32a03ab3199d622f1ea78c94322a24733e0120c537ed43d2f42c592e650ab72e67f067cf6578d4be2ddcdbfd6756d09369c2e9d8c1fb7757f7624bb2
+  data.tar.gz: 5dc5e8488936d2d14114522cb1880a05e165edc317b6a433b247dff8e235af989419a7fac28b71a8f5741da7a8d0b2b33c3e6d10179a0a3b830461ff748a970e

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ldpath.gemspec
 gemspec
+

data/ldpath.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rdf-reasoner"
 end

data/lib/ldpath/functions.rb

@@ -126,7 +126,6 @@ module Ldpath
     end
     
     def startsWith uri, context, str, suffix
-      
       Array(str).map { |x| x.start_with? suffix }
     end
     
@@ -136,9 +135,12 @@ module Ldpath
     end
     
     def isEmpty uri, context, str
-      
       Array(str).map(&:empty?)
     end
+
+    def predicates uri, context, *args
+      context.query([uri, nil, nil]).map(&:predicate).uniq
+    end
   
   end
 end

data/lib/ldpath/parser.rb

@@ -32,11 +32,13 @@ module Ldpath
     rule(:star) { str("*") }
     rule(:not_op) { str("!") }
     rule(:inverse) { str("^") }
+    rule(:tap) { str("?") }
     rule(:is) { str "is" }
     rule(:is_a) { str "is-a" }
     rule(:func) { str "fn:"}
     rule(:type) { str "^^" }
     rule(:lang) { str "@" }
+    rule(:loose) { str("~") }
     
     # todo: fixme
     rule(:uri) do
@@ -138,14 +140,17 @@ module Ldpath
         self_selector |
         function_selector |
         property_selector |
+        loose_property_selector |
         wildcard_selector | 
         reverse_property_selector |
         string_constant_selector |
         recursive_path_selector |
-        grouped_selector
+        grouped_selector |
+        tap_selector
       )
     }    
 
+
     rule(:atomic_or_testing_selector) {
       (testing_selector | atomic_selector)
     }
@@ -207,6 +212,14 @@ module Ldpath
       ).repeat >>
       wsp?
     }
+    
+    # xyz
+    rule(:loose_property_selector) {
+      wsp? >> 
+      loose >> 
+      wsp? >> 
+      uri.as(:loose_property) >> wsp?
+    }
 
     # xyz
     rule(:property_selector) {
@@ -251,6 +264,15 @@ module Ldpath
       selector >> wsp? >> 
       str(")") >> wsp?
     }
+
+    rule(:tap_selector) {
+      wsp? >>
+      tap >>
+      str("<") >>
+      identifier.as(:identifier) >>
+      str(">") >>
+      (atomic_selector).as(:tap)
+    }
     
     # Testing Selectors
     

data/lib/ldpath/program.rb

@@ -21,25 +21,38 @@ module Ldpath
       end
     end
     
-    attr_reader :mappings
-    def initialize mappings
+    attr_reader :mappings, :cache, :loaded
+    def initialize mappings, cache = RDF::Util::Cache.new
       @mappings ||= mappings
-      @cache = {}
+      @cache = cache
+      @loaded = {}
     end
     
     def loading uri, context
-      if uri.to_s =~ /^http/ and !context.has_subject?(uri)
-        @cache[uri] ||= RDF::Graph.load(uri)
-        context << @cache[uri]
+      if uri.to_s =~ /^http/ and !loaded[uri]
+        context << load_graph(uri)
+      end
+    end
+
+    def load_graph uri
+      cache[uri] ||= begin
+        Ldpath.logger.debug "[#{self.object_id}] Loading #{uri.inspect}"
+
+        reader_types = RDF::Format.reader_types.reject { |t| t.to_s =~ /html/ }.map do |t|
+          t.to_s =~ /text\/(?:plain|html)/  ? "#{t};q=0.5" : t
+        end
+
+        RDF::Graph.load(uri, headers: { 'Accept' => reader_types.join(", ") }).tap { loaded[uri] = true }
       end
     end
 
     def evaluate uri, context = nil
       h = {}
-      context ||= RDF::Graph.load uri.to_s
+      context ||= load_graph(uri.to_s)
 
       mappings.each do |m|
-        h[m.name] = case m.selector
+        h[m.name] ||= []
+        h[m.name] += case m.selector
         when Selector
           m.selector.evaluate(self, uri, context).map do |x| 
             next x unless m.field_type
@@ -50,7 +63,11 @@ module Ldpath
         end
       end
 
-      h
+      h.merge(meta)
+    end
+
+    def meta
+      @meta ||= {}
     end
     
     def func_call fname, uri, context, *arguments

data/lib/ldpath/selectors.rb

@@ -21,9 +21,9 @@ module Ldpath
   class FunctionSelector < Selector
     attr_reader :fname, :arguments
 
-    def initialize fname, arguments
+    def initialize fname, arguments = []
       @fname = fname
-      @arguments = arguments
+      @arguments = Array(arguments)
     end
     
     def evaluate program, uris, context
@@ -37,7 +37,7 @@ module Ldpath
             i
           end
         end
-        program.func_call fname, uri, context, *arguments
+        program.func_call fname, uri, context, args
       end.flatten.compact
     end
   end
@@ -53,6 +53,21 @@ module Ldpath
     end
   end
   
+  class LoosePropertySelector < Selector
+    attr_reader :property
+    def initialize property
+      @property = property
+    end
+
+    def evaluate_one uri, context
+      return PropertySelector.new(property).evaluate_one(uri_context) unless defined? RDF::Reasoner
+
+      context.query([uri, nil, nil]).select do |result|
+        result.predicate.entail(:subPropertyOf).include? property
+      end.map(&:object)
+    end
+  end
+  
   class WildcardSelector < Selector
     def evaluate_one uri, context
       context.query([uri, nil, nil]).map(&:object)
@@ -121,4 +136,25 @@ module Ldpath
     end
   end
 
+  class TapSelector < Selector
+    attr_reader :identifier, :tap
+    def initialize identifier, tap
+      @identifier = identifier
+      @tap = tap
+    end
+
+    def evaluate program, uris, context
+      program.meta[identifier] = tap.evaluate(program, uris, context).map { |x| RDF::Literal.new(x.to_s).canonicalize.object }
+
+      Array(uris).map do |uri|
+        loading program, uri, context
+        evaluate_one uri, context
+      end.flatten.compact
+    end
+    
+    def evaluate_one uri, context
+      uri
+    end
+  end
+
 end

data/lib/ldpath/transform.rb

@@ -53,6 +53,10 @@ module Ldpath
       SelfSelector.new
     end
 
+    rule(fname: simple(:fname)) do
+      FunctionSelector.new fname.to_s
+    end
+
     rule(fname: simple(:fname), arglist: subtree(:arglist)) do
       FunctionSelector.new fname.to_s, arglist
     end
@@ -60,6 +64,10 @@ module Ldpath
     rule(property: simple(:property)) do
       PropertySelector.new property
     end
+    
+    rule(loose_property: simple(:property)) do
+      LoosePropertySelector.new property
+    end
 
     rule(wildcard: simple(:wilcard)) do
       WildcardSelector.new
@@ -85,6 +93,10 @@ module Ldpath
 
       RecursivePathSelector.new properties[:delegate], repeat  
     end
+
+    rule(identifier: simple(:identifier), tap: subtree(:tap)) do
+      TapSelector.new identifier.to_s, tap
+    end
   
     ### Test Selectors
 

data/lib/ldpath/version.rb

@@ -1,3 +1,3 @@
 module Ldpath
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ldpath.rb

@@ -1,5 +1,6 @@
 require "ldpath/version"
 require 'linkeddata'
+require 'logger'
 
 module Ldpath
   require 'ldpath/field_mapping'
@@ -14,5 +15,19 @@ module Ldpath
     def evaluate program, uri, context
       Ldpath::Program.parse(program).evaluate(uri, context)
     end
+
+    def logger
+      @logger ||= begin
+        if defined? Rails
+          Rails.logger
+        else
+          Logger.new(STDERR)
+        end
+      end
+    end
+
+    def logger= logger
+      @logger = logger
+    end
   end
 end

data/spec/ldpath_parser_spec.rb

@@ -143,6 +143,14 @@ describe Ldpath::Parser do
       it "function_selector" do
         subject.selector.parse('fn:concat(foaf:givename," ",foaf:surname)')
       end
+      
+      it "tap_selector" do
+        subject.selector.parse('?<a><info:a>')
+      end
+      
+      it "loose_selector" do
+        subject.selector.parse('~<info:a>')
+      end
     end
     
     describe "integration tests" do

data/spec/ldpath_program_spec.rb

@@ -76,7 +76,8 @@ EOF
       subject do
         Ldpath::Program.parse <<-EOF
 @prefix dcterms : <http://purl.org/dc/terms/> ;
-title = fn:concat("a", "b") ;
+ab = fn:concat("a", "b") ;
+title = fn:concat(dcterms:title, dcterms:description) ;
 first_a = fn:first("a", "b") ;
 last_b = fn:last("a", "b") ;
 EOF
@@ -85,15 +86,19 @@ EOF
       let(:object) { RDF::URI.new("info:a") }
       
       let(:graph) do
-        RDF::Graph.new
+        graph = RDF::Graph.new
+        graph << [object, RDF::DC.title, "Hello, world!"]
+        graph << [object, RDF::DC.description, "Description"]
+
+        graph
       end
       
     it "should work" do
       result = subject.evaluate object, graph
-      expect(result["title"]).to match_array "ab"
+      expect(result["ab"]).to match_array "ab"
+      expect(result["title"]).to match_array "Hello, world!Description"
       expect(result["first_a"]).to match_array "a"
       expect(result["last_b"]).to match_array "b"
-      
     end
   end
   
@@ -112,4 +117,79 @@ EOF
       expect(result["title"]).to match_array "Huw Stephens"
     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
+    end
+
+    it "should work" do
+      result = subject.evaluate RDF::URI.new("http://www.bbc.co.uk/programmes/b0081dq5.rdf")
+      expect(result["predicates"]).to include "http://www.w3.org/1999/02/22-rdf-syntax-ns#type", "http://purl.org/ontology/po/pid", "http://purl.org/dc/elements/1.1/title"
+    end
+  end
+
+  describe "tap selector" do
+    let(:object) { RDF::URI.new("info:a") }
+    let(:child) { RDF::URI.new("info:b") }
+    let(:grandchild) { RDF::URI.new("info:c") }
+    
+    let(:graph) do
+      graph = RDF::Graph.new
+      
+      graph << [object, RDF::DC.title, "Object"]
+      graph << [child, RDF::DC.title, "Child"]
+      graph << [object, RDF::DC.hasPart, child]
+
+      graph
+    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 ;
+      EOF
+    end
+
+    it "should work" do
+      result = subject.evaluate object, graph
+      expect(result["child_title_with_tap"]).to eq result["child_title"]
+      expect(result["tap"]).to eq ["http://purl.org/dc/terms/title"]
+    end
+  end
+  
+  describe "loose selector" do
+    let(:object) { RDF::URI.new("info:a") }
+    let(:child) { RDF::URI.new("info:b") }
+    let(:grandchild) { RDF::URI.new("info:c") }
+    
+    let(:graph) do
+      graph = RDF::Graph.new
+      
+      graph << [object, RDF::DC.title, "Object"]
+      graph << [child, RDF::DC.title, "Child"]
+      graph << [object, RDF::DC.hasPart, child]
+
+      graph
+    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 ;
+      EOF
+    end
+
+    it "should work" do
+      result = subject.evaluate object, graph
+      expect(result["title_with_loose"]).to eq result["title"]
+    end
+  end
 end

data/spec/ldpath_transform_spec.rb

@@ -38,6 +38,15 @@ describe Ldpath::Transform do
     subject.apply parser.parse("xyz = (info:a){2,} ;\n")
   end
   
+  it "should transform tap selectors" do
+    subject.apply parser.parse("xyz = ?<x>info:a ;\n")
+  end
+  
+  it "should transform loose property selectors" do
+    subject.apply parser.parse("xyz = ~info:a ;\n")
+  end
+
+
   it "should transform namespaces" do
     subject.apply parser.parse("@prefix foaf: <http://xmlns.com/foaf/0.1/>")
   end

data/spec/spec_helper.rb

@@ -1,2 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'ldpath'
+
+require 'rdf/reasoner'
+
+RDF::Reasoner.apply(:rdfs)
+RDF::Reasoner.apply(:owl)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ldpath
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdf-reasoner
+  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: 
 email:
 - cabeer@stanford.edu
@@ -132,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of LDPath