scout 5.7.3.pre.2 → 5.7.4

data/vendor/json_pure/tests/test_json_generic_object.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'setup_variant')
+class TestJSONGenericObject < Test::Unit::TestCase
+  include JSON
+
+  def setup
+    @go = GenericObject[ :a => 1, :b => 2 ]
+  end
+
+  def test_attributes
+    assert_equal 1, @go.a
+    assert_equal 1, @go[:a]
+    assert_equal 2, @go.b
+    assert_equal 2, @go[:b]
+    assert_nil @go.c
+    assert_nil @go[:c]
+  end
+
+  def test_generate_json
+    switch_json_creatable do
+      assert_equal @go, JSON(JSON(@go), :create_additions => true)
+    end
+  end
+
+  def test_parse_json
+    assert_kind_of Hash, JSON('{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }', :create_additions => true)
+    switch_json_creatable do
+      assert_equal @go, l = JSON('{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }', :create_additions => true)
+      assert_equal 1, l.a
+      assert_equal @go, l = JSON('{ "a": 1, "b": 2 }', :object_class => GenericObject)
+      assert_equal 1, l.a
+      assert_equal GenericObject[:a => GenericObject[:b => 2]],
+        l = JSON('{ "a": { "b": 2 } }', :object_class => GenericObject)
+      assert_equal 2, l.a.b
+    end
+  end
+
+  def test_from_hash
+    result  = GenericObject.from_hash(
+      :foo => { :bar => { :baz => true }, :quux => [ { :foobar => true } ] })
+    assert_kind_of GenericObject, result.foo
+    assert_kind_of GenericObject, result.foo.bar
+    assert_equal   true, result.foo.bar.baz
+    assert_kind_of GenericObject, result.foo.quux.first
+    assert_equal   true, result.foo.quux.first.foobar
+    assert_equal   true, GenericObject.from_hash(true)
+  end
+
+  def test_json_generic_object_load
+    empty = JSON::GenericObject.load(nil)
+    assert_kind_of JSON::GenericObject, empty
+    simple_json = '{"json_class":"JSON::GenericObject","hello":"world"}'
+    simple = JSON::GenericObject.load(simple_json)
+    assert_kind_of JSON::GenericObject, simple
+    assert_equal "world", simple.hello
+    converting = JSON::GenericObject.load('{ "hello": "world" }')
+    assert_kind_of JSON::GenericObject, converting
+    assert_equal "world", converting.hello
+
+    json = JSON::GenericObject.dump(JSON::GenericObject[:hello => 'world'])
+    assert_equal JSON(json), JSON('{"json_class":"JSON::GenericObject","hello":"world"}')
+  end
+
+  private
+
+  def switch_json_creatable
+    JSON::GenericObject.json_creatable = true
+    yield
+  ensure
+    JSON::GenericObject.json_creatable = false
+  end
+end

data/vendor/json_pure/tests/test_json_string_matching.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'setup_variant')
+require 'stringio'
+require 'time'
+
+class TestJSONStringMatching < Test::Unit::TestCase
+  include JSON
+
+  class TestTime < ::Time
+    def self.json_create(string)
+      Time.parse(string)
+    end
+
+    def to_json(*)
+      %{"#{strftime('%FT%T%z')}"}
+    end
+
+    def ==(other)
+      to_i == other.to_i
+    end
+  end
+
+  def test_match_date
+    t = TestTime.new
+    t_json = [ t ].to_json
+    assert_equal [ t ],
+      JSON.parse(t_json, :create_additions => true,
+        :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime })
+    assert_equal [ t.strftime('%FT%T%z') ],
+      JSON.parse(t_json, :create_additions => true,
+        :match_string => { /\A\d{3}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime })
+    assert_equal [ t.strftime('%FT%T%z') ],
+      JSON.parse(t_json,
+        :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/ => TestTime })
+  end
+end

data/vendor/json_pure/tests/test_json_unicode.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'setup_variant')
+
+class TestJSONUnicode < Test::Unit::TestCase
+  include JSON
+
+  def test_unicode
+    assert_equal '""', ''.to_json
+    assert_equal '"\\b"', "\b".to_json
+    assert_equal '"\u0001"', 0x1.chr.to_json
+    assert_equal '"\u001f"', 0x1f.chr.to_json
+    assert_equal '" "', ' '.to_json
+    assert_equal "\"#{0x7f.chr}\"", 0x7f.chr.to_json
+    utf8 = [ "© ≠ €! \01" ]
+    json = '["© ≠ €! \u0001"]'
+    assert_equal json, utf8.to_json(:ascii_only => false)
+    assert_equal utf8, parse(json)
+    json = '["\u00a9 \u2260 \u20ac! \u0001"]'
+    assert_equal json, utf8.to_json(:ascii_only => true)
+    assert_equal utf8, parse(json)
+    utf8 = ["\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212"]
+    json = "[\"\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212\"]"
+    assert_equal utf8, parse(json)
+    assert_equal json, utf8.to_json(:ascii_only => false)
+    utf8 = ["\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212"]
+    assert_equal utf8, parse(json)
+    json = "[\"\\u3042\\u3044\\u3046\\u3048\\u304a\"]"
+    assert_equal json, utf8.to_json(:ascii_only => true)
+    assert_equal utf8, parse(json)
+    utf8 = ['საქართველო']
+    json = '["საქართველო"]'
+    assert_equal json, utf8.to_json(:ascii_only => false)
+    json = "[\"\\u10e1\\u10d0\\u10e5\\u10d0\\u10e0\\u10d7\\u10d5\\u10d4\\u10da\\u10dd\"]"
+    assert_equal json, utf8.to_json(:ascii_only => true)
+    assert_equal utf8, parse(json)
+    assert_equal '["Ã"]', JSON.generate(["Ã"], :ascii_only => false)
+    assert_equal '["\\u00c3"]', JSON.generate(["Ã"], :ascii_only => true)
+    assert_equal ["€"], JSON.parse('["\u20ac"]')
+    utf8 = ["\xf0\xa0\x80\x81"]
+    json = "[\"\xf0\xa0\x80\x81\"]"
+    assert_equal json, JSON.generate(utf8, :ascii_only => false)
+    assert_equal utf8, JSON.parse(json)
+    json = '["\ud840\udc01"]'
+    assert_equal json, JSON.generate(utf8, :ascii_only => true)
+    assert_equal utf8, JSON.parse(json)
+  end
+
+  def test_chars
+    (0..0x7f).each do |i|
+      json = '["\u%04x"]' % i
+      if RUBY_VERSION >= "1.9."
+        i = i.chr
+      end
+      assert_equal i, JSON.parse(json).first[0]
+      if i == ?\b
+        generated = JSON.generate(["" << i])
+        assert '["\b"]' == generated || '["\10"]' == generated
+      elsif [?\n, ?\r, ?\t, ?\f].include?(i)
+        assert_equal '[' << ('' << i).dump << ']', JSON.generate(["" << i])
+      elsif i.chr < 0x20.chr
+        assert_equal json, JSON.generate(["" << i])
+      end
+    end
+    assert_raise(JSON::GeneratorError) do
+      JSON.generate(["\x80"], :ascii_only => true)
+    end
+    assert_equal "\302\200", JSON.parse('["\u0080"]').first
+  end
+end

data/vendor/json_pure/tools/fuzz.rb

@@ -0,0 +1,139 @@
+require 'json'
+
+require 'iconv'
+ISO_8859_1_TO_UTF8 = Iconv.new('utf-8', 'iso-8859-15')
+class ::String
+  def to_utf8
+    ISO_8859_1_TO_UTF8.iconv self
+  end
+end
+
+class Fuzzer
+  def initialize(n, freqs = {})
+    sum = freqs.inject(0.0) { |s, x| s + x.last }
+    freqs.each_key { |x| freqs[x] /= sum }
+    s = 0.0
+    freqs.each_key do |x|
+      freqs[x] = s .. (s + t = freqs[x])
+      s += t
+    end
+    @freqs = freqs
+    @n = n
+    @alpha = (0..0xff).to_a
+  end
+
+  def random_string
+    s = ''
+    30.times { s << @alpha[rand(@alpha.size)] }
+    s.to_utf8
+  end
+
+  def pick
+    r = rand
+    found = @freqs.find { |k, f| f.include? rand }
+    found && found.first
+  end
+
+  def make_pick
+    k = pick
+    case
+    when k == Hash, k == Array
+      k.new
+    when k == true, k == false, k == nil
+      k
+    when k == String
+      random_string
+    when k == Fixnum
+      rand(2 ** 30) - 2 ** 29
+    when k == Bignum
+      rand(2 ** 70) - 2 ** 69
+    end
+  end
+
+  def fuzz(current = nil)
+    if @n > 0
+      case current
+      when nil
+        @n -= 1
+        current = fuzz [ Hash, Array ][rand(2)].new
+      when Array
+        while @n > 0
+          @n -= 1
+          current << case p = make_pick
+          when Array, Hash
+            fuzz(p)
+          else
+            p
+          end
+        end
+      when Hash
+        while @n > 0
+          @n -= 1
+          current[random_string] = case p = make_pick
+          when Array, Hash
+            fuzz(p)
+          else
+            p
+          end
+        end
+      end
+    end
+    current
+  end
+end
+
+class MyState < JSON.state
+  WS = " \r\t\n"
+
+  def initialize
+    super(
+          :indent       => make_spaces,
+          :space        => make_spaces,
+          :space_before => make_spaces,
+          :object_nl    => make_spaces,
+          :array_nl     => make_spaces,
+          :max_nesting  => false
+         )
+  end
+
+  def make_spaces
+    s = ''
+    rand(1).times { s << WS[rand(WS.size)] }
+    s
+  end
+end
+
+n = (ARGV.shift || 500).to_i
+loop do
+  fuzzer = Fuzzer.new(n,
+                      Hash => 25,
+                      Array => 25,
+                      String => 10,
+                      Fixnum => 10,
+                      Bignum => 10,
+                      nil => 5,
+                      true => 5,
+                      false => 5
+                     )
+  o1 = fuzzer.fuzz
+  json = JSON.generate o1, MyState.new
+  if $DEBUG
+    puts "-" * 80
+    puts json, json.size
+  else
+    puts json.size
+  end
+  begin
+    o2 = JSON.parse(json, :max_nesting => false)
+  rescue JSON::ParserError => e
+    puts "Caught #{e.class}: #{e.message}\n#{e.backtrace * "\n"}"
+    puts "o1 = #{o1.inspect}", "json = #{json}", "json_str = #{json.inspect}"
+    puts "locals = #{local_variables.inspect}"
+    exit
+  end
+  if o1 != o2
+    puts "mismatch", "o1 = #{o1.inspect}", "o2 = #{o2.inspect}",
+      "json = #{json}", "json_str = #{json.inspect}"
+    puts "locals = #{local_variables.inspect}"
+  end
+end

data/vendor/json_pure/tools/server.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'webrick'
+include WEBrick
+$:.unshift 'ext'
+$:.unshift 'lib'
+require 'json'
+
+class JSONServlet < HTTPServlet::AbstractServlet
+  @@count = 1
+
+  def do_GET(req, res)
+    obj = {
+      "TIME" => Time.now.strftime("%FT%T"),
+      "foo" => "Bär",
+      "bar" => "© ≠ €!",
+      'a' => 2,
+      'b' => 3.141,
+      'COUNT' => @@count += 1,
+      'c' => 'c',
+      'd' => [ 1, "b", 3.14 ],
+      'e' => { 'foo' => 'bar' },
+      'g' => "松本行弘",
+      'h' => 1000.0,
+      'i' => 0.001,
+      'j' => "\xf0\xa0\x80\x81",
+    }
+    res.body = JSON.generate obj
+    res['Content-Type'] = "application/json"
+  end
+end
+
+def create_server(err, dir, port)
+  dir = File.expand_path(dir)
+  err.puts "Surf to:", "http://#{Socket.gethostname}:#{port}"
+
+  s = HTTPServer.new(
+    :Port         => port,
+    :DocumentRoot => dir,
+    :Logger       => WEBrick::Log.new(err),
+    :AccessLog    => [
+      [ err, WEBrick::AccessLog::COMMON_LOG_FORMAT  ],
+      [ err, WEBrick::AccessLog::REFERER_LOG_FORMAT ],
+      [ err, WEBrick::AccessLog::AGENT_LOG_FORMAT   ]
+    ]
+  )
+  s.mount("/json", JSONServlet)
+  s
+end
+
+default_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'data'))
+dir = ARGV.shift || default_dir
+port = (ARGV.shift || 6666).to_i
+s = create_server(STDERR, dir, 6666)
+t = Thread.new { s.start }
+trap(:INT) do
+  s.shutdown
+  t.join
+  exit
+end
+sleep

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout
 version: !ruby/object:Gem::Version
-  version: 5.7.3.pre.2
-  prerelease: 6
+  version: 5.7.4
+  prerelease: 
 platform: ruby
 authors:
 - Andre Lewis
@@ -129,6 +129,113 @@ files:
 - vendor/httpclient/test/test_httpclient.rb
 - vendor/httpclient/test/test_include_client.rb
 - vendor/httpclient/test/test_ssl.rb
+- vendor/json_pure/.gitignore
+- vendor/json_pure/.travis.yml
+- vendor/json_pure/CHANGES
+- vendor/json_pure/COPYING
+- vendor/json_pure/COPYING-json-jruby
+- vendor/json_pure/GPL
+- vendor/json_pure/Gemfile
+- vendor/json_pure/README-json-jruby.markdown
+- vendor/json_pure/README.rdoc
+- vendor/json_pure/Rakefile
+- vendor/json_pure/TODO
+- vendor/json_pure/VERSION
+- vendor/json_pure/data/example.json
+- vendor/json_pure/data/index.html
+- vendor/json_pure/data/prototype.js
+- vendor/json_pure/diagrams/.keep
+- vendor/json_pure/ext/json/ext/fbuffer/fbuffer.h
+- vendor/json_pure/ext/json/ext/generator/depend
+- vendor/json_pure/ext/json/ext/generator/extconf.rb
+- vendor/json_pure/ext/json/ext/generator/generator.c
+- vendor/json_pure/ext/json/ext/generator/generator.h
+- vendor/json_pure/ext/json/ext/parser/depend
+- vendor/json_pure/ext/json/ext/parser/extconf.rb
+- vendor/json_pure/ext/json/ext/parser/parser.c
+- vendor/json_pure/ext/json/ext/parser/parser.h
+- vendor/json_pure/ext/json/ext/parser/parser.rl
+- vendor/json_pure/install.rb
+- vendor/json_pure/java/src/json/ext/ByteListTranscoder.java
+- vendor/json_pure/java/src/json/ext/Generator.java
+- vendor/json_pure/java/src/json/ext/GeneratorMethods.java
+- vendor/json_pure/java/src/json/ext/GeneratorService.java
+- vendor/json_pure/java/src/json/ext/GeneratorState.java
+- vendor/json_pure/java/src/json/ext/OptionsReader.java
+- vendor/json_pure/java/src/json/ext/Parser.java
+- vendor/json_pure/java/src/json/ext/Parser.rl
+- vendor/json_pure/java/src/json/ext/ParserService.java
+- vendor/json_pure/java/src/json/ext/RuntimeInfo.java
+- vendor/json_pure/java/src/json/ext/StringDecoder.java
+- vendor/json_pure/java/src/json/ext/StringEncoder.java
+- vendor/json_pure/java/src/json/ext/Utils.java
+- vendor/json_pure/json-java.gemspec
+- vendor/json_pure/json.gemspec
+- vendor/json_pure/json_pure.gemspec
+- vendor/json_pure/lib/json.rb
+- vendor/json_pure/lib/json/add/bigdecimal.rb
+- vendor/json_pure/lib/json/add/complex.rb
+- vendor/json_pure/lib/json/add/core.rb
+- vendor/json_pure/lib/json/add/date.rb
+- vendor/json_pure/lib/json/add/date_time.rb
+- vendor/json_pure/lib/json/add/exception.rb
+- vendor/json_pure/lib/json/add/ostruct.rb
+- vendor/json_pure/lib/json/add/range.rb
+- vendor/json_pure/lib/json/add/rational.rb
+- vendor/json_pure/lib/json/add/regexp.rb
+- vendor/json_pure/lib/json/add/struct.rb
+- vendor/json_pure/lib/json/add/symbol.rb
+- vendor/json_pure/lib/json/add/time.rb
+- vendor/json_pure/lib/json/common.rb
+- vendor/json_pure/lib/json/ext.rb
+- vendor/json_pure/lib/json/ext/.keep
+- vendor/json_pure/lib/json/generic_object.rb
+- vendor/json_pure/lib/json/pure.rb
+- vendor/json_pure/lib/json/pure/generator.rb
+- vendor/json_pure/lib/json/pure/parser.rb
+- vendor/json_pure/lib/json/version.rb
+- vendor/json_pure/tests/fixtures/fail1.json
+- vendor/json_pure/tests/fixtures/fail10.json
+- vendor/json_pure/tests/fixtures/fail11.json
+- vendor/json_pure/tests/fixtures/fail12.json
+- vendor/json_pure/tests/fixtures/fail13.json
+- vendor/json_pure/tests/fixtures/fail14.json
+- vendor/json_pure/tests/fixtures/fail18.json
+- vendor/json_pure/tests/fixtures/fail19.json
+- vendor/json_pure/tests/fixtures/fail2.json
+- vendor/json_pure/tests/fixtures/fail20.json
+- vendor/json_pure/tests/fixtures/fail21.json
+- vendor/json_pure/tests/fixtures/fail22.json
+- vendor/json_pure/tests/fixtures/fail23.json
+- vendor/json_pure/tests/fixtures/fail24.json
+- vendor/json_pure/tests/fixtures/fail25.json
+- vendor/json_pure/tests/fixtures/fail27.json
+- vendor/json_pure/tests/fixtures/fail28.json
+- vendor/json_pure/tests/fixtures/fail3.json
+- vendor/json_pure/tests/fixtures/fail4.json
+- vendor/json_pure/tests/fixtures/fail5.json
+- vendor/json_pure/tests/fixtures/fail6.json
+- vendor/json_pure/tests/fixtures/fail7.json
+- vendor/json_pure/tests/fixtures/fail8.json
+- vendor/json_pure/tests/fixtures/fail9.json
+- vendor/json_pure/tests/fixtures/pass1.json
+- vendor/json_pure/tests/fixtures/pass15.json
+- vendor/json_pure/tests/fixtures/pass16.json
+- vendor/json_pure/tests/fixtures/pass17.json
+- vendor/json_pure/tests/fixtures/pass2.json
+- vendor/json_pure/tests/fixtures/pass26.json
+- vendor/json_pure/tests/fixtures/pass3.json
+- vendor/json_pure/tests/setup_variant.rb
+- vendor/json_pure/tests/test_json.rb
+- vendor/json_pure/tests/test_json_addition.rb
+- vendor/json_pure/tests/test_json_encoding.rb
+- vendor/json_pure/tests/test_json_fixtures.rb
+- vendor/json_pure/tests/test_json_generate.rb
+- vendor/json_pure/tests/test_json_generic_object.rb
+- vendor/json_pure/tests/test_json_string_matching.rb
+- vendor/json_pure/tests/test_json_unicode.rb
+- vendor/json_pure/tools/fuzz.rb
+- vendor/json_pure/tools/server.rb
 - vendor/multi_json/.document
 - vendor/multi_json/.rspec
 - vendor/multi_json/.travis.yml
@@ -209,9 +316,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: scout
 rubygems_version: 1.8.25