zizia 4.2.0.alpha.01 → 4.3.1.alpha.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c529a5323dbb1b929bfc010ef73a81d52f643da989c4a390a691afa881c730c6
-  data.tar.gz: d819c1c9b34ecee1d4ac22c77f53f7dfc7e9b2c99a81cbacbaa3f0bd2336d679
+  metadata.gz: f7738ad4f5ddf617123e02b0c30426c937b8a6e1a9ac343cdc1f526db6022977
+  data.tar.gz: 11ef2ee8fd0f01df8a430847383a3f1aff3d2c5c026d30fab2892a00d183bad6
 SHA512:
-  metadata.gz: 5144300f68e907db6837c9112929eb436ca5b2072cbae740cab98cd3672b0085e0a12ca12d081c5da2cc63b7fc59a4f150430c04a911d95b95869bcdf10d66c2
-  data.tar.gz: da4bc0d67cbd3e756765ac30083f4c8ccfbed615f07dddefe6dc1701c84fb14d36aaf687490dae1f49000c5b2ba8792ee2ae33ef124a42b6c3d9b1737833623e
+  metadata.gz: 9a83df339c9be7d6aba456040d7c9be5cc260a825f0c46ff0a5daffdef9b1f57046289da88cadaae9c89ce01b6cfc46b099fd138740f32f4d794a0aef228f420
+  data.tar.gz: 69269d92ffc9743b271e53b5d9886b1408c125b0d6d5fdbb0650032c563644dfffdfe7225295c8c7fc47cd6e06ed4070af4b1f3954f79c9fa9224db5f810afda

data/app/config/usage.yml

@@ -5,6 +5,7 @@
 arkivo_checksum:        "-- system field - not directly editable --"
 based_near: " A location that something is based near, for some broadly human notion of near."
 contributor:            "Identifies contributors to the material; can be used very broadly if exact contributions aren't known"
+create_date:            "-- system field - not directly editable --"
 creator:                "Identifies the primary Creator(s) of the material"
 date_created:           "The date the material was created"
 date_modified:          "-- system field - not directly editable --"

data/app/controllers/zizia/metadata_details_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Zizia
-  class MetadataDetailsController < ApplicationController
+  class MetadataDetailsController < ::ApplicationController
     def show
       @details = MetadataDetails.instance.details(work_attributes:
                                                      WorkAttributes.instance)

data/app/models/zizia/csv_import.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Zizia
-  class CsvImport < ApplicationRecord
+  class CsvImport < ::ApplicationRecord
     belongs_to :user
 
     # This is where the CSV file is stored:

data/app/models/zizia/csv_import_detail.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Zizia
-  class CsvImportDetail < ApplicationRecord
+  class CsvImportDetail < ::ApplicationRecord
     after_initialize :set_defaults, unless: :persisted?
 
     belongs_to :csv_import

data/app/models/zizia/pre_ingest_file.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Zizia
-  class PreIngestFile < ApplicationRecord
+  class PreIngestFile < ::ApplicationRecord
     belongs_to :pre_ingest_work
   end
 end

data/app/models/zizia/pre_ingest_work.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Zizia
-  class PreIngestWork < ApplicationRecord
+  class PreIngestWork < ::ApplicationRecord
     has_many :pre_ingest_files
   end
 end

data/app/views/zizia/csv_imports/_record_count.html.erb

@@ -2,7 +2,6 @@
   <div class="col-md-8">
     <div class="alert alert-success">
       <p> This import will create or update <%= @csv_import.manifest_records %> records. </p>
-      <p> If you only want to import new records you will be able to choose that option after continuing. </p>
     </div>
   </div>
 </div>

data/lib/zizia.rb

@@ -36,6 +36,7 @@ module Zizia
   require 'zizia/metadata_mapper'
   require 'zizia/hash_mapper'
   require 'zizia/hyrax/hyrax_basic_metadata_mapper'
+  require 'zizia/hyrax/based_near_attributes'
   require 'zizia/importer'
   require 'zizia/record_importer'
   require 'zizia/hyrax/hyrax_record_importer'

data/lib/zizia/hyrax/based_near_attributes.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Zizia
+  class BasedNearAttributes
+    attr_accessor :based_near
+
+    def initialize(based_near)
+      @based_near = based_near
+    end
+
+    ##
+    # When submitting location data (a.k.a. the "based near" attribute) via the UI,
+    # Hyrax expects to receive a `based_near_attributes` hash in a specific format.
+    # We need to take geonames urls as provided by the customer and transform them to
+    # mimic what the Hyrax UI would ordinarily produce. These will get turned into
+    # Hyrax::ControlledVocabularies::Location objects upon ingest.
+    # The expected hash looks like this:
+    #   "based_near_attributes"=>
+    #     {
+    #       "0"=> {
+    #               "id"=>"http://sws.geonames.org/5667009/", "_destroy"=>""
+    #             },
+    #       "1"=> {
+    #               "id"=>"http://sws.geonames.org/6252001/", "_destroy"=>""
+    #             },
+    #   }
+    # @return [Hash] a "based_near_attributes" hash as
+    def to_h
+      original_geonames_uris = based_near
+      return if original_geonames_uris.empty?
+      based_near_attributes = {}
+      original_geonames_uris.each_with_index do |uri, i|
+        based_near_attributes[i.to_s] = { 'id' => uri_to_sws(uri), "_destroy" => "" }
+      end
+      based_near_attributes
+    end
+
+    #
+    # Take a user-facing geonames URI and return an sws URI, of the form Hyrax expects
+    # (e.g., "http://sws.geonames.org/6252001/")
+    # @param [String] uri
+    # @return [String] an sws style geonames uri
+    def uri_to_sws(uri)
+      uri = URI(uri)
+      geonames_number = uri.path.split('/')[1]
+      "http://sws.geonames.org/#{geonames_number}/"
+    end
+  end
+end

data/lib/zizia/hyrax/hyrax_record_importer.rb

@@ -140,44 +140,6 @@ module Zizia
       filepath
     end
 
-    ##
-    # When submitting location data (a.k.a. the "based near" attribute) via the UI,
-    # Hyrax expects to receive a `based_near_attributes` hash in a specific format.
-    # We need to take geonames urls as provided by the customer and transform them to
-    # mimic what the Hyrax UI would ordinarily produce. These will get turned into
-    # Hyrax::ControlledVocabularies::Location objects upon ingest.
-    # The expected hash looks like this:
-    #   "based_near_attributes"=>
-    #     {
-    #       "0"=> {
-    #               "id"=>"http://sws.geonames.org/5667009/", "_destroy"=>""
-    #             },
-    #       "1"=> {
-    #               "id"=>"http://sws.geonames.org/6252001/", "_destroy"=>""
-    #             },
-    #   }
-    # @return [Hash] a "based_near_attributes" hash as
-    def based_near_attributes(based_near)
-      original_geonames_uris = based_near
-      return if original_geonames_uris.empty?
-      based_near_attributes = {}
-      original_geonames_uris.each_with_index do |uri, i|
-        based_near_attributes[i.to_s] = { 'id' => uri_to_sws(uri), "_destroy" => "" }
-      end
-      based_near_attributes
-    end
-
-    #
-    # Take a user-facing geonames URI and return an sws URI, of the form Hyrax expects
-    # (e.g., "http://sws.geonames.org/6252001/")
-    # @param [String] uri
-    # @return [String] an sws style geonames uri
-    def uri_to_sws(uri)
-      uri = URI(uri)
-      geonames_number = uri.path.split('/')[1]
-      "http://sws.geonames.org/#{geonames_number}/"
-    end
-
     private
 
       # Update an existing object using the Hyrax actor stack
@@ -218,7 +180,8 @@ module Zizia
         # since this is reserved for Hyrax and is where uploaded_files will be attached
         attrs.delete(:files)
         based_near = attrs.delete(:based_near)
-        attrs.merge(based_near_attributes: based_near_attributes(based_near)) unless based_near.nil? || based_near.empty?
+        attrs = attrs.merge(based_near_attributes: Zizia::BasedNearAttributes.new(based_near).to_h) unless based_near.nil? || based_near.empty?
+        attrs
       end
 
       # Create an object using the Hyrax actor stack

data/lib/zizia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zizia
-  VERSION = '4.2.0.alpha.01'
+  VERSION = '4.3.1.alpha.01'
 end

data/spec/dummy/config/initializers/hyrax.rb

@@ -105,7 +105,7 @@ Hyrax.config do |config|
 
   # Location autocomplete uses geonames to search for named regions
   # Username for connecting to geonames
-  # config.geonames_username = ''
+  config.geonames_username = ENV['GEONAMES_USERNAME']
 
   # Should the acceptance of the licence agreement be active (checkbox), or
   # implied when the save button is pressed? Set to true for active

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zizia
 version: !ruby/object:Gem::Version
-  version: 4.2.0.alpha.01
+  version: 4.3.1.alpha.01
 platform: ruby
 authors:
 - Data Curation Experts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -644,7 +644,6 @@ files:
 - app/assets/stylesheets/zizia/application.css
 - app/assets/stylesheets/zizia/zizia.scss
 - app/config/usage.yml
-- app/controllers/zizia/application_controller.rb
 - app/controllers/zizia/csv_imports_controller.rb
 - app/controllers/zizia/metadata_details_controller.rb
 - app/helpers/zizia/application_helper.rb
@@ -655,7 +654,6 @@ files:
 - app/lib/zizia/metadata_details.rb
 - app/lib/zizia/metadata_usage.rb
 - app/lib/zizia/work_attributes.rb
-- app/models/zizia/application_record.rb
 - app/models/zizia/csv_import.rb
 - app/models/zizia/csv_import_detail.rb
 - app/models/zizia/pre_ingest_file.rb
@@ -704,6 +702,7 @@ files:
 - lib/zizia/csv_template.rb
 - lib/zizia/engine.rb
 - lib/zizia/hash_mapper.rb
+- lib/zizia/hyrax/based_near_attributes.rb
 - lib/zizia/hyrax/hyrax_basic_metadata_mapper.rb
 - lib/zizia/hyrax/hyrax_default_updater.rb
 - lib/zizia/hyrax/hyrax_delete_files_updater.rb

data/app/controllers/zizia/application_controller.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-module Zizia
-  class ApplicationController < ::ApplicationController
-    protect_from_forgery with: :exception
-  end
-end

data/app/models/zizia/application_record.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-module Zizia
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end