hyogen 0.0.2 → 0.0.3

data/README

@@ -43,5 +43,6 @@ Template format is erb.
 <b><></b>:: This tag means 
 
 = Install
-require ParseExcel
+require ParseExcel (version >= 2007-02-07)  [http://scm.ywesee.com/?p=parseexcel]
 
+gem install hyogen

data/Rakefile

@@ -45,7 +45,6 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.url = HOMEPATH
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
 #  p.test_globs = ["test/**/test_*.rb"]
-#  p.test_globs = ["spec/**/spec_*.rb", "spec/**/*.csv", "spec/**/*.xls"]
   p.test_globs = ["spec/**/*[^~]"]
   p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
 #  p.package_files.include("spec/**/*")
@@ -104,8 +103,7 @@ Rake::RDocTask.new do |rdoc|
   if ENV['DOC_FILES']
     rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
   else
-#    rdoc.rdoc_files.include('README', 'CHANGELOG')
-    rdoc.rdoc_files.include('README')
+    rdoc.rdoc_files.include('README', 'CHANGELOG')
     rdoc.rdoc_files.include('lib/**/*.rb')
   end
 end

data/lib/hyogen/reader.rb

@@ -159,12 +159,13 @@ module Hyogen
     end
     
     def add_label label_names, label_start_position
-      @previous_label_name = nil
+      @previous_label_name = ""
       label_names.each_with_index do |label_name, i|
-        if label_name
+        label_name ||= ""
+        if label_name != ""
           label_name = Tag.aliased(label_name)
         else
-          raise "���x����������܂���"  unless @previous_label_name
+#          raise "���x����������܂���"  unless @previous_label_name
           label_name = @previous_label_name
         end
         @scheme.add_label label_name, label_start_position+i
@@ -245,7 +246,8 @@ module Hyogen
     def self.worksheet_to_matrix worksheet
       data = []
       worksheet.num_rows.times do |r|
-        data << worksheet.row(r).collect {|cell| cell.to_s(CHAR_CODE)}
+        #        data << worksheet.row(r).collect {|cell| cell.to_s(CHAR_CODE)}
+        data << worksheet.row(r).collect {|cell| cell.to_s == "" ? "" : cell.to_s(CHAR_CODE).to_s}
       end
       Matrix.new(data)
     end

data/lib/hyogen/version.rb

@@ -2,7 +2,7 @@ module Hyogen #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/spec_hyogen.rb

@@ -231,6 +231,14 @@ context "label syoryaku" do
     table = Hyogen.parse_tables(csvdata).first
     table.records.should == expect
   end
+  specify "htable" do
+    csvdata = CSV.parse("{HTABLE},,\n{L},{L},leaf\nparent,child1,1\n,child2,2")
+    expect = [{"" => {"" => "leaf"}, "parent"=> {"child1" => "1", "child2" => "2"}}]
+    table = Hyogen.parse_tables(csvdata).first
+#    p table.labels
+#    exit
+    table.records.should == expect
+  end
   
   specify "overwrite" do
     csvdata = CSV.parse("{VTABLE},\n{L}a,\n{L}t,\n1,2")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: hyogen
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-05-14 00:00:00 +09:00
+  version: 0.0.3
+date: 2007-05-16 00:00:00 +09:00
 summary: This package allows you to mapping CSV or Excel to Ruby objects and generating some data.
 require_paths: 
 - lib