json-ld 1.1.3.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca0e3cc4b404992e98906955e4f18b6db85b72ad
-  data.tar.gz: 23742db95aa45683dc15afb31dd5eb0b9d250b3a
+  metadata.gz: e160cdefa8e2b74088deae22decfcb6e4676bb1f
+  data.tar.gz: 7910c785d852f65ea62214573c53e6aaf07854ad
 SHA512:
-  metadata.gz: 39c2c3ab9f3bfda908845ecd2d24af85dda870a7b636079e8e0360e36682a662f3b9e61552542f4fc1b5e3708872b70be915c534e735214d3f3542cc44afa15e
-  data.tar.gz: b83c14a4a432554db8e87e93f54ab622fa462a30034fdb29a2fad4f2fe344aa0fe21092aa7b6d8e48220570f597a0ec2981af87644d15061a0c345a0507ac11c
+  metadata.gz: 945604edd6ddf16aaf768d2e028d71724fd167d182fd997d431e6efc5b11db1aecff8a37d6fa9400b2c16f85a3c2b664ee4a31f3a1b666dfac4b588c94096c4a
+  data.tar.gz: 3062bba010e1170ed9626280e346b988d8b5369cece0aba57addcfdc6111ba46326759f0d9c698581657e35b92412a9bc9905f870b39933105879a21b8e5d786

data/README.md

@@ -268,7 +268,7 @@ To get a local working copy of the development repository, do:
 * Don't use hard tabs, and don't leave trailing whitespace on any line.
 * Do document every method you add using [YARD][] annotations. Read the
   [tutorial][YARD-GS] or just look at the existing code for examples.
-* Don't touch the `.gemspec`, `VERSION` or `AUTHORS` files. If you need to
+* Don't touch the `json-ld.gemspec`, `VERSION` or `AUTHORS` files. If you need to
   change them, do so on your private branch only.
 * Do feel free to add yourself to the `CREDITS` file and the corresponding
   list in the the `README`. Alphabetical order applies.

data/VERSION

@@ -1 +1 @@
-1.1.3.1
+1.1.4

data/lib/json/ld/context.rb

@@ -295,6 +295,7 @@ module JSON::LD
             debug("parse") {"=> provided_context: #{context.inspect}"}
           when Hash
             # If context has a @vocab member: if its value is not a valid absolute IRI or null trigger an INVALID_VOCAB_MAPPING error; otherwise set the active context's vocabulary mapping to its value and remove the @vocab member from context.
+            context = context.dup # keep from modifying a hash passed as a param
             {
               '@base' => :base=,
               '@language' => :default_language=,

data/lib/json/ld/resource.rb

@@ -2,60 +2,59 @@ module JSON::LD
   # Simple Ruby reflector class to provide native
   # access to JSON-LD objects
   class Resource
-    # @!attribute [r] attributes
+    include RDF::Enumerable
+
     # @return [Hash<String => Object] Object representation of resource
     attr_reader :attributes
 
-    # @!attribute [r] id
     # @return [String] ID of this resource
     attr_reader :id
 
-    # @!attribute [r] context
     # @return [JSON::LD::Context] Context associated with this resource
     attr_reader :context
 
+    ##
     # Is this resource clean (i.e., saved to mongo?)
     #
     # @return [Boolean]
     def clean?; @clean; end
 
+    ##
     # Is this resource dirty (i.e., not yet saved to mongo?)
     #
     # @return [Boolean]
     def dirty?; !clean?; end
-    
+
+    ##
     # Has this resource been reconciled against a mongo ID?
     #
     # @return [Boolean]
     def reconciled?; @reconciled; end
 
+    ##
     # Has this resource been resolved so that
     # all references are to other Resources?
     #
     # @return [Boolean]
     def resolved?; @resolved; end
 
+    ##
     # Anonymous resources have BNode ids or no schema:url
     #
     # @return [Boolean]
     def anonymous?; @anon; end
 
+    ##
     # Is this a stub resource, which has not yet been
     # synched or created within the DB?
     def stub?; !!@stub; end
 
+    ##
     # Is this a new resource, which has not yet been
     # synched or created within the DB?
     def new?; !!@new; end
 
-    # Manage contexts used by resources.
-    #
-    # @param [String] ctx
-    # @return [JSON::LD::Context]
-    def self.set_context(ctx)
-      (@@contexts ||= {})[ctx] = JSON::LD::Context.new.parse(ctx)
-    end
-
+    ##
     # A new resource from the parsed graph
     # @param [Hash{String => Object}] node_definition
     # @param [Hash{Symbol => Object}] options
@@ -76,8 +75,7 @@ module JSON::LD
     #   This is a stand-in for another resource that has
     #   not yet been retrieved (or created) from Mongo
     def initialize(node_definition, options = {})
-      @context_name = options[:context]
-      @context = self.class.set_context(@context_name)
+      @context = options[:context]
       @clean = options.fetch(:clean, false)
       @new = options.fetch(:new, true)
       @reconciled = options.fetch(:reconciled, !@new)
@@ -91,12 +89,14 @@ module JSON::LD
       @anon = @id.nil? || @id.to_s[0,2] == '_:'
     end
 
+    ##
     # Return a hash of this object, suitable for use by for ETag
     # @return [Fixnum]
     def hash
       self.deresolve.hash
     end
 
+    ##
     # Reverse resolution of resource attributes.
     # Just returns `attributes` if
     # resource is unresolved. Otherwise, replaces `Resource`
@@ -134,6 +134,7 @@ module JSON::LD
       compacted.delete_if {|k, v| k == '@context'}
     end
 
+    ##
     # Serialize to JSON-LD, minus `@context` using
     # a deresolved version of the attributes
     #
@@ -143,6 +144,13 @@ module JSON::LD
       deresolve.to_json(options)
     end
 
+    ##
+    # Enumerate over statements associated with this resource
+    def each(&block)
+      JSON::LD::API.toRdf(attributes, expandContext: context, &block)
+    end
+
+    ##
     # Update node references using the provided map.
     # This replaces node references with Resources,
     # either stub or instantiated.
@@ -186,29 +194,7 @@ module JSON::LD
       self
     end
 
-    # Merge resources
-    # FIXME: If unreconciled or unresolved resources are merged
-    # against reconciled/resolved resources, they will appear
-    # to not match, even if they are really the same thing.
-    #
-    # @param [Resource] resource
-    # @return [Resource] self
-    def merge(resource)
-      if attributes.neq?(resource.attributes)
-        resource.attributes.each do |p, v|
-          next if p == 'id'
-          if v.nil? or (v.is_a?(Array) and v.empty?)
-            attributes.delete(p)
-          else
-            attributes[p] = v
-          end
-        end
-        @resolved = @clean = false
-      end
-      self
-    end
-
-    #
+    ##
     # Override this method to implement save using
     # an appropriate storage mechanism.
     #
@@ -218,12 +204,14 @@ module JSON::LD
     #
     # @return [Boolean] true or false if resource not saved
     def save
-      raise NotImplemented
+      raise NotImplementedError
     end
 
+    ##
     # Access individual fields, from subject definition
     def property(prop_name); @attributes.fetch(prop_name, nil); end
 
+    ##
     # Access individual fields, from subject definition
     def method_missing(method, *args)
       property(method.to_s)

data/spec/resource_spec.rb

@@ -3,5 +3,75 @@ $:.unshift "."
 require 'spec_helper'
 
 describe JSON::LD::Resource do
-  it "is pending"
+  subject {JSON::LD::Resource.new({'@id' => '_:foo', "http://schema.org/name" => "foo"})}
+  describe "#initialize" do
+    specify {expect(subject).not_to be_nil}
+    specify {expect(subject).to be_a(JSON::LD::Resource)}
+    specify {expect(subject).not_to be_clean}
+    specify {expect(subject).to be_anonymous}
+    specify {expect(subject).to be_dirty}
+    specify {expect(subject).to be_new}
+    specify {expect(subject).not_to be_resolved}
+    specify {expect(subject).not_to be_stub}
+    context "schema:name property" do
+      specify {expect(subject.property("http://schema.org/name")).to eq "foo"}
+    end
+
+    describe "compacted with context" do
+      subject {JSON::LD::Resource.new({'@id' => '_:foo', "http://schema.org/name" => "foo"}, :compact => true, :context => {"@vocab" => "http://schema.org/"})}
+      specify {expect(subject).not_to be_nil}
+      specify {expect(subject).to be_a(JSON::LD::Resource)}
+      specify {expect(subject).not_to be_clean}
+      specify {expect(subject).to be_anonymous}
+      specify {expect(subject).to be_dirty}
+      specify {expect(subject).to be_new}
+      specify {expect(subject).not_to be_resolved}
+      specify {expect(subject).not_to be_stub}
+      its(:name) {should eq "foo"}
+    end
+  end
+
+  describe "#deresolve" do
+    it "FIXME"
+  end
+
+  describe "#resolve" do
+    it "FIXME"
+  end
+
+  describe "#hash" do
+    specify {subject.hash.should be_a(Fixnum)}
+      
+    it "returns the hash of the attributes" do
+      subject.hash.should == subject.deresolve.hash
+    end
+  end
+
+  describe "#to_json" do
+    it "has JSON" do
+      subject.to_json.should be_a(String)
+      JSON.parse(subject.to_json).should be_a(Hash)
+    end
+    it "has same ID" do
+      JSON.parse(subject.to_json)['@id'].should == subject.id
+    end
+  end
+
+  describe "#each" do
+    specify {expect {|b| subject.each(&b)}.to yield_with_args(RDF::Statement)}
+  end
+
+  describe RDF::Enumerable do
+    specify {expect(subject).to be_enumerable}
+
+    it "initializes a graph" do
+      g = RDF::Graph.new << subject
+      expect(g.count).to eq 1
+      expect(g.objects.first).to eq "foo"
+    end
+  end
+
+  describe "#save" do
+    specify {expect {subject.save}.to raise_error(NotImplementedError)}
+  end
 end

metadata

@@ -1,162 +1,163 @@
 --- !ruby/object:Gem::Specification
 name: json-ld
 version: !ruby/object:Gem::Version
-  version: 1.1.3.1
+  version: 1.1.4
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdf-spec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdf-turtle
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdf-trig
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rdf-trig
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdf-isomorphic
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rdf-xsd
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  prerelease: false
   type: :development
-description: JSON::LD parses and serializes JSON-LD into RDF and implements expansion, compaction and framing API interfaces.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+description: JSON::LD parses and serializes JSON-LD into RDF and implements expansion,
+  compaction and framing API interfaces.
 email: public-linked-json@w3.org
 executables:
 - jsonld
@@ -268,24 +269,24 @@ homepage: http://github.com/ruby-rdf/json-ld
 licenses:
 - Public Domain
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: json-ld
 rubygems_version: 2.2.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: JSON-LD reader/writer for Ruby.
 test_files:
@@ -310,9 +311,9 @@ test_files:
 - spec/suite_helper.rb
 - spec/suite_remote_doc_spec.rb
 - spec/suite_to_rdf_spec.rb
+- spec/support/extensions.rb
 - spec/to_rdf_spec.rb
 - spec/writer_spec.rb
-- spec/support/extensions.rb
 - spec/test-files/test-1-automatic.json
 - spec/test-files/test-1-compacted.json
 - spec/test-files/test-1-context.json