jsonity 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5e0cbbf0655194ed77a8e96424d290e700cc6a6
-  data.tar.gz: c26576875dc473fd201e7f8ccd21940a642da05f
+  metadata.gz: c2659fcf6db5641ea0b6dbf288e14562dcd57cc6
+  data.tar.gz: 87eea35053efa6c0f1b5dc7ec4ae5a6185ff22b2
 SHA512:
-  metadata.gz: 305a32a835c2695991915d9e35899c5080ec3c624dffd63eb54c4760d9107b0390c8c6fd43b10cf86e5135cf0ceca19b1996ac763dfc11d250c34c77af3a6c0b
-  data.tar.gz: 4ef7f0f1a7c647255cff9f469ef35f0a7027510f5bdb1e9764fe8e6964ab6b20d142d4d7bd0db4fb792ea4c8c7b7dabe56ed87058c1e7d57c0b16d088765b712
+  metadata.gz: 97c515d3530a9922573f0cc1902739aa5e5876f248c0b2ad3d345fb67cf9860c22a6a4100d30ebdb966626af45470ea2bf8725291c015c76ad62aa0ef4469f97
+  data.tar.gz: 8db7d2049b3996e47c7c7c57075edbb6321596f9ddef05b6a801a94eab698b3e7420bdb4895885eabeab7c01235069c4bb4e66b556a68e9844359788d43c120d

data/lib/jsonity/attribute.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Jsonity
   module Attribute
     module ClassMethods

data/lib/jsonity/builder.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 module Jsonity
   class Builder < BasicObject
 
@@ -32,6 +30,7 @@ module Jsonity
     ###
     def initialize(object, content)
       @object, @content = object, content
+      @deferred_array_blocks = {}
     end
 
     ###
@@ -42,7 +41,7 @@ module Jsonity
     end
 
     ###
-    # Make array context
+    # Create array context
     #
     # @return {Jsonity::Builder} - `self`
     ###
@@ -74,7 +73,7 @@ module Jsonity
     def method_missing(name, *args, &block)
       name = name.to_s
       is_object = name.match OBJECT_SUFFIX
-      name = name[0..-2] if is_object
+      name, is_object = name[0..-2], is_object[0] if is_object
 
       options = args.last.is_a?(::Hash) ? args.pop : {}
       options[:_object] = args[0]
@@ -105,6 +104,7 @@ module Jsonity
     # @return {Hash | nil}
     ###
     def content
+      evaluate_array_blocks!
       @content
     end
 
@@ -148,24 +148,49 @@ module Jsonity
     # @block
     ###
     def array(name, options, &block)
+      ::Kernel.raise RequiredBlockError.new('No block') unless block
+
+      if (deferred = @deferred_array_blocks[name])
+        deferred[:blocks] << block
+        return
+      end
+
       obj = get_object_for name, options
 
       is_array = obj && obj.class < ::Enumerable
 
       if !is_array && options[:_nullable]
         @content[name] ||= nil
-        return
+      else
+        @content[name] = [] unless @content[name].is_a?(::Array)
       end
 
-      @content[name] = [] unless @content[name].is_a?(::Array)
-      ary = @content[name]
-
       if is_array
-        obj.each.with_index do |a, i|
-          # TODO: deferred build so that can be merged correctly with conditional nodes
-          ary[i] = Builder.build a, ary[i], &block
+        @deferred_array_blocks[name] = {
+          obj: obj,
+          blocks: [block],
+        }
+      end
+    end
+
+    ###
+    # Evaluate all deferred blocks of array nodes,
+    # and reset block stack
+    ###
+    def evaluate_array_blocks!
+      @deferred_array_blocks.each do |name, d|
+        next unless d[:obj]
+
+        ary = @content[name]
+
+        d[:obj].each.with_index do |a, i|
+          d[:blocks].each do |block|
+            ary[i] = Builder.build a, ary[i], &block
+          end
         end
       end
+
+      @deferred_array_blocks = {}
     end
 
     ###

data/lib/jsonity/rails.rb

@@ -1,8 +1,11 @@
 module ActionController
   class Base
 
-    def render_json(options = {}, &block)
-      json = Jsonity::Builder.build &block
+    protected
+
+    def render_json(*args, &block)
+      options = args.extract_options!
+      json = Jsonity::Builder.build args[0], &block
       options[:json] = json
       render options
     end

data/lib/jsonity/version.rb

@@ -1,3 +1,3 @@
 module Jsonity
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonity
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Yuki Iwanaga