handle base-encoding errors. #315

app/models/doi.rb

@@ -459,7 +459,7 @@ def self.import_by_ids(options={})
 
     # get every id between from_id and end_id
     (from_id..until_id).step(500).each do |id|
-      DoiImportByIdJob.perform_later(id: id)
+      DoiImportByIdJob.perform_later(options.merge(id: id))
       puts "Queued importing for DOIs with IDs starting with #{id}."
     end
 
@@ -470,7 +470,13 @@ def self.import_by_id(options={})
     return nil unless options[:id].present?
 
     id = options[:id].to_i
-    index = Rails.env.test? ? "dois-test" : self.inactive_index
+    index = if Rails.env.test?
+              "dois-test"
+            elsif options[:index].present?
+              options[:index]
+            else
+              self.inactive_index
+            end
     errors = 0
     count = 0
 

app/serializers/doi_serializer.rb

@@ -12,7 +12,11 @@ class DoiSerializer
   has_many :media, if: Proc.new { |object, params| params && params[:detail] }
 
   attribute :xml, if: Proc.new { |object, params| params && params[:detail] } do |object|
-    xml_encoded
+    begin
+      Base64.strict_encode64(object.xml) if object.xml.present?
+    rescue ArgumentError
+      nil
+    end
   end
 
   attribute :doi do |object|

spec/requests/dois_spec.rb

@@ -35,10 +35,9 @@
 
       expect(last_response.status).to eq(200)
       expect(json['data'].size).to eq(3)
-      json['data'].each{
-        |doi|
+      json['data'].each do |doi|
         expect(doi.dig('attributes')).to include('xml')
-      }
+      end
     end
   end