Finish 1.1.2

Author: gkellogg

.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

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)
 

VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

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?

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