homeschool 0.0.1.31 → 0.0.1.34

data/lib/form_buildr.rb

@@ -35,32 +35,41 @@
 #   labeled_text_field(:name)
 #     <label class="fieldLabel" for="person_name">Name:</label>
 #     <input id="person_name" name="person[name]" size="30" type="text" />
-#   
-class ActionView::Helpers::FormBuilder
-  
-  def labeled_radio_button(method, tag_value, options={})
-    id = %{#{@object_name}_#{method}_#{tag_value}}
-    send(:radio_button, method, tag_value, {:id => id}.update(options.without(:label, :no_colon))) + send(:label_for, method, {:no_colon => true, :label => tag_value.humanize, :id => id}.update(options))
-  end
-  
-  def labeled_check_box(method, options={}, checked_value="1", unchecked_value="0")
-    send(:check_box, method, options.without(:label, :no_colon), checked_value, unchecked_value) + send(:label_for, method, options.update(:no_colon => true))
-  end
-  
-  def labeled_select(method, choices, options={}, html_options={})
-    label_for(method, options) + select(method, choices, options.without(:label, :no_colon), html_options)
-  end
-  
-  def labeled_collection_select(method, collection, value_method, text_method, options={}, html_options={})
-    label_for(method, options) + collection_select(method, collection, value_method, text_method, options.without(:label, :no_colon), html_options)
+#
+module Homeschool::FormBuildr
+  module ClassMethods; end
+  module InstanceMethods
+    def label_for(method, options={})
+      options = {:label => options} if options.is_a? String
+      begin
+        label = options[:label] || @object_name.to_s.classify.constantize.human_name(method)
+      rescue NameError
+        label = method.to_s.titleize
+      end
+      %{<label class="fieldLabel" for="#{options[:id] || "#{@object_name}_#{method}"}">#{label}#{":" if !options[:no_colon]}</label>}
+    end
+    
+    def labeled_radio_button(method, tag_value, options={})
+      id = %{#{@object_name}_#{method}_#{tag_value}}
+      send(:radio_button, method, tag_value, {:id => id}.update(options.without(:label, :no_colon))) + send(:label_for, method, {:no_colon => true, :label => tag_value.humanize, :id => id}.update(options))
+    end
+
+    def labeled_check_box(method, options={}, checked_value="1", unchecked_value="0")
+      send(:check_box, method, options.without(:label, :no_colon), checked_value, unchecked_value) + send(:label_for, method, options.update(:no_colon => true))
+    end
+
+    def labeled_select(method, choices, options={}, html_options={})
+      label_for(method, options) + select(method, choices, options.without(:label, :no_colon), html_options)
+    end
+
+    def labeled_collection_select(method, collection, value_method, text_method, options={}, html_options={})
+      label_for(method, options) + collection_select(method, collection, value_method, text_method, options.without(:label, :no_colon), html_options)
+    end
   end
-  
+end
+ActionView::Helpers::FormBuilder.add_extension(Homeschool::FormBuildr)
+class ActionView::Helpers::FormBuilder
   rdef(/labeled_(.*)/) do |match, *args|
     return send(:label_for, *args) + send(match[1].to_sym, *args)
   end
-  
-  def label_for(method, options={})
-    options = {:label => options} if options.is_a? String
-    %{<label class="fieldLabel" for="#{options[:id] || "#{@object_name}_#{method}"}">#{options[:label] || @object.human_name(method)}#{":" if !options[:no_colon]}</label>}
-  end
 end

data/lib/homeschool.rb

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'metaid'
 require 'active_support'
 
+module Homeschool; end
+
 class Symbol
   def self.pattern(name, pattern, &formation)
     define_method(name) {to_s.match(pattern) ? self : formation.call(self).to_sym}

data/lib/model_extensions.rb

@@ -1,14 +1,18 @@
-module Homeschool; module ModelExtensions
+module Homeschool::ModelExtensions
   module ClassMethods
     def human_field_names(hash=nil)
       @human_field_names = hash if hash
       @human_field_names || {}
     end
+    
+    def human_name(field)
+      human_field_names[field.to_sym] || field.to_s.titleize
+    end
   end
   module InstanceMethods
     def human_name(field)
-      self.class.human_field_names[field.to_sym] || field.to_s.titleize
+      self.class.human_name(field)
     end
   end
-end; end
+end
 ActiveRecord::Base.add_extension(Homeschool::ModelExtensions)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: homeschool
 version: !ruby/object:Gem::Version 
-  version: 0.0.1.31
-date: 2007-10-05 00:00:00 -04:00
+  version: 0.0.1.34
+date: 2007-10-06 00:00:00 -04:00
 summary: The homeschool gem
 require_paths: 
 - lib