stead 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/bin/csv2ead

@@ -26,10 +26,11 @@ EOS
   opt :stdout, 'Output full EAD to terminal'
 end
 
-unless opts[:output] or opts[:stdout]
-  puts "You must specify either --output <file> and/or --stdout to direct output to the terminal."
-  exit
-end
+# unless opts[:output] or opts[:stdout]
+#   puts "You must specify either --output <file> and/or --stdout to direct output to the terminal."
+#   exit
+# end
+
 
 if opts[:ncsu]
   opts[:template] = File.join(File.dirname(__FILE__), '..', 'lib', 'stead', 'templates', 'ncsu_ead.xml')
@@ -66,5 +67,5 @@ if opts[:output]
   end
 end
 
-puts Stead.pretty_write(ead) if opts[:stdout]
+puts Stead.pretty_write(ead) if !opts[:output]
 

data/lib/stead/ead.rb

@@ -21,11 +21,12 @@ module Stead
     end
 
     def self.from_csv(csv, opts={})
-      lines = csv.split(/\r\n|\n/)
-      100.times do
-        lines[0] = lines.first.gsub(',,', ',"",')
+      lines = csv.split(/\r\n|\n|\r/)
+      # trim empty lines
+      cleaned_lines = lines.select do |line|
+        !line.strip.empty?
       end
-      csv = lines.join("\n")
+      csv = cleaned_lines.join("\n")
       self.new(opts.merge(:csv => csv))
     end
 

data/test/helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 require 'ruby-debug'
+require 'equivalent-xml'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_empty_note.rb

@@ -0,0 +1,18 @@
+require 'helper'
+
+class TestWheless < Test::Unit::TestCase
+  include SteadTestHelpers
+  def setup
+    #@example = Nokogiri::XML('')
+    @ead_generator = Stead::EadGenerator.from_csv(File.read(File.join(File.dirname(__FILE__),
+          'container_lists', 'wheless.csv' )))
+    @generated_ead = @ead_generator.to_ead
+  end
+  
+  def test_lack_of_empty_c01_at_end
+    last_c01 = @generated_ead.xpath('//xmlns:c01').last
+    assert !EquivalentXml.equivalent?("<c01 level=\"file\">\n  <did/>\n</c01>", 
+      last_c01.to_xml, opts = { :element_order => false, :normalize_whitespace => true })
+  end
+    
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stead
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jason Ronallo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -05:00
+date: 2011-02-25 00:00:00 -05:00
 default_executable: csv2ead
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,6 +104,7 @@ files:
 - lib/stead/templates/ead.xsd
 - lib/stead/templates/ncsu_ead.xml
 - test/test_ead_no_series.rb
+- test/test_empty_note.rb
 - test/test_ead_bad_container_type.rb
 - test/test_ead_series.rb
 - test/helper.rb
@@ -144,6 +145,7 @@ specification_version: 3
 summary: Spreadsheets To Encoded Archival Description
 test_files: 
 - test/test_ead_no_series.rb
+- test/test_empty_note.rb
 - test/test_ead_bad_container_type.rb
 - test/test_ead_series.rb
 - test/helper.rb