form-bootstrap 0.0.2 → 0.0.3

data/README.md

@@ -40,7 +40,10 @@ Example Form
         <%= f.text_field :email, autofocus: :true %>
         <%= f.password_field :password, help: 'Must be at least 6 characters long' %>
         <%= f.password_field :password_confirmation, label: 'Confirm Password' %>
-        <%= f.actions 'Sign Up' %>
+
+        <%= f.actions do %>
+          <%= f.primary 'Sign Up' %>
+        <% end %>
       </fieldset>
     <% end %>
 

data/lib/form-bootstrap/builder.rb

@@ -7,26 +7,31 @@ module FormBootstrap
       @help_css = (options[:help].try(:to_sym) == :block) ? 'help-block' : 'help-inline'
     end
 
-    %w{text_field text_area password_field collection_select}.each do |method_name|
+    %w{text_field text_area password_field collection_select file_field date_select}.each do |method_name|
       define_method(method_name) do |name, *args|
-        options = args.extract_options!.stringify_keys
+        options = args.extract_options!.symbolize_keys!
         content_tag :div, class: "clearfix#{(' error' if object.errors[name].any?)}"  do
-          label(name, options['label']) +
+          label(name, options[:label]) +
           content_tag(:div, class: 'input') do
-            help = object.errors[name].any? ? object.errors[name].join(', ') : options['help']
+            help = object.errors[name].any? ? object.errors[name].join(', ') : options[:help]
             help = content_tag(:span, class: @help_css) { help } if help
-            super(name, *args, options.except('label', 'help')) + help
+            args << options.except(:label, :help)
+            super(name, *args) + help
           end
         end
       end
     end
 
-    def actions(name)
+    def actions(&block)
       content_tag :div, class: "actions" do
-        submit name, class: 'btn primary'
+        block.call
       end
     end
 
+    def primary(name)
+      submit name, class: 'btn primary'
+    end
+
     def alert_message(title, *args)
       options = args.extract_options!
       css = options[:class] || "alert-message error"

data/lib/form-bootstrap/version.rb

@@ -1,3 +1,3 @@
 module FormBootstrap
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/dummy/db/migrate/20120106063521_create_users.rb

@@ -5,6 +5,7 @@ class CreateUsers < ActiveRecord::Migration
       t.string :password
       t.text :comments
       t.string :status
+      t.string :misc
 
       t.timestamps
     end

data/test/dummy/db/schema.rb

@@ -18,6 +18,7 @@ ActiveRecord::Schema.define(:version => 20120106063521) do
     t.string   "password"
     t.text     "comments"
     t.string   "status"
+    t.string   "misc"
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/test/dummy/log/development.log

@@ -17,3 +17,22 @@ Migrating to CreateUsers (20120106063521)
    (1.4ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
    (0.1ms)  SELECT version FROM "schema_migrations"
    (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20120106063521')
+   (0.1ms)  select sqlite_version(*)
+   (1.4ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateUsers (20120106063521)
+   (0.6ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255), "password" varchar(255), "comments" text, "status" varchar(255), "misc" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20120106063521')
+   (0.3ms)  select sqlite_version(*)
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.0ms)  PRAGMA index_list("users")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (2.6ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar(255), "password" varchar(255), "comments" text, "status" varchar(255), "misc" varchar(255), "created_at" datetime, "updated_at" datetime) 
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.0ms)  PRAGMA index_list("schema_migrations")
+   (2.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20120106063521')

data/test/form-bootstrap_test.rb

@@ -45,6 +45,16 @@ class FormBootstrapTest < ActionView::TestCase
     assert_equal expected, @builder.collection_select(:status, [], :id, :name)
   end
 
+  test "file fields are wrapped correctly" do
+    expected = %{<div class="clearfix"><label for="user_misc">Misc</label><div class="input"><input id="user_misc" name="user[misc]" type="file" /></div></div>}
+    assert_equal expected, @builder.file_field(:misc)
+  end
+
+  test "date selects are wrapped correctly" do
+    expected = %{<div class="clearfix"><label for="user_misc">Misc</label><div class="input"><select id="user_misc_1i" name="user[misc(1i)]">\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n<option value="2010">2010</option>\n<option value="2011">2011</option>\n<option selected="selected" value="2012">2012</option>\n<option value="2013">2013</option>\n<option value="2014">2014</option>\n<option value="2015">2015</option>\n<option value="2016">2016</option>\n<option value="2017">2017</option>\n</select>\n<select id="user_misc_2i" name="user[misc(2i)]">\n<option selected="selected" value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n</select>\n<select id="user_misc_3i" name="user[misc(3i)]">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option selected="selected" value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n</select>\n</div></div>}
+    assert_equal expected, @builder.date_select(:misc)
+  end
+
   test "changing the label text" do
     expected = %{<div class="clearfix"><label for="user_email">Email Address</label><div class="input"><input id="user_email" name="user[email]" size="30" type="text" value="steve@example.com" /></div></div>}
     assert_equal expected, @builder.text_field(:email, label: 'Email Address')
@@ -61,8 +71,16 @@ class FormBootstrapTest < ActionView::TestCase
   end
 
   test "actions are wrapped correctly" do
-    expected = %{<div class="actions"><input class="btn primary" name="commit" type="submit" value="Submit" /></div>}
-    assert_equal expected, @builder.actions('Submit')
+    output = @builder.actions do
+      'something'
+    end
+    expected = %{<div class="actions">something</div>}
+    assert_equal expected, output
+  end
+
+  test "primary buttons the correct classes" do
+    expected = %{<input class="btn primary" name="commit" type="submit" value="Submit" />}
+    assert_equal expected, @builder.primary('Submit')
   end
 
   test "passing :help :block to the form builder" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: form-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
+date: 2012-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70259696646240 !ruby/object:Gem::Requirement
+  requirement: &70366623207280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70259696646240
+  version_requirements: *70366623207280
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70259696643700 !ruby/object:Gem::Requirement
+  requirement: &70366623206340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259696643700
+  version_requirements: *70366623206340
 description: Provides a builder that makes it super easy to take advantage of Twitter
   Bootstrap forms styles.
 email: