mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-27 09:38:12 -07:00
dev-ruby/multi_json: remove unused patches.
Closes: https://github.com/gentoo/gentoo/pull/2417 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
committed by
Patrice Clement
parent
ba9e52e8e8
commit
bb66fe5f86
@@ -1,24 +0,0 @@
|
||||
diff --git a/spec/multi_json_spec.rb b/spec/multi_json_spec.rb
|
||||
index 2df3350..9d2a376 100644
|
||||
--- a/spec/multi_json_spec.rb
|
||||
+++ b/spec/multi_json_spec.rb
|
||||
@@ -13,13 +13,17 @@ end
|
||||
describe "MultiJson" do
|
||||
context 'engines' do
|
||||
it 'should default to the best available gem' do
|
||||
+ begin
|
||||
require 'yajl'
|
||||
MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
|
||||
+ rescue LoadError
|
||||
+ pending "YAJL (or a dependency) not available."
|
||||
+ end
|
||||
end
|
||||
|
||||
it 'should be settable via a symbol' do
|
||||
- MultiJson.engine = :yajl
|
||||
- MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
|
||||
+ MultiJson.engine = :json_pure
|
||||
+ MultiJson.engine.name.should == 'MultiJson::Engines::JsonPure'
|
||||
end
|
||||
|
||||
it 'should be settable via a class' do
|
||||
@@ -1,75 +0,0 @@
|
||||
A small part of
|
||||
|
||||
commit d83002691a34a32b6d6d181817af7f8e68524638
|
||||
Author: Erik Michaels-Ober <sferik@gmail.com>
|
||||
Date: Sat May 14 09:26:31 2011 -0700
|
||||
|
||||
Cleanup
|
||||
|
||||
diff --git a/spec/multi_json_spec.rb b/spec/multi_json_spec.rb
|
||||
index 9be78f4..55238c9 100644
|
||||
--- b/spec/multi_json_spec.rb
|
||||
+++ a/spec/multi_json_spec.rb
|
||||
@@ -1,9 +1,9 @@
|
||||
-require 'helper'
|
||||
+require 'spec_helper'
|
||||
require 'stringio'
|
||||
-
|
||||
+
|
||||
class MockDecoder
|
||||
def self.decode(string, options = {})
|
||||
- {'abc' => 'def'}
|
||||
+ { 'abc' => 'def' }
|
||||
end
|
||||
|
||||
def self.encode(string)
|
||||
@@ -26,10 +26,16 @@
|
||||
end
|
||||
end
|
||||
end
|
||||
-
|
||||
+
|
||||
it 'defaults to the best available gem' do
|
||||
- require 'yajl'
|
||||
- MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
|
||||
+ # the yajl-ruby gem does not work on jruby, so the best engine is the JsonGem engine
|
||||
+ if jruby?
|
||||
+ require 'json'
|
||||
+ MultiJson.engine.name.should == 'MultiJson::Engines::JsonGem'
|
||||
+ else
|
||||
+ require 'yajl'
|
||||
+ MultiJson.engine.name.should == 'MultiJson::Engines::Yajl'
|
||||
+ end
|
||||
end
|
||||
|
||||
it 'is settable via a symbol' do
|
||||
@@ -89,7 +95,7 @@
|
||||
encoded_json = MultiJson.encode(:a => 1, :b => {:c => 2})
|
||||
MultiJson.decode(encoded_json).should == { "a" => 1, "b" => { "c" => 2 } }
|
||||
end
|
||||
-
|
||||
+
|
||||
it "properly decodes valid JSON in StringIOs" do
|
||||
json = StringIO.new('{"abc":"def"}')
|
||||
MultiJson.decode(json).should == { 'abc' => 'def' }
|
||||
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
|
||||
deleted file mode 100644
|
||||
index a9b66e6..0000000
|
||||
--- /dev/null
|
||||
+++ a/spec/spec_helper.rb
|
||||
@@ -0,0 +1,15 @@
|
||||
+begin
|
||||
+ require 'bundler'
|
||||
+rescue LoadError
|
||||
+ puts "although not required, it's recommended that you use bundler during development"
|
||||
+end
|
||||
+
|
||||
+require 'rspec'
|
||||
+require 'rspec/autorun'
|
||||
+
|
||||
+$VERBOSE = true
|
||||
+require 'multi_json'
|
||||
+
|
||||
+def jruby?
|
||||
+ defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
|
||||
+end
|
||||
Reference in New Issue
Block a user