moab-versioning 1.3.4 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6b1025fc0ecc5e1e510760e0fe07c25cdd17c24
-  data.tar.gz: 9dda4d6838452417cbbbf5db0c6fc0504e83cab6
+  metadata.gz: eccc36c9ff00556b0bceeb9105606382cecea370
+  data.tar.gz: c08e5b8c4f199716d8c40890505791c204f23012
 SHA512:
-  metadata.gz: 9e00c721df5050af220e8691aa2d281a90ac97a36b8b80317f370118ee8b7fcc9241d44f4d4b33201f2a6258fe722402fd81d51c44c01a4e43d7730cf15965d1
-  data.tar.gz: e21caf9571df72920f002320abc4e66bf667d66ed16db59a0d463dbc0814800ba47ab97ef4374f9f15006c6528a7c9c005dd7f1966d1a8f43ac735933c950614
+  metadata.gz: cd559e11acb29aa9eb4503f98037ca14e0683a393a243b11d1a458368468ee5a7ba6a3bd059118de8e0438b25a10f50daa11c52fb4ae54212224ba0c254ab949
+  data.tar.gz: 85d1a5798696d633bacdb113bac94dd4ca22a13702112082de8b9b9cf83ff38ced2c12436abe6401104ed87823471877b8ca7346e467914a56473f800e1ecfbc

data/lib/moab/file_group.rb

@@ -24,7 +24,7 @@ module Moab
 
     # (see Serializable#initialize)
     def initialize(opts={})
-      @signature_hash = OrderedHash.new
+      @signature_hash = Hash.new
       @data_source = ""
       super(opts)
     end
@@ -75,15 +75,15 @@ module Moab
       @signature_hash.values
     end
 
-    # @return [OrderedHash<FileSignature, FileManifestation>] The actual in-memory store for the collection
+    # @return [Hash<FileSignature, FileManifestation>] The actual in-memory store for the collection
     #   of {FileManifestation} objects that are contained in this file group.
     attr_accessor :signature_hash
 
     # @api internal
-    # @return [OrderedHash<String,FileSignature>] An index of file paths,
+    # @return [Hash<String,FileSignature>] An index of file paths,
     #   used to test for existence of a filename in this file group
     def path_hash
-      path_hash = OrderedHash.new
+      path_hash = Hash.new
       @signature_hash.each do |signature,manifestation|
         manifestation.instances.each do |instance|
           path_hash[instance.path] = signature
@@ -99,9 +99,9 @@ module Moab
 
     # @api internal
     # @param signature_subset [Array<FileSignature>] The signatures used to select the entries to return
-    # @return [OrderedHash<String,FileSignature>] A pathname,signature hash containing a subset of the filenames in this file group
+    # @return [Hash<String,FileSignature>] A pathname,signature hash containing a subset of the filenames in this file group
     def path_hash_subset(signature_subset)
-      path_hash = OrderedHash.new
+      path_hash = Hash.new
       signature_subset.each do |signature|
         manifestation = @signature_hash[signature]
         manifestation.instances.each do |instance|

data/lib/moab/file_group_difference.rb

@@ -54,7 +54,7 @@ module Moab
 
     # (see Serializable#initialize)
     def initialize(opts={})
-      @subset_hash = OrderedHash.new {|hash, key| hash[key] = FileGroupDifferenceSubset.new(:change => key.to_s)}
+      @subset_hash = Hash.new {|hash, key| hash[key] = FileGroupDifferenceSubset.new(:change => key.to_s)}
       super(opts)
     end
 
@@ -220,9 +220,9 @@ module Moab
 
     # @api internal
     # @param matching_signatures [Array<FileSignature>] The file signature of the file manifestations being compared
-    # @param basis_signature_hash [OrderedHash<FileSignature, FileManifestation>]
+    # @param basis_signature_hash [Hash<FileSignature, FileManifestation>]
     #   Signature to file path mapping from the file group that is the basis of the comparison
-    # @param other_signature_hash [OrderedHash<FileSignature, FileManifestation>]
+    # @param other_signature_hash [Hash<FileSignature, FileManifestation>]
     #   Signature to file path mapping from the file group that is the being compared to the basis group
     # @return [FileGroupDifference]
     #   Container for reporting the set of file-level differences of type 'identical'
@@ -245,9 +245,9 @@ module Moab
 
     # @api internal
     # @param matching_signatures [Array<FileSignature>] The file signature of the file manifestations being compared
-    # @param basis_signature_hash [OrderedHash<FileSignature, FileManifestation>]
+    # @param basis_signature_hash [Hash<FileSignature, FileManifestation>]
     #   Signature to file path mapping from the file group that is the basis of the comparison
-    # @param other_signature_hash [OrderedHash<FileSignature, FileManifestation>]
+    # @param other_signature_hash [Hash<FileSignature, FileManifestation>]
     #   Signature to file path mapping from the file group that is the being compared to the basis group
     # @return [FileGroupDifference]
     #   Container for reporting the set of file-level differences of type 'renamed','copyadded', or 'copydeleted'
@@ -280,9 +280,9 @@ module Moab
 
 
     # @api internal
-    # @param basis_path_hash [OrderedHash<String,FileSignature>]
+    # @param basis_path_hash [Hash<String,FileSignature>]
     #   The file paths and associated signatures for manifestations appearing only in the basis group
-    # @param other_path_hash [OrderedHash<String,FileSignature>]
+    # @param other_path_hash [Hash<String,FileSignature>]
     #   The file paths and associated signatures for manifestations appearing only in the other group
     # @return [FileGroupDifference]
     #   Container for reporting the set of file-level differences of type 'modified'
@@ -299,9 +299,9 @@ module Moab
     end
 
     # @api internal
-    # @param basis_path_hash [OrderedHash<String,FileSignature>]
+    # @param basis_path_hash [Hash<String,FileSignature>]
     #   The file paths and associated signatures for manifestations appearing only in the basis group
-    # @param other_path_hash [OrderedHash<String,FileSignature>]
+    # @param other_path_hash [Hash<String,FileSignature>]
     #   The file paths and associated signatures for manifestations appearing only in the other group
     # @return [FileGroupDifference]
     #   Container for reporting the set of file-level differences of type 'added'
@@ -317,9 +317,9 @@ module Moab
     end
 
     # @api internal
-    # @param basis_path_hash [OrderedHash<String,FileSignature>]
+    # @param basis_path_hash [Hash<String,FileSignature>]
     #   The file paths and associated signatures for manifestations appearing only in the basis group
-    # @param other_path_hash [OrderedHash<String,FileSignature>]
+    # @param other_path_hash [Hash<String,FileSignature>]
     #   The file paths and associated signatures for manifestations appearing only in the other group
     # @return [FileGroupDifference]
     #   Container for reporting the set of file-level differences of type 'deleted'

data/lib/moab/file_inventory.rb

@@ -212,7 +212,7 @@ module Moab
       checksum_types.each do |type|
         manifest_pathname[type] = bag_pathname.join("manifest-#{type.to_s}.txt")
       end
-      signatures = OrderedHash.new { |hash,path| hash[path] = FileSignature.new }
+      signatures = Hash.new { |hash,path| hash[path] = FileSignature.new }
       checksum_types.each do |type|
         if manifest_pathname[type].exist?
           manifest_pathname[type].each_line do |line|

data/lib/moab/file_signature.rb

@@ -85,7 +85,7 @@ module Moab
 
    # @return [Hash<Symbol,String>] A hash of the checksum data
     def checksums
-      checksum_hash = OrderedHash.new
+      checksum_hash = Hash.new
       checksum_hash[:md5] = @md5
       checksum_hash[:sha1] = @sha1
       checksum_hash[:sha256] = @sha256
@@ -101,7 +101,7 @@ module Moab
     # @api internal
     # @return [Hash<Symbol,String>] A hash of fixity data from this signataure object
     def fixity
-      fixity_hash = OrderedHash.new
+      fixity_hash = Hash.new
       fixity_hash[:size] = @size.to_s
       fixity_hash.merge!(checksums)
       fixity_hash
@@ -177,7 +177,7 @@ module Moab
 
     # @return [Hash<Symbol,String>] Key is type (e.g. :sha1), value is checksum names (e.g. ['SHA-1', 'SHA1'])
     def FileSignature.checksum_names_for_type
-      names_for_type = OrderedHash.new
+      names_for_type = Hash.new
       names_for_type[:md5] = ['MD5']
       names_for_type[:sha1] = ['SHA-1', 'SHA1']
       names_for_type[:sha256] = ['SHA-256', 'SHA256']
@@ -186,7 +186,7 @@ module Moab
 
    # @return [Hash<String, Symbol>] Key is checksum name (e.g. MD5), value is checksum type (e.g. :md5)
     def FileSignature.checksum_type_for_name
-      type_for_name = OrderedHash.new
+      type_for_name = Hash.new
       self.checksum_names_for_type.each do |type, names|
         names.each do |name|
           type_for_name[name] = type

data/lib/moab/signature_catalog.rb

@@ -34,7 +34,7 @@ module Moab
     # (see Serializable#initialize)
     def initialize(opts={})
       @entries = Array.new
-      @signature_hash = OrderedHash.new
+      @signature_hash = Hash.new
       super(opts)
     end
 
@@ -103,7 +103,7 @@ module Moab
       end
     end
 
-    # @return [OrderedHash] An index having {FileSignature} objects as keys and {SignatureCatalogEntry} objects as values
+    # @return [Hash] An index having {FileSignature} objects as keys and {SignatureCatalogEntry} objects as values
     attr_accessor :signature_hash
 
     # @api internal
@@ -192,4 +192,4 @@ module Moab
 
   end
 
-end
+end

data/lib/moab/storage_object.rb

@@ -154,6 +154,7 @@ module Moab
     # @return [Integer] The identifier of the latest version of this object, or 0 if no versions exist
     def current_version_id
       return @current_version_id unless @current_version_id.nil?
+      #@current_version_id = self.version_id_list.last || 0
       list = self.version_id_list
       version_id = list.empty? ? 0 : list.last
       @current_version_id = version_id

data/lib/moab/verification_result.rb

@@ -41,6 +41,7 @@ module Moab
     # @return [VerificationResult] The result of evaluating the expression
     def self.verify_truth(entity,expression,details=nil)
       result = VerificationResult.new(entity.to_s)
+      # TODO: add expression.empty?
       result.verified = !(expression.nil? or (expression == false))
       result.details = details
       result
@@ -54,9 +55,9 @@ module Moab
 
     # @param verbose [Boolean] If true, always provide all details of the verification
     # @param level [Integer] Used to test the depth of recursion
-    # @return [OrderedHash] The verification result serialized to a hash
+    # @return [Hash] The verification result serialized to a hash
     def to_hash(verbose=false,level=0)
-      hash = OrderedHash.new
+      hash = Hash.new
       hash['verified'] = @verified
       if (verbose or @verified == false)
         hash['details'] = @details ? @details : subentities_to_hash(verbose,level)
@@ -70,9 +71,9 @@ module Moab
 
     # @param verbose [Boolean] If true, always provide all details of the verification
     # @param level [Integer] Used to increment the depth of recursion
-    # @return [OrderedHash] The verification result of subentities serialized to a hash
+    # @return [Hash] The verification result of subentities serialized to a hash
     def subentities_to_hash(verbose,level)
-      hash = OrderedHash.new
+      hash = Hash.new
       @subentities.each do |s|
        hash[s.entity] = s.to_hash(verbose, level+1)
       end

data/lib/serializer.rb

@@ -7,7 +7,7 @@
 # * <b>{Serializable} = utility methods to faciliate serialization to Hash, JSON, or YAML</b>
 #   * {Manifest} = adds methods for marshalling/unmarshalling data to a persistent XML file format
 #
-# @see https://github.com/jnunemaker/happymapper
+# @see https://github.com/dam5s/happymapper
 # @note Copyright (c) 2012 by The Board of Trustees of the Leland Stanford Junior University.
 #   All rights reserved.  See {file:LICENSE.rdoc} for details.
 module Serializer
@@ -15,15 +15,9 @@ end
 
 require 'nokogiri'
 require 'happymapper'
-if RUBY_VERSION < '1.9'
-  require 'hashery/ordered_hash'
-  include Hashery
-else
-  require 'psych'
-  OrderedHash = Hash
-end
 require 'json'
-require 'json/pure'
+require 'psych'
+#require 'json/pure'
 require 'pathname'
 require 'fileutils'
 require 'time'

data/lib/serializer/manifest.rb

@@ -58,7 +58,11 @@ module Serializer
     # @return [void] Serializize the in-memory object to a xml file instance
     def self.write_xml_file(xml_object, parent_dir, filename=nil)
       parent_dir.mkpath
-      self.xml_pathname(parent_dir, filename).open('w') { |f| f << xml_object.to_xml }
+      self.xml_pathname(parent_dir, filename).open('w') do |f|
+        xmlBuilder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8')
+        xmlBuilder = xml_object.to_xml(xmlBuilder)
+        f << xmlBuilder.to_xml
+      end
       nil
     end
 

data/lib/serializer/serializable.rb

@@ -77,11 +77,11 @@ module Serializer
 
     # @api internal
     # @param array [Array] The array to be converted to a hash
-    # @return [OrderedHash] Generate a hash from an array of objects.
+    # @return [Hash] Generate a hash from an array of objects.
     #   If the array member has a field tagged as a key, that field will be used as the hash.key.
     #   Otherwise the index position of the array member will be used as the key
     def array_to_hash(array,summary=false)
-      item_hash = OrderedHash.new
+      item_hash = Hash.new
       array.each_index do |index|
         item = array[index]
         ikey = (item.respond_to?(:key) && item.key) ?  item.key : index
@@ -91,13 +91,13 @@ module Serializer
     end
 
     # @api internal
-    # @return [OrderedHash] Recursively generate an OrderedHash containing the object's properties
+    # @return [Hash] Recursively generate an Hash containing the object's properties
     # @param summary [Boolean] Controls the depth and detail of recursion
     def to_hash(summary=false)
-      oh = OrderedHash.new
+      oh = Hash.new
       vars = summary ? variables.select{|v| summary_fields.include?(v.name)} : variables
       vars.each do |variable|
-        key = variable.options[:tag] || variable.name.to_s
+        key = variable.name.to_s
         value = self.send(variable.name)
         case value
           when Array
@@ -111,14 +111,14 @@ module Serializer
       oh
     end
 
-    # @return [OrderedHash] Calls to_hash(summary=true)
+    # @return [Hash] Calls to_hash(summary=true)
     def summary
       self.to_hash(summary=true)
     end
 
     # @api internal
     # @param other [Serializable] The other object being compared
-    # @return [OrderedHash] Generate a hash containing the differences between two objects of the same type
+    # @return [Hash] Generate a hash containing the differences between two objects of the same type
     def diff(other)
       raise "Cannot compare different classes" if self.class != other.class
       left = other.to_hash
@@ -135,11 +135,11 @@ module Serializer
 
     # @api internal
     # @param hashes [Array<Hash>] The hashes to be compared, with optional name tags
-    # @return [OrderedHash] Generate a hash containing the differences between two hashes
+    # @return [Hash] Generate a hash containing the differences between two hashes
     #   (recursively descend parallel trees of hashes)
     # @see https://gist.github.com/146844
     def Serializable.deep_diff(*hashes)
-      diff = OrderedHash.new
+      diff = Hash.new
       case hashes.length
         when 4
           ltag, left, rtag, right = hashes
@@ -153,7 +153,7 @@ module Serializer
           if left[k].is_a?(Hash) && right[k].is_a?(Hash)
             diff[k] = deep_diff(ltag, left[k], rtag, right[k])
           else
-            diff[k] = OrderedHash.[](ltag, left[k], rtag, right[k])
+            diff[k] = Hash.[](ltag, left[k], rtag, right[k])
           end
         end
       end
@@ -175,4 +175,4 @@ module Serializer
 
   end
 
-end
+end

data/lib/stanford/content_inventory.rb

@@ -205,7 +205,7 @@ module Stanford
     # @return [void] update the file's checksum elements if data missing, raise exception if inconsistent
     def remediate_checksum_nodes(file_node, signature)
       # collect <checksum> elements for checksum types that are already present
-      checksum_nodes = OrderedHash.new
+      checksum_nodes = Hash.new
       file_node.xpath('checksum').each do |checksum_node|
         type = @type_for_name[checksum_node['type']]
         checksum_nodes[type] = checksum_node
@@ -233,4 +233,4 @@ module Stanford
 
   end
 
-end
+end

data/lib/tools/api_doc_generator.rb

@@ -1,6 +1,5 @@
 #$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 require 'rubygems'
-require 'hashery/orderedhash'
 require 'pathname'
 require 'yard'
 include YARD
@@ -45,7 +44,7 @@ class ApiClass
   def initialize(class_name)
     @class_name = class_name
     @yard_class = @@class_hash[class_name]
-    if yard_class.nil?
+    if @yard_class.nil?
       raise "class_hash[#{class_name}] is Nil"
     end
     @mhash = categorize_members(@yard_class)
@@ -69,8 +68,8 @@ class ApiClass
 
   def categorize_members(yard_class)
     mhash = {
-        :class_attributes => OrderedHash.new,
-        :instance_attributes => OrderedHash.new,
+        :class_attributes => Hash.new,
+        :instance_attributes => Hash.new,
         :class_methods => Array.new,
         :instance_methods => Array.new
     }
@@ -254,7 +253,7 @@ class ApiClass
   end
 
   def confluence_translate(input)
-    map = OrderedHash.new
+    map = Hash.new
     map[/\|/] = "\\|"
     map[/====/] = "h4. "
     map[/\*/] = "\\*"

data/lib/tools/spec_generator.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'hashery/orderedhash' if RUBY_VERSION < '1.9'
 require 'pathname'
 require 'yard'
 include YARD
@@ -90,8 +89,8 @@ class SpecGenerator
   # @param cls [CodeObjects::ClassObject]
   def categorize_members(cls)
     mhash = {
-        :class_attributes => OrderedHash.new,
-        :instance_attributes => OrderedHash.new,
+        :class_attributes => Hash.new,
+        :instance_attributes => Hash.new,
         :class_methods => Array.new,
         :instance_methods => Array.new
     }
@@ -168,7 +167,7 @@ class SpecGenerator
         if p.name == 'opts'
           output " "
           output "# test initialization with options hash"
-          output "opts = OrderedHash.new"
+          output "opts = Hash.new"
           attribute_name_type_pairs(mhash).each do |name, type|
             output "opts[:#{name}] = #{value_for(name, type)}"
           end
@@ -363,7 +362,7 @@ class SpecGenerator
           case type[0]
             when 'Array'
               "[#{value_for(name, type[1])}]"
-            when 'Hash', 'OrderedHash'
+            when 'Hash'
               key, value = type[1].split(/[,]/)
               "{#{value_for(name, key)} => #{value_for(name, value)}}"
             else
@@ -376,7 +375,7 @@ class SpecGenerator
   end
 
   def attribute_arrays_and_hashes(mhash)
-    arrays_and_hashes = OrderedHash.new
+    arrays_and_hashes = Hash.new
     attribute_name_type_pairs(mhash).each do |name, type|
       if type.include?('Array')
         arrays_and_hashes[name] = 'Array'
@@ -388,7 +387,7 @@ class SpecGenerator
   end
 
   def attribute_name_type_pairs(mhash)
-    pairs = OrderedHash.new
+    pairs = Hash.new
     mhash[:instance_attributes].values.each do |attribute|
       read = attribute[:read]
       return_tag = read.docstring.tag(:return)

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: moab-versioning
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.1
 platform: ruby
 authors:
+- Darren Weber
 - Richard Anderson
 - Lynn McRae
 - Hannah Frost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: confstruct
@@ -41,21 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashery
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: json_pure
+  name: nokogiri-happymapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,7 +56,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: happymapper
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,30 +101,30 @@ dependencies:
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -158,14 +145,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -180,9 +167,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Contains classes to process digital object version content and metadata
 email:
-- rnanders@stanford.edu
+- darren.weber@stanford.edu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -224,8 +225,9 @@ files:
 - lib/tools/api_doc_generator.rb
 - lib/tools/spec_generator.rb
 - lib/tools/spec_generator_old.rb
-homepage: 
-licenses: []
+homepage: https://github.com/sul-dlss/moab-versioning
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -243,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of digital object versioning toolkit used by the SULAIR