lib/datev/base.rb in datev-0.2.2 vs lib/datev/base.rb in datev-0.2.3

@@ -6,29 +6,33 @@
       attr_accessor :fields
     end
 
     attr_accessor :attributes
 
-    def self.field(name, type, options={})
+    def self.field(name, type, options={}, &block)
       self.fields ||= []
 
       # Check if there is already a field with the same name
-      if self.fields.find { |f| f.name == name }
+      if field_by_name(name)
         raise ArgumentError.new("Field '#{name}' already exists")
       end
 
-      self.fields << Field.new(name, type, options)
+      self.fields << Field.new(name, type, options, &block)
     end
 
+    def self.field_by_name(name)
+      self.fields.find { |f| f.name == name }
+    end
+
     def initialize(attributes)
       self.attributes = {}
 
       raise ArgumentError.new('Hash required') unless attributes.is_a?(Hash)
 
       # Check existing names and set value (if valid)
       attributes.each_pair do |name,value|
-        unless field = self.class.fields.find { |f| f.name == name }
+        unless field = self.class.field_by_name(name)
           raise ArgumentError.new("Field '#{name}' not found")
         end
 
         field.validate!(value)
         self.attributes[name] = value
@@ -40,13 +44,20 @@
           raise ArgumentError.new("Value for field '#{field.name}' is required but missing")
         end
       end
     end
 
-    def to_a
+    def [](name)
+      field = self.class.field_by_name(name)
+      raise ArgumentError.new("Field '#{name}' not found") unless field
+
+      attributes[field.name]
+    end
+
+    def output(context=nil)
       self.class.fields.map do |field|
         value = attributes[field.name]
-        field.output(value)
+        field.output(value, context)
       end
     end
   end
 end