jro_apps/redmine Commit - r13719:6c5e5142dffd

Don't include milliseconds in JSON API responses (#19354)....

Jean-Philippe Lang -

r13719:6c5e5142dffd

parent child

Context file:

r13719:6c5e5142dffd

Collapse all files

lib/redmine/views/builders/structure.rb +14 -3

             # Redmine - project management software
             # Copyright (C) 2006-2015  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
                     attr_accessor :request, :response
                     def initialize(request, response)
                       @struct = [{}]
                       self.request = request
                       self.response = response
                     end
                     def array(tag, options={}, &block)
                       @struct << []
                       block.call(self)
                       ret = @struct.pop
                       @struct.last[tag] = ret
                       @struct.last.merge!(options) if options
                     end
+                    def encode_value(value)
+                      if value.is_a?(Time)
+                        # Rails uses a global setting to format JSON times
+                        # Don't rely on it for the API as it could have been changed
+                        value.xmlschema(0)
+                      else
+                        value
+                      end
+                    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 unless block
                           else
                             @struct.last[sym] = args.first
                           end
                         else
+                          value = encode_value(args.first)
                           if @struct.last.is_a?(Array)
                             if args.size == 1 && !block_given?
-                              @struct.last << args.first
+                              @struct.last << value
                             else
-                              @struct.last << (args.last || {}).merge(:value => args.first)
+                              @struct.last << (args.last || {}).merge(:value => value)
                             end
                           else
-                            @struct.last[sym] = args.first
+                            @struct.last[sym] = value
                           end
                         end
                       end
                       if block
                         @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/integration/api_test/api_test.rb +11 -1

             # Redmine - project management software
             # Copyright (C) 2006-2015  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.expand_path('../../../test_helper', __FILE__)
             class Redmine::ApiTest::ApiTest < Redmine::ApiTest::Base
               fixtures :users
               def test_api_should_work_with_protect_from_forgery
                 ActionController::Base.allow_forgery_protection = true
                 assert_difference('User.count') do
                   post '/users.xml', {
                     :user => {
                       :login => 'foo', :firstname => 'Firstname', :lastname => 'Lastname',
                       :mail => 'foo@example.net', :password => 'secret123'}
                     },
                     credentials('admin')
                   assert_response 201
                 end
               ensure
                 ActionController::Base.allow_forgery_protection = false
               end
-            end
  No newline at end of file
+              def test_json_datetime_format
+                get '/users/1.json', {}, credentials('admin')
+                assert_include '"created_on":"2006-07-19T17:12:21Z"', response.body
+              end
+              def test_xml_datetime_format
+                get '/users/1.xml', {}, credentials('admin')
+                assert_include '<created_on>2006-07-19T17:12:21Z</created_on>', response.body
+              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