solr_ead 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fdef7b50871ffde537ec7625ce858bf30a780bd
-  data.tar.gz: d54d41cc1719a04954100e77f789f97c02033107
+  metadata.gz: fac4816cdbd0c90b954d357444668ccce88ff511
+  data.tar.gz: b9a2fb99788ffa1b4f6be8dc95bbe59da4ee20a3
 SHA512:
-  metadata.gz: 4e1344df2d9ba2880aa8f5fb1feeea3acb9cc36fbd6a3d00dda3866a55488757e333fe32b19cc9e8b07c718cc5980935f319836e48ddfa1ab28bb8e17d930113
-  data.tar.gz: 0121dea63780951b4395a9d4c4510aa025cd39414c417aed19b10b30411901d191a0eb2b96d0f6c40e414dedcbf0369e95d75e00077ff0c7c226e96681c5b753
+  metadata.gz: 93fcefab8ff1af3447e6c7da861d22f10d92696b0d1865c0f57fe70f01b0a395f1adcfa4f12c0e05035124c238c4b4fbb3697a76fe2e2a45e4bb218559b802c2
+  data.tar.gz: 63f11b18aa234f899dec25b16bb295bcb505895a2789f2e31512603ac7f2e754d043dc3f2930d3380448d37f6014d08817bbd5e3512f687da708eefd2bc8565f

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.0
   - 2.1
   - 2.2
   - 2.2.7

data/lib/solr_ead/behaviors.rb

@@ -67,19 +67,39 @@ module SolrEad::Behaviors
   # These fields are used so that we may reconstruct placement of a single component
   # within the hierarchy of the original ead.
   def additional_component_fields(node, addl_fields = Hash.new)
-    addl_fields["id"]                                                        = [node.xpath("//eadid").text, node.attr("id")].join
-    addl_fields[Solrizer.solr_name("ead", :stored_sortable)]                 = node.xpath("//eadid").text
+
+    # Clear or create the cache
+    @cache = {}
+
+    p_ids        = parent_id_list(node)
+    p_unittitles = parent_unittitle_list(node)
+
+    addl_fields["id"]                                                        = [eadid(node), node.attr("id")].join
+    addl_fields[Solrizer.solr_name("ead", :stored_sortable)]                 = eadid(node)
     addl_fields[Solrizer.solr_name("parent", :stored_sortable)]              = node.parent.attr("id") unless node.parent.attr("id").nil?
-    addl_fields[Solrizer.solr_name("parent", :displayable)]                  = parent_id_list(node)
-    addl_fields[Solrizer.solr_name("parent_unittitles", :displayable)]       = parent_unittitle_list(node)
-    addl_fields[Solrizer.solr_name("parent_unittitles", :searchable)]        = parent_unittitle_list(node)
-    addl_fields[Solrizer.solr_name("component_level", :type => :integer)]    = parent_id_list(node).length + 1
+    addl_fields[Solrizer.solr_name("parent", :displayable)]                  = p_ids
+    addl_fields[Solrizer.solr_name("parent_unittitles", :displayable)]       = p_unittitles
+    addl_fields[Solrizer.solr_name("parent_unittitles", :searchable)]        = p_unittitles
+    addl_fields[Solrizer.solr_name("component_level", :type => :integer)]    = p_ids.length + 1
     addl_fields[Solrizer.solr_name("component_children", :type => :boolean)] = component_children?(node)
-    addl_fields[Solrizer.solr_name("collection", :facetable)]                = node.xpath("//archdesc/did/unittitle").text
-    addl_fields[Solrizer.solr_name("collection", :displayable)]              = node.xpath("//archdesc/did/unittitle").text
-    addl_fields[Solrizer.solr_name("repository", :facetable)]                = node.xpath("//archdesc/did/repository").text.strip
-    addl_fields[Solrizer.solr_name("repository", :displayable)]              = node.xpath("//archdesc/did/repository").text.strip
-    return addl_fields
+    addl_fields[Solrizer.solr_name("collection", :facetable)]                = collection(node)
+    addl_fields[Solrizer.solr_name("collection", :displayable)]              = collection(node)
+    addl_fields[Solrizer.solr_name("repository", :facetable)]                = repository(node)
+    addl_fields[Solrizer.solr_name("repository", :displayable)]              = repository(node)
+    addl_fields
+  end
+
+  # can these be made to use absolute xpaths?
+  def repository(node)
+    @cache[:repo] ||= node.xpath("/ead/archdesc/did/repository").text.strip
+  end
+
+  def collection(node)
+    @cache[:collection] ||= node.xpath("/ead/archdesc/did/unittitle").text
+  end
+
+  def eadid(node)
+    @cache[:eadid] ||= node.xpath("/ead/eadheader/eadid").text
   end
 
   # Array of all id attributes from the component's parent <c> nodes, sorted in descending order
@@ -99,19 +119,23 @@ module SolrEad::Behaviors
   # the correct order, ex:
   #   ["Series I", "Subseries a", "Sub-subseries 1"]
   # From there, you can assemble and display as you like.
-  def parent_unittitle_list(node, results = Array.new)
+  def parent_unittitle_list(node, results = ::Array.new)
     while node.parent.name == "c"
       parent = node.parent
-      part = Nokogiri::XML(parent.to_xml)
-      results << get_title(part)
+      results << get_title(parent)
       node = parent
     end
-    return results.reverse
+    results.reverse
+  end
+
+  def get_title(node)
+    @memtitle ||= Hash.new {|h, node| h[node.object_id] = _get_title(node)}
+    @memtitle[node]
   end
 
-  def get_title(xml)
-    title = xml.at("/c/did/unittitle")
-    date  = xml.at("/c/did/unitdate")
+  def _get_title(node)
+    title = node.at_xpath("./did/unittitle")
+    date  = node.at_xpath("./did/unitdate")
     if !title.nil? and !title.content.empty?
       return ead_to_html(title.content)
     elsif !date.nil? and !date.content.empty?

data/lib/solr_ead/version.rb

@@ -1,3 +1,3 @@
 module SolrEad
-  VERSION = "0.7.5"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_ead
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Adam Wead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: om
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A gem for indexing ead into solr using OM
@@ -259,4 +259,3 @@ test_files:
 - spec/formatting_spec.rb
 - spec/indexer_spec.rb
 - spec/spec_helper.rb
-has_rdoc: