ddr-core 1.2.0.rc2 → 1.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d6925972d1974e35d35effa69d27a8b8764006e1a7554236325956ab31b674d
-  data.tar.gz: 2e1e0c7b49694c06c031bbd44736f6a567590b1fed08a48a7e76bac31d494f22
+  metadata.gz: 3ebab371e1259e1586c6965ab7178a509be2ee2213267ccfd15122ec1a970890
+  data.tar.gz: 9d108eb264f17016ef13103568fcf569887883f3b902d272deba1af26a8787db
 SHA512:
-  metadata.gz: 5646fab91d66b7c9c96a2ee38d5cc86abd0052337e2b0b3bd79a53c4b8dbbfefc0db8f61eee33261d95d898a06d5c47aa865e605dbf1aea64d5d2319d68ad6ce
-  data.tar.gz: 650f2186d40227f43b7a6e5ba6734d3358006f103bf7dc4f472a174202e866c9660969e092f92bc8f011b0d7073ef0dc4c63ba4b4d3eb10a1d51845ea942030e
+  metadata.gz: c59868928e54535e9ed804ef93c60a867c9ec00bdb2f69e5a63874cf5b59e37dcc5796fcbc2c8e59d06b1e29957086aa2360b92cb351b8b02badce21b1ddefdc
+  data.tar.gz: bd67b175ee5cff3e11f8eb7867b95124ab6dff4f954d17cf528ab3708e2aacb23c3f4fda5ee57563af258849b1ad215ea9e1041dfdc10a1183c77b0e3c58683b

data/app/models/concerns/ddr/solr_document_behavior.rb

@@ -21,6 +21,9 @@ module Ddr
       end
 
       def find_by_permanent_id(ark)
+        if ark.blank?
+          raise ArgumentError, "ARK argument must be present."
+        end
         query = Ddr::Index::Query.new do
           q *:*
           where permanent_id: ark

data/app/models/ddr/finding_aid.rb

@@ -1,61 +1,53 @@
-# TODO: 'https://duldev.atlassian.net/browse/DDR-1755'
-
 module Ddr
   class FindingAid
     attr_reader :ead_id
 
-    EAD_XMLNS = "urn:isbn:1-931666-22-9"
-
     def initialize(ead_id)
       @ead_id = ead_id
     end
 
+    # TODO: use permalinks in the future when all finding aids have ARKs
     def url
-      doc.css("eadid").attr("url").text
+      [Ddr.finding_aid_base_url, '/catalog/', ead_id].join
     end
 
-    # The finding aid title
     def title
-      doc.css("titleproper").children.first.text.strip
+      doc.fetch('normalized_title_ssm',[])&.first
     end
 
     def repository
-      collection.xpath('ead:did/ead:repository/ead:corpname', ead: EAD_XMLNS).text
+      doc.fetch('repository_ssm',[])&.first
     end
 
     def collection_date_span
-      collection.xpath('ead:did/ead:unitdate[@type="inclusive"]', ead: EAD_XMLNS).text
+      doc.fetch('normalized_date_ssm',[])&.first
     end
 
     def collection_number
-      collection.xpath('ead:did/ead:unitid', ead: EAD_XMLNS).text
+      doc.fetch('unitid_ssm',[])&.first
     end
 
     def collection_title
-      collection.xpath('ead:did/ead:unittitle', ead: EAD_XMLNS).text
+      doc.fetch('title_ssm',[])&.first
     end
 
     def extent
-      collection.xpath('ead:did/ead:physdesc/ead:extent', ead: EAD_XMLNS).map(&:text).join("; ")
+      doc.fetch('extent_ssm',[]).join("; ")
     end
 
     def abstract
-      collection.xpath('ead:did/ead:abstract', ead: EAD_XMLNS).text
+      first_abstract = doc.fetch('abstract_tesim',[])&.first
+      ActionController::Base.helpers.strip_tags(first_abstract)
     end
 
     private
 
-    def collection
-      doc.xpath('//ead:archdesc[@level="collection"]', ead: EAD_XMLNS)
-    end
-
-    # @raise [OpenURI::HTTPError] if 404, etc.
     def doc
-      @doc ||= Nokogiri::XML(open(ead_xml_url))
+      @doc ||= JSON.parse(open(arclight_collection_data_url).read)
     end
 
-    def ead_xml_url
-      Ddr.ead_xml_base_url + ead_id + ".xml"
+    def arclight_collection_data_url
+      [Ddr.finding_aid_base_url, '/catalog/', ead_id, '/raw.json'].join
     end
   end
 end

data/lib/ddr/auth/ability_definitions/publication_ability_definitions.rb

@@ -11,7 +11,7 @@ module Ddr
           obj.published? || !obj.publishable?
         end
         cannot :unpublish, Ddr::Resource do |obj|
-          !obj.published?
+          !obj.published? && !obj.nonpublishable?
         end
         cannot :make_nonpublishable, Ddr::Resource do |obj|
           obj.published? || !obj.publishable?

data/lib/ddr/core.rb

@@ -108,10 +108,15 @@ module Ddr
     ENV["DDR_AUX_API_URL"]
   end
 
+  # Deprecated in ddr-core 1.2.0. Remove in future.
   mattr_accessor :ead_xml_base_url do
     ENV["EAD_XML_BASE_URL"]
   end
 
+  mattr_accessor :finding_aid_base_url do
+    ENV["FINDING_AID_BASE_URL"] || 'https://archives.lib.duke.edu'
+  end
+
   module Core
 
   end

data/lib/ddr/core/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Core
-    VERSION = '1.2.0.rc2'
+    VERSION = '1.2.0.rc3'
   end
 end

data/lib/ddr/index/query_clause.rb

@@ -16,9 +16,9 @@ module Ddr::Index
 
     values do
       attribute :field,       FieldAttribute
-      attribute :value,       String
-      attribute :quote_value, Boolean, default: false
-      attribute :template,    String,  default: STANDARD_QUERY
+      attribute :value,       String,  required: true
+      attribute :quote_value, Boolean, default:  false
+      attribute :template,    String,  default:  STANDARD_QUERY
     end
 
     def to_s
@@ -46,7 +46,7 @@ module Ddr::Index
       alias_method :id, :unique_key
 
       def where(field, value)
-         values = Array(value)
+        values = Array(value)
         if values.size > 1
           disjunction(field, values)
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc2
+  version: 1.2.0.rc3
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource