from_hyrax 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 701c458c978b82af2182dd38541d47e138d167dc833594ec907bc75a7fae22ce
-  data.tar.gz: d17303bc8c32a043db18b1ff382adce41bb8e09717de46e77fe781918612622e
+  metadata.gz: 8a456ae00345fe94bd306dada4cbad8adb0b15d5711a36f4ca42f301fb95f73a
+  data.tar.gz: bdba2ee1cda317be7785a03c34dfda8e02b44928fc48dd56f5bc30c660dcf2c2
 SHA512:
-  metadata.gz: 021ea7d23cc8068b078cd76f30514189879bcc21b1db1c92ffbb52839fe52e3b4b301b10580e3291988aace386d52c2bda0d4be6417aade08af483c29bbb2876
-  data.tar.gz: 18ef84636d952fd114429608194765658bda88307210c98e05845c632b575f6cd37332e5b93027c1701fdeb0b2d32a7ba640d7b2a4dd0a30eaf3aef8d73fc1a8
+  metadata.gz: 5431fb3d21d357f88b5e54b5263f34f21830aaee235cbc7e41cf067d19e26fb22df3e49fe63bab7e98a855961e40582d87b7b8535da859db1c8639537bb2c9a5
+  data.tar.gz: aa6c9bfa913f8e488a0ffa381208645bff700fe0b3c204f1b751019db79228062e47b261c7fd27b051228867b5fcafa142cfe1e324d04d8d730a3de008abfc32

data/app/assets/javascripts/from_hyrax/application.js

@@ -13,10 +13,10 @@
 //= require_tree .
 
 function newSelect(e) {
-    count = e.parentElement.childElementCount/2;
+    count = e.parentElement.childElementCount / 2;
     cln = e.previousElementSibling.cloneNode(true);
-    cln.name = cln.name.replace(/spotlight\]\[.*\]/, "spotlight]["+count+"]");
-    cln.id = cln.id.replace(/spotlight\]\[.*\]/, "spotlight]["+count+"]");
+    cln.name = cln.name.replace(/spotlight\]\[.*\]/, "spotlight][" + count + "]");
+    cln.id = cln.id.replace(/spotlight\]\[.*\]/, "spotlight][" + count + "]");
     e.parentElement.appendChild(document.createElement('br'));
     e.parentElement.appendChild(cln);
 
@@ -26,7 +26,7 @@ function get_next(e) {
     var url = "/from_hyrax/hyrax_api?repo=" + e.value + "&api_type=collections";
     var replace = document.getElementById("collections_div");
     var xhttp = new XMLHttpRequest();
-    xhttp.onreadystatechange = function() {
+    xhttp.onreadystatechange = function () {
         if (this.readyState == 4 && this.status == 200) {
             replace.innerHTML = this.responseText;
         }

data/app/controllers/from_hyrax_controller.rb

@@ -1,6 +1,6 @@
 class FromHyraxController < Spotlight::ApplicationController
   layout 'from_hyrax/application'
-  before_action :authenticate_user!
+  before_action :authenticate_user!, except: :receive
   protect_from_forgery with: :exception
   skip_before_action :verify_authenticity_token, only: :receive
   load_and_authorize_resource :current_exhibit, class: Spotlight::Exhibit
@@ -8,7 +8,7 @@ class FromHyraxController < Spotlight::ApplicationController
 
   def hyrax_api
     return nil unless instances.include?(params[:repo])
-    uri = URI("#{params[:repo]}/to_spotlight/api/#{params[:api_type]}")
+    uri      = URI("#{params[:repo]}/to_spotlight/api/#{params[:api_type]}")
     response = get_response(uri)
     render html: response.body.html_safe
   end
@@ -18,18 +18,19 @@ class FromHyraxController < Spotlight::ApplicationController
   end
 
   def new
-    uri = URI("#{params[:repo]}/to_spotlight/api/fields")
-    response = get_response(uri)
-    @hyrax_fields = eval(response.body)
+    uri               = URI("#{params[:repo]}/to_spotlight/api/fields")
+    response          = get_response(uri)
+    @hyrax_fields     = eval(response.body)
     @spotlight_fields = spotlight_fields.map { |f| [f[:label], f[:field_name]] }
   end
 
   def create
     return unless instances.include? params[:repo]
     # go to: to_spotlight/receive
-    @mappings = params[:transfer][:mappings].permit!.to_h.map { |_, v| v unless v['spotlight']['0'].empty? }.compact #use hash.values
-    post_options = { transfer: params[:transfer], mappings: @mappings, token: token }
-    @res = post_response URI("#{params[:repo]}/to_spotlight/receive"), post_options
+    @mappings    = params[:transfer][:mappings].permit!.to_h.map { |_, v| v unless v['spotlight']['0'].empty? }.compact #use hash.values
+    post_options = {transfer: params[:transfer], mappings: @mappings, token: token}
+    @res         = post_response URI("#{params[:repo]}/to_spotlight/receive"), post_options
+    redirect_to from_hyrax_index_path
   end
 
   def receive
@@ -39,98 +40,43 @@ class FromHyraxController < Spotlight::ApplicationController
 
   private
 
-  def get_response uri
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Get.new(uri.request_uri)
-    http.request(request)
-  end
+    def get_response uri
+      http             = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl     = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request          = Net::HTTP::Get.new(uri.request_uri)
+      http.request(request)
+    end
 
-  def post_response uri, options={}
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Post.new(uri.request_uri, 'Content-Type' => 'application/json')
-    request.body = options.to_json
-    http.request(request)
-  end
+    def post_response uri, options = {}
+      http             = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl     = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request          = Net::HTTP::Post.new(uri.request_uri, 'Content-Type' => 'application/json')
+      request.body     = options.to_json
+      http.request(request)
+    end
 
-  def instances
-    @instances ||= FromHyrax::Engine.config['hyrax_instances'] || []
-  end
+    def instances
+      @instances ||= FromHyrax::Engine.config['hyrax_instances'] || []
+    end
 
-  def token
-    FromHyrax::Engine.config['secret_token']
-  end
+    def token
+      FromHyrax::Engine.config['secret_token']
+    end
 
-  def csv_params
-    params.require(:transfer).permit(:user, :exhibit_id).to_h
-  end
+    def csv_params
+      params.require(:transfer).permit(:user, :exhibit_id).to_h
+    end
 
-  def spotlight_fields
-    # use Spotlight::Engine.config.upload_fields to get spotlight fields list
-    # map {|f| [f.label, f.field_name]}
-    [
-      { label: 'Description', field_name: 'spotlight_upload_dc_description_tesim' },
-      { label: 'Abstract', field_name: 'spotlight_upload_dc_Subject_tesim' },
-      { label: 'Subjects', field_name: 'spotlight_upload_dc_Subjects_tesim' },
-      { label: 'Subjects Facet', field_name: 'spotlight_upload_dc_Subjects_ftesim' },
-      { label: 'Creator', field_name: 'spotlight_upload_Creator_tesim' },
-      { label: 'Publisher', field_name: 'spotlight_upload_Publisher_tesim' },
-      { label: 'Contributors', field_name: 'spotlight_upload_Contributors_tesim' },
-      { label: 'Date', field_name: 'spotlight_upload_dc_Date_tesi' },
-      { label: 'Date searchable', field_name: 'spotlight_upload_dc_Date-Created_Searchable_ftesi' },
-      { label: 'Date searchable', field_name: 'spotlight_upload_dc_Date-Created_Searchable_tesi' },
-      { label: 'Genre', field_name: 'spotlight_upload_dc_Type_Genre_tesim' },
-      { label: 'Genre Facet', field_name: 'spotlight_upload_dc_Type_Genre_ftesim' },
-      { label: 'Format', field_name: 'spotlight_upload_Format_tesim' },
-      { label: 'Identifier', field_name: 'spotlight_upload_Identifier_tesim' },
-      { label: 'Source', field_name: 'spotlight_upload_Source_tesim' },
-      { label: 'Language', field_name: 'spotlight_upload_Language_tesim' },
-      { label: 'Language Facet', field_name: 'spotlight_upload_Language_ftesim' },
-      { label: 'Relation', field_name: 'spotlight_upload_Relation_tesim' },
-      { label: 'Coverage', field_name: 'spotlight_upload_Coverage_tesim' },
-      { label: 'Rights', field_name: 'spotlight_upload_Rights_tesim' },
-      { label: 'Provenance', field_name: 'spotlight_upload_Provenance_tesim' },
-      { label: 'Title-Alternative', field_name: 'spotlight_upload_dc_Title_Alternative_tesim' },
-      { label: 'Description-Table Of Contents', field_name: 'spotlight_upload_Description-Table-Of-Contents_tesim' },
-      { label: 'Description-Abstract', field_name: 'spotlight_upload_Description-Abstract_tesim' },
-      { label: 'Format-Extent', field_name: 'spotlight_upload_Format-Extent_tesim' },
-      { label: 'Format-Medium', field_name: 'spotlight_upload_Format-Medium_tesim' },
-      { label: 'Identifier-Bibliographic Citation', field_name: 'spotlight_upload_Identifier-Bibliographic-Citation_tesim' },
-      { label: 'Collection', field_name: 'spotlight_upload_dc_Relation_IsPartOf_Collection_tesim' },
-      { label: 'Collection Facet', field_name: 'spotlight_upload_dc_Relation_IsPartOf_Collection_ftesim' },
-      { label: 'Location(s)', field_name: 'spotlight_upload_dc_Coverage-Spatial_Location_tesim' },
-      { label: 'Location(s) Facet', field_name: 'spotlight_upload_dc_Coverage-Spatial_Location_ftesim' },
-      { label: 'Coverage-Temporal', field_name: 'spotlight_upload_Coverage-Temporal_tesim' },
-      { label: 'Date Digitized', field_name: 'spotlight_upload_Date-Digitized_tesi' },
-      { label: 'Transcript', field_name: 'spotlight_upload_dc_Description_Transcript_tesim' },
-      { label: 'People Depicted', field_name: 'spotlight_upload_dc_Subject_People_tesim' },
-      { label: 'People Facet', field_name: 'spotlight_upload_dc_Subject_People_ftesim' },
-      { label: 'Sketchfab Uid', field_name: 'spotlight_upload_Sketchfab-uid_tesim' },
-      { label: 'Hidden', field_name: :spotlight_annotation_x_dbsm },
-      { label: 'Hidden', field_name: :spotlight_annotation_y_dbsm },
-      { label: 'Hidden', field_name: :spotlight_annotation_width_dbsm },
-      { label: 'Hidden', field_name: :spotlight_annotation_height_dbsm },
-      { label: 'Hidden', field_name: :spotlight_annotation_title_tesim },
-      { label: 'Hidden', field_name: :spotlight_annotation_author_tesim },
-      { label: 'Hidden', field_name: :spotlight_annotation_description_tesim },
-      { label: 'Hidden', field_name: :spotlight_annotation_date_tesim },
-      { label: 'Hidden', field_name: :spotlight_annotation_publisher_tesim },
-      { label: 'Hidden', field_name: 'spotlight_annotation_publisher-place_tesim' },
-      { label: 'Hidden', field_name: 'spotlight_annotation_publisher-date_tesim' },
-      { label: 'Hidden', field_name: :spotlight_annotation_people_tesim },
-      { label: 'Hidden', field_name: :spotlight_annotation_locations_tesim },
-      { label: 'Hidden', field_name: :spotlight_annotation_transcript_tesim },
-      { label: 'Hidden', field_name: :spotlight_annotation_genre_tesim },
-      { label: 'Hidden', field_name: :spotlight_annotation_public_isim },
-      { label: 'Parent', field_name: 'spotlight_upload_parent_tesim' },
-      { label: 'Commentary', field_name: 'spotlight_upload_Commentary_tesim' },
-      { label: 'User Defined 2', field_name: 'spotlight_upload_UserDefined_tesim' },
-      { label: 'sortDate', field_name: 'sortDate' },
-      { label: 'Geographic Coordinates', field_name: 'spotlight_upload_dc_box_tesim' }
-    ]
-  end
+    def spotlight_fields
+      @spotlight_fields ||= Spotlight::Engine.config.upload_fields
+                                .map do |f|
+        {
+            label:      f.label,
+            field_name: f.field_name
+        }
+      end
+    end
 
 end

data/app/views/from_hyrax/_rows.erb

@@ -1,4 +1,6 @@
-<tr><td><b><%= "Common Fields" %></b></td></tr>
+<tr>
+  <td><b><%= "Common Fields" %></b></td>
+</tr>
 <% @hyrax_fields.each do |category, fields| %>
 
   <% fields.each_with_index do |field, i| %>
@@ -17,6 +19,8 @@
       </td>
     </tr>
   <% end %>
-  <tr><td><b><%= "Work Specific Fields" if category.include?"common" %></b></td></tr>
+  <tr>
+    <td><b><%= "Work Specific Fields" if category.include? "common" %></b></td>
+  </tr>
 <% end %>
 

data/app/views/from_hyrax/index.html.erb

@@ -1,6 +1,6 @@
 <%= render 'spotlight/shared/exhibit_sidebar' %>
 <div id="content" class="col-md-9">
-  <%= form_tag from_hyrax.new_path do %>
+  <%= form_tag from_hyrax_new_path do %>
     <%= select_tag "repo", options_for_select(@instances), {include_blank: true, onchange: 'get_next(this)'} %>
     <div id="collections_div"></div>
     <%= submit_tag 'start mapping' %>

data/app/views/from_hyrax/new.html.erb

@@ -13,14 +13,14 @@
 <div id="content" class="col-md-9">
   <h1><%= "Map from #{params[:repo]}" %></h1>
 
-  <%= params.inspect %>
+  <%#= params.inspect %>
 
-  <%= form_tag from_hyrax.create_path do %>
+  <%= form_tag from_hyrax_create_path do %>
 
     <%#= select_tag "admin_set", options_for_select(@admin_sets), include_blank: true %>
     <%= hidden_field_tag "repo", params[:repo] %>
     <%= hidden_field_tag "transfer[user]", current_user %>
-    <%= hidden_field_tag "transfer[exhibit_id]", @current_exhibit.id %>
+    <%= hidden_field_tag "transfer[exhibit_id]", current_exhibit.id %>
     <%= hidden_field_tag "transfer[collection_id]", params[:collection] %>
     <%= hidden_field_tag "transfer[spotlight_url]", request.base_url %>
 

data/config/routes.rb

@@ -1,7 +1,7 @@
-FromHyrax::Engine.routes.draw do
-  get 'index'
-  post 'new'
-  post 'create'
-  post 'receive'
-  get 'hyrax_api'
+Rails.application.routes.draw do
+  get '/spotlight/:exhibit_id/from_hyrax' => 'from_hyrax#index', as: 'from_hyrax_index'
+  post '/spotlight/:exhibit_id/from_hyrax/new' => 'from_hyrax#new', as: 'from_hyrax_new'
+  post '/from_hyrax/create' => 'from_hyrax#create'
+  post '/from_hyrax/receive' => 'from_hyrax#receive'
+  get '/from_hyrax/hyrax_api' => 'from_hyrax#hyrax_api'
 end

data/lib/from_hyrax/version.rb

@@ -1,3 +1,3 @@
 module FromHyrax
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: from_hyrax
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - sephirothkod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,7 +60,6 @@ files:
 - app/mailers/from_hyrax/application_mailer.rb
 - app/models/from_hyrax/application_record.rb
 - app/views/from_hyrax/_rows.erb
-- app/views/from_hyrax/create.html.erb
 - app/views/from_hyrax/index.html.erb
 - app/views/from_hyrax/new.html.erb
 - app/views/from_hyrax/receive.html.erb

data/app/views/from_hyrax/create.html.erb

@@ -1,7 +0,0 @@
-<h1>FromHyrax::FromHyrax#create</h1>
-<p>Find me in app/views/from_hyrax/from_hyrax/create.html.erb</p>
-<br>
-
-<%= @mappings %>
-<br>
-<%= @res.body %>