foundation_rails_helper 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8778cbf569b219f1dc900b76ccc9dbce91f14352
-  data.tar.gz: 2f04eeda4780f7ea097fc6489b522089c3828799
+  metadata.gz: dbac7ada4277e720024750bf07c703d5d1404dbb
+  data.tar.gz: 040f0a887dbd697f63400aa20584eac8f16c67c9
 SHA512:
-  metadata.gz: 95f6960132fbfc01eba7fc1490897c3d67bbf9ea6fb678ef8ac478bc9a75421be821bb98d1f4e224ac5d3ec8bda5ae912d7bc596033c23b67126d37f7279d150
-  data.tar.gz: 44739788edf92dd99efdf494081aee4a5930d367e79750a987d9d336b8552351de84d464ea11470eb9fb1a620d0d95f7b65c7f0b2a74ed2cc78c0258403100c8
+  metadata.gz: eddef716126110058f5164799bcb4c3e8e3bc1818b08f02f17d5922fbd4ed4083361aa2d1b2659d675031cd817d28dea47ffff768ba5d208510c693c1053e073
+  data.tar.gz: 0e189759a3e85f514d065b2c05655198b34e45d6e42f8e416bead9fb010e4d21d4880025cc15b220c0a92f71dcc0d42ae5366a6228f61ed04410d0d1dbb2e906

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 .rbenv-gemsets
 vendor/bundle/*
+.ruby-version

data/.travis.yml

@@ -2,3 +2,4 @@ rvm:
   - 1.9.3
   - 2.1.0
   - 2.2.0
+sudo: false

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Version 1.1.0
+* Form Helper: [Prefix and
+  Postfix](http://foundation.zurb.com/sites/docs/v/5.5.3/components/forms.html#pre-postfix-labels-amp-actions) are now supported  (PR #104 thanks djkz)
+* Flash Helper: a list of keys to be ignored can be specified - e.g. keys which are only used internally to pass data, not user-viewable messages(fix for #98)
+* FIX: Hints are added as span elements (PR #96 thanks collimarco)
+* FIX: Labels and fields don't have empty class attributes or repeated error classes
+  (thanks collimarco)
+* FIX: Radio buttons don't have the `label="false"` on them when `label:
+  false` is set (PR #107 thanks frenkel)
+
 ## Version 1.0.0
 
 * Released Feb 03rd 2015

data/README.md

@@ -110,11 +110,11 @@ generates:
 <input id="user_name" name="user[name]" type="text">
 ```
 
-Prevent the generation of a label:
-
+Preventing the generation of labels can be accomplished two ways. To disable on a form element:
 ```ruby
 f.text_field :name, label: false
 ```
+For all form elements, add the option: `auto_labels: false` to the form helper.
 
 Change the label text and add a class on the label:
 
@@ -170,18 +170,55 @@ The class attribute of the 'small' element will mirror the class attribute of th
 
 If the `html_safe_errors: true` option is specified on a field, then any HTML you may have embedded in a custom error string will be displayed with the html_safe option.
 
+### Prefix and Postfix
+Simple prefix and postfix span elements can be added beside inputs.
+```ruby
+f.text_field :name, prefix { value: 'foo' small: 2, large: 3 }
+```
+generates
+```html
+<div class="row collapse">
+  <div class="small-2 large-3 columns">
+    <span class="prefix">foo</span>
+  </div>
+  <div class="small-10 large-9 columns">
+    <input type="text" name="user[name]" id="user_name">
+  </div>
+</div>
+```
+
+
 ## Configuration
-Add an initializer file to your Rails app: *config/initializers/foundation_rails_helper.rb*.  See below for current options.
+Add an initializer file to your Rails app: *config/initializers/foundation_rails_helper.rb*
+containing the following block:
 
-### Submit Button Class
-To use a different class for the [submit button](https://github.com/sgruhier/foundation_rails_helper#submit-button) used in `form_for`, add a config named **button_class**.  Please note, the button class can still be overridden by an options hash.
 ```ruby
 FoundationRailsHelper.configure do |config|
-  # Default: 'small radius success button'
-  config.button_class = 'large secondary button'
+  # your options here
 end
 ```
 
+Currently supported options:
+
+### Submit Button Class
+To use a different class for the [submit button](https://github.com/sgruhier/foundation_rails_helper#submit-button) used in `form_for`, add a config named **button_class**:
+```ruby
+# Default: 'small radius success button'
+config.button_class = 'large secondary button'
+```
+
+Please note, the button class can still be overridden by an options hash.
+
+### Ignored Flash Keys
+The flash helper assumes all flash entries are user-viewable messages.
+To exclude flash entries which are used for storing state
+(e.g. [Devise's `:timedout` flash](https://github.com/plataformatec/devise/issues/1777))
+you can specify a blacklist of keys to ignore with the **ignored_flash_keys** config option:
+```ruby
+# Default: []
+config.ignored_flash_keys = [:timedout]
+```
+
 ## Contributing
 
 See the [CONTRIBUTING](CONTRIBUTING.md) file.

data/foundation_rails_helper.gemspec

@@ -16,12 +16,13 @@ Gem::Specification.new do |gem|
   gem.version       = FoundationRailsHelper::VERSION
   gem.license       = 'MIT'
 
-  gem.add_dependency 'railties',      '~> 4.1', '>= 4.1.1'
-  gem.add_dependency 'actionpack',    '~> 4.1', '>= 4.1.1'
-  gem.add_dependency 'activemodel',   '~> 4.1', '>= 4.1.1'
-  gem.add_dependency 'activesupport', '~> 4.1', '>= 4.1.1'
+  gem.add_dependency 'railties',      '~> 4.1'
+  gem.add_dependency 'actionpack',    '~> 4.1'
+  gem.add_dependency 'activemodel',   '~> 4.1'
+  gem.add_dependency 'activesupport', '~> 4.1'
   gem.add_dependency 'tzinfo',        '~> 1.2', '>= 1.2.2'
 
   gem.add_development_dependency 'rspec-rails', '~> 3.1', '>= 3.1.0'
+  gem.add_development_dependency 'mime-types',  '~> 2'
   gem.add_development_dependency 'capybara',    '~> 2.4', '>= 2.4.3'
 end

data/lib/foundation_rails_helper/configuration.rb

@@ -17,9 +17,11 @@ module FoundationRailsHelper
 
   class Configuration
     attr_accessor :button_class
+    attr_accessor :ignored_flash_keys
 
     def initialize
       @button_class = 'small radius success button'
+      @ignored_flash_keys = []
     end
   end
 end

data/lib/foundation_rails_helper/flash_helper.rb

@@ -17,12 +17,29 @@ module FoundationRailsHelper
     }
     def display_flash_messages(key_matching = {})
       key_matching = DEFAULT_KEY_MATCHING.merge(key_matching)
+      key_matching.default = :standard
 
-      flash.inject "" do |message, (key, value)|
-        message += content_tag :div, :data => { :alert => "" }, :class => "alert-box #{key_matching[key.to_sym] || :standard}" do
-          (value + link_to("×".html_safe, "#", :class => :close)).html_safe
+      capture do
+        flash.each do |key, value|
+          next if FoundationRailsHelper.configuration.ignored_flash_keys.include? key.to_sym
+          alert_class = key_matching[key.to_sym]
+          concat alert_box(value, alert_class)
         end
-      end.html_safe
+      end
     end
+
+  private
+
+    def alert_box(value, alert_class)
+      content_tag :div, :data => { :alert => "" }, :class => "alert-box #{alert_class}" do
+        concat value
+        concat close_link
+      end
+    end
+
+    def close_link
+      link_to("×".html_safe, "#", :class => :close)
+    end
+
   end
 end

data/lib/foundation_rails_helper/form_builder.rb

@@ -5,23 +5,27 @@ module FoundationRailsHelper
     include ActionView::Helpers::TagHelper
     %w(file_field email_field text_field text_area telephone_field phone_field
        url_field number_field date_field datetime_field datetime_local_field
-       month_field week_field time_field range_field search_field color_field ).each do |method_name|
+       month_field week_field time_field range_field search_field color_field)
+      .each do |method_name|
       define_method(method_name) do |*args|
         attribute = args[0]
         options   = args[1] || {}
-        field(attribute, options) do |options|
-          super(attribute, options)
+        field(attribute, options) do |opts|
+          super(attribute, opts)
         end
       end
     end
 
     def label(attribute, text = nil, options = {})
-      options[:class] ||= ""
-      options[:class] += " error" if has_error?(attribute)
-      super(attribute, (text || "").html_safe, options)
+      if has_error?(attribute)
+        options[:class] ||= ''
+        options[:class] += ' error'
+      end
+
+      super(attribute, (text || '').html_safe, options)
     end
 
-    def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0")
+    def check_box(attribute, options = {}, checked_value = '1', unchecked_value = '0')
       custom_label(attribute, options[:label], options[:label_options]) do
         options.delete(:label)
         options.delete(:label_options)
@@ -32,120 +36,204 @@ module FoundationRailsHelper
     def radio_button(attribute, tag_value, options = {})
       options[:label_options] ||= {}
       label_options = options.delete(:label_options).merge!(value: tag_value)
-      unless options[:label] == false
-        l = label(attribute, options.delete(:label), label_options)
+      label_text = options.delete(:label)
+      unless label_text == false
+        l = label(attribute, label_text, label_options)
       end
-      r = @template.radio_button(@object_name, attribute, tag_value, objectify_options(options))
+      r = @template.radio_button(@object_name, attribute, tag_value,
+                                 objectify_options(options))
 
       "#{r}#{l}".html_safe
     end
 
     def password_field(attribute, options = {})
-      field attribute, options do |options|
-        super(attribute, options.merge(:autocomplete => :off))
+      field attribute, options do |opts|
+        super(attribute, opts.merge(:autocomplete => :off))
       end
     end
 
     def datetime_select(attribute, options = {}, html_options = {})
-      field attribute, options, html_options do |html_options|
-        super(attribute, options, html_options.merge(:autocomplete => :off))
+      field attribute, options, html_options do |html_opts|
+        super(attribute, options, html_opts.merge(:autocomplete => :off))
       end
     end
 
     def date_select(attribute, options = {}, html_options = {})
-      field attribute, options, html_options do |html_options|
-        super(attribute, options, html_options.merge(:autocomplete => :off))
+      field attribute, options, html_options do |html_opts|
+        super(attribute, options, html_opts.merge(:autocomplete => :off))
       end
     end
 
     def time_zone_select(attribute, priorities = nil, options = {}, html_options = {})
-      field attribute, options, html_options do |html_options|
-        super(attribute, priorities, options, html_options.merge(:autocomplete => :off))
+      field attribute, options, html_options do |html_opts|
+        super(attribute, priorities, options,
+              html_opts.merge(:autocomplete => :off))
       end
     end
 
     def select(attribute, choices, options = {}, html_options = {})
-      field attribute, options, html_options do |html_options|
+      field attribute, options, html_options do |html_opts|
         html_options[:autocomplete] ||= :off
-        super(attribute, choices, options, html_options)
+        super(attribute, choices, options, html_opts)
       end
     end
 
     def collection_select(attribute, collection, value_method, text_method, options = {}, html_options = {})
-      field attribute, options, html_options do |html_options|
+      field attribute, options, html_options do |html_opts|
         html_options[:autocomplete] ||= :off
-        super(attribute, collection, value_method, text_method, options, html_options)
+        super(attribute, collection, value_method, text_method, options,
+              html_opts)
       end
     end
 
     def grouped_collection_select(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
-      field attribute, options, html_options do |html_options|
+      field attribute, options, html_options do |html_opts|
         html_options[:autocomplete] ||= :off
-        super(attribute, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
+        super(attribute, collection, group_method, group_label_method,
+              option_key_method, option_value_method, options, html_opts)
       end
     end
 
     def autocomplete(attribute, url, options = {})
-      field attribute, options do |options|
-        autocomplete_field(attribute, url, options.merge(:update_elements => options[:update_elements],
-                                                         :min_length => 0,
-                                                         :value => object.send(attribute)))
+      field attribute, options do |opts|
+        opts.merge!(:update_elements => opts[:update_elements],
+                    :min_length => 0, :value => object.send(attribute))
+        autocomplete_field(attribute, url, opts)
       end
     end
 
-    def submit(value=nil, options={})
+    def submit(value = nil, options = {})
       options[:class] ||= FoundationRailsHelper.configuration.button_class
       super(value, options)
     end
 
   private
+
     def has_error?(attribute)
       object.respond_to?(:errors) && !object.errors[attribute].blank?
     end
 
     def error_for(attribute, options = {})
-      class_name = "error"
+      class_name = 'error'
       class_name += " #{options[:class]}" if options[:class]
-      if has_error?(attribute)
-        error_messages = object.errors[attribute].join(', ')
-        error_messages = error_messages.html_safe if options[:html_safe_errors]
-        content_tag(:small, error_messages, :class => class_name)
-      end
+
+      return unless has_error?(attribute)
+
+      error_messages = object.errors[attribute].join(', ')
+      error_messages = error_messages.html_safe if options[:html_safe_errors]
+      content_tag(:small, error_messages, :class => class_name)
     end
 
     def custom_label(attribute, text, options, &block)
-      return block_given? ? block.call.html_safe : "".html_safe if text == false
+      return block_given? ? block.call.html_safe : ''.html_safe if text == false
       if text.nil? || text == true
-        text = if object.class.respond_to?(:human_attribute_name)
-          object.class.human_attribute_name(attribute)
-        else
-          attribute.to_s.humanize
-        end
+        text =
+          if object.class.respond_to?(:human_attribute_name)
+            object.class.human_attribute_name(attribute)
+          else
+            attribute.to_s.humanize
+          end
       end
       text = block.call.html_safe + " #{text}" if block_given?
       options ||= {}
-      options[:class] ||= ""
-      options[:class] += " error" if has_error?(attribute)
       label(attribute, text, options)
     end
 
+    def column_classes(options)
+      classes = ''
+      if options[:small].present? && options[:small].to_i < 12
+        classes += "small-#{options[:small]} "
+      end
+      if options[:medium].present? && options[:medium].to_i < 12
+        classes += "medium-#{options[:medium]} "
+      end
+      if options[:large].present? && options[:large].to_i < 12
+        classes += "large-#{options[:large]} "
+      end
+      classes + 'columns'
+    end
+
+    def tag_from_options(name, options)
+      return ''.html_safe unless options && options[:value].present?
+
+      content_tag(:div,
+                  content_tag(:span, options[:value], :class => name),
+                  :class => "#{ column_classes( options ) }")
+    end
+
+    def decrement_input_size(input, column, options)
+      return unless options.key?(column)
+
+      input.send("#{column}=",
+                 (input.send(column) - options.fetch(column).to_i))
+      input.send('changed?=', true)
+    end
+
+    def calculate_input_size(prefix_options, postfix_options)
+      input_size =
+        OpenStruct.new(changed?: false, small: 12, medium: 12, large: 12)
+      if prefix_options.present?
+        %w(small medium large).each do |size|
+          decrement_input_size(input_size, size.to_sym, prefix_options)
+        end
+      end
+      if postfix_options.present?
+        %w(small medium large).each do |size|
+          decrement_input_size(input_size, size.to_sym, postfix_options)
+        end
+      end
+
+      input_size
+    end
+
+    def wrap_prefix_and_postfix(block, prefix_options, postfix_options)
+      prefix = tag_from_options('prefix', prefix_options)
+      postfix = tag_from_options('postfix', postfix_options)
+
+      input_size = calculate_input_size(prefix_options, postfix_options)
+      klass = "#{column_classes(input_size.marshal_dump)}"
+      input = content_tag(:div, block, :class => klass)
+
+      html =
+        if input_size.changed?
+          content_tag(:div, prefix + input + postfix, :class => "row collapse")
+        else
+          block
+        end
+
+      html.html_safe
+    end
+
     def error_and_hint(attribute, options = {})
-      html = ""
-      html += content_tag(:span, options[:hint], :class => :hint) if options[:hint]
-      html += error_for(attribute, options) || ""
+      html = ''
+      if options[:hint]
+        html += content_tag(:span, options[:hint], :class => :hint)
+      end
+      html += error_for(attribute, options) || ''
       html.html_safe
     end
 
-    def field(attribute, options, html_options=nil, &block)
-      html = ''.html_safe
-      html = custom_label(attribute, options[:label], options[:label_options]) if @options[:auto_labels] || options[:label]
+    def field(attribute, options, html_options = nil, &block)
+      if @options[:auto_labels] || options[:label]
+        html = custom_label(attribute, options[:label], options[:label_options])
+      else
+        html = ''.html_safe
+      end
       class_options = html_options || options
-      class_options[:class] = class_options[:class].to_s
-      class_options[:class] += " error" if has_error?(attribute)
+
+      if has_error?(attribute)
+        class_options[:class] = class_options[:class].to_s
+        class_options[:class] += ' error'
+      end
+
       options.delete(:label)
       options.delete(:label_options)
-      html += yield(class_options)
-      html += error_and_hint(attribute, options)
+      hint = options.delete(:hint)
+      prefix = options.delete(:prefix)
+      postfix = options.delete(:postfix)
+
+      html += wrap_prefix_and_postfix(yield(class_options), prefix, postfix)
+      html + error_and_hint(attribute, options.merge(hint: hint))
     end
   end
 end

data/lib/foundation_rails_helper/version.rb

@@ -1,3 +1,3 @@
 module FoundationRailsHelper
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/foundation_rails_helper/configuration_spec.rb

@@ -18,19 +18,43 @@ describe FoundationRailsHelper do
       end
     end
 
+    describe "#ignored_flash_keys" do
+      it "defaults to empty" do
+        config = FoundationRailsHelper::Configuration.new
+        expect(config.ignored_flash_keys).to eq([])
+      end
+    end
+
+    describe "#ignored_flash_keys=" do
+      it "can set the value" do
+        config = FoundationRailsHelper::Configuration.new
+        config.ignored_flash_keys = [:foo]
+        expect(config.ignored_flash_keys).to eq([:foo])
+      end
+    end
+
     describe ".reset" do
-      before :each do
+      it "resets the configured button class" do
         FoundationRailsHelper.configure do |config|
           config.button_class = 'new-class'
         end
-      end
 
-      it "resets the configuration" do
         FoundationRailsHelper.reset
 
         config = FoundationRailsHelper.configuration
         expect(config.button_class).to eq('small radius success button')
       end
+
+      it "resets the configured ignored flash keys" do
+        FoundationRailsHelper.configure do |config|
+          config.ignored_flash_keys = [:new_key]
+        end
+
+        FoundationRailsHelper.reset
+
+        config = FoundationRailsHelper.configuration
+        expect(config.ignored_flash_keys).to eq([])
+      end
     end
   end
 

data/spec/foundation_rails_helper/flash_helper_spec.rb

@@ -6,32 +6,80 @@ describe FoundationRailsHelper::FlashHelper do
   include ActionView::Context if defined?(ActionView::Context)
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::TextHelper
   include FoundationRailsHelper::FlashHelper
 
   FoundationRailsHelper::FlashHelper::DEFAULT_KEY_MATCHING.each do |message_type, foundation_type|
     it "displays flash message with #{foundation_type} class for #{message_type} message" do
-      allow(self).to receive(:flash).and_return({message_type => "Flash message"})
+      allow(self).to receive(:flash).and_return({message_type.to_s => "Flash message"})
       node = Capybara.string display_flash_messages
-      expect(node).to have_css("div.alert-box.#{foundation_type}", :text => "Flash message")
-      expect(node).to have_css("div.alert-box a.close", :text => "×")
+      expect(node).
+        to  have_css("div.alert-box.#{foundation_type}", :text => "Flash message").
+        and have_css("div.alert-box a.close", :text => "×")
     end
   end
 
+  it "handles symbol keys" do
+    allow(self).to receive(:flash).and_return({ :success => "Flash message" })
+    node = Capybara.string display_flash_messages
+    expect(node).to have_css("div.alert-box.success", :text => "Flash message")
+  end
+
+  it "handles string keys" do
+    allow(self).to receive(:flash).and_return({ "success" => "Flash message" })
+    node = Capybara.string display_flash_messages
+    expect(node).to have_css("div.alert-box.success", :text => "Flash message")
+  end
+
+  it "displays multiple flash messages" do
+    allow(self).to receive(:flash).and_return({ "success" => "Yay it worked", "error" => "But this other thing failed" })
+    node = Capybara.string display_flash_messages
+    expect(node).
+      to  have_css("div.alert-box.success", :text => "Yay it worked").
+      and have_css("div.alert-box.alert",   :text => "But this other thing failed")
+  end
+
   it "displays flash message with overridden key matching" do
-    allow(self).to receive(:flash).and_return({:notice => "Flash message"})
+    allow(self).to receive(:flash).and_return({ "notice" => "Flash message" })
     node = Capybara.string display_flash_messages({:notice => :alert})
-    expect(node).to have_css("div.alert-box.alert")
+    expect(node).to have_css("div.alert-box.alert", :text => "Flash message")
   end
 
   it "displays flash message with custom key matching" do
-    allow(self).to receive(:flash).and_return({:custom_type => "Flash message"})
+    allow(self).to receive(:flash).and_return({ "custom_type" => "Flash message" })
     node = Capybara.string display_flash_messages({:custom_type => :custom_class})
-    expect(node).to have_css("div.alert-box.custom_class")
+    expect(node).to have_css("div.alert-box.custom_class", :text => "Flash message")
   end
 
   it "displays flash message with standard class if key doesn't match" do
-    allow(self).to receive(:flash).and_return({:custom_type => "Flash message"})
+    allow(self).to receive(:flash).and_return({ "custom_type" => "Flash message" })
     node = Capybara.string display_flash_messages
-    expect(node).to have_css("div.alert-box.standard")
+    expect(node).to have_css("div.alert-box.standard", :text => "Flash message")
+  end
+
+  context "when the flash hash contains devise internal data" do
+    before do
+      FoundationRailsHelper.configure do |config|
+        config.ignored_flash_keys += [:timedout]
+      end
+    end
+
+    it "doesn't raise an error (e.g. NoMethodError)" do
+      allow(self).to receive(:flash).and_return({ "timedout" => true })
+      expect{ Capybara.string display_flash_messages }.not_to raise_error
+    end
+
+    it "doesn't display an alert for that data" do
+      allow(self).to receive(:flash).and_return({ "timedout" => true })
+      expect(display_flash_messages).to be_nil
+
+      # Ideally we'd create a node using Capybara.string, as in the other examples
+      # and set the following expectation:
+      #   expect(node).to_not have_css("div.alert-box")
+      # but Capybara.string doesn't behave nicely with nil input:
+      # the input gets assigned to the @native instance variable,
+      # which is used by the css matcher, so we get the following error:
+      #   undefined method `css' for nil:NilClass
+    end
   end
 end

data/spec/foundation_rails_helper/form_builder_spec.rb

@@ -34,6 +34,153 @@ describe "FoundationRailsHelper::FormHelper" do
     end
   end
 
+  describe "label" do
+    context "when there aren't any errors and no class option is passed" do
+      it "should not have a class attribute" do
+        form_for(@author) do |builder|
+          node = Capybara.string builder.text_field(:login)
+          expect(node).to have_css('label:not([class=""])')
+        end
+      end
+    end
+
+    it "should not have error class multiple times" do
+      form_for(@author) do |builder|
+        allow(@author).to receive(:errors).and_return({:login => ['required']})
+        node = Capybara.string builder.text_field(:login)
+        error_class = node.find('label')['class'].split(/\s+/).keep_if { |v| v == 'error' }
+        expect(error_class.size).to eq 1
+      end
+    end
+  end
+
+  describe "prefix" do
+    context "when input field has a prefix" do
+      before do
+        form_for(@author) do |builder|
+          @node = Capybara.string builder.text_field(:login, :prefix => {small: 2, medium:4, large: 6, value: "Prefix"})
+        end
+      end
+
+      it "wraps input in the div with class 'row collapse'" do
+          expect(@node.find('.row.collapse')).to_not be nil
+      end
+
+      it "wraps prefix in the div with the right column size" do
+        expect(@node.find('.row.collapse')).to have_css('div.small-2.medium-4.large-6.columns')
+      end
+
+      it "creates prefix span with right value" do
+        expect(@node.find('.row.collapse').find('div.small-2.medium-4.large-6.columns').find('span').text).to eq "Prefix"
+      end
+
+      it "creates prefix span with right class" do
+        expect(@node.find('.row.collapse')).to have_css('span.prefix')
+      end
+
+      it "wraps input in the div with the right column size" do
+        expect(@node.find('.row.collapse')).to have_css('div.small-10.medium-8.large-6.columns')
+      end
+
+      it "has right value for the input" do
+        expect(@node.find('.row.collapse').find('div.small-10.medium-8.large-6.columns')).to have_css('input[type="text"][name="author[login]"]')
+      end
+    end
+
+    context "without prefix" do
+      it "will not wrap input into a div" do
+        form_for(@author) do |builder|
+          node = Capybara.string builder.text_field(:login)
+          expect(node).to_not have_css('div.row.collapse')
+        end
+      end
+    end
+  end
+
+  describe "postfix" do
+    context "when input field has a postfix" do
+      before do
+        form_for(@author) do |builder|
+          @node = Capybara.string builder.text_field(:login, :postfix => {small: 2, medium: 4, large: 6, value: "Postfix"})
+        end
+      end
+
+      it "wraps input in the div with class 'row collapse'" do
+          expect(@node.find('.row.collapse')).to_not be nil
+      end
+
+      it "wraps postfix in the div with the right column size" do
+        expect(@node.find('.row.collapse')).to have_css('div.small-2.medium-4.large-6.columns')
+      end
+
+      it "creates postfix span with right value" do
+        expect(@node.find('.row.collapse').find('div.small-2.medium-4.large-6.columns').find('span').text).to eq "Postfix"
+      end
+
+      it "creates postfix span with right class" do
+        expect(@node.find('.row.collapse')).to have_css('span.postfix')
+      end
+
+      it "wraps input in the div with the right column size" do
+        expect(@node.find('.row.collapse')).to have_css('div.small-10.medium-8.large-6.columns')
+      end
+
+      it "has right value for the input" do
+        expect(@node.find('.row.collapse').find('div.small-10.medium-8.large-6.columns')).to have_css('input[type="text"][name="author[login]"]')
+      end
+    end
+
+    context "with only one column size" do
+      before do
+        form_for(@author) do |builder|
+          @small_node = Capybara.string builder.text_field(:login, :postfix => {small: 2, value: "Postfix"})
+          @medium_node = Capybara.string builder.text_field(:login, :postfix => {medium: 2, value: "Postfix"})
+          @large_node = Capybara.string builder.text_field(:login, :postfix => {large: 2, value: "Postfix"})
+        end
+      end
+
+      it "wraps postfix in the div with the right column size" do
+        expect(@small_node.find('.row.collapse')).to have_css('div.small-2.columns')
+        expect(@medium_node.find('.row.collapse')).to have_css('div.medium-2.columns')
+        expect(@large_node.find('.row.collapse')).to have_css('div.large-2.columns')
+      end
+
+      it "wraps input in the div with the right column size" do
+        expect(@small_node.find('.row.collapse')).to have_css('div.small-10.columns')
+        expect(@medium_node.find('.row.collapse')).to have_css('div.medium-10.columns')
+        expect(@large_node.find('.row.collapse')).to have_css('div.large-10.columns')
+      end
+
+      it "excludes other classes from the prefix" do
+        expect(@small_node.find('.row.collapse')).to_not have_css('div.medium-2.columns')
+        expect(@small_node.find('.row.collapse')).to_not have_css('div.large-2.columns')
+      end
+
+      it "excludes other classes from the input" do
+        expect(@small_node.find('.row.collapse')).to have_css('div.small-10.columns')
+        expect(@small_node.find('.row.collapse')).to_not have_css('div.medium-12.columns')
+        expect(@small_node.find('.row.collapse')).to_not have_css('div.large-12.columns')
+      end
+    end
+  end
+
+  describe "with both prefix and postfix" do
+    context "when input field has a prefix" do
+      before do
+        form_for(@author) do |builder|
+          @node = Capybara.string builder.text_field(:login,
+                                                     :prefix => {small: 2, medium: 3, large: 4, value:"Prefix"},
+                                                     :postfix => {small: 2, medium: 3, large: 4, value: "Postfix"})
+        end
+      end
+
+      it "wraps input in the div with the right column size" do
+        expect(@node.find('.row.collapse')).to have_css('div.small-8.medium-6.large-4.columns')
+      end
+      
+    end
+  end
+
   describe "input generators" do
     it "should generate text_field input" do
       form_for(@author) do |builder|
@@ -168,6 +315,7 @@ describe "FoundationRailsHelper::FormHelper" do
       form_for(@author) do |builder|
         node = Capybara.string builder.radio_button(:active, "ok", label: false)
         expect(node).to_not have_css('label[for="author_active_ok"]')
+        expect(node).to_not have_css('input[label="false"]')
         expect(node).to have_css('input[type="radio"][name="author[active]"]')
       end
     end
@@ -340,6 +488,32 @@ describe "FoundationRailsHelper::FormHelper" do
         expect(node).to have_css('select[name="author[favorite_book]"] optgroup[label="Pirate Exploits"] option[value="133"]', :text => "Treasure Island")
       end
     end
+
+    describe "hint" do
+      it "should add a span element" do
+        form_for(@author) do |builder|
+          hint = 'Enter login'
+          node = Capybara.string builder.text_field(:login, :hint => hint)
+          expect(node.find("span").text).to eq hint
+        end
+      end
+
+      it "should not add hint attribute" do
+        form_for(@author) do |builder|
+          node = Capybara.string builder.text_field(:login, :hint => 'Enter login')
+          expect(node.find_field("author_login")['hint']).to be_nil
+        end
+      end
+    end
+
+    context "when there aren't any errors and no class option is passed" do
+      it "should not have a class attribute" do
+        form_for(@author) do |builder|
+          node = Capybara.string builder.text_field(:login)
+          expect(node).to have_css('input:not([class=""])')
+        end
+      end
+    end
   end
 
   describe "errors generator" do
@@ -518,82 +692,4 @@ describe "FoundationRailsHelper::FormHelper" do
       end
     end
   end
-
-  describe 'submit button generator' do
-    after :each do
-      FoundationRailsHelper.reset
-    end
-
-    context 'when button_class config is not set' do
-      it "should display form button with default class" do
-        form_for(@author) do |builder|
-          node = Capybara.string builder.submit('Save')
-          expect(node).to have_css('input[type="submit"][class="small radius success button"]')
-        end
-      end
-    end
-
-    context 'when button_class config is "superduper"' do
-      before do
-        FoundationRailsHelper.configure do |config|
-          config.button_class = 'superduper'
-        end
-      end
-
-      it "should display form button with 'superduper' class" do
-        form_for(@author) do |builder|
-          node = Capybara.string builder.submit('Save')
-          expect(node).to have_css('input[type="submit"][class="superduper"]')
-        end
-      end
-    end
-
-    context 'when option value is "superduper"' do
-      it "should display form button with 'superduper' class" do
-        form_for(@author) do |builder|
-          node = Capybara.string builder.submit('Save', class: 'superduper')
-          expect(node).to have_css('input[type="submit"][class="superduper"]')
-        end
-      end
-    end
-  end
-
-  describe 'submit button generator' do
-    after :each do
-      FoundationRailsHelper.reset
-    end
-
-    context 'when button_class config is not set' do
-      it "should display form button with default class" do
-        form_for(@author) do |builder|
-          node = Capybara.string builder.submit('Save')
-          expect(node).to have_css('input[type="submit"][class="small radius success button"]')
-        end
-      end
-    end
-
-    context 'when button_class config is "superduper"' do
-      before do
-        FoundationRailsHelper.configure do |config|
-          config.button_class = 'superduper'
-        end
-      end
-
-      it "should display form button with 'superduper' class" do
-        form_for(@author) do |builder|
-          node = Capybara.string builder.submit('Save')
-          expect(node).to have_css('input[type="submit"][class="superduper"]')
-        end
-      end
-    end
-
-    context 'when option value is "superduper"' do
-      it "should display form button with 'superduper' class" do
-        form_for(@author) do |builder|
-          node = Capybara.string builder.submit('Save', class: 'superduper')
-          expect(node).to have_css('input[type="submit"][class="superduper"]')
-        end
-      end
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foundation_rails_helper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sebastien Gruhier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,9 +17,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -57,9 +45,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,9 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -77,9 +59,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -87,9 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -130,6 +106,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Rails helpers for zurb foundation CSS framework