ddr-core 0.3.0 → 1.2.0.rc1

data/lib/ddr/index.rb

@@ -19,10 +19,10 @@ module Ddr
     autoload :SortOrder
     autoload :UniqueKeyField
 
-    def self.pids
+    def self.ids
       builder = QueryBuilder.new { field UniqueKeyField.instance }
       query = builder.query
-      query.pids
+      query.ids
     end
 
   end

data/lib/ddr/index/csv_query_result.rb

@@ -6,8 +6,35 @@ module Ddr::Index
     MAX_ROWS         = 10**8 # Just set to a really high number :)
     CSV_MV_SEPARATOR = ";"
 
+    DEFAULT_CSV_OPTIONS = {
+      headers:        :first_row,
+      return_headers: false,
+      write_headers:  true,
+      converters:     [
+        # convert semicolons
+        lambda { |f| f.gsub(/\\#{CSV_MV_SEPARATOR}/, CSV_MV_SEPARATOR) rescue f },
+        # convert escaped newlines
+        lambda { |f| f.gsub(/\\r/, "\r").gsub(/\\n/, "\n") rescue f }
+      ],
+    }.freeze
+
     delegate :headers, :to_s, :to_csv, to: :table
 
+    attr_reader :csv_opts
+
+    #
+    # See Ruby docs on CSV::new for details on available keys
+    # and values for the optional `csv_options' Hash parameter.
+    #
+    # N.B. If you want to *add* a converter and retain the
+    # default converters, append DEFAULT_CSV_OPTIONS[:converters]
+    # to your Array of converters.
+    #
+    def initialize(query, csv_opts: {})
+      super(query)
+      @csv_opts = DEFAULT_CSV_OPTIONS.merge(csv_opts)
+    end
+
     def delete_empty_columns!
       table.by_col!.delete_if { |c, vals| vals.all?(&:nil?) }
     end
@@ -24,14 +51,6 @@ module Ddr::Index
       @table ||= CSV.parse(data, csv_opts)
     end
 
-    def csv_opts
-      { headers:        csv_headers,
-        converters:     [convert_semicolons, convert_escaped_newlines],
-        return_headers: false,
-        write_headers:  true,
-      }
-    end
-
     def solr_csv_opts
       { "csv.mv.separator" => CSV_MV_SEPARATOR,
         "csv.header"       => solr_csv_header?,
@@ -44,10 +63,6 @@ module Ddr::Index
       query.fields.map { |f| f.respond_to?(:heading) ? f.heading : f.to_s }
     end
 
-    def csv_headers
-      :first_row
-    end
-
     def solr_csv_header?
       query.fields.empty?
     end
@@ -72,13 +87,5 @@ module Ddr::Index
       Connection.get("select", params: solr_csv_params)
     end
 
-    def convert_semicolons
-      lambda { |f| f.gsub(/\\#{CSV_MV_SEPARATOR}/, CSV_MV_SEPARATOR) rescue f }
-    end
-
-    def convert_escaped_newlines
-      lambda { |f| f.gsub(/\\r/, "\r").gsub(/\\n/, "\n") rescue f }
-    end
-
   end
 end

data/lib/ddr/index/fields.rb

@@ -29,15 +29,20 @@ module Ddr::Index
     CONTENT_CREATE_DATE           = Field.new :content_create_date, :stored_sortable, type: :date
     CONTENT_SIZE                  = Field.new :content_size, solr_name: "content_size_lsi"
     CONTENT_SIZE_HUMAN            = Field.new :content_size_human, :symbol
+    CONTENTDM_ID                  = Field.new :contentdm_id, :stored_sortable
     CONTRIBUTOR_FACET             = Field.new :contributor_facet, :facetable
     CREATOR_FACET                 = Field.new :creator_facet, :facetable
     DATE_FACET                    = Field.new :date_facet, :facetable
     DATE_SORT                     = Field.new :date_sort, :sortable
     DC_IS_PART_OF                 = Field.new :isPartOf, :symbol
     DEPOSITOR                     = Field.new :depositor, :stored_sortable
+    # DDR-1997 - description should always be indexed as _tesim regardless of length - Valkyrie indexes fields > 1000
+    # characters in length as _tsim only
+    DESCRIPTION                   = Field.new :description, :stored_searchable # stored_searchable produces _tesim
     DISPLAY_FORMAT                = Field.new :display_format, :stored_sortable
     DOI                           = Field.new :doi, :symbol
     EAD_ID                        = Field.new :ead_id, :stored_sortable
+    EFFECTIVE_ROLE                = Field.new :effective_role, :symbol
     ENGRAVER_FACET                = Field.new :engraver_facet, :facetable
     EXTRACTED_TEXT                = Field.new :extracted_text, solr_name: "extracted_text_tsm"
     FCREPO3_PID                   = Field.new :fcrepo3_pid, :stored_sortable

data/lib/ddr/managers/technical_metadata_manager.rb

@@ -2,7 +2,9 @@ module Ddr
   module Managers
     class TechnicalMetadataManager < Manager
 
-      FITS_TIMESTAMP_FORMAT = "%D %l:%M %p" # Ex. 7/3/15 8:29 PM
+      FITS_141_TIMESTAMP_FORMAT = "%D %l:%M %p" # Ex. 7/3/15 8:29 PM
+      FITS_150_TIMESTAMP_FORMAT = "%D, %l:%M %p" # Ex. 7/3/15, 8:29 PM
+      FITS_TIMESTAMP_FORMATS = [ FITS_141_TIMESTAMP_FORMAT, FITS_150_TIMESTAMP_FORMAT ]
 
       delegate :content, to: :object
 
@@ -43,9 +45,12 @@ module Ddr
 
       def fits_datetime
         if fits_timestamp = fits.timestamp.first
-          # no_zone = DateTime.strptime(fits_timestamp, FITS_TIMESTAMP_FORMAT)
-          # no_zone.change(offset: no_zone.to_time.zone)
-          Time.zone.strptime(fits_timestamp, FITS_TIMESTAMP_FORMAT)
+          parsed = nil
+          FITS_TIMESTAMP_FORMATS.each do |format|
+            parsed = Time.zone.strptime(fits_timestamp, format) rescue nil
+            break if parsed
+          end
+          parsed
         end
       end
 

data/lib/ddr/structure.rb

@@ -82,6 +82,7 @@ module Ddr
 
     def add_filesec(id:nil)
       filesec = Ddr::Structures::FileSec.build(id: id, document: as_xml_document)
+      
       root.add_child(filesec)
       filesec
     end
@@ -92,7 +93,7 @@ module Ddr
       filegrp
     end
 
-    def add_file(parent:, id:SecureRandom.uuid, use:nil)
+    def add_file(parent:, id: "id_" + SecureRandom.uuid, use:nil)
       file = Ddr::Structures::File.build(id: id, use: use, document: as_xml_document)
       parent.add_child(file)
       file

data/lib/ddr/vocab/asset.rb

@@ -47,5 +47,9 @@ module Ddr::Vocab
              label: "Nested Path",
              comment: "The nested/tree path to the object to be reflected in structural metadata."
 
+    property "contentdmId",
+             label: "CONTENTdm ID"
+             comment: "The CONTENTdm reference corresponding to the object."
+
   end
 end

data/lib/ddr/workflow.rb

@@ -3,6 +3,7 @@ module Ddr
 
     PUBLISHED = 'published'
     UNPUBLISHED = 'unpublished'
+    NONPUBLISHABLE = 'nonpublishable'
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.2.0.rc1
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: grouper-rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +209,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: equivalent-xml
+  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'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -292,6 +306,7 @@ files:
 - app/assets/config/ddr_core_manifest.js
 - app/controllers/users/omniauth_callbacks_controller.rb
 - app/controllers/users/sessions_controller.rb
+- app/models/concerns/ddr/#search_builder_behavior.rb#
 - app/models/concerns/ddr/captionable.rb
 - app/models/concerns/ddr/describable.rb
 - app/models/concerns/ddr/governable.rb
@@ -305,15 +320,23 @@ files:
 - app/models/concerns/ddr/has_parent.rb
 - app/models/concerns/ddr/has_struct_metadata.rb
 - app/models/concerns/ddr/has_thumbnail.rb
+- app/models/concerns/ddr/search_builder_behavior.rb~
 - app/models/concerns/ddr/solr_document_behavior.rb
 - app/models/concerns/ddr/streamable.rb
+- app/models/ddr/#admin_set.rb#
+- app/models/ddr/#auxiliary_resource_cache.rb#
 - app/models/ddr/admin_set.rb
+- app/models/ddr/alert.rb
 - app/models/ddr/attachment.rb
+- app/models/ddr/auxiliary_resource.rb
+- app/models/ddr/auxiliary_resource.rb~
+- app/models/ddr/cacheable_auxiliary_resource.rb~
 - app/models/ddr/collection.rb
 - app/models/ddr/component.rb
 - app/models/ddr/contact.rb
 - app/models/ddr/digest.rb
 - app/models/ddr/file.rb
+- app/models/ddr/finding_aid.rb
 - app/models/ddr/item.rb
 - app/models/ddr/language.rb
 - app/models/ddr/media_type.rb
@@ -325,8 +348,10 @@ files:
 - config/routes.rb
 - db/migrate/20141104181418_create_users.rb
 - db/migrate/20141107124012_add_columns_to_user.rb
+- db/migrate/20200207194453_add_default_to_lock_version.rb
 - lib/ddr-core.rb
 - lib/ddr/auth.rb
+- lib/ddr/auth/#duke_person.rb#
 - lib/ddr/auth/ability.rb
 - lib/ddr/auth/ability_definitions.rb
 - lib/ddr/auth/ability_definitions/admin_set_ability_definitions.rb
@@ -347,6 +372,7 @@ files:
 - lib/ddr/auth/auth_context.rb
 - lib/ddr/auth/auth_context_factory.rb
 - lib/ddr/auth/detached_auth_context.rb
+- lib/ddr/auth/duke_directory.rb~
 - lib/ddr/auth/dynamic_groups.rb
 - lib/ddr/auth/effective_permissions.rb
 - lib/ddr/auth/effective_roles.rb
@@ -419,7 +445,8 @@ files:
 homepage: https://gitlab.oit.duke.edu/ddr/ddr-core
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -431,12 +458,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository