jsonbuilder 0.0.3 → 0.0.4

data/lib/builder/jsonmarkup.rb

@@ -1,13 +1,15 @@
 module Builder
 
   class XmlMarkup
-    def array_mode(&block)
+    def array_mode(key = nil, &block)
       yield(self)
     end
   end
 
   class JsonMarkup
 
+    attr_accessor :path, :target
+
     def initialize(options = {})
       # @default_content_key is used in such case: markup.key(value, :attr_key => attr_value)
       # in this case, we need some key for value.
@@ -22,10 +24,18 @@ module Builder
     end
 
     # NOTICE: you have to call this method to use array in json
-    def array_mode(&block)
+    def array_mode(key = nil, &block)
       @array_mode = true
-      eval("#{current} = []")
-      yield(self)
+      if eval("#{current}").is_a?(Hash)
+        key ||= :entries
+        eval("#{current}.merge!(key => [])")
+        @path.push(key.to_sym)
+        yield(self)
+        @path.pop
+      else
+        eval("#{current} = []")
+        yield(self)
+      end
       @array_mode = false
     end
 
@@ -73,7 +83,6 @@ module Builder
       else
         children(key, args, &block)
       end
-      self
       target!
     end
 
@@ -88,6 +97,7 @@ module Builder
     end
 
     def children(key, args, &block)
+      eval("#{current} ||= {}")
       @path.push(key)
       set_args(args, &block)
       @path.pop

data/lib/jsonbuilder.rb

@@ -2,7 +2,7 @@ module JsonBuilder
   module Version
     MAJOR = 0
     MINOR = 0
-    REVISION = 3
+    REVISION = 4
     class << self
       def to_version
         "#{MAJOR}.#{MINOR}.#{REVISION}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsonbuilder
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - nov