bulk_ops 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cd7f0776712d0ce3a2434c044def2e48b22a9205aa7fe72cea6dde32e60142d
-  data.tar.gz: 706abceb8ddcea1ba1d876135f32c334693eb6edbf6b529b5baf287f1d1f2e25
+  metadata.gz: 4231e72e9eca7cf205487d52f2613ef8542e37789c117070cb7402cf489f77da
+  data.tar.gz: d788d06b28f38ff386578ef962a14b0e8cc9525f5bb408daa13c4d38ded94e7a
 SHA512:
-  metadata.gz: 5a243cc191391eb59645b8ced1ff5752945f98744ad0e6c51f94fa0c78e1949b28b186c1078b80e6e17e00098185a6fea69728543942f7c9f1c146849773fc38
-  data.tar.gz: 4fd360260733508e0ffb219ecabc156bc236bf6e90fcda0e8510f59dd019c4928c83b6e2af900f34983f50663e6b18e7e12c00281f65d0972b51c8c9ae89e760
+  metadata.gz: b86b3ddb3e462d2b6a098dbcea45a4945e31f88f135e6780eaa84fd908ff238a75f170bb05af3e093d46dab6e7bc52ce59cd6176aa29bc2da2df547866175425
+  data.tar.gz: 54be897f9392fe0e19fc85350ef57d2a1c503d65ff5cb7cbbea44efc6615573fa58d50d61d7e31e323a5271b1d6470dc1d9cddac3998a8d7b1de79195c097733

data/lib/bulk_ops/operation.rb

@@ -110,6 +110,7 @@ module BulkOps
         work_proxies.create(status: "queued",
                             last_event: DateTime.now,
                             row_number: row_number,
+                            visibility: options['visibility'],
                             message: "created during ingest initiated by #{user.name || user.email}")
       end
       # make sure the work proxies we just created are loaded in memory
@@ -124,7 +125,7 @@ module BulkOps
                                              user.email,
                                              data,
                                              proxy.id,
-                                             proxy.visibility || "open")
+                                             proxy.visibility)
       end
       # If any errors have occurred, make sure they are logged in github and users are notified.
       report_errors!
@@ -191,7 +192,7 @@ module BulkOps
                                              user.email,
                                              data,
                                              proxy.id,
-                                             proxy.visibility || "private")
+                                             proxy.visibility)
       end
       report_errors! 
     end
@@ -230,20 +231,11 @@ module BulkOps
       unless options.blank?
         full_options = YAML.load_file(File.join(bulk_ops_dir,TEMPLATE_DIR, BulkOps::GithubAccess::OPTIONS_FILENAME))
 
-        puts "Creating new bulk_ops options"
-        puts "new options:"
-        puts options.inspect
-        puts "standard options:"
-        puts full_options.inspect
-
         options.each { |option, value| full_options[option] = value }
 
         full_options[name] = name
         full_options[type] = type
         full_options[status] = status
-        
-        puts "final options:"
-        puts full_options.inspect
 
         git.update_options full_options
       end
@@ -267,8 +259,8 @@ module BulkOps
       git.update_spreadsheet(file, message: message)
     end
 
-    def update_options filename, message=nil
-      git.update_options(filename, message: message)
+    def update_options options, message=nil
+      git.update_options(options, message: message)
     end
 
     def options

data/lib/bulk_ops/version.rb

@@ -1,3 +1,3 @@
 module BulkOps
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/bulk_ops/work_job.rb

@@ -44,8 +44,9 @@ class BulkOps::WorkJob < ActiveJob::Base
     @work_proxy.operation.check_if_finished
   end
 
-  def perform(workClass,user_email,attributes,work_proxy_id,visibility="private")
+  def perform(workClass,user_email,attributes,work_proxy_id,visibility=nil)
     update_status "starting", "Initializing the job"
+    attributes['visibility']= visibility if visibility.present?
     @work_proxy = BulkOps::WorkProxy.find(work_proxy_id)
     unless @work_proxy
       report_error("Cannot find work proxy with id: #{work_proxy_id}") 
@@ -61,7 +62,7 @@ class BulkOps::WorkJob < ActiveJob::Base
         return
       end
     else # The work is not found in Solr. If we're trying to update a work, we're in trouble.
-      if (type == "update")
+      if (type.to_s == "update")
         report_error "Could not find work to update with id: #{@work_proxy.work_id}" 
         return
       end

data/lib/bulk_ops/work_proxy.rb

@@ -154,7 +154,6 @@ class BulkOps::WorkProxy < ActiveRecord::Base
 
       remove = field_name.downcase.starts_with?("remove") || field_name.downcase.starts_with?("delete")
       
-
       # handle multiple values
       value_array = split_values(value)
       controlled_data[field_name_norm] ||= [] unless value_array.blank?
@@ -164,13 +163,13 @@ class BulkOps::WorkProxy < ActiveRecord::Base
         value.strip!
         if value =~ /^#{URI::regexp}$/ and !field_name.downcase.ends_with?("label")
           id = value
-          label = WorkIndexer.fetch_remote_label(value)
-          error_message =  "cannot fetch remote label for url: #{value}"
-          report_error( :cannot_retrieve_label , error_message, url: value, row_number: row_number) unless label
+#          label = WorkIndexer.fetch_remote_label(value)
+#          error_message =  "cannot fetch remote label for url: #{value}"
+#          report_error( :cannot_retrieve_label , error_message, url: value, row_number: row_number) unless label
         else
           # It's a label, so get the id
           id = get_remote_id(value, property: field_name_norm, authority: authority) || localAuthUrl(field_name_norm, value)
-          label = value
+#          label = value
           report_error(:cannot_retrieve_url, 
                        message: "cannot find or create url for controlled vocabulary label: #{value}", 
                        url: value, 
@@ -385,20 +384,21 @@ class BulkOps::WorkProxy < ActiveRecord::Base
     return nil unless (entries = Qa::Authorities::Local.subauthority_for(auth).search(value))
     entries.each do |entry|
       #require exact match
-      next unless entry["label"] == value
+      next unless entry["label"].encode('UTF-8') == value.encode('UTF-8')
       url = entry["url"]
       url ||= entry["id"]
-      url = localIdToUrl(url,auth) unless url =~ URI::regexp
+#      url = localIdToUrl(url,auth) unless url =~ URI::regexp
       return url
     end
     return nil
   end
 
   def localIdToUrl(id,auth_name) 
-    hostname = Socket.gethostname
-    hostname = "localhost" unless hostname.include?('.')
-    protocol = (Rails.env == "production") ? "https" : "http"
-    return "#{protocol}://#{hostname}/authorities/show/local/#{auth_name}/#{id}"
+    root_urls = {production: "https://digitalcollections.library.ucsc.edu",
+                 staging: "http://digitalcollections-staging.library.ucsc.edu",
+                 development: "http://#{Socket.gethostname}",
+                 test: "http://#{Socket.gethostname}"}
+    return "#{root_urls[Rails.env.to_sym]}/authorities/show/local/#{auth_name}/#{id}"
   end
 
   def getLocalAuth(field_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulk_ops
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ned Henry, UCSC Library Digital Initiatives
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails