formula 0.2.0 → 0.2.1

data/lib/formula.rb

@@ -202,16 +202,37 @@ module Formula
     # Usage:
     #
     #   f.association(:category_id, Category.all, :id, :name, :hint => "What do you do?")
+    #   f.association(:category_id, Category.all, :id, :name, :association => { :prompt => "Category?" })
+    #   f.association(:category_id, Category.all, :id, :name, :association => { :html => { :class => "category" } })
     #
     # Equivalent:
     #
     #   <div>
     #     <div class="association">
     #       <%= f.label(:category_id)
-    #       <div class="association"><%= f.collection_select(:category_id, Category.all, :id, :name) %></div>
+    #       <div class="association">
+    #         <%= f.collection_select(:category_id, Category.all, :id, :name) %>
+    #       </div>
     #       <div class="hint">What do you do?</div>
     #     </div>
     #   </div>
+    #   <div>
+    #     <div class="association">
+    #       <%= f.label(:category_id)
+    #       <div class="association">
+    #         <%= f.collection_select(:category_id, Category.all, :id, :name, { :prompt => "Category") } %>
+    #       </div>
+    #     </div>
+    #   </div>
+    #   <div>
+    #     <div class="association">
+    #       <%= f.label(:category_id)
+    #       <div class="association">
+    #         <%= f.collection_select(:category_id, Category.all, :id, :name, {}, { :class => "category" } %>
+    #       </div>
+    #     </div>
+    #   </div>
+    
     
     def association(method, collection, value, text, options = {})
       options[:as] ||= :select
@@ -220,7 +241,8 @@ module Formula
       self.block(method, options) do
         @template.content_tag(::Formula.association_tag, :class => [::Formula.association_class, options[:as]]) do
           case options[:as]
-            when :select then collection_select(method, collection, value, text, options[:association])
+            when :select then collection_select(method, collection, value, text, 
+              options[:association], options[:association].delete(:html))
           end
         end
       end
@@ -317,7 +339,25 @@ module Formula
     
     
   public
-    
+  
+  
+    # Generates a wrapper around fields_form with :builder set to FormulaFormBuilder.
+    #
+    # Supports:
+    #
+    # * f.formula_fields_for(@user.company)
+    # * f.fieldsula_for(@user.company)
+    #
+    # Equivalent:
+    #
+    # * f.fields_for(@user.company, :builder => Formula::FormulaFormBuilder))
+    #
+    # Usage:
+    #
+    #   <% f.formula_fields_for(@user.company) do |company_f| %>
+    #     <%= company_f.input :url %>
+    #     <%= company_f.input :phone %>
+    #   <% end %>
     
     def formula_fields_for(record_or_name_or_array, *args, &block)
       options = args.extract_options!
@@ -325,6 +365,8 @@ module Formula
       fields_for(record_or_name_or_array, *(args << options), &block)
     end
     
+    alias :fieldsula_for :formula_fields_for
+    
   
   end
   
@@ -358,7 +400,7 @@ module Formula
     alias :formula_for :formula_form_for
     
     
-    # Generates a wrapper around fields_form with :builder set to FormulaFormBuilder.
+    # Generates a wrapper around fields_for with :builder set to FormulaFormBuilder.
     #
     # Supports:
     #
@@ -371,7 +413,7 @@ module Formula
     #
     # Usage:
     #
-    #   <% f.formula_form_for(@user.company) do |company_f| %>
+    #   <% f.formula_fields_for(@user.company) do |company_f| %>
     #     <%= company_f.input :url %>
     #     <%= company_f.input :phone %>
     #   <% end %>

data/lib/formula/version.rb

@@ -1,3 +1,3 @@
 module Formula
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: formula
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors: 
 - Kevin Sylvestre
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -05:00
+date: 2011-02-12 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -49,21 +45,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A great way to simplify complex forms