simple_bootstrap_form 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49612ff415db9c67ef7d7fddec5ce1628a89bd56
-  data.tar.gz: f44b2d057f9fb6c315271314a119245dab29f9d1
+  metadata.gz: 1ec18e4dcc4888081e0d602db082eedff9afced8
+  data.tar.gz: 44da0c8960e49510e754f7b4d7f955d4ad5c3070
 SHA512:
-  metadata.gz: 5d98ef3d428ad7ced926485824bc37ba490d531d2d7adbae27ea7b3b7a065566155fa1aff84a68dc366e0129e8f203a13541f97c8a74030ad26ae9f4d47bf402
-  data.tar.gz: 70730348cf4eb5997e8de562623fc2cb76e44d48de10d412cbac84e77ec06ca38e7cc86be8785fa6dfffddbee28b8cdcb477e149d486f79a86951036c2469e42
+  metadata.gz: a06e26323f3f4eb7c0e2874c804ac335454228dc209a9641b11923834ca83e7a584d2d09465cf49401253be32b0f0de993e35c49b1c819fb3bc1d065262656c3
+  data.tar.gz: 22ab8c478c9c90450ef14bc66093b55ad67ebc25fbc7d26d68fc4dc682a98ccdd4e152b09797da2acf791073b2b1fe0193e0e230a34814dbf3de59088ce32687

data/Gemfile

@@ -7,6 +7,7 @@ group :development, :test do
   # Gems required to run guard-rspec and send notifications to OS Notification
   # System
   gem 'guard-rspec', require: false
+  gem 'guard-markdown'
   gem 'terminal-notifier-guard'
 
   gem 'byebug'

data/Guardfile

@@ -7,3 +7,7 @@ guard 'rspec', all_on_start: false, all_after_pass: false , failed_mode: :keep d
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/simple_bootstrap_form_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end
+
+guard :markdown, convert_on_start: true do
+  watch(/(README)\.md/) { |match| "#{match[1]}.md|tmp/#{match[1]}.html" }
+end

data/README.md

@@ -135,6 +135,18 @@ Generates (spaces added for clarity):
 </form>
 ```
 
+### Input Options
+
+| Option         | Meaning                        | Default
+|----------------|--------------------------------|------------
+| `:as`          | Override column type. Use on of the types from the _Supported Field Types_ table below.
+| `:label`       | Set custom label. | Humanized and titlized attribute name.
+| `:placeholder` | Set custom placeholder. | Humanized and titlized attribute name.
+| `:group_class` | For ease of testing in Capybara, a class is added to each `form-group` div, constructed from the object name and attribute name, e.g. `article_title_group`.  This option allows you to override that class name, or suppress using the value `false`. | (_model_)\_(_attribute_)\_group
+| `:label_size`  | Bootstrap CSS class to use to size the label for this field.  By default this is set by the form.  This option is only needed if you need a label to be differently sized from the rest of the form's labels.
+| `:input_size`  | Bootstrap CSS class to use to size the input for this field.  By default these are set by the form.  This option is only needed if you need an input to be differently sized from the rest of the form's inputs.
+| `:required`    | Set this to `true`/`false` to override whether this field should be marked required. | If an attribute has a presence validator, it will be marked required.
+
 ## Support
 
 #### Bootstrap Support
@@ -143,11 +155,23 @@ Generates (spaces added for clarity):
 
 #### Simple Form API Support
 
-* Input types: boolean, datetime, email, password, text, textarea.  These are
-  trivial to add.  Just take a look in fields/.
 * Required fields.
 * Placeholders, automatic and custom.
 
+#### Supported Field Types
+
+* These are straighforward to add.  Just take a look in fields/.
+
+     Field Type      | Generated HTML Element                             | Database Column Type
+     --------------- |:---------------------------------------------------|:--------------------
+     `boolean`       | `input[type=checkbox]`                             | `boolean`
+     `email`         | `input[type=email]`                                | `string` with `name =~ /email/`
+     `password`      | `input[type=password]`                             | `string` with `name =~ /password/`
+     `string`        | `input[type=text]`                                 | `string`
+     `text`          | `textarea`                                         | `text`
+     `datetime`      | `input[type=text]` setup for jquery.datetimepicker | `datetime`
+     `select`        | `select`                                           | just provide a `collection:` option
+
 ## Contributing
 
 1. Fork it ( http://github.com/<my-github-username>/my_gem/fork )
@@ -155,3 +179,10 @@ Generates (spaces added for clarity):
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## TODO
+
+* Vertical Form
+* Inline Form
+* bootstrap\_fields\_for
+* Suppress placeholder

data/lib/simple_bootstrap_form/field_factory.rb

@@ -28,6 +28,8 @@ module SimpleBootstrapForm
     def field_class_type_prefix(attr, options)
       if options[:as]
         options[:as].to_s.capitalize
+      elsif options.has_key? :collection
+        'Select'
       else
         derive_field_class_prefix attr
       end

data/lib/simple_bootstrap_form/horizontal_form/fields/base_field.rb

@@ -4,7 +4,7 @@ module SimpleBootstrapForm
       class BaseField
 
         class << self
-          attr_accessor :type
+          attr_accessor :input_type
         end
 
         def initialize(form_builder, template, name, options)
@@ -30,6 +30,9 @@ module SimpleBootstrapForm
           @input_size  = @options.delete :input_size
           @label_text  = @options.delete :label
           @group_class = @options.delete :group_class
+          unless @label_size && @input_size
+            raise "label_size and input_size are required options"
+          end
         end
 
         def group_options
@@ -47,11 +50,11 @@ module SimpleBootstrapForm
         end
 
         def field_label
-          @form_builder.label @name, @label_text, label_options
+          @form_builder.label @name, label_text, label_options
         end
 
         def label_text
-          text = @options[:label] || @name.to_s.humanize.capitalize
+          text = @label_text || @name.to_s.humanize.capitalize
           required_asterisk + text
         end
 
@@ -78,7 +81,7 @@ module SimpleBootstrapForm
         def input_options
           @options.merge! class: 'form-control',
                           placeholder: placeholder,
-                          type: self.class.type
+                          type: self.class.input_type
           @options.merge! required: 'required' if required?
           @options
         end
@@ -104,6 +107,7 @@ module SimpleBootstrapForm
 
         def required?
           return false unless model
+          return @options[:required] if @options.has_key?(:required)
           model.class.validators_on(@name).any? do |validator|
             validator.kind_of? ActiveModel::Validations::PresenceValidator
           end

data/lib/simple_bootstrap_form/horizontal_form/fields/boolean_field.rb

@@ -3,7 +3,7 @@ module SimpleBootstrapForm
     module Fields
       class BooleanField < BaseField
 
-        self.type = 'checkbox'
+        self.input_type = 'checkbox'
 
         def input_tag
           @template.content_tag(:div, class: 'col-sm-6') do

data/lib/simple_bootstrap_form/horizontal_form/fields/datetime_field.rb

@@ -1,9 +1,12 @@
 module SimpleBootstrapForm
   module HorizontalForm
     module Fields
+
+      # Creates a text field that should be initialized with
+      # jquery.datetimepicker
       class DatetimeField < BaseField
 
-        self.type = 'datetime'
+        self.input_type = 'datetime'
 
         def input_tag
           @template.content_tag(:div, class: 'col-sm-6') do

data/lib/simple_bootstrap_form/horizontal_form/fields/email_field.rb

@@ -3,7 +3,7 @@ module SimpleBootstrapForm
     module Fields
       class EmailField < BaseField
 
-        self.type = 'email'
+        self.input_type = 'email'
       end
     end
   end

data/lib/simple_bootstrap_form/horizontal_form/fields/password_field.rb

@@ -3,7 +3,7 @@ module SimpleBootstrapForm
     module Fields
       class PasswordField < BaseField
 
-        self.type = 'password'
+        self.input_type = 'password'
       end
     end
   end

data/lib/simple_bootstrap_form/horizontal_form/fields/select_field.rb

@@ -0,0 +1,40 @@
+module SimpleBootstrapForm
+  module HorizontalForm
+    module Fields
+      class SelectField < BaseField
+
+        def input_tag
+          @template.content_tag(:div, class: @input_size) do
+            @form_builder.select @name, choices, options, html_options
+          end
+        end
+
+        private
+
+        def process_options(options)
+          super
+          @collection = @options.delete :collection
+          unless @collection
+            raise ":collection is a required option for select fields"
+          end
+        end
+
+        def choices
+          @template.options_for_select @collection, selected: model.send(@name)
+        end
+
+        def options
+          {}
+        end
+
+        def html_options
+          opts = {
+            class: 'form-control'
+          }
+          opts.merge! required: 'required' if required?
+          opts
+        end
+      end
+    end
+  end
+end

data/lib/simple_bootstrap_form/horizontal_form/fields/text_field.rb

@@ -3,7 +3,7 @@ module SimpleBootstrapForm
     module Fields
       class TextField < BaseField
 
-        self.type = 'text'
+        self.input_type = 'text'
       end
     end
   end

data/lib/simple_bootstrap_form/horizontal_form/form_builder.rb

@@ -2,10 +2,10 @@ module SimpleBootstrapForm
   module HorizontalForm
     class FormBuilder < ActionView::Helpers::FormBuilder
 
-      def initialize(object_name, object, template, options={}, block=nil)
+      def initialize(object_name, object, template, options={})
         @field_factory = FieldFactory.new self, template
         process_options options
-        super object_name, object, template, options_for_rails_form_builder, block
+        super object_name, object, template, options_for_rails_form_builder
       end
 
       def input(name, supplied_options = {})

data/lib/simple_bootstrap_form/version.rb

@@ -1,3 +1,3 @@
 module SimpleBootstrapForm
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/simple_bootstrap_form.rb

@@ -8,6 +8,7 @@ require 'simple_bootstrap_form/horizontal_form/fields/boolean_field'
 require 'simple_bootstrap_form/horizontal_form/fields/datetime_field'
 require 'simple_bootstrap_form/horizontal_form/fields/email_field'
 require 'simple_bootstrap_form/horizontal_form/fields/password_field'
+require 'simple_bootstrap_form/horizontal_form/fields/select_field'
 require 'simple_bootstrap_form/horizontal_form/fields/text_field'
 require 'simple_bootstrap_form/horizontal_form/fields/textarea_field'
 

data/spec/field_factory_spec.rb

@@ -7,7 +7,8 @@ describe SimpleBootstrapForm::FieldFactory do
   describe "#for_attribute" do
     let(:column) { double 'column' }
     let(:attr_name) { 'foo' }
-    let(:options) { {} }
+    let(:required_options) { { label_size: 'foo', input_size: 'bar' } }
+    let(:options) { required_options }
 
     def setup_stubs
       allow(builder).to receive(:object).and_return(model)
@@ -27,7 +28,7 @@ describe SimpleBootstrapForm::FieldFactory do
         it { expect(subject).to be_a SimpleBootstrapForm::HorizontalForm::Fields::TextField }
 
         context "when given an :as option" do
-          let(:options) { { as: :password } }
+          let(:options) { required_options.merge as: :password }
 
           it "should override the default field type with the supplied one" do
             expect(subject).to be_a SimpleBootstrapForm::HorizontalForm::Fields::PasswordField
@@ -60,6 +61,12 @@ describe SimpleBootstrapForm::FieldFactory do
 
         it { expect(subject).to be_a SimpleBootstrapForm::HorizontalForm::Fields::DatetimeField }
       end
+
+      context "when given a collection option" do
+        let(:options) { required_options.merge collection: %w[one two] }
+
+        it { expect(subject).to be_a SimpleBootstrapForm::HorizontalForm::Fields::SelectField }
+      end
     end
   end
 end

data/spec/have_element_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+describe "have_element RSpec matcher" do
+  subject { '<input id="foo" class="bar baz" name="attr1" type="text" placeholder="Attr One"/>' }
+
+  it { should     have_element("input") }
+  it { should_not have_element("label") }
+
+  it { should     have_element("input").with_id('foo') }
+  it { should_not have_element("input").with_id('bad_id') }
+
+  it { should     have_element("input").with_class('bar') }
+  it { should_not have_element("input").with_class('bad_class') }
+
+  it { should     have_element("input").with_attr_value(:name, 'attr1') }
+  it { should     have_element("input").with_attr_value('name', 'attr1') }
+  it { should_not have_element("input").with_attr_value(:name, 'bad_value') }
+  it { should_not have_element("input").with_attr_value('name', 'bad_value') }
+
+  it { should     have_element("input").with_type('text') }
+  it { should_not have_element("input").with_type('radio') }
+
+  it { should     have_element("input").with_placeholder('Attr One') }
+  it { should_not have_element("input").with_placeholder('bad placeholder') }
+
+  describe "#with_only_classes" do
+    it { should     have_element("input").with_only_classes('bar baz') }
+    it { should_not have_element("input").with_only_classes('bar') }
+
+    it "should have an appropriate error message for should" do
+      matcher = have_element("input").with_only_classes('bar')
+      expect(matcher.matches? subject).to eq false
+      expect(matcher.failure_message_for_should).to eq(
+        %Q{expected #{subject} to have classes "bar" but it has classes "bar baz"}
+      )
+    end
+
+    it "should have an appropriate error message for should not" do
+      matcher = have_element("input").with_only_classes('bar baz')
+      expect(matcher.matches? subject).to eq true
+      expect(matcher.failure_message_for_should_not).to eq(
+        %Q{expected #{subject} not to have classes "bar baz" but it has classes "bar baz"}
+      )
+    end
+  end
+
+  describe "combo" do
+    it { should     have_element("input").with_id('foo')
+                                         .with_class('bar')
+                                         .with_only_classes('bar baz')
+                                         .with_attr_value(:name, 'attr1')
+                                         .with_type('text')
+                                         .with_placeholder('Attr One')
+    }
+
+    it "should have an appropriate error message for should" do
+      matcher = have_element("input").with_id('foo')
+                                     .with_class('bar')
+                                     .with_only_classes('bad class list')
+                                     .with_attr_value(:name, 'attr1')
+                                     .with_type('text')
+                                     .with_placeholder('Attr One')
+
+      expect(matcher.matches? subject).to eq false
+      expect(matcher.failure_message_for_should).to eq(
+        %Q{expected #{subject} to have classes "bad class list" but it has classes "bar baz"}
+      )
+    end
+
+    it { should_not have_element("input").with_id('foo')
+                                         .with_class('bar')
+                                         .with_only_classes('bar baz')
+                                         .with_attr_value(:name, 'attr1')
+                                         .with_type('bad_type')
+                                         .with_placeholder('Attr One')
+    }
+  end
+
+  describe "content testing" do
+    subject { '<div id="foo" class="c1 c2">Some Content</div>' }
+    let(:inspected_subject) { '<div id="foo" class="c1 c2"/>' }
+
+    it { should     have_element('div').with_content('Some Content') }
+    it { should_not have_element('div').with_content('Some Content with extra') }
+    it { should_not have_element('div').with_content('Bad Content') }
+
+    it { should     have_element('div').with_id('foo').with_content('Some Content') }
+    it { should_not have_element('div').with_id('foo').with_content('Bad Content') }
+
+    describe "error messages" do
+      it "should have an appropriate error message for should" do
+        matcher = have_element("div").with_id('foo').with_content('Bad Content')
+        expect(matcher.matches? subject).to eq false
+        expect(matcher.failure_message_for_should).to eq(
+          %Q{expected #{inspected_subject} to } +
+          %Q{have content "Bad Content" but it has content "Some Content"}
+        )
+      end
+
+      it "should have an appropriate error message for should not" do
+        matcher = have_element("div").with_id('foo').with_content('Some Content')
+        expect(matcher.matches? subject).to eq true
+        expect(matcher.failure_message_for_should_not).to eq(
+          %Q{expected #{inspected_subject} not to } +
+          %Q{have content "Some Content" but it has content "Some Content"}
+        )
+      end
+
+      it "should generate correct combo error messages" do
+        matcher = have_element("div").with_id('foo')
+                                     .with_only_classes('bar')
+                                     .with_content('Bad Content')
+        expect(matcher.matches? subject).to eq false
+        expect(matcher.failure_message_for_should).to eq(
+          %Q{expected #{inspected_subject} to } +
+          %Q{have classes "bar" but it has classes "c1 c2"} +
+          %Q{ and have content "Bad Content" but it has content "Some Content"}
+        )
+      end
+    end
+  end
+end

data/spec/horizontal_form/fields/base_field_spec.rb

@@ -0,0 +1,191 @@
+require 'spec_helper'
+
+class MockTemplate
+  attr_accessor :output_buffer
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::FormHelper
+end
+
+class Model1
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  include ActiveModel::Naming
+  
+  attr_accessor :attr1
+end
+
+describe SimpleBootstrapForm::HorizontalForm::Fields::BaseField do
+  let(:object) { Model1.new }
+  let(:object_name) { "model1" }
+  let(:template) { MockTemplate.new }
+  let(:form_builder) { SimpleBootstrapForm::HorizontalForm::FormBuilder.new object_name, object, template }
+  let(:attr_name) { "attr1" }
+  let(:required_options) { { label_size: 'col-sm-3', input_size: "col-sm-6" } }
+  let(:options) { required_options }
+
+  subject { described_class.new(form_builder, template, attr_name, options).to_s }
+
+  context "with no options" do
+    let(:options) { {} }
+
+    it "should raise an error" do
+      expect {
+       subject
+      }.to raise_error
+    end
+  end
+
+  describe "Full example demonstrating many options" do
+    let(:options) {
+      {
+        label_size: 'col-xs-4',
+        input_size: 'col-xs-6',
+        group_class: 'custom-group-class',
+        label: 'Custom Label',
+        placeholder: 'Custom Placeholder'
+      }
+    }
+    
+    it "should generate the correct output" do
+      expect(pretty_html subject).to eq outdent <<-HTML
+        <div class="form-group custom-group-class">
+          <label class="col-xs-4 control-label" for="model1_attr1">Custom Label</label>
+          <div class="col-xs-6">
+            <input class="form-control" id="model1_attr1" name="model1[attr1]" placeholder="Custom Placeholder" type="text" />
+          </div>
+        </div>
+      HTML
+    end
+  end
+
+  describe "Group class" do
+    context "without a group class option" do
+      let(:options) { required_options.merge label: "Custom Label" }
+
+      it "should generate a group class using the object and field name" do
+        expect(subject).to have_element('div.form-group')
+                                .with_class('model1_attr1_group')
+      end
+    end
+
+    context "given option group_class: false" do
+      let(:options) { required_options.merge group_class: false }
+
+      it "should only give the group class form-group" do
+        expect(subject).to have_element('div.form-group').with_only_classes('form-group')
+      end
+    end
+
+    context "given a custom group_class" do
+      let(:options) { required_options.merge group_class: "CUSTOM_GROUP_CLASS" }
+
+      it "should incorporate the custom group" do
+        expect(subject).to have_element('div.form-group')
+                                .with_class('CUSTOM_GROUP_CLASS')
+      end
+    end
+  end
+  
+  describe "Form columns" do
+    context "with label/input sizes" do
+      let(:options) { { label_size: 'LABEL_CSS_CLASS', input_size: "INPUT_CSS_CLASS" } }
+
+      it "should generate a horizontal field, defaulting to type text" do
+        expect(subject).to have_element "label.LABEL_CSS_CLASS"
+        expect(subject).to have_element "div.INPUT_CSS_CLASS > input"
+      end
+    end
+  end
+
+  describe "Label" do
+    context "with no label option" do
+      it "should generate the label by humanizing the object name" do
+        expect(subject).to have_element('label').with_content('Attr1')
+      end
+    end
+
+    context "for a required field" do
+      before do
+        allow(Model1).to receive(:validators_on).with('attr1').and_return(
+          [ ActiveModel::Validations::PresenceValidator.new(attributes:'') ]
+        )
+      end
+
+      it "should add an asterisk" do
+        expect(subject).to have_element('label').with_content("* Attr1")
+      end
+    end
+
+    context "Given a custom label" do
+      let(:options) { required_options.merge label: "Custom Label" }
+
+      it "should use the custom label" do
+        expect(subject).to have_element('label').with_content('Custom Label')
+      end
+
+      context "for a required field" do
+        before do
+          allow(Model1).to receive(:validators_on).with('attr1').and_return(
+            [ ActiveModel::Validations::PresenceValidator.new(attributes:'') ]
+          )
+        end
+
+        it "should add an asterisk" do
+          expect(subject).to have_element('label').with_content("* Custom Label")
+        end
+      end
+    end
+  end
+
+  describe "Placeholder" do
+    context "with no placeholder option" do
+      it "should generate the placeholder by humanizing the object name" do
+        expect(subject).to have_element('input').with_placeholder('Attr1')
+      end
+    end
+
+    context "Given a placeholder option" do
+      let(:options) { required_options.merge placeholder: "Custom Placeholder" }
+
+      it "should use the custom label" do
+        expect(subject).to have_element('input').with_placeholder('Custom Placeholder')
+      end
+    end
+  end
+
+  describe "Required Fields" do
+    context "for a required field" do
+      before do
+        allow(Model1).to receive(:validators_on).with('attr1').and_return(
+          [ ActiveModel::Validations::PresenceValidator.new(attributes:'') ]
+        )
+      end
+
+      it "should add required=required to the input" do
+        expect(subject).to have_element('input').with_attr_value(:required, 'required')
+      end
+
+      context "given option :required => false" do
+        let(:options) { required_options.merge required: false }
+
+        it "should not add required=required to the input" do
+          expect(subject).not_to have_element('input').with_attr_value(:required, 'required')
+        end
+      end
+    end
+
+    context "for an optional field" do
+      it "should not add required=required to the input" do
+        expect(subject).not_to have_element('input').with_attr_value(:required, 'required')
+      end
+
+      context "given option :required => true" do
+        let(:options) { required_options.merge required: true }
+
+        it "should not add required=required to the input" do
+          expect(subject).to have_element('input').with_attr_value(:required, 'required')
+        end
+      end
+    end
+  end
+end

data/spec/horizontal_form/fields/select_field_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+class MockTemplate
+  attr_accessor :output_buffer
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::FormHelper
+  include ActionView::Helpers::FormOptionsHelper
+end
+
+class Model1
+  include ActiveModel::Validations
+  include ActiveModel::Conversion
+  include ActiveModel::Naming
+
+  attr_accessor :attr1
+end
+
+describe SimpleBootstrapForm::HorizontalForm::Fields::SelectField do
+
+  let(:object) { Model1.new }
+  let(:object_name) { "model1" }
+  let(:template) { MockTemplate.new }
+  let(:form_builder) { SimpleBootstrapForm::HorizontalForm::FormBuilder.new object_name, object, template }
+  let(:attr_name) { "attr1" }
+  let(:required_options) { { label_size: 'col-sm-3', input_size: "col-sm-6" } }
+  let(:options) { required_options }
+
+  subject { described_class.new(form_builder, template, attr_name, options).to_s }
+
+  context "without a collection: option" do
+    it { expect { subject.to_s }.to raise_error }
+  end
+
+  context "with a simple array collection" do
+    let(:options) { required_options.merge collection: [1,3,5] }
+    before { object.attr1 = 5 }
+
+    it "should generate a select tag" do
+      expect(pretty_html subject.to_s).to eq outdent <<-HTML
+        <div class="form-group model1_attr1_group">
+          <label class="col-sm-3 control-label" for="model1_attr1">Attr1</label>
+          <div class="col-sm-6">
+            <select class="form-control" id="model1_attr1" name="model1[attr1]">
+              <option value="1">1</option>
+              <option value="3">3</option>
+              <option selected="selected" value="5">5</option>
+            </select>
+          </div>
+        </div>
+      HTML
+    end
+
+    context "for a required attribute" do
+      before do
+        allow(Model1).to receive(:validators_on).with('attr1').and_return(
+          [ ActiveModel::Validations::PresenceValidator.new(attributes:'') ]
+        )
+      end
+
+      it { should have_element('select').with_attr_value(:required, 'required') }
+    end
+  end
+end

data/spec/simple_bootstrap_form_spec.rb

@@ -1,9 +1,5 @@
 require 'spec_helper'
 
-def pretty_print(html)
-  Nokogiri::XML(html, &:noblanks).to_xhtml
-end
-
 describe SimpleBootstrapForm, type: :helper do
 
   def account_form
@@ -234,6 +230,23 @@ describe SimpleBootstrapForm, type: :helper do
           end
         end
       end
+
+      describe "select" do
+        let(:field_id) { "account_email" }
+        before { model.email = "foo" }
+
+        subject {
+          helper.bootstrap_form_for model, layout: 'horizontal' do |f|
+            f.input :email, collection: %w[foo bar]
+          end
+        }
+
+        it "should generate a select tag with options" do
+          should have_element '.form-group.account_email_group > div.col-sm-6 > select#account_email'
+          should have_element('select#account_email > option[value="foo"][selected="selected"]').with_content("foo")
+          should have_element('select#account_email > option[value="bar"]').with_content("bar")
+        end
+      end
     end
   end
 
@@ -293,7 +306,7 @@ describe SimpleBootstrapForm, type: :helper do
         end
       }
 
-      it "should generate the correct output"
+      #it "should generate the correct output"
     end
 
     describe "Inline form" do
@@ -426,7 +439,7 @@ describe SimpleBootstrapForm, type: :helper do
       }
 
       it "should generate the correct output" do
-        #expect(pretty_print subject).to eq horizontal_form_output
+        #expect(pretty_html subject).to eq horizontal_form_output
       end
     end
   end

data/spec/support/have_element.rb

@@ -4,41 +4,49 @@ RSpec::Matchers.define :have_element do |selector|
   match_for_should do |markup|
     @selector = selector
     @markup = markup
-    element_is_present && classes_match
+    element_is_present && classes_match && content_matches
   end
 
-  match_for_should_not do |markup|
-    @selector = selector
-    @markup = markup
-    !element_is_present || !classes_match
-  end
+  #match_for_should_not do |markup|
+  #  @selector = selector
+  #  @markup = markup
+  #  !element_is_present || !classes_match || !content_matches
+  #end
 
   failure_message_for_should do |markup|
     if the_element.nil?
-      "expected to find an element matching #{selector} in #{markup}"
-    elsif @expected_classes
-      actual_classes = @element['class'].split(' ')
-      "expected #{inspect_the_element} to have classes \"#{@expected_classes.sort.join(' ')}\" but it has classes \"#{actual_classes.sort.join(' ')}\""
+      "expected to find an element matching #{actual_selector} in #{markup}"
     else
+      error_messages = [
+        classes_match_error_message,
+        content_matches_error_message(:should)
+      ].reject(&:blank?)
+      "expected #{inspect_the_element} to " + error_messages.join(' and ')
     end
   end
 
   failure_message_for_should_not do |markup|
-    "expected #{inspect_the_element} not to have classes \"#{@expected_classes.sort.join(' ')}\" in #{markup}"
+    if checking_classes? || checking_content?
+      if the_element.nil?
+        # If we have post tag-retrieval checks, it is an error not to find the tag
+        "expected to find an element matching #{actual_selector} in #{markup}"
+      else
+        error_messages = [
+          classes_match_error_message,
+          content_matches_error_message(:should_not)
+        ].reject(&:blank?)
+        "expected #{inspect_the_element} not to " + error_messages.join(' and ')
+      end
+    else
+      "expected not to find an element matching #{actual_selector} in #{markup}"
+    end
   end
 
   def element_is_present
     the_element.is_a? Nokogiri::XML::Element
   end
 
-  def check_element(element)
-    if @expected_classes
-    else
-      true
-    end
-  end
-
-  ########## Chain assertions that will affect the selector
+  ########## Chain assertions used to build the selector
 
   chain :with_id do |id|
     @id = id
@@ -82,15 +90,53 @@ RSpec::Matchers.define :have_element do |selector|
     @expected_classes = classes.split ' '
   end
   
+  def checking_classes?
+    !!@expected_classes
+  end
+  
   def actual_classes
-    the_element['class'].split ' '
+    @actual_classes ||= the_element['class'].split ' '
   end
   
   def classes_match
     return true unless @expected_classes
     actual_classes.sort == @expected_classes.sort
   end
+
+  def classes_match_error_message
+    return nil unless checking_classes?
+    "have classes \"%s\" but it has classes \"%s\"" % [
+      @expected_classes.sort.join(' '),
+      @actual_classes.sort.join(' ')
+    ]
+  end
+
+  chain :with_content do |content|
+    @expected_content = content
+  end
+
+  def checking_content?
+    !!@expected_content
+  end
   
+  def actual_content
+    @actual_content ||= the_element.text
+  end
+
+  def content_matches
+    return true unless @expected_content
+    actual_content == @expected_content
+  end
+
+  def content_matches_error_message(comparison=:should)
+    return nil unless checking_content?
+    return nil if comparison == :should && content_matches
+    return nil if comparison == :should_not && !content_matches
+    "have content \"%s\" but it has content \"%s\"" % [
+      @expected_content, @actual_content
+    ]
+  end
+
   ########## Utility methods
   
   def the_element

data/spec/support/pretty_html.rb

@@ -0,0 +1,19 @@
+module PrettyHtml
+
+  # Methods for matching HTML output with blocks of HTML in spec files.
+
+  def pretty_html(html)
+    Nokogiri::XML(html, &:noblanks).to_xhtml
+  end
+
+  # Outdent all lines by the amount of whitespace before the first line
+  def outdent(text)
+    lines = text.split("\n")
+    indented_with = /^ +/.match(lines.first)[0]
+    lines.map { |line| line.gsub(/^#{indented_with}/, '') }.join("\n") + "\n"
+  end
+end
+
+RSpec.configure do |config|
+  config.include PrettyHtml
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sam Pierson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,6 +121,7 @@ files:
 - lib/simple_bootstrap_form/horizontal_form/fields/datetime_field.rb
 - lib/simple_bootstrap_form/horizontal_form/fields/email_field.rb
 - lib/simple_bootstrap_form/horizontal_form/fields/password_field.rb
+- lib/simple_bootstrap_form/horizontal_form/fields/select_field.rb
 - lib/simple_bootstrap_form/horizontal_form/fields/text_field.rb
 - lib/simple_bootstrap_form/horizontal_form/fields/textarea_field.rb
 - lib/simple_bootstrap_form/horizontal_form/form_builder.rb
@@ -170,9 +171,13 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/field_factory_spec.rb
+- spec/have_element_spec.rb
+- spec/horizontal_form/fields/base_field_spec.rb
+- spec/horizontal_form/fields/select_field_spec.rb
 - spec/simple_bootstrap_form_spec.rb
 - spec/spec_helper.rb
 - spec/support/have_element.rb
+- spec/support/pretty_html.rb
 homepage: https://github.com/Piersonally/simple_bootstrap_form
 licenses:
 - MIT
@@ -242,6 +247,10 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/field_factory_spec.rb
+- spec/have_element_spec.rb
+- spec/horizontal_form/fields/base_field_spec.rb
+- spec/horizontal_form/fields/select_field_spec.rb
 - spec/simple_bootstrap_form_spec.rb
 - spec/spec_helper.rb
 - spec/support/have_element.rb
+- spec/support/pretty_html.rb