neorails-form_fu 0.7 → 0.41

data/form_fu.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'form_fu'
-  s.version = '0.7'
-  s.date = '2008-11-18'
+  s.version = '0.41'
+  s.date = '2008-07-07'
   
   s.summary = "Build Nice DRY Rails Forms"
   s.description = "FormFu is a Rails plugin that enables you to easily build nice, tableless forms"

data/lib/form_fu/form_builder.rb

@@ -15,7 +15,7 @@ module FormFu
     
     alias :text_area_input :text_area
     def text_area(field, options = {}, &block)
-      format_with_label(field, options.merge(:field_type => "text_area"), super(field, purge_custom_tags(options)), &block)
+      format_with_label(field, options.merge(:field_type => "text_area", :preserve => true), super(field, purge_custom_tags(options)), &block)
     end
 
     # wrap the date_select helper
@@ -74,17 +74,18 @@ module FormFu
 
     # format a helper by generating the haml to wrap it in a field_tag and include a label
     def format_with_label(field, options, tag_output, &block)
-      if object and object.errors
-        # see if we have an error on the field
-        has_error = object.errors.on(field).present?
-      else
-        has_error = false
-      end
+      # see if we have an error on the field
+      errors_on = object.send(:errors).send(:on, field)
+      has_error = true unless errors_on.blank?
 
       # set field options
       options[:field] ||= {}
       options[:field].merge!(:has_error => has_error, :field_type => options[:field_type])
 
+      if options[:preserve]
+        tag_output = @template.preserve(tag_output)
+      end
+
       # find label name
       label_name = options[:label] || field.to_s.humanize
       options[:separator] ||= default_separator
@@ -94,14 +95,13 @@ module FormFu
       output_html = @template.field_tag(options[:field], [
           @template.label(@object_name, field, label_name),
           tag_output,
-          block_given? ? @template.universal_capture(&block) : nil,
-          @template.validation_tag(@object, field)
+          @template.validation_tag(@object, field),
+          block_given? ? @template.capture(&block) : nil
       ].compact.join("\n"))
 
       if block_given?
         # concat to page if block was given
-        @template.universal_concat(output_html)
-        return nil
+        return @template.concat(output_html, block.binding)
       else
         # otherwise return html directly
        return output_html

data/lib/form_fu/helpers.rb

@@ -1,31 +1,14 @@
 module FormFu
   module Helpers
     # Create a form_for block using FormFuBuilder
-    def formfu_for(*args, &block)  
-      raise ArgumentError, "Missing block" unless block_given?
-      
+    def formfu_for(record_or_name_or_array, *args, &proc)  
       options = args.extract_options!
       args << options.merge(:builder => FormFu::FormBuilder)
-      form_for(*args, &block)
-      
+      form_for(record_or_name_or_array, *args, &proc)
     end
     
     # also work with the more semantic name (build_form_for)
     alias :build_form_for :formfu_for
-
-
-    # Create a form_for block using FormFuBuilder
-    def remote_formfu_for(*args, &block)  
-      raise ArgumentError, "Missing block" unless block_given?
-      
-      options = args.extract_options!
-      args << options.merge(:builder => FormFu::FormBuilder)
-      remote_form_for(*args, &block)
-    end
-    
-    # also work with the more semantic name (build_form_for)
-    alias :build_remote_form_for :remote_formfu_for
-
     
     # Create a fields_for block using FormFuBuilder
     def formfu_fields_for(object_or_object_name, *args, &block)
@@ -51,10 +34,10 @@ module FormFu
     # wrap content with a fieldset tag with a legend
     def fieldset_tag(legend_name, options = {}, &block)
       if block_given?
-        universal_concat(content_tag(:fieldset, options) do
+        concat(content_tag(:fieldset, options) do
           (legend_name ? content_tag(:legend, legend_name) : "")+
-          universal_capture(&block)
-        end)
+          capture(&block)
+        end, block.binding)
       else
         return content_tag(:fieldset, options) do
           content_tag :legend, legend_name
@@ -81,10 +64,10 @@ module FormFu
       end
       
       if block_given?
-        universal_concat(content_tag(:div, options) do
+        concat(content_tag(:div, options) do
           (label.blank? ? "" : content_tag(:label, label.strip)) +
-          universal_capture(&block)
-        end)
+          capture(&block)
+        end, block.binding)
       else
         content_tag(:div, options) do
           (label.blank? ? "" : content_tag(:label, label.strip))+content.to_s
@@ -103,21 +86,5 @@ module FormFu
       end
     end
     
-    def universal_capture(&block)
-      if respond_to?(:is_haml?) and is_haml?
-        capture_haml(&block)
-      else
-        capture(&block)
-      end
-    end
-
-    def universal_concat(html)
-      if haml?
-        haml_concat(html)
-      else
-        concat(html)
-      end
-    end
-    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: neorails-form_fu
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: "0.41"
 platform: ruby
 authors: 
 - Tyler Crocker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-07-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency