eader 0.0.3 → 0.0.4

data/lib/eader/document.rb

@@ -12,7 +12,7 @@ module Eader
     def series
       doc.css('dsc c01').map do |c|
         if c['level'] == 'series'
-          Item.new(c.css('did'))
+          Item.new(c)
         end
       end.compact
     end
@@ -20,7 +20,7 @@ module Eader
     def subseries
       doc.css('dsc c02').map do |c|
         if c['level'] == 'subseries'
-          Item.new(c.css('did'))
+          Item.new(c)
         end
       end.compact
     end
@@ -31,7 +31,7 @@ module Eader
       (1..3).each do |n|
         doc.css("dsc c0#{n}").map do |c|
           if c['level'] == 'item'
-            @items << Item.new(c.css('did'))
+            @items << Item.new(c)
           end
         end
       end

data/lib/eader/item.rb

@@ -7,44 +7,51 @@ module Eader
     end
 
     def unitid
-      if (uid = node.css('unitid')).any?
-        uid[0].text.strip
-      end
+      find('did unitid')
     end
 
     def origination
-      if (orig = node.css('origination')).any?
-        orig[0].text.strip
-      end
+      find('did origination')
     end
 
     def langmaterial
-      if (langm = node.css('langmaterial')).any?
-        langm[0].text.strip
-      end
+      find('did langmaterial')
     end
 
     def unittitle
-      if (ut = node.css('unittitle')).any?
-        ut[0].text.strip
-      end
+      find('did unittitle')
+    end
+
+    def scope_content
+      find('scopecontent', :html => true)
+    end
+
+    def note
+      find('note', :html => true)
+    end
+
+    def use_restrict
+      find('userestrict')
     end
 
     def unitdate
-      if _unit_dates.any?
-        _unit_dates[0].text.strip
-      end
+      find('did unitdate')
     end
 
     def unitdate_type
-      if _unit_dates.any?
-        _unit_dates[0].attr('type')
-      end
+      node.css('did unitdate')[0].attr('type')
     end
 
     private
-    def _unit_dates
-      node.css('unitdate')
+    def find(selector, options = {})
+      results = node.css(selector)
+      return nil unless results.any?
+
+      if options[:html]
+        results[0].children.to_s
+      else
+        results[0].text.strip
+      end
     end
   end
 end

data/lib/eader/version.rb

@@ -1,3 +1,3 @@
 module Eader
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/eader_spec.rb

@@ -9,7 +9,9 @@ describe Eader do
     e.should have(1).items
 
     # checking that remote url works
-    i.should have(4434).items
+    if ENV['REMOTE_URL']
+      i.should have(4434).items
+    end
   end
 
   it "returns item unitids" do
@@ -32,4 +34,40 @@ describe Eader do
     item.unitdate.should be_empty
     item.unitdate_type.should == "inclusive"
   end
+
+  it "returns items' scope_content" do
+    expected  = <<-EOD
+ <p>Thurman Barker, percussion</p>
+          <p>Recorded live 1987.03.21, Links Hall, 3435 N. Sheffield, Chicago, IL 60657</p>
+          <p>Contents: [Introduction] (2 min. 17 sec.) -- ["The Hunt"] (11 min. 7 sec.) --
+            [Untitled] (11 min. 19 sec.) -- [Untitled] (10 min. 42 sec.) -- ["Blue in
+            green"] (12 min. 5 sec.) -- [Intermission] (2 min. 40 sec.) --
+            ["Kalingalinga"] (17 min. 1 sec.) -- ["Hocus Pocus"] (21 min. 15 sec.) --
+            [Outro] (2 min. 19 sec.)</p>
+
+    EOD
+
+    content = item.scope_content.gsub(/\n\s+/, ' ')
+
+    content.should == expected.gsub(/\n\s+/, ' ')
+  end
+
+  it "returns items' note" do
+    expected = <<-EOD
+ <p>Barker's recent activities include a trio with Joseph Jarman and Amina
+            Claudine Meyers, and solo work on marimba, traps and xylophone. He has
+            recorded with Muhal Richard Abrams, Sam Rivers, Anthony Braxton, Roscoe
+            Mitchell, Billy Bang, John Lindberg and the World Bass Violin Ensemble, to
+            name a few. [Links Hall Program Schedule, March-June 1987]</p>
+
+    EOD
+
+    note = item.note.gsub(/\n\s+/, ' ')
+
+    note.should == expected.gsub(/\n\s+/, ' ')
+  end
+
+  it "returns items' use_restrict" do
+    item.use_restrict.should == 'Material is copyright of respective artists.'
+  end
 end

data/spec/support/test.xml

@@ -138,6 +138,24 @@
             <unittitle> 5 empty loose CD jewel cases [sound recording]</unittitle>
             <unitdate type="inclusive"> </unitdate>
         </did>
+        <scopecontent>
+          <p>Thurman Barker, percussion</p>
+          <p>Recorded live 1987.03.21, Links Hall, 3435 N. Sheffield, Chicago, IL 60657</p>
+          <p>Contents: [Introduction] (2 min. 17 sec.) -- ["The Hunt"] (11 min. 7 sec.) --
+            [Untitled] (11 min. 19 sec.) -- [Untitled] (10 min. 42 sec.) -- ["Blue in
+            green"] (12 min. 5 sec.) -- [Intermission] (2 min. 40 sec.) --
+            ["Kalingalinga"] (17 min. 1 sec.) -- ["Hocus Pocus"] (21 min. 15 sec.) --
+            [Outro] (2 min. 19 sec.)</p>
+        </scopecontent>
+        <note>
+          <p>Barker's recent activities include a trio with Joseph Jarman and Amina
+            Claudine Meyers, and solo work on marimba, traps and xylophone. He has
+            recorded with Muhal Richard Abrams, Sam Rivers, Anthony Braxton, Roscoe
+            Mitchell, Billy Bang, John Lindberg and the World Bass Violin Ensemble, to
+            name a few. [Links Hall Program Schedule, March-June 1987]</p>
+        </note>
+        <userestrict>Material is copyright of respective artists.</userestrict>
+
     </c01>
 </dsc>
 </ead>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eader
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri