to_jbuilder 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fea4b1d3823b9fbf79d2089bcbeec4a26b282bd
-  data.tar.gz: 76c6f2cab9f79c056cf8252f2c5abba914f451b6
+  metadata.gz: ce7616e8edda34f464c51c17657556493d58ecb2
+  data.tar.gz: 46d50ed8ae4ec0876d0d099246e83468a51602c8
 SHA512:
-  metadata.gz: b476579a67244808eb995e706398825d0f2ade2bb10c033afefc6bbadc1a361f07c7f70d609b7ba2f78a8705366e4e914edc808a86de1c9812599eaa68dcf6fd
-  data.tar.gz: c334307a7ceeb1c672225be66194d0447f2118a63111e02998c1c7712d7b45372d7919bf6f304d7e449e6e117f98d55b2d994f1223b2bb660dc8d0123f63b8ca
+  metadata.gz: 690ae50f4c3fd36b0c24867e1a0c879f003c9113ea7a4fe7e31b9d64b269c5999b184b3ac9900d0269f90fb312ecdb46e756b10580eac4b571850bf525f4ff9f
+  data.tar.gz: ceaacc4d03008d66279230e3f9880d38f5098076ffe1c97c53069256b31b5e513266d0a21eaa6d25e0b438dbe929bb23f18fed9025dec7b66c03fd54872fc065

data/lib/to_jbuilder/emitter.rb

@@ -43,13 +43,15 @@ module ToJbuilder
       end
     end
 
-    class Nesting < Struct.new(:name, :type)
+    class Nesting < Struct.new(:name, :type, :sequence_processed)
+      def sequence_processed?
+        !! sequence_processed
+      end
     end
 
     def initialize(io, resource_name)
       @io, @resource_name = io, resource_name
 
-      @sequence_processed = false
       @jbuilder_array     = nil
       @jbuilder_lines     = []
       @nesting            = [Nesting.new(@resource_name, :root)]
@@ -78,11 +80,11 @@ module ToJbuilder
       when ARRAY_START
         flush!
 
-        @io.write "\n" if @trace[-3] != ARRAY_END
-        @io.write @jbuilder_array.to_jbuilder
+        unless @nesting.last.sequence_processed?
+          @io.write "\n" if @trace[-3] != ARRAY_END && @trace[-3] != HASH_START
+          @io.write @jbuilder_array.to_jbuilder
+        end
       when PAIR_KEY
-        return if @sequence_processed
-
         line = @jbuilder_lines.pop
         flush!
         line.line_break = true if @trace[-2] != HASH_START
@@ -95,7 +97,7 @@ module ToJbuilder
 
     def end_mapping
       flush!
-      @sequence_processed = true if within_array? && !@sequence_processed
+      @nesting.last.sequence_processed = true if within_array? && !@nesting.last.sequence_processed?
 
       if @nesting.size > 1 && !within_array?
         @nesting.pop
@@ -116,26 +118,28 @@ module ToJbuilder
         @jbuilder_array = JbuilderArray.new(nil, @nesting.last.name)
       end
 
-      @nesting.push Nesting.new((@jbuilder_array.line || @jbuilder_array).key.singularize, ARRAY_START)
+      @nesting.push Nesting.new((@jbuilder_array.line || @jbuilder_array).key.singularize, ARRAY_START, @nesting.last.sequence_processed)
       @trace << ARRAY_START
     end
 
     def end_sequence
       case @trace.last
+      when ARRAY_START
+        @nesting.pop
+        @jbuilder_lines << @jbuilder_array.line unless @nesting.last.sequence_processed?
       when PAIR_VALUE
         @nesting.pop
         @jbuilder_lines << @jbuilder_array.line
       when HASH_END
         @nesting.pop
-        @io.write "#{indent}end\n"
+        @io.write "#{indent}end\n" unless @nesting.last.sequence_processed?
       end
 
-      @sequence_processed = false
       @trace << ARRAY_END
     end
 
     def scalar(value, anchor, tag, plain, quoted, style)
-      return if @sequence_processed
+      return if @nesting.last.sequence_processed?
 
       case @trace.last
       when DOCUMENT_START, HASH_START, HASH_END, ARRAY_END, PAIR_VALUE
@@ -145,7 +149,7 @@ module ToJbuilder
         @jbuilder_lines << JbuilderLine.new(@nesting.last.name, value, nil, prefix, indent, line_break)
         @trace << PAIR_KEY
       when ARRAY_START
-        @sequence_processed = true
+        @nesting.last.sequence_processed = true
 
         @trace << PAIR_VALUE
       when PAIR_KEY

data/lib/to_jbuilder/version.rb

@@ -1,3 +1,3 @@
 module ToJbuilder
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: to_jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuki Nishijima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Convert JSON to jbuilder templates