summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog15
-rw-r--r--ext/psych/lib/psych.rb2
-rw-r--r--ext/psych/lib/psych/json.rb6
-rw-r--r--ext/psych/lib/psych/json/stream.rb32
-rw-r--r--ext/psych/lib/psych/json/tree_builder.rb12
-rw-r--r--ext/psych/lib/psych/stream.rb2
-rw-r--r--ext/psych/lib/psych/visitors/json_tree.rb15
-rw-r--r--test/psych/json/test_stream.rb75
8 files changed, 140 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 76ff1a25cf..ce10f992d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Sun May 23 07:08:34 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/json/stream.rb: adding a JSON streaming API
+
+ * ext/psych/lib/psych/stream.rb: ditto
+
+ * ext/psych/lib/psych.rb: using autoload
+
+ * ext/psych/lib/psych/json.rb: ditto
+
+ * ext/psych/lib/psych/json/tree_builder.rb: refactor
+
+ * ext/psych/lib/psych/visitors/json_tree.rb: refactor
+
+
Sat May 22 03:53:05 2010 Satoshi Shiba <shiba@rvm.jp>
* cont.c (fiber_setcontext): Use swapcontext() instead longjmp().
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index 4b529c0904..c1feff8e3a 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -3,7 +3,6 @@ require 'psych/nodes'
require 'psych/visitors'
require 'psych/handler'
require 'psych/tree_builder'
-require 'psych/json/tree_builder'
require 'psych/parser'
require 'psych/omap'
require 'psych/set'
@@ -98,6 +97,7 @@ module Psych
end
autoload :Stream, 'psych/stream'
+ autoload :JSON, 'psych/json'
###
# Load +yaml+ in to a Ruby data structure. If multiple documents are
diff --git a/ext/psych/lib/psych/json.rb b/ext/psych/lib/psych/json.rb
new file mode 100644
index 0000000000..412ab2708b
--- /dev/null
+++ b/ext/psych/lib/psych/json.rb
@@ -0,0 +1,6 @@
+module Psych
+ module JSON
+ autoload :TreeBuilder, 'psych/json/tree_builder'
+ autoload :Stream, 'psych/json/stream'
+ end
+end
diff --git a/ext/psych/lib/psych/json/stream.rb b/ext/psych/lib/psych/json/stream.rb
new file mode 100644
index 0000000000..a6da584cbf
--- /dev/null
+++ b/ext/psych/lib/psych/json/stream.rb
@@ -0,0 +1,32 @@
+module Psych
+ module JSON
+ class Stream < Psych::Stream
+ class Emitter < Psych::Stream::Emitter # :nodoc:
+ def start_document version, tag_directives, implicit
+ super(version, tag_directives, !streaming?)
+ end
+
+ def start_mapping anchor, tag, implicit, style
+ super(anchor, tag, implicit, Nodes::Mapping::FLOW)
+ end
+
+ def start_sequence anchor, tag, implicit, style
+ super(anchor, tag, implicit, Nodes::Sequence::FLOW)
+ end
+
+ def scalar value, anchor, tag, plain, quoted, style
+ if "tag:yaml.org,2002:null" == tag
+ super('null', nil, nil, true, false, Nodes::Scalar::PLAIN)
+ else
+ super
+ end
+ end
+ end
+
+ def visit_String o
+ @emitter.scalar o.to_s, nil, nil, false, true, Nodes::Scalar::ANY
+ end
+ alias :visit_Symbol :visit_String
+ end
+ end
+end
diff --git a/ext/psych/lib/psych/json/tree_builder.rb b/ext/psych/lib/psych/json/tree_builder.rb
index d0a76177bf..720ede7e1e 100644
--- a/ext/psych/lib/psych/json/tree_builder.rb
+++ b/ext/psych/lib/psych/json/tree_builder.rb
@@ -5,11 +5,11 @@ module Psych
# to an instance of Psych::JSON::TreeBuilder and a JSON AST is constructed.
class TreeBuilder < Psych::TreeBuilder
def start_document version, tag_directives, implicit
- super(version, tag_directives, true)
+ super(version, tag_directives, !streaming?)
end
def end_document implicit_end = !streaming?
- super(true)
+ super(implicit_end)
end
def start_mapping anchor, tag, implicit, style
@@ -19,6 +19,14 @@ module Psych
def start_sequence anchor, tag, implicit, style
super(anchor, tag, implicit, Nodes::Sequence::FLOW)
end
+
+ def scalar value, anchor, tag, plain, quoted, style
+ if "tag:yaml.org,2002:null" == tag
+ super('null', nil, nil, true, false, Nodes::Scalar::PLAIN)
+ else
+ super
+ end
+ end
end
end
end
diff --git a/ext/psych/lib/psych/stream.rb b/ext/psych/lib/psych/stream.rb
index ac231aafdc..508483e573 100644
--- a/ext/psych/lib/psych/stream.rb
+++ b/ext/psych/lib/psych/stream.rb
@@ -35,7 +35,7 @@ module Psych
# Create a new streaming emitter. Emitter will print to +io+. See
# Psych::Stream for an example.
def initialize io
- super({}, Emitter.new(io))
+ super({}, self.class.const_get(:Emitter).new(io))
end
###
diff --git a/ext/psych/lib/psych/visitors/json_tree.rb b/ext/psych/lib/psych/visitors/json_tree.rb
index 0ec1678a39..3502cdb63c 100644
--- a/ext/psych/lib/psych/visitors/json_tree.rb
+++ b/ext/psych/lib/psych/visitors/json_tree.rb
@@ -5,25 +5,10 @@ module Psych
super
end
- def visit_NilClass o
- @emitter.scalar 'null', nil, nil, true, false, Nodes::Scalar::PLAIN
- end
-
- def visit_Integer o
- @emitter.scalar o.to_s, nil, nil, true, false, Nodes::Scalar::PLAIN
- end
-
- def visit_Float o
- return super if o.nan? || o.infinite?
- visit_Integer o
- end
-
def visit_String o
@emitter.scalar o.to_s, nil, nil, false, true, Nodes::Scalar::ANY
end
alias :visit_Symbol :visit_String
-
- private
end
end
end
diff --git a/test/psych/json/test_stream.rb b/test/psych/json/test_stream.rb
new file mode 100644
index 0000000000..712465d4c0
--- /dev/null
+++ b/test/psych/json/test_stream.rb
@@ -0,0 +1,75 @@
+require_relative '../helper'
+
+module Psych
+ module JSON
+ class TestStream < TestCase
+ def setup
+ @io = StringIO.new
+ @stream = Psych::JSON::Stream.new(@io)
+ @stream.start
+ end
+
+ def test_explicit_documents
+ @io = StringIO.new
+ @stream = Psych::JSON::Stream.new(@io)
+ @stream.start
+
+ @stream.push({ 'foo' => 'bar' })
+
+ assert !@stream.finished?, 'stream not finished'
+ @stream.finish
+ assert @stream.finished?, 'stream finished'
+
+ assert_match(/^---/, @io.string)
+ assert_match(/\.\.\.$/, @io.string)
+ end
+
+ def test_null
+ @stream.push(nil)
+ assert_match(/^--- null/, @io.string)
+ end
+
+ def test_string
+ @stream.push "foo"
+ assert_match(/(['"])foo\1/, @io.string)
+ end
+
+ def test_symbol
+ @stream.push :foo
+ assert_match(/(['"])foo\1/, @io.string)
+ end
+
+ def test_int
+ @stream.push 10
+ assert_match(/^--- 10/, @io.string)
+ end
+
+ def test_float
+ @stream.push 1.2
+ assert_match(/^--- 1.2/, @io.string)
+ end
+
+ def test_hash
+ hash = { 'one' => 'two' }
+ @stream.push hash
+
+ json = @io.string
+ assert_match(/}$/, json)
+ assert_match(/^--- \{/, json)
+ assert_match(/['"]one['"]/, json)
+ assert_match(/['"]two['"]/, json)
+ end
+
+ def test_list_to_json
+ list = %w{ one two }
+ @stream.push list
+
+ json = @io.string
+ assert_match(/]$/, json)
+ assert_match(/^--- \[/, json)
+ assert_match(/['"]one['"]/, json)
+ assert_match(/['"]two['"]/, json)
+ end
+ end
+ end
+end
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 13:44:41 +0000