json-ld 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 54892ea3d40dc8dbea39f06ade6803302e8b01b0
+  data.tar.gz: 002b2860c421d7a56ebb4493bf0b7942db6edd6d
+SHA512:
+  metadata.gz: 97bb1266a783b8f8a5e00df566185d40e13f4c0528599593c0fa0f2ecdecb277e90aaf29d31cf0a095bb0f712961545332c2b21cc1d0eac3912924cd733d2232
+  data.tar.gz: 4a86e9c48172c8794149ea858091323c695a4e96a0f785534303353ba04c9d9992eff880f0e49447f91b9a65bf71bf7021e0daf30fc2072385bf70c38b7c3c28

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/bin/jsonld

@@ -26,17 +26,22 @@ def run(input, options)
   prefixes = {}
   start = Time.new
   if options[:expand]
-    output = JSON::LD::API.expand(input, options[:context], nil, options)
+    output = JSON::LD::API.expand(input, options[:context], options)
     secs = Time.new - start
     options[:output].puts output.to_json(JSON::LD::JSON_STATE)
     STDERR.puts "Expanded in #{secs} seconds." unless options[:quiet]
   elsif options[:compact]
-    output = JSON::LD::API.compact(input, options[:context], nil, options)
+    output = JSON::LD::API.compact(input, options[:context], options)
     secs = Time.new - start
     options[:output].puts output.to_json(JSON::LD::JSON_STATE)
     STDERR.puts "Compacted in #{secs} seconds." unless options[:quiet]
+  elsif options[:flatten]
+    output = JSON::LD::API.flatten(input, options[:context], options)
+    secs = Time.new - start
+    options[:output].puts output.to_json(JSON::LD::JSON_STATE)
+    STDERR.puts "Flattened in #{secs} seconds." unless options[:quiet]
   elsif options[:frame]
-    output = JSON::LD::API.frame(input, options[:frame], nil, options)
+    output = JSON::LD::API.frame(input, options[:frame], options)
     secs = Time.new - start
     options[:output].puts output.to_json(JSON::LD::JSON_STATE)
     STDERR.puts "Framed in #{secs} seconds." unless options[:quiet]
@@ -76,6 +81,7 @@ OPT_ARGS = [
   ["--context",       GetoptLong::REQUIRED_ARGUMENT,"Context to apply for expand, compact and converting from RDF"],
   ["--evaluate","-e", GetoptLong::REQUIRED_ARGUMENT,"Evaluate argument as a JSON-LD document"],
   ["--expand",        GetoptLong::NO_ARGUMENT,      "Expand document, using an optional --context"],
+  ["--flatten",       GetoptLong::NO_ARGUMENT,      "Flatten document, using an optional --context"],
   ["--format",        GetoptLong::REQUIRED_ARGUMENT,"Specify output format when converting to RDF"],
   ["--frame",         GetoptLong::REQUIRED_ARGUMENT,"Frame document, using the file or URL as a frame specification"],
   ["--input-format",  GetoptLong::REQUIRED_ARGUMENT,"Format of the input document, when converting from RDF."],
@@ -112,6 +118,7 @@ opts.each do |opt, arg|
   when '--execute'      then input = arg
   when '--expand'       then options[:expand] = true
   when '--format'       then options[:output_format] = arg.to_sym
+  when '--flatten'      then options[:flatten] = arg
   when '--frame'        then options[:frame] = arg
   when '--input-format' then options[:input_format] = arg.to_sym
   when '--output'       then options[:output] = File.open(arg, "w")

data/lib/json/ld/flatten.rb

@@ -24,7 +24,7 @@ module JSON::LD
       depth do
         debug("node_map") {"active_graph: #{active_graph}, element: #{element.inspect}"}
         if element.is_a?(Array)
-          # If element is an array, process each entry in element recursively, using this algorithm and return
+          # If element is an array, process each entry in element recursively by passing item for element, node map, active graph, active subject, active property, and list.
           element.map {|o|
             generate_node_map(o,
                               node_map,
@@ -37,7 +37,7 @@ module JSON::LD
           # Otherwise element is a JSON object. Reference the JSON object which is the value of the active graph member of node map using the variable graph. If the active subject is null, set node to null otherwise reference the active subject member of graph using the variable node.
           # Spec FIXME: initializing it to an empty JSON object, if necessary
           raise "Expected element to be a hash, was #{element.class}" unless element.is_a?(Hash)
-          graph = node_map[active_graph] ||= Hash.ordered
+          graph = node_map[active_graph] ||= {}
           node = graph[active_subject] if active_subject
 
           # If element has an @type member, perform for each item the following steps:
@@ -77,6 +77,7 @@ module JSON::LD
                               result)
 
             # Append result to the the value of the active property member of node.
+            debug("node_map") {"@list: #{result.inspect}"}
             merge_value(node, active_property, result)
           else
             # Otherwise element is a node object, perform the following steps:
@@ -88,14 +89,12 @@ module JSON::LD
             debug("node_map") {"id: #{id.inspect}"}
 
             # If graph does not contain a member id, create one and initialize it to a JSON object consisting of a single member @id whose value is set to id.
-            graph[id] ||= Hash.ordered
-            graph[id]['@id'] ||= id
+            graph[id] ||= {'@id' => id}
 
             # If active property is not null, perform the following steps:
             if active_property
               # Create a new JSON object reference consisting of a single member @id whose value is id.
-              reference = Hash.ordered
-              reference['@id'] = id
+              reference = {'@id' => id}
 
               # If list is null:
               unless list
@@ -148,6 +147,7 @@ module JSON::LD
 
             # Finally, for each key-value pair property-value in element ordered by property perform the following steps:
             element.keys.sort.each do |property|
+              #require 'debugger'; breakpoint
               value = element[property]
 
               # If property is a blank node identifier, replace it with a newly generated blank node identifier passing property for identifier.
@@ -161,8 +161,7 @@ module JSON::LD
                                 node_map,
                                 active_graph,
                                 id,
-                                property,
-                                list)
+                                property)
             end
           end
         end

data/spec/flatten_spec.rb

@@ -171,11 +171,38 @@ describe JSON::LD::API do
           }, {
             "@id": "http://www.wikipedia.org/"
           }])),
+      },
+      "Test Manifest (shortened)" => {
+        :input => ::JSON.parse(%q{
+          {
+            "@id": "",
+            "http://example/sequence": {"@list": [
+              {
+                "@id": "#t0001",
+                "http://example/name": "Keywords cannot be aliased to other keywords",
+                "http://example/input": {"@id": "error-expand-0001-in.jsonld"}
+              }
+            ]}
+          }
+        }),
+        :output => ::JSON.parse(%q{
+          [{
+            "@id": "",
+            "http://example/sequence": [{"@list": [{"@id": "#t0001"}]}]
+          }, {
+            "@id": "#t0001",
+            "http://example/input": [{"@id": "error-expand-0001-in.jsonld"}],
+            "http://example/name": [{"@value": "Keywords cannot be aliased to other keywords"}]
+          }, {
+            "@id": "error-expand-0001-in.jsonld"
+          }]
+        }),
+        :options => {}
       }
     }.each do |title, params|
       it title do
         @debug = []
-        jld = JSON::LD::API.flatten(params[:input], nil, :debug => @debug) 
+        jld = JSON::LD::API.flatten(params[:input], nil, (params[:options] || {}).merge(:debug => @debug)) 
         jld.should produce(params[:output], @debug)
       end
     end

metadata

@@ -1,190 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdf-trig
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: JSON::LD parses and serializes JSON-LD into RDF and implements expansion,
@@ -298,27 +275,26 @@ files:
 homepage: http://github.com/gkellogg/json-ld
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: json-ld
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: JSON-LD reader/writer for Ruby.
 test_files:
 - spec/api_spec.rb