jro_apps/redmine Commit - r4350:88e593ee027b

Fixes unhandled case in json builder....

Jean-Philippe Lang -

r4350:88e593ee027b

parent child

Context file:

r4350:88e593ee027b

Collapse all files

lib/redmine/views/builders/structure.rb +2 -2

             # Redmine - project management software
             # Copyright (C) 2006-2010  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'blankslate'
             module Redmine
               module Views
                 module Builders
                   class Structure < BlankSlate
                     def initialize
                       @struct = [{}]
                     end
                     def array(tag, &block)
                       @struct << []
                       block.call(self)
                       ret = @struct.pop
                       @struct.last[tag] = ret
                     end
                     def method_missing(sym, *args, &block)
                       if args.any?
                         if args.first.is_a?(Hash)
                           if @struct.last.is_a?(Array)
-                            @struct.last << args.first
+                            @struct.last << args.first unless block
                           else
                             @struct.last[sym] = args.first
                           end
                         else
                           if @struct.last.is_a?(Array)
                             @struct.last << (args.last || {}).merge(:value => args.first)
                           else
                             @struct.last[sym] = args.first
                           end
                         end
                       end
                       if block
-                        @struct << {}
+                        @struct << (args.first.is_a?(Hash) ? args.first : {})
                         block.call(self)
                         ret = @struct.pop
                         if @struct.last.is_a?(Array)
                           @struct.last << ret
                         else
                           if @struct.last.has_key?(sym) && @struct.last[sym].is_a?(Hash)
                             @struct.last[sym].merge! ret
                           else
                             @struct.last[sym] = ret
                           end
                         end
                       end
                     end
                     def output
                       raise "Need to implement #{self.class.name}#output"
                     end
                   end
                 end
               end
             end

test/unit/lib/redmine/views/builders/json_test.rb +11 0

             # Redmine - project management software
             # Copyright (C) 2006-2010  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../../../../../test_helper'
             class Redmine::Views::Builders::JsonTest < HelperTestCase
               def test_hash
                 assert_json_output({'person' => {'name' => 'Ryan', 'age' => 32}}) do |b|
                   b.person do
                     b.name 'Ryan'
                     b.age  32
                   end
                 end
               end
               def test_hash_hash
                 assert_json_output({'person' => {'name' => 'Ryan', 'birth' => {'city' => 'London', 'country' => 'UK'}}}) do |b|
                   b.person do
                     b.name 'Ryan'
                     b.birth :city => 'London', :country => 'UK'
                   end
                 end
                 assert_json_output({'person' => {'id' => 1, 'name' => 'Ryan', 'birth' => {'city' => 'London', 'country' => 'UK'}}}) do |b|
                   b.person :id => 1 do
                     b.name 'Ryan'
                     b.birth :city => 'London', :country => 'UK'
                   end
                 end
               end
               def test_array
                 assert_json_output({'books' => [{'title' => 'Book 1', 'author' => 'B. Smith'}, {'title' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b|
                   b.array :books do |b|
                     b.book :title => 'Book 1', :author => 'B. Smith'
                     b.book :title => 'Book 2', :author => 'G. Cooper'
                   end
                 end
+                assert_json_output({'books' => [{'title' => 'Book 1', 'author' => 'B. Smith'}, {'title' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b|
+                  b.array :books do |b|
+                    b.book :title => 'Book 1' do
+                      b.author 'B. Smith'
+                    end
+                    b.book :title => 'Book 2' do
+                      b.author 'G. Cooper'
+                    end
+                  end
+                end
               end
               def test_array_with_content_tags
                 assert_json_output({'books' => [{'value' => 'Book 1', 'author' => 'B. Smith'}, {'value' => 'Book 2', 'author' => 'G. Cooper'}]}) do |b|
                   b.array :books do |b|
                     b.book 'Book 1', :author => 'B. Smith'
                     b.book 'Book 2', :author => 'G. Cooper'
                   end
                 end
               end
               def assert_json_output(expected, &block)
                 builder = Redmine::Views::Builders::Json.new
                 block.call(builder)
                 assert_equal(expected, ActiveSupport::JSON.decode(builder.output))
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages