bulk_ops 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0b68ae5923dae38908ff5382d52aba0fa514d0cf9e714eefcfb46013ec9ce02
-  data.tar.gz: 175b647ebf14fb4e432861c0185d9bf142d666e4df29129631d064517f55f588
+  metadata.gz: 3653b9554a93348ce398063d0b5fb98d01e075ac70efaee09b3081f49fa036e1
+  data.tar.gz: 01eb0bdb7084fb3e0d37b417d82b47772dc5d7734428f47f91168f81724c2139
 SHA512:
-  metadata.gz: 4209b3080bd3e6b4e5df1ef727e1db943252b0d32169bb080db61e6ed01b4ba93fff56303a38d6e655eda22f82377e06a1d847c7d47df8d664f7af6e5bf49d75
-  data.tar.gz: ac685fa72de08e26d4fe403b57143399602986aa3cf2600c00f2c55a86788bdefa5cfc0dc250d364a8b808ed1f856ea8f84c5e7dd8c88107859d21783b6ca55c
+  metadata.gz: 4d77355a39703eca5010a42b3bfcb0bcd872468e77b9b15e8f57bc68042dc684c2afe57d296c858cd5d6a68e60668c6bd2a11f4e3125e1d428dd5cd1e5dd1e2e
+  data.tar.gz: 6ee7e9c2d50231d555a9adde17a6c27b6f52041533e86a9727bb9d9caf2eafb9f8ba18e6cae76f8ef010980d3b09981e9c7e794ed54dd1b8dbab776060e923bc

data/lib/bulk_ops/github_access.rb

@@ -2,7 +2,7 @@ require "octokit"
 require "socket"
 require "securerandom"
 require 'base64'
-
+require 'erb'
 class BulkOps::GithubAccess
 
   attr_accessor :name
@@ -272,8 +272,6 @@ class BulkOps::GithubAccess
   end
 
   def github_config
-    @github_config ||=  YAML.load_file("#{Rails.root.to_s}/config/github.yml")[Rails.env]
+    @github_config ||= YAML.load(ERB.new(File.read("#{Rails.root}/config/github.yml")).result)[Rails.env]
   end
-
-
 end

data/lib/bulk_ops/parser.rb

@@ -1,3 +1,4 @@
+
 class BulkOps::Parser
   require 'uri'
 
@@ -8,7 +9,7 @@ class BulkOps::Parser
   def self.is_file_set? metadata, row_number
     return false unless metadata[row_number].present?
     # If the work type is explicitly specified, use that
-    if (type_key = metadata[row_number].to_h.keys.find{|key| key.downcase.gsub(/[_\-\s]/,"").include?("worktype") })
+    if (type_key = metadata[row_number].to_h.keys.find{|key| key.to_s.downcase.gsub(/[_\-\s]/,"").include?("worktype") })
       return true if metadata[row_number][type_key].downcase == "fileset" 
       return false if metadata[row_number][type_key].present?
     end
@@ -57,6 +58,7 @@ class BulkOps::Parser
     (0...@raw_row.length).each do |i|
       header = @raw_row.headers[i]
       value = @raw_row[i]
+      next unless value.present?
       # separate values in identical columns using the separator
       row[header] = (Array(row[header]) << value).join(BulkOps::SEPARATOR)
     end
@@ -65,9 +67,9 @@ class BulkOps::Parser
 
   def connect_existing_work
     return unless (column_name = operation.options["update_identifier"])
-    return unless (key = @raw_row.keys.find{|key| key.to_s.parameterize.downcase.gsub("_","") == column_name.to_s.parameterize.downcase.gsub("_","")})
-    return unless (value = @raw_row[key])
-    return unless (work_id = find_work_id_from_unique_metadata(key, value)) 
+    return unless (key = @raw_row.to_h.keys.find{|key| key.to_s.parameterize.downcase.gsub("_","") == column_name.to_s.parameterize.downcase.gsub("_","")})
+    return unless (value = @raw_row[key]).present?
+    return unless (work_id = find_work_id_from_unique_metadata(key, value))
     proxy.update(work_id: work_id)
   end
 
@@ -76,7 +78,7 @@ class BulkOps::Parser
     query = "_query_:\"{!dismax qf=#{field_solr_name}}#{value}\""
     response = ActiveFedora::SolrService.instance.conn.get(ActiveFedora::SolrService.select_path, params: { fq: query, rows: 1, start: 0})["response"]
     if response["numFound"] > 1
-      report_error( :id_not_unique , "",  row_number: row_number, object_id: @proxy.id, options_name: field_name, option_values: value ) unless label
+      report_error( :id_not_unique , "",  row_number: row_number, object_id: @proxy.id, options_name: field_name, option_values: value )
     end
     return response["docs"][0]["id"]
   end

data/lib/bulk_ops/version.rb

@@ -1,3 +1,3 @@
 module BulkOps
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

data/lib/bulk_ops/work_job.rb

@@ -76,7 +76,7 @@ class BulkOps::WorkJob < ActiveJob::Base
       end
     else
       @work = workClass.capitalize.constantize.new
-      return :ingest
+      return :create
     end
   end
 
@@ -105,9 +105,4 @@ class BulkOps::WorkJob < ActiveJob::Base
     @work_proxy.update(atts)
   end
 
-  def define_work(workClass)
-    #override this unless you want a simple ingest
-    @work = workClass.capitalize.constantize.new
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulk_ops
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Ned Henry, UCSC Library Digital Initiatives
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails