Finish 1.1.2

gkellogg · gkellogg · commit 6f1a406ef484 · 2014-04-07T15:27:15.000-07:00
diff --git a/.gemspec b/.gemspec
@@ -27,16 +27,16 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.2'
   gem.requirements          = []
-  gem.add_runtime_dependency     'rdf',             '>= 1.0.8'
-  gem.add_development_dependency 'equivalent-xml' , '>= 0.2.8'
-  gem.add_development_dependency 'open-uri-cached', '>= 0.0.5'
-  gem.add_development_dependency 'yard' ,           '>= 0.8.3'
-  gem.add_development_dependency 'rspec',           '>= 2.12.0'
-  gem.add_development_dependency 'rdf-spec',        '>= 1.0'
-  gem.add_development_dependency 'rdf-turtle',      '>= 1.0.7'
-  gem.add_development_dependency 'rdf-trig',        '>= 1.0.1'
-  gem.add_development_dependency 'rdf-isomorphic'
-  gem.add_development_dependency 'rdf-xsd'
+  gem.add_runtime_dependency     'rdf',             '~> 1.1'
+  gem.add_development_dependency 'equivalent-xml' , '~> 0.4'
+  gem.add_development_dependency 'open-uri-cached', '~> 0.0', '>= 0.0.5'
+  gem.add_development_dependency 'yard' ,           '~> 0.8'
+  gem.add_development_dependency 'rspec',           '~> 2.14'
+  gem.add_development_dependency 'rdf-spec',        '~> 1.1'
+  gem.add_development_dependency 'rdf-turtle',      '~> 1.1'
+  gem.add_development_dependency 'rdf-trig',        '~> 1.1'
+  gem.add_development_dependency 'rdf-isomorphic',  '~> 1.1'
+  gem.add_development_dependency 'rdf-xsd',         '~> 1.1'
 
   gem.post_install_message  = nil
 end
diff --git a/README.md b/README.md
@@ -216,6 +216,8 @@ Install with `gem install json-ld`
 
 `RDF::GRAPH#dump` can also take a `:context` option to use a separately defined context
 
+As JSON-LD may come from many different sources, included as an embedded script tag within an HTML document, the RDF Reader will strip input before the leading `{` or `[` and after the trailing `}` or `]`.
+
 ## Documentation
 Full documentation available on [RubyDoc](http://rubydoc.info/gems/json-ld/file/README.md)
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.1
+1.1.2
diff --git a/bin/jsonld b/bin/jsonld
@@ -116,7 +116,7 @@ opts.each do |opt, arg|
   when '--dbg'          then parser_options[:debug] = ::JSON::LD::debug = true
   when '--compact'      then options[:compact] = true
   when '--context'      then options[:context] = arg
-  when '--execute'      then input = arg
+  when '--evaluate'     then input = arg
   when '--expand'       then options[:expand] = true
   when '--format'       then options[:output_format] = arg.to_sym
   when '--flatten'      then options[:flatten] = arg
diff --git a/etc/doap.jsonld b/etc/doap.jsonld
@@ -28,7 +28,7 @@
     "doap:homepage":      "http://github.com/ruby-rdf/json-ld/",
     "doap:license":       "http://creativecommons.org/licenses/publicdomain/",
     "doap:shortdesc":     "JSON-LD support for RDF.rb.",
-    "doap:description":   "RDF.rb plugin for parsing/serializing JSON-LD data.",
+    "doap:description":   "RDF.rb extension for parsing/serializing JSON-LD data.",
     "doap:created":       "2011-05-07",
     "doap:platform":      "Ruby",
     "doap:implements":    [
diff --git a/etc/doap.ttl b/etc/doap.ttl
@@ -11,7 +11,7 @@
    doap:blog <http://greggkellogg.net/>;
    doap:bug-database <http://github.com/ruby-rdf/json-ld/issues>;
    doap:created "2011-05-07"^^xsd:date;
-   doap:description "RDF.rb plugin for parsing/serializing JSON-LD data."@en;
+   doap:description "RDF.rb extension for parsing/serializing JSON-LD data."@en;
    doap:developer <http://greggkellogg.net/foaf#me>;
    doap:documenter <http://greggkellogg.net/foaf#me>;
    doap:homepage <http://github.com/ruby-rdf/json-ld/>;
diff --git a/etc/earl.ttl b/etc/earl.ttl
@@ -11,7 +11,7 @@
    doap:blog <http://greggkellogg.net/>;
    doap:bug-database <http://github.com/ruby-rdf/json-ld/issues>;
    doap:created "2011-05-07"^^xsd:date;
-   doap:description "RDF.rb plugin for parsing/serializing JSON-LD data."@en;
+   doap:description "RDF.rb extension for parsing/serializing JSON-LD data."@en;
    doap:developer <http://greggkellogg.net/foaf#me>;
    doap:documenter <http://greggkellogg.net/foaf#me>;
    doap:homepage <http://github.com/ruby-rdf/json-ld/>;
diff --git a/lib/json/ld.rb b/lib/json/ld.rb
@@ -3,7 +3,7 @@
 
 module JSON
   ##
-  # **`JSON::LD`** is a JSON-LD plugin for RDF.rb.
+  # **`JSON::LD`** is a JSON-LD extension for RDF.rb.
   #
   # @example Requiring the `JSON::LD` module
   #   require 'json/ld'
diff --git a/lib/json/ld/context.rb b/lib/json/ld/context.rb
@@ -274,7 +274,7 @@ def parse(local_context, remote_contexts = [])
               raise
             rescue Exception => e
               # Speical case for schema.org, until they get their act together
-              if context.to_s == 'http://schema.org/'
+              if context.to_s.start_with?('http://schema.org')
                 RDF::Util::File.open_file("http://json-ld.org/contexts/schema.org.jsonld") do |f|
                   context = JSON.parse(f.read)['@context']
                   if @options[:processingMode] == "json-ld-1.0"
diff --git a/lib/json/ld/reader.rb b/lib/json/ld/reader.rb
@@ -30,6 +30,9 @@ def initialize(input = $stdin, options = {}, &block)
       super do
         @options[:base] ||= base_uri.to_s if base_uri
         begin
+          # Trim non-JSON stuff in script.
+          input = input.read if input.respond_to?(:read)
+          input = input.to_s.sub(%r(\A[^{\[]*)m, '').sub(%r([^}\]]*\Z)m, '') 
           @doc = JSON.load(input)
         rescue JSON::ParserError => e
           raise RDF::ReaderError, "Failed to parse input document: #{e.message}" if validate?
diff --git a/lib/json/ld/to_rdf.rb b/lib/json/ld/to_rdf.rb
@@ -101,10 +101,10 @@ def parse_object(item)
     #
     # @param [Array] list
     #   The Array to serialize as a list
-    # @param [Array<RDF::Statement>] list_results
-    #   Statements for each item in the list
     # @yield statement
     # @yieldparam [RDF::Resource] statement
+    # @return [Array<RDF::Statement>]
+    #   Statements for each item in the list
     def parse_list(list)
       debug('parse_list') {"list: #{list.inspect}"}
 
diff --git a/spec/reader_spec.rb b/spec/reader_spec.rb
@@ -26,52 +26,87 @@
   end
 
   context :interface do
-    subject { %q({
-      "@context": {"foaf": "http://xmlns.com/foaf/0.1/"},
-       "@id": "_:bnode1",
-       "@type": "foaf:Person",
-       "foaf:homepage": "http://example.com/bob/",
-       "foaf:name": "Bob"
-     }) }
+    {
+      plain: %q({
+        "@context": {"foaf": "http://xmlns.com/foaf/0.1/"},
+         "@id": "_:bnode1",
+         "@type": "foaf:Person",
+         "foaf:homepage": "http://example.com/bob/",
+         "foaf:name": "Bob"
+       }),
+       leading_comment: %q(
+         // A comment before content
+         {
+           "@context": {"foaf": "http://xmlns.com/foaf/0.1/"},
+            "@id": "_:bnode1",
+            "@type": "foaf:Person",
+            "foaf:homepage": "http://example.com/bob/",
+            "foaf:name": "Bob"
+          }
+         ),
+       script: %q(<script type="application/ld+json">
+         {
+           "@context": {"foaf": "http://xmlns.com/foaf/0.1/"},
+            "@id": "_:bnode1",
+            "@type": "foaf:Person",
+            "foaf:homepage": "http://example.com/bob/",
+            "foaf:name": "Bob"
+          }
+         </script>),
+       script_comments: %q(<script type="application/ld+json">
+         // A comment before content
+         {
+           "@context": {"foaf": "http://xmlns.com/foaf/0.1/"},
+            "@id": "_:bnode1",
+            "@type": "foaf:Person",
+            "foaf:homepage": "http://example.com/bob/",
+            "foaf:name": "Bob"
+          }
+         </script>),
+    }.each do |variant, src|
+      context variant do
+        subject {src}
 
-    describe "#initialize" do
-      it "yields reader given string" do
-        inner = double("inner")
-        inner.should_receive(:called).with(JSON::LD::Reader)
-        JSON::LD::Reader.new(subject) do |reader|
-          inner.called(reader.class)
-        end
-      end
+        describe "#initialize" do
+          it "yields reader given string" do
+            inner = double("inner")
+            inner.should_receive(:called).with(JSON::LD::Reader)
+            JSON::LD::Reader.new(subject) do |reader|
+              inner.called(reader.class)
+            end
+          end
 
-      it "yields reader given IO" do
-        inner = double("inner")
-        inner.should_receive(:called).with(JSON::LD::Reader)
-        JSON::LD::Reader.new(StringIO.new(subject)) do |reader|
-          inner.called(reader.class)
-        end
-      end
+          it "yields reader given IO" do
+            inner = double("inner")
+            inner.should_receive(:called).with(JSON::LD::Reader)
+            JSON::LD::Reader.new(StringIO.new(subject)) do |reader|
+              inner.called(reader.class)
+            end
+          end
 
-      it "returns reader" do
-        JSON::LD::Reader.new(subject).should be_a(JSON::LD::Reader)
-      end
-    end
+          it "returns reader" do
+            JSON::LD::Reader.new(subject).should be_a(JSON::LD::Reader)
+          end
+        end
 
-    describe "#each_statement" do
-      it "yields statements" do
-        inner = double("inner")
-        inner.should_receive(:called).with(RDF::Statement).exactly(3)
-        JSON::LD::Reader.new(subject).each_statement do |statement|
-          inner.called(statement.class)
+        describe "#each_statement" do
+          it "yields statements" do
+            inner = double("inner")
+            inner.should_receive(:called).with(RDF::Statement).exactly(3)
+            JSON::LD::Reader.new(subject).each_statement do |statement|
+              inner.called(statement.class)
+            end
+          end
         end
-      end
-    end
 
-    describe "#each_triple" do
-      it "yields statements" do
-        inner = double("inner")
-        inner.should_receive(:called).exactly(3)
-        JSON::LD::Reader.new(subject).each_triple do |subject, predicate, object|
-          inner.called(subject.class, predicate.class, object.class)
+        describe "#each_triple" do
+          it "yields statements" do
+            inner = double("inner")
+            inner.should_receive(:called).exactly(3)
+            JSON::LD::Reader.new(subject).each_triple do |subject, predicate, object|
+              inner.called(subject.class, predicate.class, object.class)
+            end
+          end
         end
       end
     end

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`module JSON`
`5`	`5`	`##`
`6`		- # `JSON::LD` is a JSON-LD plugin for RDF.rb.
	`6`	+ # `JSON::LD` is a JSON-LD extension for RDF.rb.
`7`	`7`	`#`
`8`	`8`	# @example Requiring the `JSON::LD` module
`9`	`9`	`# require 'json/ld'`