Remove config/initializers/time_formats.rb

dpn-admin · Oct 27, 2016 · c8e206c · c8e206c
1 parent ec4ea9b
commit c8e206c
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 32 deletions.
diff --git a/app/adapters/adapter.rb b/app/adapters/adapter.rb
@@ -18,8 +18,8 @@ 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)
+  # @param [String] date_format The Date format to use ("%Y-%m-%dT%H:%M:%SZ").
+  def map_date(model_field, public_field, date_format = "%Y-%m-%dT%H:%M:%SZ")
     map_from_public public_field do |value|
       {model_field => time_from_public(value)}
     end
@@ -165,9 +165,9 @@ def from_public(public)
 
   def time_from_public(time)
     if time.is_a? String
-      return time_from_string(time)
+      Time.zone.parse(time)
     else
-      return time
+      time
     end
   end
 
@@ -201,4 +201,4 @@ def to_bool(value)
   end
 
 
-end
+end
diff --git a/app/adapters/bag_adapter.rb b/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

diff --git a/app/adapters/fixity_check_adapter.rb b/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

diff --git a/app/adapters/ingest_adapter.rb b/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

diff --git a/app/adapters/member_adapter.rb b/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

diff --git a/app/adapters/message_digest_adapter.rb b/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

diff --git a/app/adapters/node_adapter.rb b/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

diff --git a/app/adapters/replication_transfer_adapter.rb b/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

diff --git a/app/adapters/restore_transfer_adapter.rb b/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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -44,8 +44,7 @@ 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)
+          params[key] = Time.zone.parse(params[key])
         rescue ArgumentError
           params[key] = nil
         end

diff --git a/config/initializers/time_formats.rb b/config/initializers/time_formats.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -101,3 +101,7 @@
   Kernel.srand config.seed
 =end
 end
+
+def time_from_string(string_time)
+  Time.zone.parse(string_time)
+end