stead 0.0.3 → 0.0.4

data/Rakefile

@@ -12,7 +12,6 @@ begin
     gem.authors = ["Jason Ronallo"]
     gem.add_dependency "nokogiri", ">= 1.4.1"
     gem.add_dependency "fastercsv", ">= 1.5.0"
-    gem.add_dependency "activesupport", ">= 2.3.5"
     gem.add_dependency "trollop", ">= 1.16.2"
     gem.add_development_dependency "shoulda", ">= 0"
     gem.files = FileList["[A-Z]*", "{bin,examples,lib}/**/*"]

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/stead/ead.rb

@@ -56,13 +56,14 @@ module Stead
       @component_parts.each do |cp|
         c = node(file_component_part_name)
         c['level'] = 'file'
-        c['audience'] = 'internal' if !cp['internal only'].blank?
+        c['audience'] = 'internal' if !cp['internal only'].nil?
         did = node('did')
         c.add_child(did)
         add_did_nodes(cp, did)
         add_containers(cp, did)
         add_scopecontent(cp, did)
         add_accessrestrict(cp, did)
+        add_controlaccess(cp, c)
         add_file_component_part(cp, c)
       end
       begin
@@ -118,7 +119,7 @@ module Stead
       item = node('item')
       contents = []
       ser.each do |ser_part|
-        contents << ser_part unless ser_part.blank?
+        contents << ser_part unless ser_part.nil? or ser_part.empty?
       end
       item.content = contents.join(', ')
       list.add_child(item)
@@ -151,7 +152,7 @@ module Stead
 
     def add_did_nodes(cp, did)
       field_map.each do |header, element|
-        if !cp[header].blank?
+        if !cp[header].nil?
           if element.is_a? String
             node = node(element)
             node.content = cp[header]
@@ -171,7 +172,7 @@ module Stead
       ['1', '2', '3'].each do |container_number|
         container_type = cp['container ' + container_number + ' type']
         container_number = cp['container ' + container_number + ' number']
-        if !container_type.blank? and !container_number.blank?
+        if !container_type.nil? and !container_number.nil?
           unless valid_container_type?(container_type)
             raise Stead::InvalidContainerType, container_type
           end
@@ -184,6 +185,25 @@ module Stead
       end
     end
 
+    def add_controlaccess(cp, component_part)
+      ['geogname', 'corpname', 'famname', 'name', 'persname', 'subject'].each do |controlaccess_type|
+        if cp[controlaccess_type]
+          controlaccess = component_part.xpath('controlaccess').first
+#          debugger
+          if !controlaccess
+            controlaccess = node('controlaccess')
+          end
+          controlaccess_element = node(controlaccess_type)
+          controlaccess_element.content = cp[controlaccess_type]
+          if !cp[controlaccess_type + '_source'].nil?
+            controlaccess_element['source'] = cp[controlaccess_type + '_source']
+          end
+          controlaccess.add_child(controlaccess_element)
+          component_part.add_child(controlaccess)
+        end
+      end
+    end
+
     def valid_container_type?(container_type)
       if Stead::CONTAINER_TYPES.include?(container_type)
         return true
@@ -193,7 +213,7 @@ module Stead
     end
 
     def add_scopecontent(cp, did)
-      unless cp['scopecontent'].blank?
+      unless cp['scopecontent'].nil?
         scopecontent = node('scopecontent')
         p = node('p')
         p.content = cp['scopecontent']
@@ -203,7 +223,7 @@ module Stead
     end
 
     def add_accessrestrict(cp, did)
-      unless cp['conditions governing access'].blank?
+      unless cp['conditions governing access'].nil?
         accessrestrict = node('accessrestrict')
         p = node('p')
         p.content = cp['conditions governing access']
@@ -266,7 +286,7 @@ module Stead
 
     def series_found?
       @component_parts.each do |row|
-        return false if row['series number'].blank?
+        return false if row['series number'].nil?
       end
     end
 

data/lib/stead.rb

@@ -49,7 +49,6 @@ require 'csv'
 if CSV.const_defined? :Reader
   require 'fastercsv'
 end
-require 'active_support'
 
 require 'pp'
 

data/test/helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'ruby-debug'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -13,7 +14,7 @@ module SteadTestHelpers
   def assert_main_elements_equal(did, example_did)
     ['unitid', 'unittitle', 'unitdate', 'extent', 'container'].each do |elem|
       #puts example_did.xpath('.//xmlns:' + elem)
-      if !example_did.xpath('.//xmlns:' + elem).blank?
+      if !example_did.xpath('.//xmlns:' + elem).empty?
         did_content = did.xpath('.//xmlns:' + elem).first.content
         assert_not_nil did_content
         assert_equal example_did.xpath('.//xmlns:' + elem).first.content,

data/test/test_ead_series.rb

@@ -37,6 +37,24 @@ class TestSteadEadSeries < Test::Unit::TestCase
     end
   end
 
+  def test_has_controlaccess
+    assert_equal 1, @generated_ead.xpath('//xmlns:c02/xmlns:controlaccess').length
+  end
+
+  def test_has_controlaccess_geogname
+    geonames = @generated_ead.xpath('//xmlns:c02/xmlns:controlaccess/xmlns:geogname')
+    assert_equal 1, geonames.length
+    assert_equal 'Raleigh (N.C.)', geonames.first.content
+    assert_equal 'lcnaf', geonames.first['source']
+  end
+
+  def test_has_controlaccess_corpname
+    corpnames = @generated_ead.xpath('//xmlns:c02/xmlns:controlaccess/xmlns:corpname')
+    assert_equal 1, corpnames.length
+    assert_equal 'corpname', corpnames.first.content
+    assert_equal 'corpname_source', corpnames.first['source']
+  end
+
 
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stead
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jason Ronallo
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 -04:00
+date: 2010-10-18 00:00:00 -04:00
 default_executable: csv2ead
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 1
         - 4
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
@@ -47,49 +50,36 @@ dependencies:
         version: 1.5.0
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: trollop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 83
         segments: 
         - 1
         - 16
         - 2
         version: 1.16.2
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 description: Converts CSV files of a specific schema into EAD XML.
 email: jronallo@gmail.com
 executables: 
@@ -113,11 +103,11 @@ files:
 - lib/stead/templates/ead.xml
 - lib/stead/templates/ead.xsd
 - lib/stead/templates/ncsu_ead.xml
+- test/test_ead_no_series.rb
 - test/test_ead_bad_container_type.rb
+- test/test_ead_series.rb
 - test/helper.rb
 - test/test_stead.rb
-- test/test_ead_no_series.rb
-- test/test_ead_series.rb
 has_rdoc: true
 homepage: http://github.com/jronallo/stead
 licenses: []
@@ -132,6 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -140,6 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -151,9 +143,9 @@ signing_key:
 specification_version: 3
 summary: Spreadsheets To Encoded Archival Description
 test_files: 
+- test/test_ead_no_series.rb
 - test/test_ead_bad_container_type.rb
+- test/test_ead_series.rb
 - test/helper.rb
 - test/test_stead.rb
-- test/test_ead_no_series.rb
-- test/test_ead_series.rb
 - examples/ncsu.rb