json-ld 0.0.4 → 0.0.6

data/README

@@ -1,64 +1,50 @@
-JSON-LD reader/writer
-==================================
+# JSON-LD reader/writer
 
 [JSON-LD][] reader/writer for [RDF.rb][RDF.rb] .
 
-Features
---------
+## Features
 
 JSON::LD parses and serializes [JSON-LD][] into statements or triples.
 
 Install with `gem install json-ld`
 
-Examples
---------
+## Examples
 
     require 'rubygems'
     require 'json/ld'
 
-Documentation
--------------
-
-<http://rdf.rubyforge.org/json-ld>
+## Documentation
+Full documentation available on [RubyDoc](http://rubydoc.info/gems/json-ld/0.0.4/file/README)
 
+### Principle Classes
 * {JSON::LD}
+  * {JSON::LD::Format}
+  * {JSON::LD::Reader}
+  * {JSON::LD::Writer}
 
-Dependencies
-------------
-
+##Dependencies
 * [Ruby](http://ruby-lang.org/) (>= 1.8.7) or (>= 1.8.1 with [Backports][])
 * [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.3.3)
 * [JSON](https://rubygems.org/gems/json) (>= 1.5.1)
 
-Installation
-------------
-
+## Installation
 The recommended installation method is via [RubyGems](http://rubygems.org/).
 To install the latest official release of the `JSON-LD` gem, do:
 
     % [sudo] gem install json-ld
 
-Download
---------
-
+## Download
 To get a local working copy of the development repository, do:
 
     % git clone git://github.com/gkellogg/json-ld.git
 
-Mailing List
-------------
-
+## Mailing List
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>
 
-Author
-------
-
+## Author
 * [Gregg Kellogg](http://github.com/gkellogg) - <http://kellogg-assoc.com/>
 
-
-Contributing
-------------
-
+## Contributing
 * Do your best to adhere to the existing coding conventions and idioms.
 * 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

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.6

data/lib/json/ld/extensions.rb

@@ -31,4 +31,73 @@ module RDF
       query(:subject => subject, :predicate => RDF.type).map {|st| st.object}
     end
   end
+end
+
+if RUBY_VERSION < "1.9"
+  class InsertOrderPreservingHash < Hash
+    include Enumerable
+
+    def initialize(*args, &block)
+      super
+      @ordered_keys = []
+    end
+
+    def []=(key, val)
+      @ordered_keys << key unless has_key? key
+      super
+    end
+
+    def each
+      @ordered_keys.each {|k| yield(k, super[k])}
+    end
+    alias :each_pair :each
+
+    def each_value
+      @ordered_keys.each {|k| yield(super[k])}
+    end
+
+    def each_key
+      @ordered_keys.each {|k| yield k}
+    end
+
+    def keys
+      @ordered_keys
+    end
+
+    def values
+      @ordered_keys.map {|k| super[k]}
+    end
+
+    def clear
+      @ordered_keys.clear
+      super
+    end
+
+    def delete(k, &block)
+      @ordered_keys.delete(k)
+      super
+    end
+
+    def reject!
+      del = []
+      each_pair {|k,v| del << k if yield k,v}
+      del.each {|k| delete k}
+      del.empty? ? nil : self
+    end
+
+    def delete_if(&block)
+      reject!(&block)
+      self
+    end
+
+    def merge!(other)
+      @ordered_keys += other.instance_variable_get(:@ordered_keys) || other.keys
+      super
+      self
+    end
+    
+    def merge(other)
+      self.dup.merge!(other)
+    end
+  end
 end

data/lib/json/ld/writer.rb

@@ -69,12 +69,21 @@ module JSON::LD
     # @attr [Hash{RDF::URI => RDF::URI}]
     attr :coerce, true
 
+    def self.new_hash
+      if RUBY_VERSION < "1.9"
+        InsertOrderPreservingHash.new
+      else
+        Hash.new
+      end
+    end
+    def new_hash; self.class.new_hash; end
+
     ##
     # Return the pre-serialized Hash before turning into JSON
     #
     # @return [Hash]
     def self.hash(*args, &block)
-      hash = {}
+      hash = new_hash
       self.new(hash, *args, &block)
       hash
     end
@@ -164,7 +173,7 @@ module JSON::LD
       preprocess
       
       # Don't generate context for canonical output
-      json_hash = @options[:canonicalize] ? {} : start_document
+      json_hash = @options[:canonicalize] ? new_hash : start_document
 
       elements = []
       order_subjects.each do |subject|
@@ -233,7 +242,7 @@ module JSON::LD
         # Encode like a subject
         iri_range?(options[:property]) ?
           format_uri(value, :position => :subject) :
-          {:iri => format_uri(value, :position => :subject)}
+          {IRI => format_uri(value, :position => :subject)}
       end
     
       add_debug("format_uri(#{options.inspect}, #{value.inspect}) => #{result.inspect}")
@@ -260,11 +269,11 @@ module JSON::LD
     # @return [Object]
     def format_literal(literal, options = {})
       if options[:canonical] || @options[:canonicalize]
-        return {
-          :literal => literal.value,
-          :datatype => (format_uri(literal.datatype, :position => :subject) if literal.has_datatype?),
-          :language => (literal.language.to_s if literal.has_language?)
-        }.delete_if {|k,v| v.nil?}
+        ret = new_hash
+        ret[LITERAL] = literal.value
+        ret[DATATYPE] = format_uri(literal.datatype, :position => :subject)if literal.has_datatype?
+        ret[LANGUAGE] = literal.language.to_s if literal.has_language?
+        return ret.delete_if {|k,v| v.nil?}
       end
 
       case literal
@@ -320,7 +329,7 @@ module JSON::LD
     # Generate @context
     # @return [Hash]
     def start_document
-      ctx = {}
+      ctx = new_hash
       ctx[BASE] = base_uri.to_s if base_uri
       ctx[VOCAB] = vocab.to_s if vocab
       
@@ -334,7 +343,7 @@ module JSON::LD
       # Coerce
       add_debug "start_doc: coerce= #{coerce.inspect}"
       unless coerce == DEFAULT_COERCE
-        c_h = {}
+        c_h = new_hash
         coerce.keys.sort.each do |k|
           next if coerce[k] == DEFAULT_COERCE[k]  ||
                   coerce[k] == false ||
@@ -357,8 +366,11 @@ module JSON::LD
       end
 
       add_debug "start_doc: context=#{ctx.inspect}"
+
       # Return hash with @context, or empty
-      ctx.empty? ? {} : {CONTEXT => ctx}
+      r = new_hash
+      r[CONTEXT] = ctx unless ctx.empty?
+      r
     end
     
     # Perform any preprocessing of statements required
@@ -367,7 +379,7 @@ module JSON::LD
       (@options[:prefixes] || {}).each_pair do |k, v|
         @iri_to_prefix[v.to_s] = k
       end
-      @options[:prefixes] = {}  # Will define actual used when matched
+      @options[:prefixes] = new_hash  # Will define actual used when matched
 
       @graph.each {|statement| preprocess_statement(statement)}
     end
@@ -398,7 +410,7 @@ module JSON::LD
     # Option contains referencing property, if this is recursive
     # @return [Hash]
     def subject(subject, options = {})
-      defn = {}
+      defn = new_hash
       
       raise RDF::WriterError, "Illegal use of subject #{subject.inspect}, not supported" unless subject.resource?
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json-ld
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
-  version: 0.0.4
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 3
+        - 3
         version: 0.3.3
   type: :runtime
   version_requirements: *id001
@@ -32,6 +42,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
   type: :runtime
   version_requirements: *id002
@@ -43,6 +58,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
   type: :development
   version_requirements: *id003
@@ -54,6 +74,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :development
   version_requirements: *id004
@@ -65,6 +90,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 3
+        - 2
         version: 0.3.2
   type: :development
   version_requirements: *id005
@@ -76,6 +106,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 3
+        - 3
         version: 0.3.3
   type: :development
   version_requirements: *id006
@@ -87,6 +122,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 3
+        - 4
         version: 0.3.4
   type: :development
   version_requirements: *id007
@@ -98,6 +138,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -109,6 +152,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -120,6 +166,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id010
@@ -156,17 +205,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 53
+      segments: 
+      - 1
+      - 8
+      - 1
       version: 1.8.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: json-ld
-rubygems_version: 1.6.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: JSON-LD reader/writer for Ruby.