json-ld 1.99.2 → 2.0.0.beta1

data/spec/expand_spec.rb

@@ -3,7 +3,7 @@ $:.unshift "."
 require 'spec_helper'
 
 describe JSON::LD::API do
-  before(:each) { @debug = []}
+  let(:logger) {RDF::Spec.logger}
 
   describe ".expand" do
     {
@@ -67,8 +67,8 @@ describe JSON::LD::API do
       }
     }.each_pair do |title, params|
       it title do
-        jld = JSON::LD::API.expand(params[:input], debug: @debug)
-        expect(jld).to produce(params[:output], @debug)
+        jld = JSON::LD::API.expand(params[:input], logger: logger)
+        expect(jld).to produce(params[:output], logger)
       end
     end
 
@@ -114,8 +114,8 @@ describe JSON::LD::API do
         },
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], base: "http://example.org/", debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], base: "http://example.org/", logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -173,8 +173,8 @@ describe JSON::LD::API do
         },
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -228,8 +228,8 @@ describe JSON::LD::API do
         },
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -256,8 +256,8 @@ describe JSON::LD::API do
         },
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -300,8 +300,8 @@ describe JSON::LD::API do
         }
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -328,8 +328,8 @@ describe JSON::LD::API do
         },
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -396,8 +396,8 @@ describe JSON::LD::API do
         it title do
           jld = JSON::LD::API.expand(params[:input],
             base: "http://foo/bar/",
-            debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+            logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -451,8 +451,8 @@ describe JSON::LD::API do
         ]}
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], debug: @debug, base: 'http://example/')
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], logger: logger, base: 'http://example/')
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -530,8 +530,8 @@ describe JSON::LD::API do
         }
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -583,8 +583,8 @@ describe JSON::LD::API do
         },
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -651,8 +651,8 @@ describe JSON::LD::API do
         }
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -748,8 +748,8 @@ describe JSON::LD::API do
         },
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -783,8 +783,8 @@ describe JSON::LD::API do
         },
       }.each do |title, params|
         it title do
-          jld = JSON::LD::API.expand(params[:input], debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.expand(params[:input], logger: logger)
+          expect(jld).to produce(params[:output], logger)
         end
       end
     end
@@ -848,7 +848,7 @@ describe JSON::LD::API do
         }
       }.each do |title, params|
         it title do
-          #JSON::LD::API.expand(params[:input], debug: @debug).should produce([], @debug)
+          #JSON::LD::API.expand(params[:input], logger: logger).should produce([], logger)
           expect {JSON::LD::API.expand(params[:input])}.to raise_error(params[:exception])
         end
       end

data/spec/flatten_spec.rb

@@ -3,7 +3,7 @@ $:.unshift "."
 require 'spec_helper'
 
 describe JSON::LD::API do
-  before(:each) { @debug = []}
+  let(:logger) {RDF::Spec.logger}
 
   describe ".flatten" do
     {
@@ -213,9 +213,8 @@ describe JSON::LD::API do
       }
     }.each do |title, params|
       it title do
-        @debug = []
-        jld = JSON::LD::API.flatten(params[:input], nil, (params[:options] || {}).merge(debug: @debug)) 
-        expect(jld).to produce(params[:output], @debug)
+        jld = JSON::LD::API.flatten(params[:input], nil, (params[:options] || {}).merge(logger: logger)) 
+        expect(jld).to produce(params[:output], logger)
       end
     end
   end

data/spec/format_spec.rb

@@ -66,4 +66,47 @@ describe JSON::LD::Format do
       end
     end
   end
+
+  describe ".cli_commands" do
+    require 'rdf/cli'
+    let(:ttl) {File.expand_path("../test-files/test-1-rdf.ttl", __FILE__)}
+    let(:json) {File.expand_path("../test-files/test-1-input.json", __FILE__)}
+    let(:context) {File.expand_path("../test-files/test-1-context.json", __FILE__)}
+
+    describe "#expand" do
+      it "expands RDF" do
+        expect {RDF::CLI.exec_command("expand", [ttl], format: :ttl)}.to write.to(:output)
+      end
+      it "expands JSON" do
+        expect {RDF::CLI.exec_command("expand", [json], format: :jsonld)}.to write.to(:output)
+      end
+    end
+
+    describe "#compact" do
+      it "compacts RDF" do
+        expect {RDF::CLI.exec_command("compact", [ttl], context: context, format: :ttl)}.to write.to(:output)
+      end
+      it "compacts JSON" do
+        expect {RDF::CLI.exec_command("compact", [json], context: context, format: :jsonld)}.to write.to(:output)
+      end
+    end
+
+    describe "#flatten" do
+      it "flattens RDF" do
+        expect {RDF::CLI.exec_command("flatten", [ttl], context: context, format: :ttl)}.to write.to(:output)
+      end
+      it "flattens JSON" do
+        expect {RDF::CLI.exec_command("flatten", [json], context: context, format: :jsonld)}.to write.to(:output)
+      end
+    end
+
+    describe "#frame" do
+      it "frames RDF" do
+        expect {RDF::CLI.exec_command("frame", [ttl], frame: context, format: :ttl)}.to write.to(:output)
+      end
+      it "frames JSON" do
+        expect {RDF::CLI.exec_command("frame", [json], frame: context, format: :jsonld)}.to write.to(:output)
+      end
+    end
+  end
 end

data/spec/frame_spec.rb

@@ -3,7 +3,7 @@ $:.unshift "."
 require 'spec_helper'
 
 describe JSON::LD::API do
-  before(:each) { @debug = []}
+  let(:logger) {RDF::Spec.logger}
 
   describe ".frame" do
     {
@@ -501,13 +501,12 @@ describe JSON::LD::API do
       }
     }.each do |title, params|
       it title do
-        @debug = []
         begin
-          jld = JSON::LD::API.frame(params[:input], params[:frame], debug: @debug)
-          expect(jld).to produce(params[:output], @debug)
+          jld = JSON::LD::API.frame(params[:input], params[:frame], logger: logger)
+          expect(jld).to produce(params[:output], logger)
         rescue JSON::LD::JsonLdError, JSON::LD::JsonLdError, JSON::LD::InvalidFrame => e
           fail("#{e.class}: #{e.message}\n" +
-            "#{@debug.join("\n")}\n" +
+            "#{logger}\n" +
             "Backtrace:\n#{e.backtrace.join("\n")}")
         end
       end
@@ -553,13 +552,12 @@ describe JSON::LD::API do
         },
       }.each do |title, params|
         it title do
-          @debug = []
           begin
-            jld = JSON::LD::API.frame(params[:input], params[:frame], debug: @debug)
-            expect(jld).to produce(params[:output], @debug)
+            jld = JSON::LD::API.frame(params[:input], params[:frame], logger: logger)
+            expect(jld).to produce(params[:output], logger)
           rescue JSON::LD::JsonLdError, JSON::LD::JsonLdError, JSON::LD::InvalidFrame => e
             fail("#{e.class}: #{e.message}\n" +
-              "#{@debug.join("\n")}\n" +
+              "#{logger}\n" +
               "Backtrace:\n#{e.backtrace.join("\n")}")
           end
         end

data/spec/from_rdf_spec.rb

@@ -4,6 +4,8 @@ require 'spec_helper'
 require 'rdf/spec/writer'
 
 describe JSON::LD::API do
+  let(:logger) {RDF::Spec.logger}
+
   describe ".fromRdf" do
     context "simple tests" do
       it "One subject IRI object" do
@@ -13,7 +15,7 @@ describe JSON::LD::API do
           '@id'         => "http://a/b",
           "http://a/c"  => [{"@id" => "http://a/d"}]
         }
-        ], @debug)
+        ], logger)
       end
 
       it "should generate object list" do
@@ -26,7 +28,7 @@ describe JSON::LD::API do
             {"@id" => "http://example.com/e"}
           ]
         }
-        ], @debug)
+        ], logger)
       end
     
       it "should generate property list" do
@@ -37,7 +39,7 @@ describe JSON::LD::API do
           "http://example.com/c"      => [{"@id" => "http://example.com/d"}],
           "http://example.com/e"      => [{"@id" => "http://example.com/f"}]
         }
-        ], @debug)
+        ], logger)
       end
     
       it "serializes multiple subjects" do
@@ -51,7 +53,7 @@ describe JSON::LD::API do
         to produce([
           {'@id'  => "test-cases/0001", '@type' => ["http://www.w3.org/2006/03/test-description#TestCase"]},
           {'@id'  => "test-cases/0002", '@type' => ["http://www.w3.org/2006/03/test-description#TestCase"]},
-        ], @debug)
+        ], logger)
       end
     end
   
@@ -64,7 +66,7 @@ describe JSON::LD::API do
               '@id'   => "http://example.com/a",
               "http://example.com/b"    => [{"@value" => "foo", "@type" => "http://example.com/d"}]
             }
-          ], @debug)
+          ], logger)
         end
 
         it "integer" do
@@ -72,7 +74,7 @@ describe JSON::LD::API do
           expect(serialize(input, useNativeTypes: true)).to produce([{
             '@id'   => "http://example.com/a",
             "http://example.com/b"    => [{"@value" => 1}]
-          }], @debug)
+          }], logger)
         end
 
         it "integer (non-native)" do
@@ -80,7 +82,7 @@ describe JSON::LD::API do
           expect(serialize(input, useNativeTypes: false)).to produce([{
             '@id'   => "http://example.com/a",
             "http://example.com/b"    => [{"@value" => "1","@type" => "http://www.w3.org/2001/XMLSchema#integer"}]
-          }], @debug)
+          }], logger)
         end
 
         it "boolean" do
@@ -88,7 +90,7 @@ describe JSON::LD::API do
           expect(serialize(input, useNativeTypes: true)).to produce([{
             '@id'   => "http://example.com/a",
             "http://example.com/b"    => [{"@value" => true}]
-          }], @debug)
+          }], logger)
         end
 
         it "boolean (non-native)" do
@@ -96,7 +98,7 @@ describe JSON::LD::API do
           expect(serialize(input, useNativeTypes: false)).to produce([{
             '@id'   => "http://example.com/a",
             "http://example.com/b"    => [{"@value" => "true","@type" => "http://www.w3.org/2001/XMLSchema#boolean"}]
-          }], @debug)
+          }], logger)
         end
 
         it "decmal" do
@@ -104,7 +106,7 @@ describe JSON::LD::API do
           expect(serialize(input, useNativeTypes: true)).to produce([{
             '@id'   => "http://example.com/a",
             "http://example.com/b"    => [{"@value" => "1.0", "@type" => "http://www.w3.org/2001/XMLSchema#decimal"}]
-          }], @debug)
+          }], logger)
         end
 
         it "double" do
@@ -112,7 +114,7 @@ describe JSON::LD::API do
           expect(serialize(input, useNativeTypes: true)).to produce([{
             '@id'   => "http://example.com/a",
             "http://example.com/b"    => [{"@value" => 1.0E0}]
-          }], @debug)
+          }], logger)
         end
 
         it "double (non-native)" do
@@ -120,7 +122,7 @@ describe JSON::LD::API do
           expect(serialize(input, useNativeTypes: false)).to produce([{
             '@id'   => "http://example.com/a",
             "http://example.com/b"    => [{"@value" => "1.0E0","@type" => "http://www.w3.org/2001/XMLSchema#double"}]
-          }], @debug)
+          }], logger)
         end
       end
 
@@ -142,7 +144,7 @@ describe JSON::LD::API do
             expect(serialize(input, useNativeTypes: false)).to produce([{
               '@id'   => "http://example.com/a",
               "http://example.com/b"    => [{"@value" => "#{v}","@type" => "http://www.w3.org/2001/XMLSchema##{t}"}]
-            }], @debug)
+            }], logger)
           end
         end
       end
@@ -152,7 +154,7 @@ describe JSON::LD::API do
         expect(serialize(input)).to produce([{
           '@id'   => "http://example.com/a",
           "http://example.com/b"    => [{"@value" => "foo", "@language" => "en-us"}]
-        }], @debug)
+        }], logger)
       end
     end
 
@@ -164,7 +166,7 @@ describe JSON::LD::API do
           "@id" => "_:a",
           "http://example.com/a"  => [{"@id" => "http://example.com/b"}]
         }
-        ], @debug)
+        ], logger)
       end
     
       it "should generate anon as object" do
@@ -178,7 +180,7 @@ describe JSON::LD::API do
             "@id" => "http://example.com/a",
             "http://example.com/b"  => [{"@id" => "_:a"}]
           }
-        ], @debug)
+        ], logger)
       end
     end
 
@@ -274,7 +276,7 @@ describe JSON::LD::API do
       }.each do |name, (input, output, reader)|
         it name do
           r = serialize(input, reader: reader)
-          expect(r).to produce(output, @debug)
+          expect(r).to produce(output, logger)
         end
       end
     end
@@ -368,7 +370,7 @@ describe JSON::LD::API do
       }.each_pair do |name, properties|
         it name do
           r = serialize(properties[:input], reader: RDF::NQuads::Reader)
-          expect(r).to produce(properties[:output], @debug)
+          expect(r).to produce(properties[:output], logger)
         end
       end
     end
@@ -391,7 +393,7 @@ describe JSON::LD::API do
         ],
       }.each do |t, (input, output)|
         it "#{t}" do
-          expect(serialize(input)).to produce(output, @debug)
+          expect(serialize(input)).to produce(output, logger)
         end
       end
     end
@@ -399,16 +401,15 @@ describe JSON::LD::API do
 
   def parse(input, options = {})
     reader = options[:reader] || RDF::TriG::Reader
-    RDF::Repository.new << reader.new(input, options)
+    reader.new(input, options, &:each_statement).to_a.extend(RDF::Enumerable)
   end
 
   # Serialize ntstr to a string and compare against regexps
   def serialize(ntstr, options = {})
-    @debug = []
-    @debug << ntstr if ntstr.is_a?(String)
+    logger.info ntstr if ntstr.is_a?(String)
     g = ntstr.is_a?(String) ? parse(ntstr, options) : ntstr
-    @debug << g.dump(:trig)
+    logger.info g.dump(:trig)
     statements = g.each_statement.to_a
-    JSON::LD::API.fromRdf(statements, options.merge(debug: @debug))
+    JSON::LD::API.fromRdf(statements, options.merge(logger: logger))
   end
 end