Finish 2.1.7

Author: gkellogg

Gemfile

@@ -1,22 +1,22 @@
 source "https://rubygems.org"
 
 gemspec
-gem 'rdf',              github: "ruby-rdf/rdf",             branch: "develop"
-gem 'rdf-spec',         github: "ruby-rdf/rdf-spec",        branch: "develop"
+gem 'rdf',              git: "https://github.com/ruby-rdf/rdf",             branch: "develop"
+gem 'rdf-spec',         git: "https://github.com/ruby-rdf/rdf-spec",        branch: "develop"
 
 group :development do
-  gem 'ebnf',           github: "gkellogg/ebnf",            branch: "develop"
-  gem 'sxp',            github: "dryruby/sxp.rb",           branch: "develop"
-  gem 'rdf-isomorphic', github: "ruby-rdf/rdf-isomorphic",  branch: "develop"
-  gem 'rdf-trig',       github: "ruby-rdf/rdf-trig",        branch: "develop"
-  gem 'rdf-vocab',      github: "ruby-rdf/rdf-vocab",       branch: "develop"
-  gem 'rdf-xsd',        github: "ruby-rdf/rdf-xsd",         branch: "develop"
+  gem 'ebnf',           git: "https://github.com/gkellogg/ebnf",            branch: "develop"
+  gem 'sxp',            git: "https://github.com/dryruby/sxp.rb",           branch: "develop"
+  gem 'rdf-isomorphic', git: "https://github.com/ruby-rdf/rdf-isomorphic",  branch: "develop"
+  gem 'rdf-trig',       git: "https://github.com/ruby-rdf/rdf-trig",        branch: "develop"
+  gem 'rdf-vocab',      git: "https://github.com/ruby-rdf/rdf-vocab",       branch: "develop"
+  gem 'rdf-xsd',        git: "https://github.com/ruby-rdf/rdf-xsd",         branch: "develop"
   gem 'fasterer'
   gem 'earl-report'
 end
 
 group :development, :test do
-  gem 'simplecov',  require: false, platform: :mri, github: "colszowka/simplecov" # Until Fixnum issues solved
+  gem 'simplecov',  require: false, platform: :mri
   gem 'coveralls',  require: false, platform: :mri
   gem 'psych',      platforms: [:mri, :rbx]
   gem 'benchmark-ips'

VERSION

@@ -1 +1 @@
-2.1.6
+2.1.7

lib/json/ld/context.rb

@@ -113,6 +113,7 @@ def initialize(term,
       def container_mapping=(mapping)
         mapping = Array(mapping)
         if @as_set = mapping.include?('@set')
+          mapping = mapping.dup
           mapping.delete('@set')
         end
         @container_mapping = mapping.first
@@ -1616,7 +1617,7 @@ def check_container(container, local_context, defined, term)
               "'@container' on term #{term.inspect} must be a string: #{container.inspect}"
       end
 
-      val = Array(container)
+      val = Array(container).dup
       val.delete('@set') if has_set = val.include?('@set')
 
       raise JsonLdError::InvalidContainerMapping,

lib/json/ld/expand.rb

@@ -32,7 +32,11 @@ def expand(input, active_property, context, ordered: true)
           raise JsonLdError::ListOfLists,
                 "A list may not contain another list" if
                 is_list && (v.is_a?(Array) || list?(v))
-          memo << v unless v.nil?
+          case v
+          when nil then nil
+          when Array then memo.concat(v)
+          else            memo << v
+          end
         end
 
         value

spec/expand_spec.rb

@@ -637,6 +637,29 @@
             "http://example.com/foo" => []
           }]
         },
+        "Free-floating values in sets" => {
+          input: %({
+            "@context": {"property": "http://example.com/property"},
+            "@graph": [{
+                "@set": [
+                    "free-floating strings in set objects are removed",
+                    {"@id": "http://example.com/free-floating-node"},
+                    {
+                        "@id": "http://example.com/node",
+                        "property": "nodes with properties are not removed"
+                    }
+                ]
+            }]
+          }),
+          output: %([{
+            "@id": "http://example.com/node",
+            "http://example.com/property": [
+              {
+                "@value": "nodes with properties are not removed"
+              }
+            ]
+          }])
+        }
       }.each do |title, params|
         it(title) {run_expand params}
       end