lib/osheet/template.rb in osheet-0.5.0 vs lib/osheet/template.rb in osheet-0.6.0

@@ -1,41 +1,27 @@
+require 'osheet/partial'
+
 module Osheet
-  class Template < ::Proc
+  class Template < Partial
 
-    # this class is essentially a way to define a named initializer
-    #  block and associate that with an osheet element
+    # this class is a partial that is associated with an osheet element
     #  if an element is initialized from a template, the template
     #  block will be instance_eval'd for the element being initialized
 
     include Instance
 
     ELEMENTS = ['worksheet', 'column', 'row', 'cell']
 
     def initialize(element, name)
-      verify(element, name)
-      set_ivar(:element, element.to_s)
-      set_ivar(:name, name.to_s)
-      super()
-    end
-
-    [:element, :name].each do |meth|
-      define_method(meth) do
-        get_ivar(meth)
-      end
-      define_method("#{meth}=") do |value|
-        set_ivar(meth, value)
-      end
-    end
-
-    private
-
-    def verify(element, name)
       unless element.respond_to?(:to_s) && ELEMENTS.include?(element.to_s)
         raise ArgumentError, "you can only define a template for #{ELEMENTS.join(', ')} elements."
       end
-      unless name.kind_of?(::String) || name.kind_of?(::Symbol)
-        raise ArgumentError, "please use a string or symbol for the template name."
-      end
+
+      set_ivar(:element, element.to_s)
+      super(name)
     end
+
+    def element; get_ivar(:element); end
+    def element=(v); set_ivar(:element, v); end
 
   end
 end