solr_ead 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f603d8f385b28bf4d15ddb66bce581ae869f85
-  data.tar.gz: d277f1628997df455daed47a8182bce5d230dfbe
+  metadata.gz: 0fdef7b50871ffde537ec7625ce858bf30a780bd
+  data.tar.gz: d54d41cc1719a04954100e77f789f97c02033107
 SHA512:
-  metadata.gz: eed1c50769951fec857c326d01decc890142e69ede412691894d82f56b0844166fc035dbd946c5276ac75375f94fecae2157e080dfec23a3091966c588045623
-  data.tar.gz: ca8c4c060d1ba190b1949fe155ec7fb51c852b1b207c6bf4d54a1e3c72e1ff9d3e9b61dfb956dc47def656f77a2fef48be1cc32b076c8f63913236f1f9be7dca
+  metadata.gz: 4e1344df2d9ba2880aa8f5fb1feeea3acb9cc36fbd6a3d00dda3866a55488757e333fe32b19cc9e8b07c718cc5980935f319836e48ddfa1ab28bb8e17d930113
+  data.tar.gz: 0121dea63780951b4395a9d4c4510aa025cd39414c417aed19b10b30411901d191a0eb2b96d0f6c40e414dedcbf0369e95d75e00077ff0c7c226e96681c5b753

data/lib/solr_ead/behaviors.rb

@@ -6,14 +6,18 @@ module SolrEad::Behaviors
 
   # Takes a file as its input and returns a Nokogiri::XML::NodeSet of component <c> nodes
   #
-  # It'll make an attempt at substituting numbered component levels for non-numbered
+  # It'll make an attempt at substituting numbered component levels (c01..c12) for non-numbered
   # ones.
+  # @param [String] `file` pathname to file with EAD data
   def components(file)
-    raw = File.read(file)
-    raw.gsub!(/xmlns="(.*?)"/, '')
-    raw.gsub!(/c[0-9]{2,2}/,"c")
-    xml = Nokogiri::XML(raw)
-    return xml.xpath("//c")
+    doc = Nokogiri::XML(File.read(file))
+    doc.remove_namespaces!
+    (1..12).each do |i| # EAD spec provides 12 levels of components
+      doc.xpath("//c#{'%02d' % i}").each do |node|
+        node.name = 'c'
+      end
+    end
+    doc.xpath('//c')
   end
 
   # Used in conjunction with #components, this takes a single Nokogiri::XML::Element
@@ -117,10 +121,10 @@ module SolrEad::Behaviors
     end
   end
 
-  # Returns true or false for a component with attached <c> child nodes.
-  def component_children?(node, t = Array.new)
-    node.children.each { |n| t << n.name }
-    t.include?("c") ? TRUE : FALSE
+  # @param [Nokogiri::XML::Node] `node`
+  # @return true or false for a component with attached <c> child nodes.
+  def component_children?(node)
+    node.children.any? { |n| n.name == 'c' }
   end
 
 end

data/lib/solr_ead/component.rb

@@ -71,7 +71,8 @@ class SolrEad::Component
 
   def to_solr(solr_doc = Hash.new)
     super(solr_doc)
-    Solrizer.insert_field(solr_doc, "ref", self.ref.first.strip, :stored_sortable)
+    Solrizer.insert_field(solr_doc, "ref", self.ref.first.strip, :stored_sortable) unless self.ref.blank? || self.ref.first.blank?
+    solr_doc
   end
 
-end
+end

data/lib/solr_ead/version.rb

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

data/spec/component_spec.rb

@@ -3,17 +3,18 @@ require "spec_helper"
 describe SolrEad::Component do
 
   context "with parent components" do
+    let(:xml_data) { fixture "component_template.xml" }
+    let(:additional_fields) { {
+            "id"                                                        => "TEST-0001ref010",
+            Solrizer.solr_name("ead", :stored_sortable)                 => "TEST-0001",
+            Solrizer.solr_name("parent", :stored_sortable)              => "ref001",
+            Solrizer.solr_name("parent", :displayable)                  => ["ref001", "ref002", "ref003"],
+            Solrizer.solr_name("parent_unittitles", :displayable)       => ["Series I", "Subseries A", "Subseries 1"],
+            Solrizer.solr_name("component_children", :type => :boolean) => false
+    } }
 
     let(:subject) do
-      additional_fields = {
-        "id"                                                        => "TEST-0001ref010",
-        Solrizer.solr_name("ead", :stored_sortable)                 => "TEST-0001",
-        Solrizer.solr_name("parent", :stored_sortable)              => "ref001",
-        Solrizer.solr_name("parent", :displayable)                  => ["ref001", "ref002", "ref003"],
-        Solrizer.solr_name("parent_unittitles", :displayable)       => ["Series I", "Subseries A", "Subseries 1"],
-        Solrizer.solr_name("component_children", :type => :boolean) => FALSE
-      }
-      SolrEad::Component.from_xml(fixture "component_template.xml").to_solr(additional_fields)
+      SolrEad::Component.from_xml(xml_data).to_solr(additional_fields)
     end
 
     it "should accept additional fields from a hash" do
@@ -26,6 +27,21 @@ describe SolrEad::Component do
       expect(subject[Solrizer.solr_name("ref", :stored_sortable)]).to eq("ref215")
     end
 
+    context '#refs' do
+      context 'missing ones' do
+        let(:xml_data) { fixture("component_template.xml").read.gsub(/id=".*"\s/, '') }
+        it do
+          expect(subject[Solrizer.solr_name("ref", :stored_sortable)]).to be_nil
+        end
+      end
+      context 'blank ones' do
+        let(:xml_data) { fixture("component_template.xml").read.gsub(/id=".*"\s/, 'id=" "') }
+        it do
+          expect(subject[Solrizer.solr_name("ref", :stored_sortable)]).to be_nil
+        end
+      end
+    end
+
   end
 
   context "without parent components" do
@@ -37,7 +53,7 @@ describe SolrEad::Component do
         Solrizer.solr_name("parent", :stored_sortable)              => "ref001",
         Solrizer.solr_name("parent", :displayable)                  => ["ref001", "ref002", "ref003"],
         Solrizer.solr_name("parent_unittitles", :displayable)       => [],
-        Solrizer.solr_name("component_children", :type => :boolean) => FALSE
+        Solrizer.solr_name("component_children", :type => :boolean) => false
       }
       SolrEad::Component.from_xml(fixture "component_template.xml").to_solr(additional_fields)
     end
@@ -47,7 +63,7 @@ describe SolrEad::Component do
       expect(subject[Solrizer.solr_name("accessrestrict", :displayable)].first).to match /^This item .* is available.$/
     end
 
-  end    
+  end
 
   describe "formatting fields as html" do
     let(:subject) { SolrEad::Component.from_xml(fixture "html_component.xml") }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solr_ead
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Adam Wead
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: om