Use ISO8601 as the DPN date-time format

app/adapters/adapter.rb

@@ -18,14 +18,13 @@ def map_simple(model_field, public_field)
   # Register a one-to-one mapping of a date field.
   # @param [Symbol] model_field
   # @param [Symbol] public_field
-  # @param [String] date_format The Date format to use.
-  def map_date(model_field, public_field, date_format)
-    raise ArgumentError, "date_format cannot be nil" if date_format.nil?
+  def map_date(model_field, public_field)
     map_from_public public_field do |value|
       {model_field => time_from_public(value)}
     end
     map_to_public model_field do |value|
-      {public_field => value.strftime(date_format)}
+      # return a datetime in UTC, using an iso8601 format
+      {public_field => value.utc.iso8601}
     end
   end
 
@@ -166,9 +165,13 @@ def from_public(public)
 
   def time_from_public(time)
     if time.is_a? String
-      return time_from_string(time)
+      # return Time object, trucated to seconds, e.g.
+      # time = "2015-02-25T15:27:40.6Z"
+      # Time.iso8601(time).change(:usec => 0)
+      # => "2015-02-25T15:27:40.000Z"
+      Time.iso8601(time).change(:usec => 0)
     else
-      return time
+      time
     end
   end
 
@@ -202,4 +205,4 @@ def to_bool(value)
   end
 
 
-end
+end

app/adapters/bag_adapter.rb

@@ -7,8 +7,8 @@
 
 class BagAdapter < ::AbstractAdapter
 
-  map_date :created_at, :created_at, Time::DATE_FORMATS[:dpn]
-  map_date :updated_at, :updated_at, Time::DATE_FORMATS[:dpn]
+  map_date :created_at, :created_at
+  map_date :updated_at, :updated_at
 
   map_simple :uuid, :uuid
   map_simple :local_id, :local_id

app/adapters/fixity_check_adapter.rb

@@ -6,8 +6,8 @@
 
 
 class FixityCheckAdapter < ::AbstractAdapter
-  map_date :created_at, :created_at, Time::DATE_FORMATS[:dpn]
-  map_date :fixity_at,  :fixity_at,  Time::DATE_FORMATS[:dpn]
+  map_date :created_at, :created_at
+  map_date :fixity_at,  :fixity_at
   map_simple      :fixity_check_id,   :fixity_check_id
   map_bool        :success,           :success
   map_belongs_to  :bag,               :bag,       sub_method: :uuid

app/adapters/ingest_adapter.rb

@@ -5,7 +5,7 @@
 
 
 class IngestAdapter < ::AbstractAdapter
-  map_date :created_at, :created_at, Time::DATE_FORMATS[:dpn]
+  map_date :created_at, :created_at
 
   map_simple      :ingest_id, :ingest_id
   map_belongs_to  :bag,       :bag,       sub_method: :uuid

app/adapters/member_adapter.rb

@@ -5,8 +5,8 @@
 
 
 class MemberAdapter < ::AbstractAdapter
-  map_date :created_at, :created_at, Time::DATE_FORMATS[:dpn]
-  map_date :updated_at, :updated_at, Time::DATE_FORMATS[:dpn]
+  map_date :created_at, :created_at
+  map_date :updated_at, :updated_at
 
   map_simple :member_id, :member_id
   map_simple :name, :name

app/adapters/message_digest_adapter.rb

@@ -5,7 +5,7 @@
 
 
 class MessageDigestAdapter < ::AbstractAdapter
-  map_date :created_at, :created_at, Time::DATE_FORMATS[:dpn]
+  map_date :created_at, :created_at
   map_simple :value, :value
   map_belongs_to :bag,        :bag,       sub_method: :uuid
   map_belongs_to :node,       :node,      sub_method: :namespace

app/adapters/node_adapter.rb

@@ -6,8 +6,8 @@
 
 
 class NodeAdapter < ::AbstractAdapter
-  map_date :created_at, :created_at, Time::DATE_FORMATS[:dpn]
-  map_date :updated_at, :updated_at, Time::DATE_FORMATS[:dpn]
+  map_date :created_at, :created_at
+  map_date :updated_at, :updated_at
 
   map_simple :name, :name
   map_simple :namespace, :namespace

app/adapters/replication_transfer_adapter.rb

@@ -4,8 +4,8 @@
 # See LICENSE.md for details.
 
 class ReplicationTransferAdapter < ::AbstractAdapter
-  map_date :created_at, :created_at, Time::DATE_FORMATS[:dpn]
-  map_date :updated_at, :updated_at, Time::DATE_FORMATS[:dpn]
+  map_date :created_at, :created_at
+  map_date :updated_at, :updated_at
 
   map_simple :replication_id, :replication_id
   map_simple :fixity_nonce, :fixity_nonce

app/adapters/restore_transfer_adapter.rb

@@ -5,8 +5,8 @@
 
 
 class RestoreTransferAdapter < ::AbstractAdapter
-  map_date :created_at, :created_at, Time::DATE_FORMATS[:dpn]
-  map_date :updated_at, :updated_at, Time::DATE_FORMATS[:dpn]
+  map_date :created_at, :created_at
+  map_date :updated_at, :updated_at
 
   map_simple  :restore_id, :restore_id
   map_bool    :accepted, :accepted

app/controllers/application_controller.rb

@@ -9,7 +9,6 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :null_session
   skip_before_action :verify_authenticity_token
-  before_action :convert_time_strings
 
   rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
 
@@ -39,18 +38,4 @@ def convert_bool(value)
   def record_not_found
     render nothing: true, status: 404
   end
-
-  def convert_time_strings
-    [:updated_at, :created_at].each do |key|
-      if params.has_key?(key)
-        begin
-          timestamp = params[key].gsub(/\.[0-9]*Z\Z/, "Z")
-          params[key] = time_from_string(timestamp)
-        rescue ArgumentError
-          params[key] = nil
-        end
-      end
-    end
-  end
-
 end

config/application.rb

@@ -45,9 +45,6 @@ class Application < Rails::Application
           :controller_specs => true,
           :request_specs => true
       end
-
-      require_relative 'time_formats'
-
     end
   end
 end

spec/spec_helper.rb

@@ -101,3 +101,7 @@
   Kernel.srand config.seed
 =end
 end
+
+def time_from_string(time)
+  Time.iso8601(time).change(:usec => 0)
+end

spec/support/examples/a_create_endpoint.rb

@@ -24,12 +24,12 @@ def body_from_instance(instance, extra_params)
   before(:each) do
     @request.headers["Content-Type"] = "application/json"
   end
-  
+
   let!(:instance) { Fabricate(factory, created_at: 5.seconds.from_now) }
   let!(:valid_post_body) { body_from_instance(instance, extra_params) }
   let!(:invalid_post_body) { {} }
-  
-  
+
+
   context "without authentication" do
     before(:each) do
       model_class.delete(instance.id)
@@ -86,8 +86,10 @@ def body_from_instance(instance, extra_params)
         expect(model_class.public_send(:last)).to be_valid
       end
       it "assigns the correct object to @#{factory.to_s}" do
-        expect(assigns(factory)).to be_a model_class
-        expect(assigns(factory).created_at.to_formatted_s(:dpn)).to eql(valid_post_body[:created_at])
+        klass = assigns(factory)
+        expect(klass).to be_a model_class
+        # check the creation time using an iso8601 format, in UTC
+        expect(klass.created_at.utc.iso8601).to eql(valid_post_body[:created_at])
       end
       it "renders json" do
         expect(response.content_type).to eql("application/json")

spec/support/examples/an_authorized_update.rb

@@ -8,7 +8,7 @@
   unless options
     options = proc {{}}
   end
-  
+
   old_updated_at = 1.year.ago.utc
   params_updated_at = 1.day.ago.utc
 
@@ -18,9 +18,9 @@
     model_options[:updated_at] = old_updated_at
     @existing_record = Fabricate(factory, model_options)
     @put_body = adapter.from_model(@existing_record).to_public_hash
-    @put_body[:updated_at] = params_updated_at.to_formatted_s(:dpn)
+    @put_body[:updated_at] = params_updated_at.utc.iso8601
   end
-  
+
   it "fabricates the record with the correct timestamp" do
     expect(@existing_record.reload.updated_at.to_s).to eql(old_updated_at.to_s)
   end
@@ -83,7 +83,7 @@
 
   context "with no changes other than timestamps" do
     before(:each) do
-      @put_body[:updated_at] = 1.day.from_now.utc.to_formatted_s(:dpn)
+      @put_body[:updated_at] = 1.day.from_now.utc.iso8601
       put :update, @put_body
     end
     it "responds with 200" do
@@ -106,8 +106,8 @@
 
   context "with old timestamps" do
     before(:each) do
-      @put_body[:created_at] = 3.years.ago.utc.to_formatted_s(:dpn)
-      @put_body[:updated_at] = 2.years.ago.utc.to_formatted_s(:dpn)
+      @put_body[:created_at] = 3.years.ago.utc.iso8601
+      @put_body[:updated_at] = 2.years.ago.utc.iso8601
       put :update, legal_update.call(@put_body)
     end
     it "responds with 200" do
@@ -127,4 +127,4 @@
       expect(response).to render_template(:update)
     end
   end
-end
+end