json-ld 0.1.4 → 0.1.4.1

data/History.markdown

@@ -1,3 +1,7 @@
+=== 0.1.4.1
+* Include rdf-xsd for some specs.
+* Refactor #expand_value to deal with previous matching on RDF::Literal::Integer for sub-types.
+ 
 === 0.1.4
 * Added bin/jsonld for command-line manipulation of JSON-LD files and to perform RDF transformations.
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.4.1

data/lib/json/ld/evaluation_context.rb

@@ -628,8 +628,20 @@ module JSON::LD
       options = {:native => true}.merge(options)
       depth(options) do
         debug("expand_value") {"property: #{property.inspect}, value: #{value.inspect}, coerce: #{coerce(property).inspect}"}
-        result = case value
-        when TrueClass, FalseClass, RDF::Literal::Boolean
+        value = RDF::Literal(value) if RDF::Literal(value).has_datatype?
+        dt = case value
+        when RDF::Literal
+          case value.datatype
+          when RDF::XSD.boolean, RDF::XSD.integer, RDF::XSD.double then value.datatype
+          else value
+          end
+        when RDF::Term then value
+        else value
+        end
+
+        result = case dt
+        when RDF::XSD.boolean
+          debug("xsd:boolean")
           case coerce(property)
           when RDF::XSD.double.to_s
             {"@value" => value.to_s, "@type" => RDF::XSD.double.to_s}
@@ -641,7 +653,8 @@ module JSON::LD
               {"@value" => value.to_s, "@type" => RDF::XSD.boolean.to_s}
             end
           end
-        when Integer, RDF::Literal::Integer
+        when RDF::XSD.integer
+          debug("xsd:integer")
           case coerce(property)
           when RDF::XSD.double.to_s
             {"@value" => RDF::Literal::Double.new(value, :canonicalize => true).to_s, "@type" => RDF::XSD.double.to_s}
@@ -658,7 +671,8 @@ module JSON::LD
             res['@type'] = coerce(property)
             res
           end
-        when Float, RDF::Literal::Double
+        when RDF::XSD.double
+          debug("xsd:double")
           case coerce(property)
           when RDF::XSD.integer.to_s
             {"@value" => value.to_int.to_s, "@type" => RDF::XSD.integer.to_s}
@@ -677,20 +691,18 @@ module JSON::LD
             res['@type'] = coerce(property)
             res
           end
-        when BigDecimal, RDF::Literal::Decimal
-          {"@value" => value.to_s, "@type" => RDF::XSD.decimal.to_s}
-        when Date, Time, DateTime
-          l = RDF::Literal(value)
-          {"@value" => l.to_s, "@type" => l.datatype.to_s}
         when RDF::URI, RDF::Node
+          debug("URI || BNode")
           {'@id' => value.to_s}
         when RDF::Literal
+          debug("Literal")
           res = Hash.ordered
           res['@value'] = value.to_s
           res['@type'] = value.datatype.to_s if value.has_datatype?
           res['@language'] = value.language.to_s if value.has_language?
           res
         else
+          debug("else")
           case coerce(property)
           when '@id'
             {'@id' => expand_iri(value, :position => :object).to_s}

data/spec/evaluation_context_spec.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 $:.unshift "."
 require 'spec_helper'
+require 'rdf/xsd'
 require 'rdf/spec/reader'
 
 describe JSON::LD::EvaluationContext do
@@ -895,6 +896,8 @@ describe JSON::LD::EvaluationContext do
       "rdf double" =>     ["foo", RDF::Literal::Double.new(1.1),  {"@value" => 1.1}],
       "rdf URI" =>        ["foo", RDF::URI("foo"),                {"@id" => "foo"}],
       "rdf date " =>      ["foo", RDF::Literal(Date.parse("2011-12-27Z")), {"@value" => "2011-12-27Z", "@type" => RDF::XSD.date.to_s}],
+      "rdf nonNeg" =>     ["foo", RDF::Literal::NonNegativeInteger.new(1), {"@value" => "1", "@type" => RDF::XSD.nonNegativeInteger}],
+      "rdf float" =>      ["foo", RDF::Literal::Float.new(1.0), {"@value" => "1.0", "@type" => RDF::XSD.float}],
     }.each do |title, (key, compacted, expanded)|
       it title do
         subject.expand_value(key, compacted).should produce(expanded, @debug)

data/spec/from_rdf_spec.rb

@@ -53,46 +53,71 @@ describe JSON::LD::API do
     end
   
     context "literals" do
-      it "coerces typed literal" do
-        input = %(@prefix ex: <http://example.com/> . ex:a ex:b "foo"^^ex:d .)
-        serialize(input).should produce([{
-          '@id'   => "http://example.com/a",
-          "http://example.com/b"    => [{"@value" => "foo", "@type" => "http://example.com/d"}]
-        }], @debug)
-      end
+      context "coercion" do
+        it "typed literal" do
+          input = %(@prefix ex: <http://example.com/> . ex:a ex:b "foo"^^ex:d .)
+          serialize(input).should produce([{
+            '@id'   => "http://example.com/a",
+            "http://example.com/b"    => [{"@value" => "foo", "@type" => "http://example.com/d"}]
+          }], @debug)
+        end
 
-      it "coerces integer" do
-        input = %(@prefix ex: <http://example.com/> . ex:a ex:b 1 .)
-        serialize(input).should produce([{
-          '@id'   => "http://example.com/a",
-          "http://example.com/b"    => [{"@value" => "1","@type" => "http://www.w3.org/2001/XMLSchema#integer"}]
-        }], @debug)
-      end
+        it "integer" do
+          input = %(@prefix ex: <http://example.com/> . ex:a ex:b 1 .)
+          serialize(input).should produce([{
+            '@id'   => "http://example.com/a",
+            "http://example.com/b"    => [{"@value" => "1","@type" => "http://www.w3.org/2001/XMLSchema#integer"}]
+          }], @debug)
+        end
 
-      it "coerces boolean" do
-        input = %(@prefix ex: <http://example.com/> . ex:a ex:b true .)
-        serialize(input).should produce([{
-          '@id'   => "http://example.com/a",
-          "http://example.com/b"    => [{"@value" => "true","@type" => "http://www.w3.org/2001/XMLSchema#boolean"}]
-        }], @debug)
-      end
+        it "boolean" do
+          input = %(@prefix ex: <http://example.com/> . ex:a ex:b true .)
+          serialize(input).should produce([{
+            '@id'   => "http://example.com/a",
+            "http://example.com/b"    => [{"@value" => "true","@type" => "http://www.w3.org/2001/XMLSchema#boolean"}]
+          }], @debug)
+        end
 
-      it "coerces decmal" do
-        input = %(@prefix ex: <http://example.com/> . ex:a ex:b 1.0 .)
-        serialize(input).should produce([{
-          '@id'   => "http://example.com/a",
-          "http://example.com/b"    => [{"@value" => "1.0", "@type" => "http://www.w3.org/2001/XMLSchema#decimal"}]
-        }], @debug)
+        it "decmal" do
+          input = %(@prefix ex: <http://example.com/> . ex:a ex:b 1.0 .)
+          serialize(input).should produce([{
+            '@id'   => "http://example.com/a",
+            "http://example.com/b"    => [{"@value" => "1.0", "@type" => "http://www.w3.org/2001/XMLSchema#decimal"}]
+          }], @debug)
+        end
+
+        it "double" do
+          input = %(@prefix ex: <http://example.com/> . ex:a ex:b 1.0e0 .)
+          serialize(input).should produce([{
+            '@id'   => "http://example.com/a",
+            "http://example.com/b"    => [{"@value" => "1.0E0","@type" => "http://www.w3.org/2001/XMLSchema#double"}]
+          }], @debug)
+        end
       end
 
-      it "coerces double" do
-        input = %(@prefix ex: <http://example.com/> . ex:a ex:b 1.0e0 .)
-        serialize(input).should produce([{
-          '@id'   => "http://example.com/a",
-          "http://example.com/b"    => [{"@value" => "1.0E0","@type" => "http://www.w3.org/2001/XMLSchema#double"}]
-        }], @debug)
+      context "datatyped" do
+        {
+          :integer            => 1,
+          :unsignedInteger    => 1,
+          :nonNegativeInteger => 1,
+          :float              => 1,
+          :nonPositiveInteger => -1,
+          :negativeInteger    => -1,
+        }.each do |t, v|
+          it "#{t}" do
+            input = %(
+              @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+              @prefix ex: <http://example.com/> .
+              ex:a ex:b "#{v}"^^xsd:#{t} .
+            )
+            serialize(input).should produce([{
+              '@id'   => "http://example.com/a",
+              "http://example.com/b"    => [{"@value" => "#{v}","@type" => "http://www.w3.org/2001/XMLSchema##{t}"}]
+            }], @debug)
+          end
+        end
       end
-    
+
       it "encodes language literal" do
         input = %(@prefix ex: <http://example.com/> . ex:a ex:b "foo"@en-us .)
         serialize(input).should produce([{
@@ -308,8 +333,10 @@ describe JSON::LD::API do
 
   # Serialize ntstr to a string and compare against regexps
   def serialize(ntstr, options = {})
+    @debug = []
+    @debug << ntstr if ntstr.is_a?(String)
     g = ntstr.is_a?(String) ? parse(ntstr, options) : ntstr
-    @debug = [] << g.dump(:trig)
+    @debug << g.dump(:trig)
     statements = g.each_statement.to_a
     JSON::LD::API.fromRDF(statements, nil, options.merge(:debug => @debug))
   end

data/spec/writer_spec.rb

@@ -139,6 +139,49 @@ describe JSON::LD::Writer do
         ]
       }, @debug)
     end
+
+    it "serializes Wikia OWL example" do
+      input = %q(
+        @prefix owl: <http://www.w3.org/2002/07/owl#> .
+        @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+        @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+        @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+        <http://data.wikia.com/terms#Character> a owl:Class;
+           rdfs:subClassOf _:a .
+        _:a a owl:Restriction;
+           owl:minQualifiedCardinality "1"^^xsd:nonNegativeInteger;
+           owl:onClass <http://data.wikia.com/terms#Element>;
+           owl:onProperty <http://data.wikia.com/terms#characterIn> .
+      )
+      serialize(input, :prefixes => {
+        :owl  => "http://www.w3.org/2002/07/owl#",
+        :rdfs => "http://www.w3.org/2000/01/rdf-schema#",
+        :xsd  => "http://www.w3.org/2001/XMLSchema#"
+      }).
+      should produce({
+        '@context'     => {
+          "owl"  => "http://www.w3.org/2002/07/owl#",
+          "rdf"  => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+          "rdfs" => "http://www.w3.org/2000/01/rdf-schema#",
+          "xsd"  => "http://www.w3.org/2001/XMLSchema#"
+        },
+        '@graph'     => [
+          {
+            "@id" => "_:a",
+            "@type" => "owl:Restriction",
+            "owl:minQualifiedCardinality" => {"@value" => "1","@type" => "xsd:nonNegativeInteger"},
+            "owl:onClass" => {"@id" => "http://data.wikia.com/terms#Element"},
+            "owl:onProperty" => {"@id" => "http://data.wikia.com/terms#characterIn"}
+          },
+          {
+            "@id" => "http://data.wikia.com/terms#Character",
+            "@type" => "owl:Class",
+            "rdfs:subClassOf" => {"@id" => "_:a"}
+          }
+        ]
+      }, @debug)
+    end
   end
   
   def parse(input, options = {})

metadata

@@ -1,216 +1,238 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: json-ld
-version: !ruby/object:Gem::Version
-  version: 0.1.4
+version: !ruby/object:Gem::Version 
+  hash: 85
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 4
+  - 1
+  version: 0.1.4.1
 platform: ruby
-authors:
+authors: 
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rdf
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.5
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 6
+        - 5
         version: 1.6.5
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id002
+- !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
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 2
+        - 8
         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
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: open-uri-cached
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 0
+        - 5
         version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.4
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 7
+        - 4
         version: 0.7.4
-- !ruby/object:Gem::Dependency
-  name: spira
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.12
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: spira
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 0
+        - 12
         version: 0.0.12
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.8.0
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
-- !ruby/object:Gem::Dependency
-  name: rdf-spec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.5
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rdf-spec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
-- !ruby/object:Gem::Dependency
-  name: rdf-turtle
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rdf-turtle
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: rdf-trig
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rdf-trig
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: rdf-isomorphic
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 3
+        - 4
         version: 0.3.4
   type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rdf-xsd
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.4
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 3
+        - 7
+        version: 0.3.7
+  type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: backports
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id013 !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,
-  compaction and framing API interfaces.
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id013
+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:
+executables: 
 - jsonld
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - AUTHORS
 - README.markdown
 - History.markdown
@@ -303,31 +325,41 @@ files:
 - spec/test-files/test-9-input.json
 - bin/jsonld
 homepage: http://github.com/gkellogg/json-ld
-licenses:
+licenses: 
 - Public Domain
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 53
+      segments: 
+      - 1
+      - 8
+      - 1
       version: 1.8.1
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: json-ld
-rubygems_version: 1.8.23
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: JSON-LD reader/writer for Ruby.
-test_files:
+test_files: 
 - spec/api_spec.rb
 - spec/compact_spec.rb
 - spec/evaluation_context_spec.rb