yaml-ld 0.0.1 → 0.0.2

data/spec/api_spec.rb

@@ -10,12 +10,11 @@ describe YAML_LD::API do
     %i(psych).each do |adapter|
       Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), 'test-files/*-input.*'))) do |filename|
         test = File.basename(filename).sub(/-input\..*$/, '')
-        frame = filename.sub(/-input\..*$/, '-frame.jsonld')
-        framed = filename.sub(/-input\..*$/, '-framed.jsonld')
-        compacted = filename.sub(/-input\..*$/, '-compacted.jsonld')
-        context = filename.sub(/-input\..*$/, '-context.jsonld')
-        expanded = filename.sub(/-input\..*$/, '-expanded.jsonld')
-        expanded_yaml = filename.sub(/-input\..*$/, '-expanded.yamlld')
+        frame = filename.sub(/-input\..*$/, '-frame.yamlld')
+        framed = filename.sub(/-input\..*$/, '-framed.yamlld')
+        compacted = filename.sub(/-input\..*$/, '-compacted.yamlld')
+        context = filename.sub(/-input\..*$/, '-context.yamlld')
+        expanded = filename.sub(/-input\..*$/, '-expanded.yamlld')
         ttl = filename.sub(/-input\..*$/, '-rdf.ttl')
 
         context test do
@@ -27,7 +26,7 @@ describe YAML_LD::API do
             when /.jsonld$/
               @file.define_singleton_method(:content_type) {'application/ld+json'}
             end
-            if context
+            if File.exist?(context)
               @ctx_io = File.open(context)
               case context
               when /\.yamlld$/
@@ -36,9 +35,19 @@ describe YAML_LD::API do
                 @ctx_io.define_singleton_method(:content_type) {'application/ld+json'}
               end
             end
+            if File.exist?(frame)
+              @frame_io = File.open(frame)
+              case frame
+              when /\.yamlld$/
+                @frame_io.define_singleton_method(:content_type) {'application/ld+yaml'}
+              when /.jsonld$/
+                @frame_io.define_singleton_method(:content_type) {'application/ld+json'}
+              end
+            end
             example.run
             @file.close
             @ctx_io.close if @ctx_io
+            @frame_io.close if @frame_io
           end
 
           if File.exist?(expanded)
@@ -47,18 +56,7 @@ describe YAML_LD::API do
               options[:expandContext] = @ctx_io if context
               yaml = described_class.expand(@file, **options)
               expect(yaml).to be_a(String)
-              parsed_json = JSON.parse(File.read(expanded))
-              expect(yaml).to produce_yamlld(parsed_json, logger)
-            end
-          end
-
-          if File.exist?(expanded_yaml)
-            it "expands to YAML" do
-              options = {logger: logger, adapter: adapter}
-              options[:expandContext] = @ctx_io if context
-              yaml = described_class.expand(@file, **options)
-              expect(yaml).to be_a(String)
-              expect(yaml).to produce_yamlld(YAML.load_file(expanded_yaml), logger)
+              expect(yaml).to produce_yamlld(File.read(expanded), logger)
             end
           end
 
@@ -66,19 +64,15 @@ describe YAML_LD::API do
             it "compacts" do
               yaml = described_class.compact(@file, @ctx_io, adapter: adapter, logger: logger)
               expect(yaml).to be_a(String)
-              parsed_json = JSON.parse(File.read(compacted))
-              expect(yaml).to produce_yamlld(parsed_json, logger)
+              expect(yaml).to produce_yamlld(File.read(compacted), logger)
             end
           end
 
           if File.exist?(framed) && File.exist?(frame)
             it "frames" do
-              File.open(frame) do |frame_io|
-                yaml = described_class.frame(@file, frame_io, adapter: adapter, logger: logger)
-                expect(yaml).to be_a(String)
-                parsed_json = JSON.parse(File.read(framed))
-                expect(yaml).to produce_yamlld(parsed_json, logger)
-              end
+              yaml = described_class.frame(@file, @frame_io, adapter: adapter, logger: logger)
+              expect(yaml).to be_a(String)
+              expect(yaml).to produce_yamlld(File.read(framed), logger)
             end
           end
 

data/spec/compact_spec.rb

@@ -328,7 +328,7 @@ describe YAML_LD::API do
           )
         },
       }.each do |title, params|
-        it(title) {run_compact(processingMode: 'json-ld-1.1', **params)}
+        it(title) {run_compact(**params)}
       end
     end
   end

data/spec/expand_spec.rb

@@ -118,7 +118,7 @@ describe JSON::LD::API do
         output: %(
           - http://example.com/p:
             - "@id": http://example.com/Sub1
-        }])
+        )
       },
     }.each_pair do |title, params|
       it(title) {run_expand params}

data/spec/format_spec.rb

@@ -51,4 +51,60 @@ describe YAML_LD::Format do
   describe "#to_uri" do
     specify {expect(described_class.to_uri).to eq RDF::URI('http://www.w3.org/ns/formats/YAML-LD')}
   end
+
+  describe ".cli_commands", skip: Gem.win_platform? do
+    require 'rdf/cli'
+    let(:ttl) {File.expand_path("../test-files/test-1-rdf.ttl", __FILE__)}
+    let(:yaml) {File.expand_path("../test-files/test-1-input.yamlld", __FILE__)}
+    let(:json) {File.expand_path("../test-files/test-1-compacted.jsonld", __FILE__)}
+    let(:context) {File.expand_path("../test-files/test-1-context.jsonld", __FILE__)}
+
+    describe "#expand" do
+      it "expands RDF" do
+        expect {RDF::CLI.exec(["expand", ttl], format: :ttl, output_format: :yamlld)}.to write.to(:output)
+      end
+      it "expands JSON" do
+        expect {RDF::CLI.exec(["expand", json], format: :jsonld, output_format: :yamlld, validate: false)}.to write.to(:output)
+      end
+      it "expands YAML" do
+        expect {RDF::CLI.exec(["expand", yaml], format: :yamlld, output_format: :yamlld, validate: false)}.to write.to(:output)
+      end
+    end
+
+    describe "#compact" do
+      it "compacts RDF" do
+        expect {RDF::CLI.exec(["compact", ttl], context: context, format: :ttl, output_format: :yamlld, validate: false)}.to write.to(:output)
+      end
+      it "compacts JSON" do
+        expect {RDF::CLI.exec(["compact", json], context: context, format: :jsonld, output_format: :yamlld, validate: false)}.to write.to(:output)
+      end
+      it "compacts YAML" do
+        expect {RDF::CLI.exec(["compact", yaml], context: context, format: :yamlld, output_format: :yamlld, validate: false)}.to write.to(:output)
+      end
+    end
+
+    describe "#flatten" do
+      it "flattens RDF" do
+        expect {RDF::CLI.exec(["flatten", ttl], context: context, format: :ttl, output_format: :yamlld, validate: false)}.to write.to(:output)
+      end
+      it "flattens JSON" do
+        expect {RDF::CLI.exec(["flatten", json], context: context, format: :jsonld, output_format: :yamlld, validate: false)}.to write.to(:output)
+      end
+      it "flattens YAML" do
+        expect {RDF::CLI.exec(["flatten", yaml], context: context, format: :yamlld, output_format: :yamlld, validate: false)}.to write.to(:output)
+      end
+    end
+
+    describe "#frame" do
+      it "frames RDF" do
+        expect {RDF::CLI.exec(["frame", ttl], frame: context, format: :ttl, output_format: :yamlld)}.to write.to(:output)
+      end
+      it "frames JSON" do
+        expect {RDF::CLI.exec(["frame", json], frame: context, format: :jsonld, output_format: :yamlld, validate: false)}.to write.to(:output)
+      end
+      it "frames YAML" do
+        expect {RDF::CLI.exec(["frame", yaml], frame: context, format: :yamlld, output_format: :yamlld, validate: false)}.to write.to(:output)
+      end
+    end
+  end
 end

data/spec/frame_spec.rb

@@ -22,12 +22,11 @@ describe YAML_LD::API do
           "@id": ex:Sub2
           "@type": ex:Type2
         ),
-        output: %(---
+        output: %(
           "@context":
             ex: http://example.org/
-          "@graph":
-          - "@id": ex:Sub1
-            "@type": ex:Type1
+          "@id": ex:Sub1
+          "@type": ex:Type1
         )
       },
       "wildcard @type match": {
@@ -76,9 +75,8 @@ describe YAML_LD::API do
         output: %(
           "@context":
             ex: http://example.org/
-          "@graph":
-          - "@id": ex:Sub2
-            ex:p: Bar
+          "@id": ex:Sub2
+          ex:p: Bar
         )
       },
       "multiple matches on @type": {
@@ -136,9 +134,8 @@ describe YAML_LD::API do
         output: %(
           "@context":
             ex: http://example.org/
-          "@graph":
-          - "@id": ex:Sub1
-            "@type": ex:Type1
+          "@id": ex:Sub1
+          "@type": ex:Type1
         )
       },
       "multiple @id match": {
@@ -194,10 +191,9 @@ describe YAML_LD::API do
         output: %(
           "@context":
             ex: http://example.org/
-          "@graph":
-          - "@id": ex:Sub1
-            ex:p:
-            ex:q: bar
+          "@id": ex:Sub1
+          ex:p:
+          ex:q: bar
         )
       },
       "match on any property if @requireAll is false": {
@@ -308,8 +304,7 @@ describe YAML_LD::API do
           familyName: Doe
           givenName: John
           name: John Doe
-        ),
-        processingMode: 'json-ld-1.1'
+        )
       },
       "mixed content": {
         frame: %(
@@ -329,11 +324,10 @@ describe YAML_LD::API do
         output: %(
           "@context":
             ex: http://example.org/
-          "@graph":
-          - "@id": ex:Sub1
-            ex:mixed:
-            - "@id": ex:Sub2
-            - literal1
+          "@id": ex:Sub1
+          ex:mixed:
+          - "@id": ex:Sub2
+          - literal1
         )
       },
       "framed list": {
@@ -365,13 +359,12 @@ describe YAML_LD::API do
             list:
               "@id": ex:list
               "@container": "@list"
-          "@graph":
-          - "@id": ex:Sub1
-            "@type": ex:Type1
-            list:
-            - "@id": ex:Sub2
-              "@type": ex:Element
-            - literal1
+          "@id": ex:Sub1
+          "@type": ex:Type1
+          list:
+          - "@id": ex:Sub2
+            "@type": ex:Element
+          - literal1
         )
       },
       "presentation example": {
@@ -410,12 +403,11 @@ describe YAML_LD::API do
             sameAs:
               "@id": http://www.w3.org/2002/07/owl#sameAs
               "@type": "@id"
-          "@graph":
-          - "@id": http://en.wikipedia.org/wiki/Linked_Data
-            primaryTopic:
-              "@id": http://dbpedia.org/resource/Linked_Data
-              "@type": http://dbpedia.org/class/yago/Buzzwords
-              sameAs: http://rdf.freebase.com/ns/m/02r2kb1
+          "@id": http://en.wikipedia.org/wiki/Linked_Data
+          primaryTopic:
+            "@id": http://dbpedia.org/resource/Linked_Data
+            "@type": http://dbpedia.org/class/yago/Buzzwords
+            sameAs: http://rdf.freebase.com/ns/m/02r2kb1
         )
       },
       "library": {
@@ -455,20 +447,19 @@ describe YAML_LD::API do
             xsd: http://www.w3.org/2001/XMLSchema#
             ex:contains:
               "@type": "@id"
-          "@graph":
-          - "@id": http://example.org/library
-            "@type": ex:Library
-            dc:name: Library
+          "@id": http://example.org/library
+          "@type": ex:Library
+          dc:name: Library
+          ex:contains:
+            "@id": http://example.org/library/the-republic
+            "@type": ex:Book
+            dc:creator: Plato
+            dc:title: The Republic
             ex:contains:
-              "@id": http://example.org/library/the-republic
-              "@type": ex:Book
-              dc:creator: Plato
-              dc:title: The Republic
-              ex:contains:
-                "@id": http://example.org/library/the-republic#introduction
-                "@type": ex:Chapter
-                dc:description: An introductory chapter on The Republic.
-                dc:title: The Introduction
+              "@id": http://example.org/library/the-republic#introduction
+              "@type": ex:Chapter
+              dc:description: An introductory chapter on The Republic.
+              dc:title: The Introduction
         )
       }
     }.each do |title, params|
@@ -502,15 +493,14 @@ describe YAML_LD::API do
           output: %(
             "@context":
               ex: http://example.org/
-            "@graph":
-            - "@id": ex:Sub1
-              "@type": ex:Type1
-              "@reverse":
+            "@id": ex:Sub1
+            "@type": ex:Type1
+            "@reverse":
+              ex:includes:
+                "@id": ex:Sub2
+                "@type": ex:Type2
                 ex:includes:
-                  "@id": ex:Sub2
-                  "@type": ex:Type2
-                  ex:includes:
-                    "@id": ex:Sub1
+                  "@id": ex:Sub1
           )
         },
         "embed matched frames with reversed property": {
@@ -539,14 +529,13 @@ describe YAML_LD::API do
               ex: http://example.org/
               excludes:
                 "@reverse": ex:includes
-            "@graph":
-            - "@id": ex:Sub1
-              "@type": ex:Type1
-              excludes:
-                "@id": ex:Sub2
-                "@type": ex:Type2
-                ex:includes:
-                  "@id": ex:Sub1
+            "@id": ex:Sub1
+            "@type": ex:Type1
+            excludes:
+              "@id": ex:Sub2
+              "@type": ex:Type2
+              ex:includes:
+                "@id": ex:Sub1
           )
         },
       }.each do |title, params|
@@ -558,27 +547,7 @@ describe YAML_LD::API do
 
     context "omitGraph option" do
       {
-        "Defaults to false in 1.0": {
-          input: %(
-            - http://example.org/prop:
-              - "@value": value
-              http://example.org/foo:
-              - "@value": bar
-          ),
-          frame: %(
-            "@context":
-              "@vocab": http://example.org/
-          ),
-          output: %(
-            "@context":
-              "@vocab": http://example.org/
-            "@graph":
-            - foo: bar
-              prop: value
-          ),
-          processingMode: "json-ld-1.0"
-        },
-        "Set with option in 1.0":  {
+        "Defaults to true": {
           input: %(
             - http://example.org/prop:
               - "@value": value
@@ -594,30 +563,9 @@ describe YAML_LD::API do
               "@vocab": http://example.org/
             foo: bar
             prop: value
-          ),
-          processingMode: "json-ld-1.0",
-          omitGraph: true
-        },
-        "Defaults to true in 1.1": {
-          input: %(
-            - http://example.org/prop:
-              - "@value": value
-              http://example.org/foo:
-              - "@value": bar
-          ),
-          frame: %(
-            "@context":
-              "@vocab": http://example.org/
-          ),
-          output: %(
-            "@context":
-              "@vocab": http://example.org/
-            foo: bar
-            prop: value
-          ),
-          processingMode: "json-ld-1.1"
+          )
         },
-        "Set with option in 1.1":  {
+        "Set with option":  {
           input: %(
             - http://example.org/prop:
               - "@value": value
@@ -635,7 +583,6 @@ describe YAML_LD::API do
             - foo: bar
               prop: value
           ),
-          processingMode: "json-ld-1.1",
           omitGraph: false
         },
       }.each do |title, params|
@@ -643,11 +590,9 @@ describe YAML_LD::API do
       end
     end
   end
-
   def do_frame(params)
     begin
       input, frame, output = params[:input], params[:frame], params[:output]
-      params = {processingMode: 'json-ld-1.0'}.merge(params)
       input = StringIO.new(input) if input.is_a?(String)
       frame = StringIO.new(frame) if frame.is_a?(String)
       yld = nil

data/spec/from_rdf_spec.rb

@@ -296,7 +296,7 @@ describe YAML_LD::API do
           },
         }.each do |title, params|
           params[:input] = RDF::Graph.new << RDF::Turtle::Reader.new(params[:input])
-          it(title) {do_fromRdf(processingMode: "json-ld-1.1", **params)}
+          it(title) {do_fromRdf(**params)}
         end
       end
     end
@@ -442,7 +442,7 @@ describe YAML_LD::API do
           }
         }.each_pair do |name, params|
           it name do
-            do_fromRdf(params.merge(reader: RDF::Turtle::Reader, rdfDirection: 'i18n-datatype', processingMode: 'json-ld-1.1'))
+            do_fromRdf(params.merge(reader: RDF::Turtle::Reader, rdfDirection: 'i18n-datatype'))
           end
         end
       end
@@ -505,7 +505,7 @@ describe YAML_LD::API do
           }
         }.each_pair do |name, params|
           it name do
-            do_fromRdf(params.merge(reader: RDF::Turtle::Reader, rdfDirection: 'compound-literal', processingMode: 'json-ld-1.1'))
+            do_fromRdf(params.merge(reader: RDF::Turtle::Reader, rdfDirection: 'compound-literal'))
           end
         end
       end

data/spec/matchers.rb

@@ -3,8 +3,8 @@ require_relative 'support/extensions'
 
 RSpec::Matchers.define :produce_yamlld do |expected, logger|
   match do |actual|
-    actual = Psych.load(actual, aliases: true) if actual.is_a?(String)
-    expected = Psych.load(expected, aliases: true) if expected.is_a?(String)
+    actual = YAML_LD::Representation.load(actual, aliases: true) if actual.is_a?(String)
+    expected = YAML_LD::Representation.load(expected, aliases: true) if expected.is_a?(String)
     expect(actual).to be_equivalent_structure expected
   end
 

data/spec/reader_spec.rb

@@ -58,7 +58,7 @@ describe YAML_LD::Reader do
           http://example.com/bob/
         "foaf:name":
           Bob
-      }),
+      ),
       leading_comment: %q(---
         # A comment before content
         "@context":

data/spec/representation_spec.rb

@@ -0,0 +1,170 @@
+# coding: utf-8
+require_relative 'spec_helper'
+
+describe YAML_LD::Representation do
+  describe "load_stream" do
+    {
+      "Stream": {
+        input: %(
+          ---
+          a
+          ...
+          ---
+          b
+          ...
+        ),
+        expected: %w(a b)
+      },
+      "String": {
+        input: %(a),
+        expected: %w(a)
+      },
+    }.each do |name, params|
+      it name do
+        input = params[:input]
+        ir = YAML_LD::Representation.load_stream(input.unindent.strip)
+        expected = params[:expected]
+        expect(ir).to be_equivalent_structure expected
+      end
+    end
+  end
+
+  describe "load" do
+    {
+      "Stream": {
+        input: %(
+          ---
+          a
+          ...
+          ---
+          b
+          ...
+        ),
+        expected: "a"
+      },
+      "Null": {
+        input: %(null),
+        expected: nil
+      },
+      "!!null null": {
+        input: %(!!null null),
+        expected: nil
+      },
+      "!<tag:yaml.org,2002:null> null": {
+        input: %(!<tag:yaml.org,2002:null> null),
+        expected: nil
+      },
+      "Boolean": {
+        input: %(true),
+        expected: true
+      },
+      "!!bool true": {
+        input: %(!!bool true),
+        expected: true
+      },
+      "!<tag:yaml.org,2002:bool> true": {
+        input: %(!<tag:yaml.org,2002:bool> true),
+        expected: true
+      },
+      "String": {
+        input: %(a),
+        expected: "a"
+      },
+      "Tagged !!str String": {
+        input: %(!!str string),
+        expected: "string"
+      },
+      "Tagged !<tag:yaml.org,2002:str> String": {
+        input: %(!<tag:yaml.org,2002:str> string),
+        expected: "string"
+      },
+      "Integer": {
+        input: %(1),
+        expected: 1
+      },
+      "Tagged !!int 1": {
+        input: %(!!int 1),
+        expected: 1
+      },
+      "Tagged !<tag:yaml.org,2002:int> 1": {
+        input: %(!<tag:yaml.org,2002:int> 1),
+        expected: 1
+      },
+      "Float": {
+        input: %(1.0),
+        expected: Float(1.0)
+      },
+      "Tagged !!float -1": {
+        input: %(!!float -1),
+        expected: Float(-1)
+      },
+      "Tagged !<tag:yaml.org,2002:float> 2.3e4": {
+        input: %(!<tag:yaml.org,2002:float> 2.3e4),
+        expected: Float(2.3e4)
+      },
+      "Tagged !<tag:yaml.org,2002:float> .inf": {
+        input: %(!<tag:yaml.org,2002:float> .inf),
+        expected: Float::INFINITY
+      },
+    }.each do |name, params|
+      it name do
+        input = params[:input]
+        ir = YAML_LD::Representation.load(input.unindent.strip)
+        expected = params[:expected]
+        expect(ir).to be_equivalent_structure expected
+      end
+    end
+
+    {
+      "!<http://www.w3.org/2001/XMLSchema%23integer> 123": {
+        input: %(!<http://www.w3.org/2001/XMLSchema%23integer> 123),
+        xsd: RDF::Literal("123", datatype: "http://www.w3.org/2001/XMLSchema#integer"),
+        plain: 123
+      },
+      "!<http://www.w3.org/2001/XMLSchema%23decimal> 123.456": {
+        input: %(!<http://www.w3.org/2001/XMLSchema%23decimal> 123.456),
+        xsd: RDF::Literal("123.456", datatype: "http://www.w3.org/2001/XMLSchema#decimal"),
+        plain: 123.456
+      },
+      "!<http://www.w3.org/2001/XMLSchema%23double> 123.456e78": {
+        input: %(!<http://www.w3.org/2001/XMLSchema%23double> 123.456e+78),
+        xsd: RDF::Literal("123.456e+78", datatype: "http://www.w3.org/2001/XMLSchema#double"),
+        plain: 123.456e+78
+      },
+      "!<http://www.w3.org/2001/XMLSchema%23boolean> true": {
+        input: %(!<http://www.w3.org/2001/XMLSchema%23boolean> true),
+        xsd: RDF::Literal("true", datatype: "http://www.w3.org/2001/XMLSchema#boolean"),
+        plain: true
+      },
+      "!<http://www.w3.org/2001/XMLSchema%23date> 2022-08-17": {
+        input: %(!<http://www.w3.org/2001/XMLSchema%23date> "2022-08-17"),
+        xsd: RDF::Literal("2022-08-17", datatype: "http://www.w3.org/2001/XMLSchema#date"),
+        plain: "2022-08-17"
+      },
+      "!<http://www.w3.org/2001/XMLSchema%23time> 12:00:00.000": {
+        input: %(!<http://www.w3.org/2001/XMLSchema%23time> "12:00:00.000"),
+        xsd: RDF::Literal("12:00:00.000", datatype: "http://www.w3.org/2001/XMLSchema#time"),
+        plain: "12:00:00.000"
+      },
+      "!<http://www.w3.org/2001/XMLSchema%23dateTime> 2022-08-17T12:00:00.000": {
+        input: %(!<http://www.w3.org/2001/XMLSchema%23dateTime> "2022-08-17T12:00:00.000"),
+        xsd: RDF::Literal("2022-08-17T12:00:00.000", datatype: "http://www.w3.org/2001/XMLSchema#dateTime"),
+        plain: "2022-08-17T12:00:00.000"
+      },
+    }.each do |name, params|
+      it "#{name} with xsd" do
+        input = params[:input]
+        ir = YAML_LD::Representation.load(input.unindent.strip, extendedYAML: true)
+        expected = params[:xsd]
+        expect(ir).to be_equivalent_structure expected
+      end
+
+      it "#{name} without xsd" do
+        input = params[:input]
+        ir = YAML_LD::Representation.load(input.unindent.strip, extendedYAML: false)
+        expected = params[:plain]
+        expect(ir).to be_equivalent_structure expected
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'rdf/vocab'
 require 'rdf/spec'
 require 'rdf/spec/matchers'
 require_relative 'matchers'
+require_relative '../lib/psych/amazing_print'
 require 'yaml'
 begin
   require 'simplecov'