From ed95eebd5b8dd21eab95f86c1bba1285ebf0a414 Mon Sep 17 00:00:00 2001
From: Florian Frank <flori@ping.de>
Date: Thu, 25 Feb 2016 00:45:21 +0100
Subject: Remove permutation dependency

---
 Rakefile           |   2 --
 json.gemspec       | Bin 4730 -> 4387 bytes
 json_pure.gemspec  |   7 ++-----
 tests/test_json.rb |  34 ----------------------------------
 4 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/Rakefile b/Rakefile
index ab5569c..3ff7785 100644
--- a/Rakefile
+++ b/Rakefile
@@ -83,7 +83,6 @@ if defined?(Gem) and defined?(Gem::PackageTask)
     s.files = PKG_FILES
 
     s.require_path = 'lib'
-    s.add_development_dependency 'permutation'
     s.add_development_dependency 'rake'
 
     s.extra_rdoc_files << 'README.md'
@@ -120,7 +119,6 @@ if defined?(Gem) and defined?(Gem::PackageTask)
     s.extensions = FileList['ext/**/extconf.rb']
 
     s.require_path = 'lib'
-    s.add_development_dependency 'permutation'
 
     s.extra_rdoc_files << 'README.md'
     s.rdoc_options <<
diff --git a/json.gemspec b/json.gemspec
index 2865776..a2c1045 100644
Binary files a/json.gemspec and b/json.gemspec differ
diff --git a/json_pure.gemspec b/json_pure.gemspec
index 0ac2236..30d2f81 100644
--- a/json_pure.gemspec
+++ b/json_pure.gemspec
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2015-11-06"
+  s.date = "2016-02-24"
   s.description = "This is a JSON implementation in pure Ruby."
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.md"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://flori.github.com/json"
   s.licenses = ["Ruby"]
   s.rdoc_options = ["--title", "JSON implemention for ruby", "--main", "README.md"]
-  s.rubygems_version = "2.5.0"
+  s.rubygems_version = "2.5.1"
   s.summary = "JSON Implementation for Ruby"
   s.test_files = ["./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
 
@@ -24,14 +24,11 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<permutation>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
     else
-      s.add_dependency(%q<permutation>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
-    s.add_dependency(%q<permutation>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
   end
 end
diff --git a/tests/test_json.rb b/tests/test_json.rb
index 7957773..98f7a49 100755
--- a/tests/test_json.rb
+++ b/tests/test_json.rb
@@ -7,20 +7,6 @@ require 'stringio'
 require 'tempfile'
 require 'ostruct'
 
-unless Array.method_defined?(:permutation)
-  begin
-    require 'enumerator'
-    require 'permutation'
-    class Array
-      def permutation
-        Permutation.for(self).to_enum.map { |x| x.project }
-      end
-    end
-  rescue LoadError
-    warn "Skipping permutation tests."
-  end
-end
-
 class TestJSON < Test::Unit::TestCase
   include JSON
 
@@ -146,26 +132,6 @@ class TestJSON < Test::Unit::TestCase
     assert_raise(JSON::ParserError) { JSON.parse('[ 1, ]', :quirks_mode => true) }
   end
 
-  if Array.method_defined?(:permutation)
-    def test_parse_more_complex_arrays
-      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
-      a.permutation.each do |perm|
-        json = pretty_generate(perm)
-        assert_equal perm, parse(json)
-      end
-    end
-
-    def test_parse_complex_objects
-      a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }]
-      a.permutation.each do |perm|
-        s = "a"
-        orig_obj = perm.inject({}) { |h, x| h[s.dup] = x; s = s.succ; h }
-        json = pretty_generate(orig_obj)
-        assert_equal orig_obj, parse(json)
-      end
-    end
-  end
-
   def test_parse_arrays
     assert_equal([1,2,3], parse('[1,2,3]'))
     assert_equal([1.2,2,3], parse('[1.2,2,3]'))
-- 
cgit v1.2.1