ldpath 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4ca1397937e56ffe65839c30b5e9635e1d3b8ea
-  data.tar.gz: 49ef72928a26735e3ad93d896eca7ee509d7a276
+  metadata.gz: 901eaf079202867fe88880b4e6297361dcd4574a
+  data.tar.gz: 9d80b28a1555f00f2400d84bb4573733cc1158c3
 SHA512:
-  metadata.gz: ee4f3b539e710feeb3fd461172feffede298fd771c78f7d025744d0dbb98b10c8300dfc71ada2dfb9cbbc7e84e71c55553faf28fef3f7404da1752a055e5e7dd
-  data.tar.gz: 344ce5f8a2827ada956c5f1ab19c5ed675fcb6ead743f9fb0f53d567ff32ed185c649227d44187f2d00ff3a500d21e8f9ebbafd3e7adc78d1ba4ecc989cc1539
+  metadata.gz: d110b7f52841afd8dec645ce426a117692ae0a7c64f90585196b481c80765472ad7d148fc132da7e79fcb25a373783007a3d8a23a252c883606ba293a5c4b8db
+  data.tar.gz: b2fd98589dfd3dceec73c5eac70eba71696647878d54f6acd437707f3427b6cc28361b88b0e94d20325738aac2f08c65e9958f4e03a1afdfefd02a58b1da6a20

data/lib/ldpath/functions.rb

@@ -71,16 +71,21 @@ module Ldpath
     end
 
     def get(uri, context, list, idx)
-      flatten(uri, context, list)[idx.to_i]
+      idx = idx.respond_to?(:to_i) ? idx.to_i : idx.to_s.to_i
+
+      flatten(uri, context, list)[idx]
     end
 
     def subList(uri, context, list, idx_start, idx_end = nil)
       arr = flatten(uri, context, list)
 
+      idx_start = idx_start.respond_to?(:to_i) ? idx_start.to_i : idx_start.to_s.to_i
+      idx_end &&= idx_end.respond_to?(:to_i) ? idx_end.to_i : idx_end.to_s.to_i
+
       if idx_end
-        arr[(idx_start.to_i..(idx_end.to_i - idx_start.to_i))]
+        arr[(idx_start.to_i..(idx_end - idx_start))]
       else
-        arr.drop(idx_start.to_i)
+        arr.drop(idx_start)
       end
     end
 
@@ -180,7 +185,7 @@ module Ldpath
     def xpath(uri, context, xpath, node)
       x = Array(xpath).flatten.first
       Array(node).flatten.compact.map do |n|
-        Nokogiri::XML(n).xpath(x, prefixes.map { |k, v| [k, v.to_s] }).map(&:text)
+        Nokogiri::XML(n.to_s).xpath(x.to_s, prefixes.map { |k, v| [k, v.to_s] }).map(&:text)
       end
     end
   end

data/lib/ldpath/parser.rb

@@ -27,36 +27,36 @@ module Ldpath
     rule(:single_line_comment) { str("#") >> (eol.absent? >> any).repeat }
 
     # simple types
-    rule(:integer) { match("[+-]").maybe >> match("\\d+") }
-    rule(:decimal) { match("[+-]").maybe >> match("\\d*") >> str(".") >> match("\\d+") }
+    rule(:integer) { match("[+-]").maybe >> match("\\d").repeat(1) }
+    rule(:decimal) { match("[+-]").maybe >> match("\\d").repeat >> str(".") >> match("\\d").repeat(1) }
     rule(:double) do
       match("[+-]").maybe >> (
-        (match("\\d+") >> str('.') >> match("\\d*") >> exponent) |
-        (str('.') >> match("\\d+") >> exponent) |
-        (match("\\d+") >> exponent)
+        (match("\\d").repeat(1) >> str('.') >> match("\\d").repeat >> exponent) |
+        (str('.') >> match("\\d").repeat(1) >> exponent) |
+        (match("\\d").repeat(1) >> exponent)
       )
     end
 
-    rule(:exponent) { match('[Ee]') >> match("[+-]").maybe >> match("\\d+") }
-    rule(:numeric_literal) { integer | decimal | double }
-    rule(:boolean_literal) { str('true') | str('false') }
+    rule(:exponent) { match('[Ee]') >> match("[+-]").maybe >> match("\\d").repeat(1) }
+    rule(:numeric_literal) { integer.as(:integer) | decimal.as(:decimal) | double.as(:double) }
+    rule(:boolean_literal) { str('true').as(:true) | str('false').as(:false) }
 
     rule(:string) { string_literal_quote | string_literal_single_quote | string_literal_long_single_quote | string_literal_long_quote }
 
     rule(:string_literal_quote) do
-      str('"') >> (match("[^\\\"\\\\\\r\\n]") | echar | uchar).repeat.as(:literal) >> str('"')
+      str('"') >> (match("[^\\\"\\\\\\r\\n]") | echar | uchar).repeat.as(:string) >> str('"')
     end
 
     rule(:string_literal_single_quote) do
-      str("'") >> (match("[^'\\\\\\r\\n]") | echar | uchar).repeat.as(:literal) >> str("'")
+      str("'") >> (match("[^'\\\\\\r\\n]") | echar | uchar).repeat.as(:string) >> str("'")
     end
 
     rule(:string_literal_long_quote) do
-      str('"""') >> (str('"""').absent? >> match("[^\\\\]") | echar | uchar).repeat.as(:literal) >> str('"""')
+      str('"""') >> (str('"""').absent? >> match("[^\\\\]") | echar | uchar).repeat.as(:string) >> str('"""')
     end
 
     rule(:string_literal_long_single_quote) do
-      str("'''") >> (str("'''").absent? >> match("[^\\\\]") | echar | uchar).repeat.as(:literal) >> str("'''")
+      str("'''") >> (str("'''").absent? >> match("[^\\\\]") | echar | uchar).repeat.as(:string) >> str("'''")
     end
 
     # operators
@@ -126,16 +126,22 @@ module Ldpath
 
     # "xyz"; 0.123e52; true
     rule(:literal) do
-      rdf_literal | numeric_literal | boolean_literal
+      (
+        rdf_literal |
+          numeric_literal |
+          boolean_literal
+      ).as(:literal)
     end
 
     # "xyz"; "xyz"^^a; "xyz"@en
     rule(:rdf_literal) do
-      string >> (literal_language_test | literal_type_test).maybe
+      string >> lang >> identifier.as(:lang) |
+        string >> type >> iri.as(:type) |
+        string
     end
 
     rule(:node) do
-      iri.as(:iri) | literal.as(:literal)
+      iri | literal
     end
 
     # @prefix id = iri ;
@@ -252,7 +258,7 @@ module Ldpath
         loose_property_selector |
         wildcard_selector |
         reverse_property_selector |
-        string_constant_selector |
+        literal_selector |
         recursive_path_selector |
         grouped_selector |
         tap_selector
@@ -316,8 +322,8 @@ module Ldpath
       inverse.as(:reverse) >> iri.as(:property)
     end
 
-    rule(:string_constant_selector) do
-      string
+    rule(:literal_selector) do
+      literal.as(:literal)
     end
 
     # (x)?; (x)*; (x)+; (x){3,5}

data/lib/ldpath/transform.rb

@@ -29,7 +29,23 @@ module Ldpath
     end
 
     # Core types
-    rule(literal: simple(:literal)) { literal.to_s }
+    rule(true: simple(:true)) { true }
+    rule(false: simple(:false)) { false }
+    rule(integer: simple(:integer)) { integer.to_i }
+    rule(double: simple(:double)) { double.to_f }
+    rule(decimal: simple(:decimal)) { decimal.to_f }
+    rule(string: simple(:string), lang: simple(:lang)) { RDF::Literal.new(string, language: lang) }
+    rule(string: simple(:string), type: simple(:type)) { RDF::Literal.new(string, datatype: RDF::URI.new(type)) }
+    rule(string: simple(:string)) { string }
+    rule(literal: simple(:literal)) do
+      case literal
+      when RDF::Literal
+        literal
+      else
+        RDF::Literal(literal)
+      end
+    end
+
     rule(iri: simple(:iri)) { RDF::IRI.new(iri) }
 
     # Namespaces

data/lib/ldpath/version.rb

@@ -1,3 +1,3 @@
 module Ldpath
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/ldpath_parser_spec.rb

@@ -154,7 +154,11 @@ describe Ldpath::Parser do
       end
 
       it "may be a numeric literal" do
-        subject.node.parse '0'
+        subject.node.parse '123'
+      end
+
+      it "may be a decimal literal" do
+        subject.decimal.parse '0.123'
       end
 
       it "may be a boolean literal" do

data/spec/ldpath_transform_spec.rb

@@ -2,13 +2,42 @@ require 'spec_helper'
 require 'pp'
 describe Ldpath::Transform do
   let(:parser) { Ldpath::Parser.new }
-  it "should transform literals" do
-    subject.apply(literal: "xyz")
-  end
+  describe "transforms nodes" do
+    let(:parser) { Ldpath::Parser.new.node }
+    it "handles iris" do
+      actual = subject.apply parser.parse("<info:a>")
+      expect(actual).to eq RDF::URI.new("info:a")
+    end
+
+    it "handles strings" do
+      actual = subject.apply parser.parse('"xyz"')
+      expect(actual).to eq RDF::Literal.new("xyz")
+    end
 
-  it "should transform uris" do
-    actual = subject.apply(iri: "info:a")
-    expect(actual).to eq RDF::URI.new("info:a")
+    it "handles langstrings" do
+      actual = subject.apply parser.parse('"xyz"@fr')
+      expect(actual).to eq RDF::Literal.new("xyz", language: 'fr')
+    end
+
+    it "handles typed literals" do
+      actual = subject.apply parser.parse('"xyz"^^info:x')
+      expect(actual).to eq RDF::Literal.new("xyz", datatype: RDF::URI.new("info:x"))
+    end
+
+    it "handles integers" do
+      actual = subject.apply parser.parse("0")
+      expect(actual).to eq RDF::Literal.new(0)
+    end
+
+    it "handles decimals" do
+      actual = subject.apply parser.parse("0.01")
+      expect(actual).to eq RDF::Literal.new(0.01)
+    end
+
+    it "handles doubles" do
+      actual = subject.apply parser.parse("1e-5")
+      expect(actual).to eq RDF::Literal.new(0.00001)
+    end
   end
 
   it "should transform prefix + localNames" do

data/spec/lib/functions/list_spec.rb

@@ -32,7 +32,7 @@ describe "LDPath list functions" do
     let(:program) do
       Ldpath::Program.parse <<-EOF
         @prefix ex : <http://example.com/> ;
-        list_item = fn:get(ex:list, "1") :: xsd:string ;
+        list_item = fn:get(ex:list, 1) :: xsd:string ;
       EOF
     end
 
@@ -45,8 +45,8 @@ describe "LDPath list functions" do
     let(:program) do
       Ldpath::Program.parse <<-EOF
         @prefix ex : <http://example.com/> ;
-        list_items = fn:subList(ex:list, "1") :: xsd:string ;
-        list_items_by_range = fn:subList(ex:list, "0", "1") :: xsd:string ;
+        list_items = fn:subList(ex:list, 1) :: xsd:string ;
+        list_items_by_range = fn:subList(ex:list, 0, 1) :: xsd:string ;
       EOF
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ldpath
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Beer