Finish 1.0.6

Author: gkellogg

.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.2'
   gem.requirements          = []
-  gem.add_runtime_dependency     'rdf',             '>= 1.0.7'
+  gem.add_runtime_dependency     'rdf',             '>= 1.0.8'
   gem.add_runtime_dependency     'json',            '>= 1.7.5'
   gem.add_development_dependency 'equivalent-xml' , '>= 0.2.8'
   gem.add_development_dependency 'open-uri-cached', '>= 0.0.5'

.travis.yml

@@ -7,4 +7,4 @@ rvm:
   - 1.9.3
   - 2.0.0
   - jruby-19mode
-  - rbx-19mode
+#  - rbx-19mode

README.md

@@ -1,6 +1,6 @@
 # JSON-LD reader/writer
 
-[JSON-LD][] reader/writer for [RDF.rb][RDF.rb] and fully conforming [JSON-LD][] processor.
+[JSON-LD][] reader/writer for [RDF.rb][RDF.rb] and fully conforming [JSON-LD API][] processor. Additionally this gem implements [JSON-LD Framing][].
 
 [![Gem Version](https://badge.fury.io/rb/json-ld.png)](http://badge.fury.io/rb/json-ld)
 [![Build Status](https://secure.travis-ci.org/ruby-rdf/json-ld.png?branch=master)](http://travis-ci.org/ruby-rdf/json-ld)
@@ -220,13 +220,12 @@ Install with `gem install json-ld`
 Full documentation available on [RubyDoc](http://rubydoc.info/gems/json-ld/file/README.md)
 
 ## Differences from [JSON-LD API][]
-The specified JSON-LD API is based on a WebIDL definition intended for use within the browser.
+The specified JSON-LD API is based on a WebIDL definition implementing [Promises][] intended for use within a browser.
 This version implements a more Ruby-like variation of this API without the use
-of futures and callback arguments, preferring Ruby blocks. All API methods
-execute synchronously, so that the return from a method can be used as well as a block.
+of promises or callback arguments, preferring Ruby blocks. All API methods
+execute synchronously, so that the return from a method can typically be used as well as a block.
 
-Note, the API method signatures differed in versions before 1.0, in that they also had
-a callback parameter.
+Note, the API method signatures differed in versions before 1.0, in that they also had a callback parameter. And 1.0.6 has some other minor method signature differences than previous versions. This should be the only exception to the use of semantic versioning.
 
 ### Principal Classes
 * {JSON::LD}
@@ -288,5 +287,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
 [RDF.rb]:           http://rubygems.org/gems/rdf
 [Backports]:        http://rubygems.org/gems/backports
-[JSON-LD]:          http://json-ld.org/spec/latest/
-[JSON-LD API]:      http://json-ld.org/spec/latest/json-ld-api/
+[JSON-LD]:          http://www.w3.org/TR/json-ld/ "JSON-LD 1.0"
+[JSON-LD API]:      http://www.w3.org/TR/json-ld-api/ "JSON-LD 1.0 Processing Algorithms and API"
+[JSON-LD Framing]:  http://json-ld.org/spec/latest/json-ld-framing/ "JSON-LD Framing 1.0"
+[Promises]:         http://dom.spec.whatwg.org/#promises

VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

bin/jsonld

@@ -26,7 +26,8 @@ def run(input, options)
   prefixes = {}
   start = Time.new
   if options[:expand]
-    output = JSON::LD::API.expand(input, options[:context], options)
+    options = options.merge(:expandContext => options.delete(:context)) if options.has_key?(:context)
+    output = JSON::LD::API.expand(input, options)
     secs = Time.new - start
     options[:output].puts output.to_json(JSON::LD::JSON_STATE)
     STDERR.puts "Expanded in #{secs} seconds." unless options[:quiet]