to_spotlight 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42072bef23a9bedf75316257ef35e762377533a0a47eb9736cc301110760017f
-  data.tar.gz: 12287d3718e9c835fe4e4de9451cb2320d7618062a4b2335ef81c79da3c23adb
+  metadata.gz: '0396d6c1545a7b42c6bc1598868019d0ff55e8a51c423e0657cbcfc6829902bd'
+  data.tar.gz: 0eee8724658d6492ef2ae51f4b5ec4462555b1bf448f2f8087e9ae35d0af5603
 SHA512:
-  metadata.gz: d5b1cbeb353243a6bcdf333feaeee88c5e83a07973cef77c3b4c2bc9fcee5e97df779ee2fbe85a570163158dec377aff2a588dc105a2beba5ae89ad5a2328b5c
-  data.tar.gz: edd17d9bc9b12b183f77320ae504953d8c753b3f6c0bffed75c79d0268067028effe8936bd3a8b3b1f43c3d498930b041f585970766ad37bfc835e34ccb4333d
+  metadata.gz: b74723ef303d5eaea2c5ca9953a88a88679048d1fdea86f759768b9bcf274a1c1ae35a55ca7625549767c018ff66ba18a856441ac057d2c133f52e845e885b4d
+  data.tar.gz: 0c41425fae0466f948a186426f732952308396fdbe572aef830a61bbffe7025c75ad1a736e30f8f3f1cdaa8ad45cbaa3464af020271f6af80052a88f50e7caeb

data/app/controllers/to_spotlight/spotlight_transfer_controller.rb

@@ -1,12 +1,12 @@
 module ToSpotlight
   class SpotlightTransferController < ApplicationController
     protect_from_forgery with: :exception
-    before_action :authenticate_user!
+    before_action :authenticate_user!, except: [:api, :receive]
     skip_before_action :verify_authenticity_token, only: :receive
     helper_method :default_page_title, :admin_host?, :available_translations, :available_works
     include ActionView::Helpers::UrlHelper
     layout 'hyrax/dashboard' if Hyrax
-    before_action :authenticate, except: :index
+    before_action :authenticate, except: [:index, :api, :receive]
     require 'json'
     require 'net/http'
 
@@ -26,7 +26,7 @@ module ToSpotlight
 
     def receive
       return unless params[:token] == token
-      @transfer = ToSpotlight::SpotlightTransfer.new get_transfer_attributes
+      @transfer          = ToSpotlight::SpotlightTransfer.new get_transfer_attributes
       @transfer.mappings = params[:mappings]
       if @transfer.save
         render plain: 'Transfer Request Received'
@@ -40,9 +40,9 @@ module ToSpotlight
     end
 
     def approve
-      now = params[:commit].downcase.include?('now')
+      now      = params[:commit].downcase.include?('now')
       transfer = ToSpotlight::SpotlightTransfer.find params[:transfer_id]
-      works = ::ActiveFedora::Base.where member_of_collection_ids_ssim: transfer.collection_id
+      works    = ::ActiveFedora::Base.where member_of_collection_ids_ssim: transfer.collection_id
       mappings = mapping_invert transfer.mappings
       if now
         SpotlightTransferJob.perform_later(works.to_a, mappings, transfer)
@@ -50,7 +50,7 @@ module ToSpotlight
         SpotlightTransferJob.set(wait_until: Date.today.end_of_day)
                             .perform_later(works.to_a, mappings, transfer)
       end
-
+      redirect_to spotlight_transfer_index_path
     end
 
     private
@@ -61,7 +61,7 @@ module ToSpotlight
 
     def mapping_invert(hash)
       result = []
-      test   = hash.map { |h| {h['hyrax'] => h['spotlight'].values} }
+      test   = hash.map { |h| { h['hyrax'] => h['spotlight'].values } }
       test.reduce({}, :merge).map { |k, v| v.map { |val| [val, k] } }.each { |a| a.each { |a2| result << a2 } }
       Hash[result]
     end
@@ -75,31 +75,21 @@ module ToSpotlight
     end
 
     def curated_fields
-      {"common_fields" => (work_fields - excluded_fields - field_differences), "differences" => field_differences}
+      {
+        common_fields: (work_fields - excluded_fields - field_differences),
+        differences: field_differences
+      }
     end
 
     def work_fields
-      curated_works.map { |work| work.constantize.new.attributes.keys }.flatten.uniq
-       #%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]
+      @work_fields ||= curated_works.map { |work| work.constantize.new.attributes.keys }.flatten.uniq
     end
 
     def excluded_fields
       %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]
+       relative_path import_url part_of resource_type access_control_id
+       representative_id thumbnail_id rendering_ids admin_set_id embargo_id
+       lease_id]
     end
 
     def field_differences
@@ -117,7 +107,7 @@ module ToSpotlight
     end
 
     def intersect a_of_a
-      eval a_of_a.map{|a| a.inspect}.join(' & ')
+      eval a_of_a.map { |a| a.inspect }.join(' & ')
     end
 
     def get_transfer_attributes
@@ -127,7 +117,7 @@ module ToSpotlight
                                        :spotlight_url)
     end
 
-    #helpers
+      #helpers
     def available_works
       @available_works ||= Hyrax::QuickClassificationQuery.new(current_user).authorized_models
     end
@@ -142,8 +132,8 @@ module ToSpotlight
 
     def available_translations
       {
-          'en' => 'English',
-          'fr' => 'French'
+        'en' => 'English',
+        'fr' => 'French'
       }
     end
   end

data/app/jobs/to_spotlight/spotlight_transfer_job.rb

@@ -3,9 +3,9 @@ module ToSpotlight
     queue_as :default
 
     def perform(works, mappings, transfer)
-      base_url = ::Account.where(tenant: Apartment::Tenant.current).first.cname
+      base_url    = ::Account.where(tenant: Apartment::Tenant.current).first.cname
       csv_headers = %w[url full_title_tesim] + mappings.keys + %w[children]
-      csv_array = [csv_headers.join(',')]
+      csv_array   = [csv_headers.join(',')]
       #items = []
       works.each do |wk|
         #if comp
@@ -16,7 +16,7 @@ module ToSpotlight
         #  next if wk.file_set_ids.length>1
         #end
         #index += 1
-        comp = false #wk.file_set_ids.length > 1
+        comp     = false #wk.file_set_ids.length > 1
         children = []
         if comp
           index = wk.ordered_file_set_ids.length * -1
@@ -29,8 +29,8 @@ module ToSpotlight
 
         doc = ::SolrDocument.find wk.id
 
-        line_hash = {}
-        line_hash['url'] = "http://#{base_url}/concern/#{underscore_name(wk)}/#{wk.id}/manifest.json" #url
+        line_hash                     = {}
+        line_hash['url']              = "http://#{base_url}/concern/#{underscore_name(wk)}/#{wk.id}/manifest.json" #url
         line_hash['full_title_tesim'] = (doc.title.length > 1 ? doc.title.join('; ') : doc.title.first) #full_title_tesim
 
         mappings.each do |skey, field|
@@ -39,30 +39,30 @@ module ToSpotlight
 
         line_hash['children'] = children.join('|')
 
-        csv_array << line_hash.values_at(*csv_headers).map { |cell| cell = '' if cell.nil?; "\"#{cell.gsub("\"","\"\"")}\"" }.join(',')
+        csv_array << line_hash.values_at(*csv_headers).map { |cell| cell = '' if cell.nil?; "\"#{cell.gsub("\"", "\"\"")}\"" }.join(',')
 
       end
 
       dir = Rails.root.join('public', 'uploads', 'csvs')
       Dir.mkdir(dir) unless Dir.exist?(dir)
-      time = DateTime.now.strftime('%s')
+      time     = DateTime.now.strftime('%s')
       filename = "spotlight_export-#{time}.csv"
       File.open(dir.join(filename), 'wb') do |file|
         file.write(csv_array.join("\n"))
       end
       res = post_response URI("#{transfer.spotlight_url}/from_hyrax/receive"),
-                          csv_url:    "https://#{base_url}/uploads/csvs/#{filename}",
-                          transfer:   transfer.attributes.slice(:user, :exhibit), #only allow user+exhibit
-                          token:      'secret_token'
+                          csv_url:  "https://#{base_url}/uploads/csvs/#{filename}",
+                          transfer: transfer.attributes.slice(:user, :exhibit), #only allow user+exhibit
+                          token: 'secret_token'
 
     end
 
-    def post_response uri, options={}
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
+    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
+      request          = Net::HTTP::Post.new(uri.request_uri, 'Content-Type' => 'application/json')
+      request.body     = options.to_json
       http.request(request)
     end
 

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

@@ -9,7 +9,7 @@
   </thead>
   <tbody>
   <% transfers.each do |transfer| %>
-      <%= render 'list_transfers', transfer: transfer %>
+    <%= render 'list_transfers', transfer: transfer %>
   <% end %>
   </tbody>
 </table>

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

@@ -7,10 +7,10 @@
   <td><%= transfer.collection_title %></td>
 
   <td>
-    <%= form_tag to_spotlight.approve_path, method: :post, class: "form-inline" do %>
+    <%= form_tag main_app.to_spotlight_approve_path, method: :post, class: "form-inline" do %>
       <%= hidden_field_tag 'transfer_id', transfer.id %>
       <%= submit_tag "Run Tonight", class: 'btn btn-primary' %>
-    <% end %><%= form_tag to_spotlight.approve_path, method: :post, class: "form-inline" do %>
+    <% end %><%= form_tag main_app.to_spotlight_approve_path, method: :post, class: "form-inline" do %>
       <%= hidden_field_tag 'transfer_id', transfer.id %>
       <%= submit_tag "Run Now", class: 'btn btn-primary' %>
     <% end %>

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

@@ -1,4 +1,4 @@
-<% # container for all batches in index view -%>
+<% # container for all batches in index view  -%>
 <div class="table-responsive" id="transfers">
   <%= render 'default_group', transfers: @transfers %>
 </div>

data/config/routes.rb

@@ -1,6 +1,6 @@
-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'
+Rails.application.routes.draw do
+  get '/to_spotlight/api/:request_type' => 'to_spotlight/spotlight_transfer#api', as: 'to_spotlight_api'
+  post '/to_spotlight/receive' => 'to_spotlight/spotlight_transfer#receive'
+  get '/to_spotlight' => 'to_spotlight/spotlight_transfer#index'
+  post '/to_spotlight/approve' => 'to_spotlight/spotlight_transfer#approve'
 end

data/lib/to_spotlight/engine.rb

@@ -3,10 +3,26 @@ module ToSpotlight
     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
+        config.paths['db/migrate'].expanded.each do |expanded_path|
+          app.config.paths['db/migrate'] << expanded_path
         end
       end
     end
+
+    class << self
+
+      def config
+        file = File.open(File.join(::Rails.root, '/config/from_hyrax.yml'))
+        @config ||= YAML.safe_load(file)
+      end
+
+      # loads a yml file with the configuration options
+      #
+      # @param file [String] path to the yml file
+      #
+      def load_config(file)
+        @config = YAML.load_file(file)
+      end
+    end
   end
 end

data/lib/to_spotlight/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: to_spotlight
 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
@@ -64,12 +64,9 @@ files:
 - app/views/to_spotlight/spotlight_transfer/_default_group.html.erb
 - app/views/to_spotlight/spotlight_transfer/_list_transfers.html.erb
 - app/views/to_spotlight/spotlight_transfer/_select.html.erb
-- app/views/to_spotlight/spotlight_transfer/_tabs.html.erb
 - app/views/to_spotlight/spotlight_transfer/_transfers_list.html.erb
-- app/views/to_spotlight/spotlight_transfer/approve.html.erb
 - app/views/to_spotlight/spotlight_transfer/index.html.erb
 - app/views/to_spotlight/spotlight_transfer/receive.html.erb
-- config/application.rb
 - config/routes.rb
 - db/migrate/20200310153953_create_to_spotlight_spotlight_transfers.rb
 - lib/generators/install/install_generator.rb

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

@@ -1,5 +0,0 @@
-<ul class="nav nav-tabs" id="my_nav" role="navigation">
-  <li<%= ' class="active"'.html_safe %>>
-    <%= link_to "All CSV Batches", to_spotlight.index_path %>
-  </li>
-</ul>

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

@@ -1,5 +0,0 @@
-<%= params.inspect %>
-
-<br/>
-
-<%#= @res.body %>

data/config/application.rb

@@ -1,10 +0,0 @@
-module ToSpotlight
-  class Application < Rails::Application
-    config.middleware.insert_before 0, Rack::Cors do
-      allow do
-        origins '*'
-        resource '/to_spotlight/api/*', headers: :any, methods: %i[get post options]
-      end
-    end
-  end
-end