worksheet.rb in osheet-1.0.0.rc.1

- old
+ new
@@ -1,45 +1,39 @@
+require 'osheet/meta_element'
 require 'osheet/column'
 require 'osheet/row'
 
+# this class is collects and validates worksheet meta-data.  It allows
+# for storing a set of columns for referencing when building rows.  It is
+# up to the writer to take this data and use it as needed.
+
 module Osheet
   class Worksheet
-    include Instance
-    include Associations
-    include WorkbookElement
+
     include MetaElement
-    include MarkupElement
 
-    hm :columns
-    hm :rows
+    attr_reader :columns, :rows
 
-    def initialize(workbook=nil, *args, &block)
-      set_ivar(:workbook, workbook)
-      set_ivar(:name, nil)
-      if block_given?
-        set_binding_ivars(block.binding)
-        instance_exec(*args, &block)
-      end
+    def initialize(name=nil, *args)
+      @name = name
+      @columns = []
+      @rows = []
     end
 
     def name(value=nil)
-      !value.nil? ? set_ivar(:name, sanitized_name(value)) : get_ivar(:name)
+      value.nil? ? @name : @name = value.to_s
     end
 
-    def attributes
-      { :name => get_ivar(:name) }
+    def column(column_obj)
+      @columns << column_obj
     end
 
-    private
-
-    def sanitized_name(name_value)
-      if get_ivar(:workbook) && get_ivar(:workbook).worksheets.collect{|ws| ws.name}.include?(name_value)
-        raise ArgumentError, "the sheet name '#{name_value}' is already in use.  choose a sheet name that is not used by another sheet"
-      end
-      if name_value.to_s.length > 31
-        raise ArgumentError, "worksheet names must be less than 32 characters long"
-      end
-      name_value.to_s
+    # Osheet only stores the latest row in memory for reference
+    # memory bloat would be unmanageable in large spreadsheets if
+    # all rows were stored
+    def row(row_obj)
+      @rows.pop
+      @rows << row_obj
     end
 
   end
 end