engineyard-serverside 2.0.5 → 2.0.6
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/engineyard-serverside.rb +3 -3
- data/lib/engineyard-serverside/configuration.rb +6 -6
- data/lib/engineyard-serverside/deploy.rb +11 -7
- data/lib/engineyard-serverside/version.rb +1 -1
- data/lib/vendor/multi_json/CHANGELOG.md +121 -0
- data/lib/vendor/multi_json/CONTRIBUTING.md +46 -0
- data/lib/vendor/multi_json/Gemfile +31 -0
- data/lib/vendor/multi_json/LICENSE.md +20 -0
- data/lib/vendor/multi_json/README.md +105 -0
- data/lib/vendor/multi_json/Rakefile +12 -0
- data/lib/vendor/multi_json/lib/multi_json.rb +137 -0
- data/lib/vendor/multi_json/lib/multi_json/adapters/gson.rb +20 -0
- data/lib/vendor/multi_json/lib/multi_json/adapters/json_common.rb +35 -0
- data/lib/vendor/multi_json/lib/multi_json/adapters/json_gem.rb +12 -0
- data/lib/vendor/multi_json/lib/multi_json/adapters/json_pure.rb +12 -0
- data/lib/vendor/multi_json/lib/multi_json/adapters/nsjsonserialization.rb +35 -0
- data/lib/vendor/multi_json/lib/multi_json/adapters/oj.rb +29 -0
- data/lib/vendor/multi_json/lib/multi_json/adapters/ok_json.rb +58 -0
- data/lib/vendor/multi_json/lib/multi_json/adapters/yajl.rb +20 -0
- data/lib/vendor/multi_json/lib/multi_json/vendor/okjson.rb +602 -0
- data/lib/vendor/multi_json/lib/multi_json/version.rb +3 -0
- data/lib/vendor/multi_json/multi_json.gemspec +22 -0
- data/lib/vendor/multi_json/spec/adapter_shared_example.rb +162 -0
- data/lib/vendor/multi_json/spec/helper.rb +45 -0
- data/lib/vendor/multi_json/spec/json_common_shared_example.rb +36 -0
- data/lib/vendor/multi_json/spec/multi_json_spec.rb +151 -0
- data/spec/configuration_spec.rb +79 -1
- data/spec/deploy_hook_spec.rb +2 -2
- data/spec/spec_helper.rb +1 -1
- metadata +26 -120
- data/lib/vendor/json_pure/CHANGES +0 -166
- data/lib/vendor/json_pure/COPYING +0 -58
- data/lib/vendor/json_pure/GPL +0 -340
- data/lib/vendor/json_pure/README +0 -358
- data/lib/vendor/json_pure/Rakefile +0 -292
- data/lib/vendor/json_pure/TODO +0 -1
- data/lib/vendor/json_pure/VERSION +0 -1
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log +0 -52
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat +0 -1000
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat +0 -1001
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat +0 -900
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat +0 -901
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat +0 -1000
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat +0 -1001
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log +0 -261
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat +0 -1000
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat +0 -1001
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat +0 -1000
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat +0 -1001
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat +0 -1000
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat +0 -1001
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log +0 -262
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat +0 -1000
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat +0 -1001
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log +0 -82
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log +0 -34
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat +0 -900
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat +0 -901
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log +0 -81
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat +0 -1000
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat +0 -1001
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log +0 -82
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat +0 -1000
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat +0 -1001
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log +0 -82
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat +0 -1000
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat +0 -1001
- data/lib/vendor/json_pure/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log +0 -82
- data/lib/vendor/json_pure/benchmarks/generator2_benchmark.rb +0 -222
- data/lib/vendor/json_pure/benchmarks/generator_benchmark.rb +0 -224
- data/lib/vendor/json_pure/benchmarks/ohai.json +0 -1216
- data/lib/vendor/json_pure/benchmarks/ohai.ruby +0 -1
- data/lib/vendor/json_pure/benchmarks/parser2_benchmark.rb +0 -251
- data/lib/vendor/json_pure/benchmarks/parser_benchmark.rb +0 -259
- data/lib/vendor/json_pure/bin/edit_json.rb +0 -9
- data/lib/vendor/json_pure/bin/prettify_json.rb +0 -75
- data/lib/vendor/json_pure/data/example.json +0 -1
- data/lib/vendor/json_pure/data/index.html +0 -38
- data/lib/vendor/json_pure/data/prototype.js +0 -4184
- data/lib/vendor/json_pure/ext/json/ext/generator/extconf.rb +0 -16
- data/lib/vendor/json_pure/ext/json/ext/generator/generator.c +0 -1323
- data/lib/vendor/json_pure/ext/json/ext/generator/generator.h +0 -170
- data/lib/vendor/json_pure/ext/json/ext/parser/extconf.rb +0 -15
- data/lib/vendor/json_pure/ext/json/ext/parser/parser.c +0 -1935
- data/lib/vendor/json_pure/ext/json/ext/parser/parser.h +0 -71
- data/lib/vendor/json_pure/ext/json/ext/parser/parser.rl +0 -792
- data/lib/vendor/json_pure/install.rb +0 -26
- data/lib/vendor/json_pure/lib/json.rb +0 -10
- data/lib/vendor/json_pure/lib/json/Array.xpm +0 -21
- data/lib/vendor/json_pure/lib/json/FalseClass.xpm +0 -21
- data/lib/vendor/json_pure/lib/json/Hash.xpm +0 -21
- data/lib/vendor/json_pure/lib/json/Key.xpm +0 -73
- data/lib/vendor/json_pure/lib/json/NilClass.xpm +0 -21
- data/lib/vendor/json_pure/lib/json/Numeric.xpm +0 -28
- data/lib/vendor/json_pure/lib/json/String.xpm +0 -96
- data/lib/vendor/json_pure/lib/json/TrueClass.xpm +0 -21
- data/lib/vendor/json_pure/lib/json/add/core.rb +0 -148
- data/lib/vendor/json_pure/lib/json/add/rails.rb +0 -58
- data/lib/vendor/json_pure/lib/json/common.rb +0 -397
- data/lib/vendor/json_pure/lib/json/editor.rb +0 -1371
- data/lib/vendor/json_pure/lib/json/ext.rb +0 -15
- data/lib/vendor/json_pure/lib/json/json.xpm +0 -1499
- data/lib/vendor/json_pure/lib/json/pure.rb +0 -77
- data/lib/vendor/json_pure/lib/json/pure/generator.rb +0 -452
- data/lib/vendor/json_pure/lib/json/pure/parser.rb +0 -307
- data/lib/vendor/json_pure/lib/json/version.rb +0 -8
- data/lib/vendor/json_pure/tests/fixtures/fail1.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail10.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail11.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail12.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail13.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail14.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail18.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail19.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail2.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail20.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail21.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail22.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail23.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail24.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail25.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail27.json +0 -2
- data/lib/vendor/json_pure/tests/fixtures/fail28.json +0 -2
- data/lib/vendor/json_pure/tests/fixtures/fail3.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail4.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail5.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail6.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail7.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail8.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/fail9.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/pass1.json +0 -56
- data/lib/vendor/json_pure/tests/fixtures/pass15.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/pass16.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/pass17.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/pass2.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/pass26.json +0 -1
- data/lib/vendor/json_pure/tests/fixtures/pass3.json +0 -6
- data/lib/vendor/json_pure/tests/test_json.rb +0 -361
- data/lib/vendor/json_pure/tests/test_json_addition.rb +0 -162
- data/lib/vendor/json_pure/tests/test_json_encoding.rb +0 -68
- data/lib/vendor/json_pure/tests/test_json_fixtures.rb +0 -34
- data/lib/vendor/json_pure/tests/test_json_generate.rb +0 -122
- data/lib/vendor/json_pure/tests/test_json_rails.rb +0 -144
- data/lib/vendor/json_pure/tests/test_json_unicode.rb +0 -76
- data/lib/vendor/json_pure/tools/fuzz.rb +0 -139
- data/lib/vendor/json_pure/tools/server.rb +0 -61
@@ -1,139 +0,0 @@
|
|
1
|
-
require 'json'
|
2
|
-
|
3
|
-
require 'iconv'
|
4
|
-
ISO_8859_1_TO_UTF8 = Iconv.new('utf-8', 'iso-8859-15')
|
5
|
-
class ::String
|
6
|
-
def to_utf8
|
7
|
-
ISO_8859_1_TO_UTF8.iconv self
|
8
|
-
end
|
9
|
-
end
|
10
|
-
|
11
|
-
class Fuzzer
|
12
|
-
def initialize(n, freqs = {})
|
13
|
-
sum = freqs.inject(0.0) { |s, x| s + x.last }
|
14
|
-
freqs.each_key { |x| freqs[x] /= sum }
|
15
|
-
s = 0.0
|
16
|
-
freqs.each_key do |x|
|
17
|
-
freqs[x] = s .. (s + t = freqs[x])
|
18
|
-
s += t
|
19
|
-
end
|
20
|
-
@freqs = freqs
|
21
|
-
@n = n
|
22
|
-
@alpha = (0..0xff).to_a
|
23
|
-
end
|
24
|
-
|
25
|
-
def random_string
|
26
|
-
s = ''
|
27
|
-
30.times { s << @alpha[rand(@alpha.size)] }
|
28
|
-
s.to_utf8
|
29
|
-
end
|
30
|
-
|
31
|
-
def pick
|
32
|
-
r = rand
|
33
|
-
found = @freqs.find { |k, f| f.include? rand }
|
34
|
-
found && found.first
|
35
|
-
end
|
36
|
-
|
37
|
-
def make_pick
|
38
|
-
k = pick
|
39
|
-
case
|
40
|
-
when k == Hash, k == Array
|
41
|
-
k.new
|
42
|
-
when k == true, k == false, k == nil
|
43
|
-
k
|
44
|
-
when k == String
|
45
|
-
random_string
|
46
|
-
when k == Fixnum
|
47
|
-
rand(2 ** 30) - 2 ** 29
|
48
|
-
when k == Bignum
|
49
|
-
rand(2 ** 70) - 2 ** 69
|
50
|
-
end
|
51
|
-
end
|
52
|
-
|
53
|
-
def fuzz(current = nil)
|
54
|
-
if @n > 0
|
55
|
-
case current
|
56
|
-
when nil
|
57
|
-
@n -= 1
|
58
|
-
current = fuzz [ Hash, Array ][rand(2)].new
|
59
|
-
when Array
|
60
|
-
while @n > 0
|
61
|
-
@n -= 1
|
62
|
-
current << case p = make_pick
|
63
|
-
when Array, Hash
|
64
|
-
fuzz(p)
|
65
|
-
else
|
66
|
-
p
|
67
|
-
end
|
68
|
-
end
|
69
|
-
when Hash
|
70
|
-
while @n > 0
|
71
|
-
@n -= 1
|
72
|
-
current[random_string] = case p = make_pick
|
73
|
-
when Array, Hash
|
74
|
-
fuzz(p)
|
75
|
-
else
|
76
|
-
p
|
77
|
-
end
|
78
|
-
end
|
79
|
-
end
|
80
|
-
end
|
81
|
-
current
|
82
|
-
end
|
83
|
-
end
|
84
|
-
|
85
|
-
class MyState < JSON.state
|
86
|
-
WS = " \r\t\n"
|
87
|
-
|
88
|
-
def initialize
|
89
|
-
super(
|
90
|
-
:indent => make_spaces,
|
91
|
-
:space => make_spaces,
|
92
|
-
:space_before => make_spaces,
|
93
|
-
:object_nl => make_spaces,
|
94
|
-
:array_nl => make_spaces,
|
95
|
-
:max_nesting => false
|
96
|
-
)
|
97
|
-
end
|
98
|
-
|
99
|
-
def make_spaces
|
100
|
-
s = ''
|
101
|
-
rand(1).times { s << WS[rand(WS.size)] }
|
102
|
-
s
|
103
|
-
end
|
104
|
-
end
|
105
|
-
|
106
|
-
n = (ARGV.shift || 500).to_i
|
107
|
-
loop do
|
108
|
-
fuzzer = Fuzzer.new(n,
|
109
|
-
Hash => 25,
|
110
|
-
Array => 25,
|
111
|
-
String => 10,
|
112
|
-
Fixnum => 10,
|
113
|
-
Bignum => 10,
|
114
|
-
nil => 5,
|
115
|
-
true => 5,
|
116
|
-
false => 5
|
117
|
-
)
|
118
|
-
o1 = fuzzer.fuzz
|
119
|
-
json = JSON.generate o1, MyState.new
|
120
|
-
if $DEBUG
|
121
|
-
puts "-" * 80
|
122
|
-
puts json, json.size
|
123
|
-
else
|
124
|
-
puts json.size
|
125
|
-
end
|
126
|
-
begin
|
127
|
-
o2 = JSON.parse(json, :max_nesting => false)
|
128
|
-
rescue JSON::ParserError => e
|
129
|
-
puts "Caught #{e.class}: #{e.message}\n#{e.backtrace * "\n"}"
|
130
|
-
puts "o1 = #{o1.inspect}", "json = #{json}", "json_str = #{json.inspect}"
|
131
|
-
puts "locals = #{local_variables.inspect}"
|
132
|
-
exit
|
133
|
-
end
|
134
|
-
if o1 != o2
|
135
|
-
puts "mismatch", "o1 = #{o1.inspect}", "o2 = #{o2.inspect}",
|
136
|
-
"json = #{json}", "json_str = #{json.inspect}"
|
137
|
-
puts "locals = #{local_variables.inspect}"
|
138
|
-
end
|
139
|
-
end
|
@@ -1,61 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby
|
2
|
-
|
3
|
-
require 'webrick'
|
4
|
-
include WEBrick
|
5
|
-
$:.unshift 'ext'
|
6
|
-
$:.unshift 'lib'
|
7
|
-
require 'json'
|
8
|
-
|
9
|
-
class JSONServlet < HTTPServlet::AbstractServlet
|
10
|
-
@@count = 1
|
11
|
-
|
12
|
-
def do_GET(req, res)
|
13
|
-
obj = {
|
14
|
-
"TIME" => Time.now.strftime("%FT%T"),
|
15
|
-
"foo" => "Bär",
|
16
|
-
"bar" => "© ≠ €!",
|
17
|
-
'a' => 2,
|
18
|
-
'b' => 3.141,
|
19
|
-
'COUNT' => @@count += 1,
|
20
|
-
'c' => 'c',
|
21
|
-
'd' => [ 1, "b", 3.14 ],
|
22
|
-
'e' => { 'foo' => 'bar' },
|
23
|
-
'g' => "松本行弘",
|
24
|
-
'h' => 1000.0,
|
25
|
-
'i' => 0.001,
|
26
|
-
'j' => "\xf0\xa0\x80\x81",
|
27
|
-
}
|
28
|
-
res.body = JSON.generate obj
|
29
|
-
res['Content-Type'] = "application/json"
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
|
-
def create_server(err, dir, port)
|
34
|
-
dir = File.expand_path(dir)
|
35
|
-
err.puts "Surf to:", "http://#{Socket.gethostname}:#{port}"
|
36
|
-
|
37
|
-
s = HTTPServer.new(
|
38
|
-
:Port => port,
|
39
|
-
:DocumentRoot => dir,
|
40
|
-
:Logger => WEBrick::Log.new(err),
|
41
|
-
:AccessLog => [
|
42
|
-
[ err, WEBrick::AccessLog::COMMON_LOG_FORMAT ],
|
43
|
-
[ err, WEBrick::AccessLog::REFERER_LOG_FORMAT ],
|
44
|
-
[ err, WEBrick::AccessLog::AGENT_LOG_FORMAT ]
|
45
|
-
]
|
46
|
-
)
|
47
|
-
s.mount("/json", JSONServlet)
|
48
|
-
s
|
49
|
-
end
|
50
|
-
|
51
|
-
default_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'data'))
|
52
|
-
dir = ARGV.shift || default_dir
|
53
|
-
port = (ARGV.shift || 6666).to_i
|
54
|
-
s = create_server(STDERR, dir, 6666)
|
55
|
-
t = Thread.new { s.start }
|
56
|
-
trap(:INT) do
|
57
|
-
s.shutdown
|
58
|
-
t.join
|
59
|
-
exit
|
60
|
-
end
|
61
|
-
sleep
|