helpful_fields 0.1.1 → 0.2.0

data/Readme.md

@@ -36,6 +36,10 @@ Usage
     <% f.check_box_with_label :is_admin, 'Can destroy stuff?' %>
     <% f.radio_button_with_label :type, 'evil', 'No so nice' %>
 
+TODO
+====
+ - support seperate options for label and input `radio_button_with_label 'xxx', 'yyy', true, 'Label', :label => {:style => 'float:left'}, :input => {:class => 'evil'}`
+
 Author
 ======
 [Michael Grosser](http://grosser.it)<br/>

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/helpful_fields.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{helpful_fields}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-11-06}
+  s.date = %q{2011-11-09}
   s.email = %q{michael@grosser.it}
   s.files = [
     "Gemfile",

data/lib/helpful_fields.rb

@@ -51,14 +51,9 @@ class HelpfulFields
       label_for = if options[:id]
         options[:id]  # when id was changed, label has to be for this id
       else
-        # name[hello][world] -> name_hello_world_
-        # name[hello][] -> name_hello_world__
-        # name -> name_
-        clean_name = name.to_s.gsub('[]','_').gsub('][','_').gsub(/[\]\[]/,'_')
-        clean_name += '_' unless clean_name =~ /_$/
-        clean_name + value.to_s.downcase
+        sanitize_to_id(name) + '_' + sanitize_to_id(value)
       end
-      radio_button_tag(name, value, checked) + label_tag(label_for, label)
+      radio_button_tag(name, value, checked, :id => label_for) + label_tag(label_for, label)
     end
 
     def params_radio_button_tag(name, value, options={})
@@ -72,11 +67,16 @@ class HelpfulFields
 
   module FormBuilder
     def check_box_with_label(field, label, options={})
-      check_box(field, options) + label(field, label, options)
+      check_box(field, :id => options[:id]) + label(field, label, :for => options[:id])
     end
 
     def radio_button_with_label(field, value, label, options={})
-      radio_button(field, value, options) + label("#{field}_#{value}", label, options)
+      unless id = options[:id]
+        object_s, fields_s, value_s = [@object_name, field, value].map{|f| @template.send(:sanitize_to_id, f) }
+        id = "#{object_s}_#{fields_s}_#{value_s}"
+      end
+
+      radio_button(field, value, :id => id) + label('_', label, :for => id)
     end
   end
 end

data/spec/helpful_fields_spec.rb

@@ -13,9 +13,19 @@ describe HelpfulFields do
     result = result.gsub("accept-charset=\"UTF-8\" ","")
     result = result.gsub(%r{<div .*?</div>},"")
     result = result.gsub('class="user_new" id="user_new" ',"")
+    assert_id_and_for_match(result)
     result
   end
 
+  def assert_id_and_for_match(html)
+    if html.include?(' for=') and html.include?(' id=')
+      id = html.match(/ id="(.*?)"/)[1]
+      _for = html.match(/ for="(.*?)"/)[1]
+      id.should_not == nil
+      id.should == _for
+    end
+  end
+
   it "has a VERSION" do
     HelpfulFields::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end
@@ -118,10 +128,15 @@ describe HelpfulFields do
     end
 
     describe :params_check_box_with_label do
-      it "its not surprise" do
+      it "works" do
         render('<%= params_check_box_with_label "foo[bar]", "1", "Click it" %>', :foo => {:bar => 1}).
           should == "<input checked=\"checked\" id=\"foo_bar\" name=\"foo[bar]\" type=\"checkbox\" value=\"1\" /><label for=\"foo_bar\">Click it</label>"
       end
+
+      it "works with given id" do
+        render('<%= params_check_box_with_label "foo[bar]", "1", "Click it", :id => "xxx" %>', :foo => {:bar => 1}).
+          should == "<input checked=\"checked\" id=\"xxx\" name=\"foo[bar]\" type=\"checkbox\" value=\"1\" /><label for=\"xxx\">Click it</label>"
+      end
     end
 
     describe :radio_button_with_label do
@@ -137,13 +152,23 @@ describe HelpfulFields do
 
       it "generates labels for arrays" do
         render('<%= radio_button_with_label "foo[]", "1", true, "Click it" %>').
-          should == "<input checked=\"checked\" id=\"foo__1\" name=\"foo[]\" type=\"radio\" value=\"1\" /><label for=\"foo_1\">Click it</label>"
+          should == "<input checked=\"checked\" id=\"foo__1\" name=\"foo[]\" type=\"radio\" value=\"1\" /><label for=\"foo__1\">Click it</label>"
+      end
+
+      it "generates labels for uppercase/weird names" do
+        render('<%= radio_button_with_label "fooáßð[]", "UA§§;", true, "Click it" %>').
+          should == "<input checked=\"checked\" id=\"foo________UA_____\" name=\"foo\303\241\303\237\303\260[]\" type=\"radio\" value=\"UA\302\247\302\247;\" /><label for=\"foo________UA_____\">Click it</label>"
       end
 
       it "generates labels for nested attribute-arrays" do
         render('<%= radio_button_with_label "foo[bar][baz][]", "1", true, "Click it" %>').
           should == "<input checked=\"checked\" id=\"foo_bar_baz__1\" name=\"foo[bar][baz][]\" type=\"radio\" value=\"1\" /><label for=\"foo_bar_baz__1\">Click it</label>"
       end
+
+      it "uses given id" do
+        render('<%= radio_button_with_label "foo", "1", true, "Click it", :id => "xxx" %>').
+          should == "<input checked=\"checked\" id=\"xxx\" name=\"foo\" type=\"radio\" value=\"1\" /><label for=\"xxx\">Click it</label>"
+      end
     end
 
     describe :params_radio_button_tag do
@@ -209,14 +234,33 @@ describe HelpfulFields do
   end
 
   describe 'FormBuilder' do
-    it "adds check_box_with_label" do
-      render('<% form_for :user, nil, :url=> "/xxx" do |f| %> <%= f.check_box_with_label :simple, "Hes so simple" %> <% end %>').
-        should == "<form action=\"/xxx\" method=\"post\"> <input name=\"user[simple]\" type=\"hidden\" value=\"0\" /><input id=\"user_simple\" name=\"user[simple]\" type=\"checkbox\" value=\"1\" /><label for=\"user_simple\">Hes so simple</label> </form>"
+    describe :check_box_with_label do
+      it "builds them" do
+        render('<% form_for :user, nil, :url=> "/xxx" do |f| %> <%= f.check_box_with_label :simple, "Hes so simple" %> <% end %>').
+          should == "<form action=\"/xxx\" method=\"post\"> <input name=\"user[simple]\" type=\"hidden\" value=\"0\" /><input id=\"user_simple\" name=\"user[simple]\" type=\"checkbox\" value=\"1\" /><label for=\"user_simple\">Hes so simple</label> </form>"
+      end
+
+      it "uses given :id" do
+        render('<% form_for :user, nil, :url=> "/xxx" do |f| %> <%= f.check_box_with_label :simple, "Hes so simple", :id => "xxx" %> <% end %>').
+          should == "<form action=\"/xxx\" method=\"post\"> <input name=\"user[simple]\" type=\"hidden\" value=\"0\" /><input id=\"xxx\" name=\"user[simple]\" type=\"checkbox\" value=\"1\" /><label for=\"xxx\">Hes so simple</label> </form>"
+      end
     end
 
-    it "adds radio_button_with_label" do
-      render('<% form_for :user, nil, :url=> "/xxx" do |f| %> <%= f.radio_button_with_label :simple, "yes", "Hes so simple" %> <% end %>').
-        should == "<form action=\"/xxx\" method=\"post\"> <input id=\"user_simple_yes\" name=\"user[simple]\" type=\"radio\" value=\"yes\" /><label for=\"user_simple_yes\">Hes so simple</label> </form>"
+    describe :radio_button_with_label do
+      it "builds them" do
+        render('<% form_for :user, nil, :url=> "/xxx" do |f| %> <%= f.radio_button_with_label :simple, "yes", "Hes so simple" %> <% end %>').
+          should == "<form action=\"/xxx\" method=\"post\"> <input id=\"user_simple_yes\" name=\"user[simple]\" type=\"radio\" value=\"yes\" /><label for=\"user_simple_yes\">Hes so simple</label> </form>"
+      end
+
+      it "builds with weird values" do
+        render('<% form_for :user, nil, :url=> "/xxx" do |f| %> <%= f.radio_button_with_label :simple, "NO.;§", "Hes so simple" %> <% end %>').
+          should == "<form action=\"/xxx\" method=\"post\"> <input id=\"user_simple_NO.___\" name=\"user[simple]\" type=\"radio\" value=\"NO.;\302\247\" /><label for=\"user_simple_NO.___\">Hes so simple</label> </form>"
+      end
+
+      it "uses given :id" do
+        render('<% form_for :user, nil, :url=> "/xxx" do |f| %> <%= f.radio_button_with_label :simple, "yes", "Hes so simple", :id => "xxx" %> <% end %>').
+          should == "<form action=\"/xxx\" method=\"post\"> <input id=\"xxx\" name=\"user[simple]\" type=\"radio\" value=\"yes\" /><label for=\"xxx\">Hes so simple</label> </form>"
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: helpful_fields
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-06 00:00:00 -07:00
+date: 2011-11-09 00:00:00 -08:00
 default_executable: 
 dependencies: []