to_spotlight 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74db6d9918bf3290f633050b0bd9cd48d5ea2567162f754e900048b7d98a2a16
-  data.tar.gz: dc240f4af0200bc92480b4a336a3404aa6ee59ded38d484c0b22f1061ff8fa33
+  metadata.gz: 36ec581276c27e1c851f430d2390e177763863df1edbf2828f0015607e0e5d7d
+  data.tar.gz: ed68bfd105acf8f243ffcadacba335c9fcade7d1bb3aad09e23785f48ebd3583
 SHA512:
-  metadata.gz: f49cb007227af1e92be26722e3435fa628c8617c86abbe1d88e91bc441742750b0935a96ecd8656d50b93e0cdee99c6d46f155d33f89be7548011532a8af5991
-  data.tar.gz: da9aafaeb9ac057e22ba86f52ad00c0ec2fa8ae75ba5beea5e29f629db18d60fe7d1345d5ee64fc2c46f9dff7ff2fae26b0ccf7c4744e889535019b4b044b80e
+  metadata.gz: f496d05636aa8eca5681226d0e027fb45735917324568ecb945eb252f69fd7b436c633336765fc2defc57d833d4105f6cbfda917cbe9a7848226e674ffe9a212
+  data.tar.gz: cead82120d6613d68bde233aeb1a653216e7ceb30da0c3579624f20c69eddd8e6dd3fb01f7e01da18c5b01f119200ba987e06eed18f74bbfebbdb87846a18ff0

data/app/controllers/to_spotlight/spotlight_transfer_controller.rb

@@ -11,8 +11,8 @@ module ToSpotlight
         render plain: curated_fields
       when 'works'
         render partial: 'to_spotlight/spotlight_transfer/select', locals: { type_name: 'work', data: curated_works }
-      when 'admin_sets'
-        render partial: 'to_spotlight/spotlight_transfer/select', locals: { type_name: 'admin_set', data: admin_sets }
+      when 'collections'
+        render partial: 'to_spotlight/spotlight_transfer/select', locals: { type_name: 'collection', data: collections }
       else
         render plain: 'Invalid Request Type'
       end
@@ -21,13 +21,13 @@ module ToSpotlight
 
     def receive
       return unless params[:token]
-      mappings = params.permit!.to_h[:mappings]
       user = params.permit!.to_h[:user]
-      admin_set_id = params.permit!.to_h[:admin_set_id]
+      mappings = params.permit!.to_h[:mappings]
+      collection_id = params.permit!.to_h[:collection_id]
       exhibit_id = params.permit!.to_h[:exhibit_id]
       @transfer = ToSpotlight::SpotlightTransfer.new user: user,
                                                      mappings: mappings,
-                                                     admin_set_id: admin_set_id,
+                                                     collection_id: collection_id,
                                                      exhibit_id: exhibit_id
       if @transfer.save
         render plain: 'Transfer Request Received'
@@ -43,14 +43,14 @@ module ToSpotlight
     def approve
       now = params[:commit].downcase.include?('now')
       transfer = ToSpotlight::SpotlightTransfer.find params[:transfer_id]
-      works = ::AdminSet.find(transfer.admin_set_id).members
+      works = ::Collection.find(transfer.collection_id).members
       mappings = mapping_invert transfer.mappings
       SpotlightTransferJob.perform_later(works, mappings)
-      @res = ::Net::HTTP.post URI('http://localhost:3000/from_hyrax/receive'),
-                              { transfer: transfer.attributes,
-                                now: now,
-                                token: 'secret_token' }.to_json,
-                              'Content-Type' => 'application/json'
+      #@res = ::Net::HTTP.post URI('http://localhost:3000/from_hyrax/receive'),
+      #                        { transfer: transfer.attributes,
+      #                          now: now,
+      #                          token: 'secret_token' }.to_json,
+      #                        'Content-Type' => 'application/json'
 
     end
 
@@ -64,35 +64,36 @@ module ToSpotlight
     end
 
     def curated_works
-      %w[GenericWork IaffWork]
+      Site.first.available_works
     end
 
-    def admin_sets
-      %w[DefaultSet SecondSet]
+    def collections
+      ::Collection.all.map { |c| [c.title.first, c.id] }
     end
 
     def curated_fields
-      genericwork_fields - excluded_fields
+      work_fields(params[:work].constantize) - excluded_fields
     end
 
-    def genericwork_fields # GenericWork.new.attributes.keys
-      %w[id head tail depositor title date_uploaded date_modified state
-         proxy_depositor on_behalf_of arkivo_checksum owner alternative_title
-         edition geographic_coverage coordinates chronological_coverage extent
-         additional_physical_characteristics has_format physical_repository
-         collection provenance provider sponsor genre format
-         archival_item_identifier fonds_title fonds_creator fonds_description
-         fonds_identifier is_referenced_by date_digitized transcript
-         technical_note year label relative_path import_url creator part_of
-         resource_type contributor description keyword license rights_statement
-         publisher date_created subject language identifier based_near
-         related_url bibliographic_citation source access_control_id
-         representative_id thumbnail_id rendering_ids admin_set_id
-         embargo_id lease_id]
+    def work_fields work
+      work.new.attributes.keys
+       #%w[id head tail depositor title date_uploaded date_modified state
+       #  proxy_depositor on_behalf_of arkivo_checksum owner alternative_title
+       #  edition geographic_coverage coordinates chronological_coverage extent
+       #  additional_physical_characteristics has_format physical_repository
+       #  collection provenance provider sponsor genre format
+       #  archival_item_identifier fonds_title fonds_creator fonds_description
+       #  fonds_identifier is_referenced_by date_digitized transcript
+       #  technical_note year label relative_path import_url creator part_of
+       #  resource_type contributor description keyword license rights_statement
+       #  publisher date_created subject language identifier based_near
+       #  related_url bibliographic_citation source access_control_id
+       #  representative_id thumbnail_id rendering_ids admin_set_id
+       #  embargo_id lease_id]
     end
 
     def excluded_fields
-      %w[id head tail state proxy_depositor on_behalf_of arkivo_checksum label
+      %w[id title head tail state proxy_depositor on_behalf_of arkivo_checksum label
          relative_path import_url part_of resource_type access_control_id
          representative_id thumbnail_id rendering_ids admin_set_id embargo_id
          lease_id]

data/app/views/to_spotlight/spotlight_transfer/_default_group.html.erb

@@ -3,7 +3,7 @@
   <tr>
     <th><%= "Uploaded" %></th>
     <th><%= "User" %></th>
-    <th><%= "Admin Set" %></th>
+    <th><%= "Collection" %></th>
     <th><%= "Actions" %></th>
   </tr>
   </thead>

data/app/views/to_spotlight/spotlight_transfer/_list_transfers.html.erb

@@ -4,7 +4,7 @@
 
   <td><%= transfer.user %></td>
 
-  <td><%= transfer.admin_set_id %></td>
+  <td><%= transfer.collection_id %></td>
 
   <td>
     <%= form_tag to_spotlight.approve_path, method: :post, class: "form-inline" do %>

data/config/routes.rb

@@ -1,6 +1,6 @@
-Rails::Application.routes.draw do
-  get 'to_spotlight/api/:request_type' => 'spotlight_transfer#api'
-  post 'to_spotlight/receive' => 'spotlight_transfer#receive'
-  get 'to_spotlight/index' => 'spotlight_transfer#index'
-  post 'to_spotlight/approve' => 'spotlight_transfer#approve'
+ToSpotlight::Engine.routes.draw do
+  get 'api/:request_type' => 'spotlight_transfer#api'
+  post 'receive' => 'spotlight_transfer#receive'
+  get 'index' => 'spotlight_transfer#index'
+  post 'approve' => 'spotlight_transfer#approve'
 end

data/db/migrate/20200310153953_create_to_spotlight_spotlight_transfers.rb

@@ -4,7 +4,7 @@ class CreateToSpotlightSpotlightTransfers < ActiveRecord::Migration[5.0]
       t.string :user
       t.text :mappings
       t.boolean :approved, default: false
-      t.string :admin_set_id
+      t.string :collection_id
       t.string :exhibit_id
 
       t.timestamps

data/lib/to_spotlight/engine.rb

@@ -1,5 +1,12 @@
 module ToSpotlight
   class Engine < ::Rails::Engine
     isolate_namespace ToSpotlight
+    initializer :append_migrations do |app|
+      unless app.root.to_s.match root.to_s
+        config.paths["db/migrate"].expanded.each do |expanded_path|
+          app.config.paths["db/migrate"] << expanded_path
+        end
+      end
+    end
   end
 end

data/lib/to_spotlight/version.rb

@@ -1,3 +1,3 @@
 module ToSpotlight
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: to_spotlight
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - sephirothkod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails