moab-versioning 1.4.7 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d610d09deb8aac429420a3ef3b65b93e1152605b
-  data.tar.gz: '03924426fb01ee11ad442e02743eedcae4be3c35'
+  metadata.gz: fc968b3f2a7ec6e2062d2deb950cf760201ed978
+  data.tar.gz: 78964058caf89d2cda709cb61fdab039dfff3fac
 SHA512:
-  metadata.gz: 99438bec608cdd06619ab1376c03a232464f02841c1c85a09d004b10049aee105bb56d39d357549f37b40200ac183ea8708da1152aabf8ab5bed412a8d828204
-  data.tar.gz: 03ccab8bdda6f3b879d9a406c142102406863e4c9d5a44cec79c9cd7fccc382d391f38942e0f89dc3837bd244ed36bc9d1e3cf828cb8aea306a34071b55327ad
+  metadata.gz: 125858b5eeb23be2f7e1d0fd4eea84bf7d864d91f223db916a1d8f7ea4832b3ceaf58c013da0a5e2afe175382f5ccbce43a5980087b43fb06e5d2806b5f79808
+  data.tar.gz: 9a3af9b77af753dddc5c82a8f8a51d74eb9e053656c7b91d43e1de2cbcf7d76528e110dac58dfa9a5740c04874733a04c6b26b284795c50b7c5f8144d75408a0

data/lib/moab.rb

@@ -35,6 +35,7 @@ require 'serializer'
 include Serializer
 require 'confstruct/configuration'
 require 'moab/config'
+require 'moab/utc_time'
 require 'moab/file_signature'
 require 'moab/file_instance'
 require 'moab/file_manifestation'

data/lib/moab/file_instance.rb

@@ -34,11 +34,11 @@ module Moab
     attribute :datetime, String
 
     def datetime=(event_datetime)
-      @datetime=UtcTime.input(event_datetime)
+      @datetime=Moab::UtcTime.input(event_datetime)
     end
 
     def datetime
-      UtcTime.output(@datetime)
+      Moab::UtcTime.output(@datetime)
     end
 
 

data/lib/moab/file_inventory.rb

@@ -64,11 +64,11 @@ module Moab
     attribute :inventory_datetime, String, :tag => 'inventoryDatetime'
 
     def inventory_datetime=(datetime)
-      @inventory_datetime=UtcTime.input(datetime)
+      @inventory_datetime=Moab::UtcTime.input(datetime)
     end
 
     def inventory_datetime
-      UtcTime.output(@inventory_datetime)
+      Moab::UtcTime.output(@inventory_datetime)
     end
 
     # @attribute

data/lib/moab/file_inventory_difference.rb

@@ -55,11 +55,11 @@ module Moab
     attribute :report_datetime, String, :tag => 'reportDatetime'
 
     def report_datetime=(datetime)
-      @report_datetime=UtcTime.input(datetime)
+      @report_datetime=Moab::UtcTime.input(datetime)
     end
 
     def report_datetime
-      UtcTime.output(@report_datetime)
+      Moab::UtcTime.output(@report_datetime)
     end
 
     # @attribute

data/lib/moab/signature_catalog.rb

@@ -56,11 +56,11 @@ module Moab
     attribute :catalog_datetime, Time, :tag => 'catalogDatetime'
 
     def catalog_datetime=(datetime)
-      @catalog_datetime=UtcTime.input(datetime)
+      @catalog_datetime=Moab::UtcTime.input(datetime)
     end
 
     def catalog_datetime
-      UtcTime.output(@catalog_datetime)
+      Moab::UtcTime.output(@catalog_datetime)
     end
 
     # @attribute

data/lib/moab/utc_time.rb

@@ -0,0 +1,39 @@
+require 'time'
+
+module Moab
+  # Timestamp conversion methods.
+  class UtcTime
+
+    # @param datetime [Time,String,Nil] The input datetime
+    # @return [void] Convert input datetime to a Time object, or nil if input is empty.
+    def self.input(datetime)
+      case datetime
+        when nil
+          nil
+        when ""
+          nil
+        when String
+          Time.parse(datetime)
+        when Time
+          datetime
+        else
+          raise "unknown time format #{datetime.inspect}"
+      end
+    end
+
+    # @param datetime [Time,String,Nil] The datetime value to output
+    # @return [String] Convert the datetime into a ISO 8601 formatted string
+    def self.output(datetime)
+      case datetime
+        when nil, ""
+          ""
+        when String
+          Time.parse(datetime).utc.iso8601
+        when Time
+          datetime.utc.iso8601
+        else
+          raise "unknown time format #{datetime.inspect}"
+      end
+    end
+  end
+end

data/lib/moab/version_metadata_event.rb

@@ -35,11 +35,11 @@ module Moab
     attribute :datetime, String
 
     def datetime=(event_datetime)
-      @datetime=UtcTime.input(event_datetime)
+      @datetime=Moab::UtcTime.input(event_datetime)
     end
 
     def datetime
-      UtcTime.output(@datetime)
+      Moab::UtcTime.output(@datetime)
     end
 
   end

data/lib/serializer.rb

@@ -24,7 +24,6 @@ require 'time'
 require 'digest/md5'
 require 'digest/sha1'
 
-require 'monkey_patches'
 require 'serializer/serializable'
 require 'serializer/manifest'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moab-versioning
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.5.0
 platform: ruby
 authors:
 - Darren Weber
@@ -207,12 +207,12 @@ files:
 - lib/moab/storage_object_version.rb
 - lib/moab/storage_repository.rb
 - lib/moab/storage_services.rb
+- lib/moab/utc_time.rb
 - lib/moab/verification_result.rb
 - lib/moab/version_metadata.rb
 - lib/moab/version_metadata_entry.rb
 - lib/moab/version_metadata_event.rb
 - lib/moab_stanford.rb
-- lib/monkey_patches.rb
 - lib/serializer.rb
 - lib/serializer/manifest.rb
 - lib/serializer/serializable.rb

data/lib/monkey_patches.rb

@@ -1,63 +0,0 @@
-require 'time'
-
-# monkey-patch to fix JSON_pure
-# @see http://prettystatemachine.blogspot.com/2010/09/typeerrors-in-tojson-make-me-briefly.html
-#noinspection RubyUnusedLocalVariable
-class Fixnum
-  # @return [String] The string value of the number
-  def to_json(options = nil)
-    to_s
-  end
-end
-
-# Timestamp conversion methods.
-class UtcTime
-
-  # @param datetime [Time,String,Nil] The input datetime
-  # @return [void] Convert input datetime to a Time object, or nil if input is empty.
-  def self.input(datetime)
-    case datetime
-      when nil
-        nil
-      when ""
-        nil
-      when String
-        Time.parse(datetime)
-      when Time
-        datetime
-      else
-        raise "unknown time format #{datetime.inspect}"
-    end
-  end
-
-  # @param datetime [Time,String,Nil] The datetime value to output
-  # @return [String] Convert the datetime into a ISO 8601 formatted string
-  def self.output(datetime)
-    case datetime
-      when nil, ""
-        ""
-      when String
-        Time.parse(datetime).utc.iso8601
-      when Time
-        datetime.utc.iso8601
-      else
-        raise "unknown time format #{datetime.inspect}"
-    end
-  end
-
-end
-
-# Add methods to Array so that one attribute of a class can be treated as a unique key
-class Array
-  # @return [Array<Object>] An array containing the key fields from a collection of objects
-  def keys
-    self.collect { |e| e.key }
-  end
-
-  # @param key [Object] The key value to search for
-  # @return [Object] The object from the array that has the specified key value
-  def keyfind(key)
-    self.each { |e| return e if key == e.key }
-    nil
-  end
-end