to_spotlight 0.0.3 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36ec581276c27e1c851f430d2390e177763863df1edbf2828f0015607e0e5d7d
-  data.tar.gz: ed68bfd105acf8f243ffcadacba335c9fcade7d1bb3aad09e23785f48ebd3583
+  metadata.gz: 3dc3e37bf423a699fa57b0be84458a76c686728ba2a03e9c77568038e23f5182
+  data.tar.gz: f7afd69a08db348741e5bdfed68a600bfadfc7538af0334417efabacf8618578
 SHA512:
-  metadata.gz: f496d05636aa8eca5681226d0e027fb45735917324568ecb945eb252f69fd7b436c633336765fc2defc57d833d4105f6cbfda917cbe9a7848226e674ffe9a212
-  data.tar.gz: cead82120d6613d68bde233aeb1a653216e7ceb30da0c3579624f20c69eddd8e6dd3fb01f7e01da18c5b01f119200ba987e06eed18f74bbfebbdb87846a18ff0
+  metadata.gz: d4bf67bc61638150beb70abc78e6a2f91575824e777c7c983a5eda3ce07ef2617544ef03c38c05d51fbb19d9894d3ecce29496f028877d51b4bd8e3a305ab3ae
+  data.tar.gz: b8f4385cd08ed6a9de0afa4598c966665e85d9c287e3162c08c9bd05260c3eefadb3d5aee52f9f99e9563eda600a52dc9869aa84796accc7e320577834796b8b

data/app/controllers/to_spotlight/spotlight_transfer_controller.rb

@@ -43,9 +43,10 @@ module ToSpotlight
     def approve
       now = params[:commit].downcase.include?('now')
       transfer = ToSpotlight::SpotlightTransfer.find params[:transfer_id]
-      works = ::Collection.find(transfer.collection_id).members
+      works = ::ActiveFedora::Base.where member_of_collection_ids_ssim: transfer.collection_id
       mappings = mapping_invert transfer.mappings
-      SpotlightTransferJob.perform_later(works, mappings)
+      SpotlightTransferJob.perform_later(works.to_a, mappings) if now
+      SpotlightTransferJob.set(wait_until: Date.today.end_of_day).perform_later(works.to_a, mappings) unless now
       #@res = ::Net::HTTP.post URI('http://localhost:3000/from_hyrax/receive'),
       #                        { transfer: transfer.attributes,
       #                          now: now,
@@ -56,10 +57,10 @@ module ToSpotlight
 
     private
 
-    def mapping_invert hash
+    def mapping_invert(hash)
       result = []
-      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 } }
+      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
 
@@ -72,11 +73,11 @@ module ToSpotlight
     end
 
     def curated_fields
-      work_fields(params[:work].constantize) - excluded_fields
+      {"common_fields" => (work_fields - excluded_fields - field_differences), "differences" => field_differences}
     end
 
-    def work_fields work
-      work.new.attributes.keys
+    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
@@ -98,5 +99,24 @@ module ToSpotlight
          representative_id thumbnail_id rendering_ids admin_set_id embargo_id
          lease_id]
     end
+
+    def field_differences
+      if @dif.nil?
+        @dif = []
+        curated_works.each do |work|
+          @dif += (work.constantize.new.attributes.keys - common_fields)
+        end
+      end
+      @dif.uniq
+    end
+
+    def common_fields
+      @all_works_hash ||= intersect(curated_works.map { |w| w.constantize.new.attributes.keys })
+    end
+
+    def intersect a_of_a
+      eval a_of_a.map{|a| a.inspect}.join(' & ')
+    end
+
   end
 end

data/app/jobs/to_spotlight/spotlight_transfer_job.rb

@@ -5,7 +5,7 @@ module ToSpotlight
     def perform(works, mappings)
       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
+      csv_array = [csv_headers.join(',')]
       #items = []
       works.each do |wk|
         #if comp
@@ -30,16 +30,16 @@ module ToSpotlight
         doc = ::SolrDocument.find wk.id
         
         line_hash = {}
-        line_hash << "http://#{base_url}/downloads/#{wk.file_sets.first.id}?locale=en" #url
-        line_hash << (doc.title.length > 1 ? doc.title.join('; ') : doc.title.first) #full_title_tesim
+        line_hash['url'] = "http://#{base_url}/downloads/#{wk.file_sets.first.id}?locale=en" #url
+        line_hash['full_title_tesim'] = (doc.title.length > 1 ? doc.title.join('; ') : doc.title.first) #full_title_tesim
 
         mappings.each do |skey, field|
           line_hash[skey] = create_cell doc, field
         end
 
-        line_hash << children.join("|")
+        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
 
@@ -50,7 +50,6 @@ module ToSpotlight
       File.open(dir.join(filename), 'wb') do |file|
         file.write(csv_array.join("\n"))
       end
-      items
     end
 
     def base_url
@@ -58,13 +57,13 @@ module ToSpotlight
     end
 
     def empty_fs_line fs_id, commas
-      "http://#{base_url}downloads/#{fs_id}?locale=en" + ("," * commas)
+      "http://#{base_url}downloads/#{fs_id}?locale=en" + (',' * commas)
     end
 
     def create_cell w, field
-      if w.respond_to?((field + "_label").to_sym)
-        w.send(field + "_label").join(';')
-      else
+      if w.respond_to?((field + '_label').to_sym)
+        w.send(field + '_label').join(';')
+      elsif w.respond_to?(field.to_sym)
         if w.send(field).is_a?(Array)
           w.send(field).join(';')
         else
@@ -84,7 +83,7 @@ module ToSpotlight
     def get_resource list
       output = []
       list.each do |url|
-        if url.include? "http"
+        if url.include? 'http'
           output << Hyrax::ResourceTypesService.label(url)
         else
           output << url
@@ -96,7 +95,7 @@ module ToSpotlight
     def get_rights list
       output = []
       list.each do |url|
-        if url.include? "http"
+        if url.include? 'http'
           output << ::VaultRightsStatementsService.label(url)
         else
           output << url

data/app/models/to_spotlight/spotlight_transfer.rb

@@ -1,5 +1,9 @@
 module ToSpotlight
   class SpotlightTransfer < ApplicationRecord
     serialize :mappings
+
+    def collection_title
+      @collection_title ||= ::SolrDocument.find(collection_id).title.first
+    end
   end
 end

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

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

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

@@ -4,4 +4,4 @@
 
 <br/>
 
-<%= @res.body %>
+<%#= @res.body %>

data/lib/to_spotlight/version.rb

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

metadata

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