lib/larynx/form.rb in larynx-0.1.5 vs lib/larynx/form.rb in larynx-0.1.6

@@ -1,20 +1,66 @@
 module Larynx
   class Form < Application
-    include Fields
     class_inheritable_accessor :setup_block
 
-    def self.setup(&block)
-      self.setup_block = block
+    class_inheritable_accessor :field_definitions
+    self.field_definitions = []
+
+    attr_accessor :fields
+
+    class << self
+      def setup(&block)
+        self.setup_block = block
+      end
+
+      def field(name, options={}, &block)
+        self.field_definitions <<  {:name => name, :options => options, :block => block}
+        attr_accessor name
+      end
     end
 
+    def initialize(*args, &block)
+      @fields = self.class.field_definitions.map {|field| Field.new(field[:name], field[:options], &field[:block]) }
+      @field_index = -1
+      super
+    end
+
     def run
       instance_eval &self.class.setup_block if self.class.setup_block
       next_field
     end
 
     def restart_form
       @field_index = -1
       run
+    end
+
+    def next_field(field_name=nil)
+      if field_name
+        @field_index = field_index(field_name)
+      else
+        @field_index += 1
+      end
+      if field = current_field
+        field.run(self)
+        field
+      end
+    end
+
+    def current_field
+      @fields[@field_index]
+    end
+
+    def field_index(name)
+      field = @fields.find {|f| f.name == name }
+      @fields.index(field)
+    end
+
+    def attempt
+      current_field.attempt
+    end
+
+    def last_attempt?
+      current_field.last_attempt?
     end
   end
 end