booter 0.3.1 → 1.0.0.rc1

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+script:
+  - bundle exec rake db:prepare && bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Booter (unreleased)
+
+* Full refactoring and specs coverage
+* Add modal forms support
+
 ## Booter 0.3.1 (April 5, 2012)
 
 * Custom classes for html inputs

data/README.md

@@ -4,20 +4,83 @@ One more twitter bootstrap wrapper for Rails.
 
 ## Installation
 
-Add `gem "booter"` to your Gemfile and fire `bundle install`.
+In your Gemfile, add the following dependencies:
 
-Include <tt>bootstrap.css</tt> to your <tt>application.css</tt> and optionally 
-<tt>bootstrap.js</tt> to <tt>application.js</tt>.
+``` ruby
+gem 'booter'
+```
+
+Run:
+
+```
+$ bundle install
+```
+
+Add `bootstrap` in your application.css:
+
+``` css
+/*
+ *= require bootstrap
+ * ...
+*/
+```
+
+And optionally add 'bootstrap' in your application.js:
+
+``` javascript
+//= require jquery
+//= require jquery_ujs
+//= require bootstrap
+//= ...
+```
 
 ## Usage
 
 Use <tt>nice_form_for</tt> helper method to draw nice bootstrap forms:
 
 ``` haml
-= nice_form_for @user do
+-# Simple
+= nice_form_for @user do |f|
   = f.errors_for
   = f.email_field :email
   = f.password_field :password
+  = f.submit 'Sign in'
+
+-# Complex 
+= nice_form_for @user do |f|
+  = f.errors_for
+
+  = f.email_field :email, class: 'input-medium'
+  = f.password_field :password
   = f.check_box :remember_me
-  = f.submit "Sign in"
+
+  = f.actions do
+    = f.submit 'Sign in'
+    = f.button 'Cancel'
+
+    = f.button 'Danger button', style: :danger
+    = f.submit 'Submit without the primary class', style: :none
+
+
+-# Modal
+= nice_form_for @user, modal: true, id: 'auth' do |f|
+  = f.errors_for
+  = f.email_field :email
+  = f.password_field :password
+  = f.submit 'Sign in'
+
+%p= link_to 'Open auth form', '#auth-modal', data: { toggle: 'modal' }
 ```
+
+## Demo
+
+See [live demo](http://growing-cloud-6915.heroku.com) or browse [source code](https://github.com/boshie/booter-demo)
+
+## Contributors
+
+* Alexey Vakhov - [https://github.com/avakhov](https://github.com/avakhov)
+* Alexey Yurchenko - [https://github.com/alexesDev](https://github.com/alexesDev)
+
+## Status
+
+[<img src="https://secure.travis-ci.org/boshie/booter.png"/>](http://travis-ci.org/boshie/booter)

data/Rakefile

@@ -1,2 +1,10 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+namespace :db do
+  desc "prepare db for specs"
+  task "prepare" do
+    `cd spec/dummy && bundle exec rake db:drop`
+    `cd spec/dummy && bundle exec rake db:create db:migrate db:test:prepare`
+  end
+end

data/app/assets/stylesheets/bootstrap-tweaks.css

@@ -0,0 +1 @@
+div.modal form {margin-bottom: 0}

data/app/assets/stylesheets/bootstrap.css.scss

@@ -1,3 +1,6 @@
+//= require_self
+//= require bootstrap-tweaks
+
 /*!
  * Bootstrap v2.0.2
  *

data/app/form_builders/bootstrap_form_builder.rb

@@ -1,5 +1,16 @@
 class BootstrapFormBuilder < ActionView::Helpers::FormBuilder
   delegate :content_tag, :safe_join, to: :@template
+  attr_reader :form_actions_content # only for modal forms
+
+  def modal_title
+    if @options[:modal]
+      if @options[:modal].is_a?(Hash) and @options[:modal].key?(:title)
+        @options[:modal][:title]
+      else
+        I18n.t('booter.modal.title.' + @object.class.model_name, default: @object.class.model_name.human)
+      end
+    end
+  end
 
   def errors_for
     return "" if @object.errors.empty?
@@ -21,17 +32,19 @@ class BootstrapFormBuilder < ActionView::Helpers::FormBuilder
     html.html_safe
   end
 
-  %w[email_field password_field text_field text_area].each do |method_name|
+  %w[email_field file_field password_field text_field text_area].each do |method_name|
     define_method method_name do |*args|
       options = args.extract_options!
       name = args.first
 
       wrapper name, options.slice(:hint) do
         options = options.except(:hint)
-        options[:class] = [options[:class], 'input-xxlarge'].compact
 
         if method_name == 'text_area'
-          super(name, options.merge(rows: 7))
+          options[:rows] ||= 7
+          options[:cols] ||= 40
+
+          super(name, options)
         else
           super(name, options)
         end
@@ -39,6 +52,16 @@ class BootstrapFormBuilder < ActionView::Helpers::FormBuilder
     end
   end
 
+  def actions &block
+    begin
+      @actions_scope = true
+      content = @template.capture(&block)
+    ensure
+      @actions_scope = false
+    end
+    form_actions_wrapper content
+  end
+
   def select(name, choices, options = {})
     wrapper name do
       super
@@ -53,10 +76,12 @@ class BootstrapFormBuilder < ActionView::Helpers::FormBuilder
     end
   end
 
-  def submit(value=nil)
-    content_tag :div, class: 'form-actions' do
-      super value, class: 'btn btn-primary'
-    end
+  def submit value = nil, *args
+    form_actions_wrapper super(value, make_button_options(args, style: :primary))
+  end
+
+  def button value = nil, *args
+    form_actions_wrapper super(value, make_button_options(args))
   end
 
   def wrapper(name, options = {}, &block)
@@ -72,4 +97,31 @@ class BootstrapFormBuilder < ActionView::Helpers::FormBuilder
       ]
     end
   end
+
+  private
+
+  def form_actions_wrapper(content)
+    if @actions_scope
+      content
+    else
+      if @options[:modal]
+        @form_actions_content = content
+        ''
+      else
+        content_tag :div, content, class: 'form-actions'
+      end
+    end
+  end
+
+  def make_button_options args, *default_args
+    options = default_args.extract_options!
+    options.merge! args.extract_options!
+    options[:class] ||= 'btn'
+
+    if options[:style] && options[:style].to_sym != :none
+      options[:class] += " btn-#{options[:style]}"
+    end
+
+    options.except(:style)
+  end
 end

data/app/helpers/booter_helper.rb

@@ -3,6 +3,11 @@ module BooterHelper
     options[:builder] = BootstrapFormBuilder
     options[:html] ||= {}
     options[:html][:class] = 'form-horizontal'
-    form_for(object, options, &block)
+
+    if options[:modal]
+      render 'booter/modal_form', object: object, options: options, block: block
+    else
+      form_for(object, options, &block)
+    end
   end
 end

data/app/views/booter/_modal_form.html.erb

@@ -0,0 +1,19 @@
+<div class="modal hide fade" id="<%= options[:id] || object.class.name.gsub('::', '').underscore %>-modal">
+  <%= form_for object, options do |f| %>
+    <div class="modal-header">
+      <a class="close" data-dismiss="modal">×</a>
+      <h3><%= f.modal_title %></h3>
+    </div>
+    <div class="modal-body">
+      <%= capture f, &block %>
+    </div>
+    <div class="modal-footer">
+      <div class="pull-left">
+        <a href="#" data-dismiss="modal" class="btn"><%= t('booter.modal.close') %></a>
+      </div>
+      <div class="pull-right">
+        <%= f.form_actions_content %>
+      </div>
+    </div>
+  <% end %>
+</div>

data/booter.gemspec

@@ -16,4 +16,10 @@ Gem::Specification.new do |gem|
   gem.version       = Booter::VERSION
 
   gem.add_dependency 'rails', '~> 3.2'
+
+  gem.add_development_dependency 'haml'
+  gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'rspec-rails'
+  gem.add_development_dependency 'factory_girl_rails'
+  gem.add_development_dependency 'database_cleaner'
 end

data/config/locales/booter.en.yml

@@ -1,4 +1,7 @@
 en:
+  booter:
+    modal:
+      close: Close
   errors:
     template:
       header:

data/config/locales/booter.ru.yml

@@ -0,0 +1,4 @@
+ru:
+  booter:
+    modal:
+      close: Закрыть

data/lib/booter/version.rb

@@ -1,3 +1,3 @@
 module Booter
-  VERSION = "0.3.1"
+  VERSION = "1.0.0.rc1"
 end

data/spec/controllers/home_controller_spec.rb

@@ -0,0 +1,127 @@
+require 'spec_helper'
+
+describe HomeController do
+  render_views
+
+  it 'renders default field' do
+    get :default_fields
+    response.should be_success
+
+    assert_select "form[class=?]", /form-horizontal/ do
+      assert_select "div.control-group" do
+        assert_select 'label.control-label', 'Email'
+        assert_select 'div.controls' do
+          assert_select 'input[type=email]'
+        end
+      end
+
+      assert_select "div.control-group" do
+        assert_select 'label.control-label', 'Avatar'
+        assert_select 'div.controls' do
+          assert_select 'input[type=file]'
+        end
+      end
+
+      assert_select "div.control-group" do
+        assert_select 'label.control-label', 'Password'
+        assert_select 'div.controls' do
+          assert_select 'input[type=password]'
+        end
+      end
+
+      assert_select "div.control-group" do
+        assert_select 'label.control-label', 'Motto'
+        assert_select 'div.controls' do
+          assert_select 'input[type=text]'
+        end
+      end
+
+      assert_select "div.control-group" do
+        assert_select 'label.control-label', 'About'
+        assert_select 'div.controls' do
+          assert_select 'textarea[rows=?][cols=?]', 7, 40
+        end
+      end
+
+      assert_select "div.control-group" do
+        assert_select 'label.control-label', 'Role'
+        assert_select 'div.controls' do
+          assert_select 'select'
+        end
+      end
+
+      assert_select "div.control-group" do
+        assert_select 'label.control-label', 'Remember me'
+        assert_select 'div.controls' do
+          assert_select 'label.checkbox' do
+            assert_select 'input[type=hidden][value=?]', 0
+            assert_select 'input[type=checkbox][value=?]', 1
+          end
+        end
+      end
+    end
+  end
+
+  it 'renders error message' do
+    get :errors_for
+    response.should be_success
+
+    assert_select "form[class=?]", /form-horizontal/ do
+      assert_select 'div.alert.alert-error' do
+        assert_select 'p' do
+          assert_select 'b', 'User: not saved because of 1 error'
+        end
+        assert_select 'ul' do
+          assert_select 'li', 'Email should be email'
+        end
+      end
+    end
+  end
+
+  it 'renders field with hint' do
+    get :field_with_hint
+    response.should be_success
+
+    assert_select "form" do
+      assert_select 'div.control-group' do
+        assert_select 'label.control-label', 'Email'
+        assert_select 'div.controls' do
+          assert_select 'input[type=email]'
+          assert_select 'p.help-block', 'Enter proper email address'
+        end
+      end
+    end
+  end
+
+  it 'renders different buttons' do
+    get :buttons
+    response.should be_success
+
+    assert_select "form" do
+      assert_select 'div.form-actions' do
+        assert_select 'input.btn.btn-primary[type=?][value=?]', 'submit', 'Sign in'
+        assert_select 'button.btn[type=?]', 'submit', 'Cancel'
+        assert_select 'button.btn.btn-danger[type=?]', 'submit', 'Danger button'
+        assert_select 'input.btn[type=?][value=?]', 'submit', 'Submit without the primary class'
+      end
+    end
+  end
+
+  it 'renders submit buttons wrapped in div.form-actions' do
+    get :submit_button
+    response.should be_success
+
+    assert_select "form" do
+      assert_select "div.control-group" do
+        assert_select 'label.control-label', 'Email'
+        assert_select 'div.controls' do
+          assert_select 'input[type=email]'
+        end
+      end
+
+      assert_select 'div.form-actions' do
+        assert_select 'input.btn.btn-primary[type=?][value=?]', 'submit', 'Create User'
+      end
+    end
+  end
+end

data/spec/controllers/modal_controller_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ModalController do
+  render_views
+
+  it 'renders' do
+    get :simple
+    response.should be_success
+
+    assert_select 'div.modal.hide.fade#auth-modal' do
+      assert_select 'form[class=?]', 'form-horizontal' do
+        assert_select '.modal-header' do
+          assert 'a.close[data-dismiss=?]', 'modal'
+          assert_select 'h3', 'User'
+        end
+
+        assert_select '.modal-body' do
+          assert_select 'input[type=email]'
+          assert_select 'input[type=password]'
+        end
+
+        assert_select '.modal-footer' do
+          assert_select '.pull-left' do
+            assert_select 'a[href=#][data-dismiss=?][class=?]', 'modal', 'btn'
+          end
+          assert_select '.pull-right' do
+            assert_select 'input[type=submit][class=?][value=?]', 'btn btn-primary', 'Sign in'
+          end
+        end
+      end
+    end
+  end
+end