bh 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad17bacb7ffb22fb404857bfce7a63c26b7e182d
-  data.tar.gz: 844812324781c1cd1af6b0fc2baf7d4f7f2dd354
+  metadata.gz: 2efc7f83e6175dbda16f557b14d18d6889748c35
+  data.tar.gz: d8f958fb28c28731a4fe32587b00f2767f1fc441
 SHA512:
-  metadata.gz: 1eaa5367a5d7ba4796cb7711a3940f22e1ef1001ce6b430ac1c10cea804edd5c6a19c63a4d0ef4b69cd2f86b9b26ac0460f4dab64ec681199dc01495caa9d8b1
-  data.tar.gz: f4ddda3cd0aa3e7ccd51b4d04dbd1b9ec7450615024927ad7d5af1e0d5ad3c2db3a572ec5243b02a2c048537591224ab748b89afe6bbc1cbdc91409e8961ffab
+  metadata.gz: 16df29192db7253cda1592a8bdb3d0cad6272fe0eb6c5b6393f44dbd61b70fc1bba2117ee571b65d8283107fe4f9a91a546c41bb0894c950f94d95a03c9092dc
+  data.tar.gz: 43106b14b0e3741cb56b2165d0babe1241056e2e23189efd2ed42dead693b3283e5c6d2afc013af415c36eece5c1acb072fd7895b9ef8ada27a6a7159c3e8355

data/CHANGELOG.md

@@ -6,6 +6,10 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 0.0.6 - 2014-08-22
+
+* [FEATURE] Add `:prefix`, `:suffix` options to form field helpers
+
 ## 0.0.5 - 2014-08-22
 
 * [FEATURE] Add `form_for` and form helpers for every type of field

data/README.md

@@ -46,7 +46,7 @@ How to install
 
 Bh is meant to be included in Rails apps by adding this line to the Gemfile:
 
-    gem 'bh', '~> 0.0.5'
+    gem 'bh', '~> 0.0.6'
 
 Since the gem follows [Semantic Versioning](http://semver.org),
 indicating the full version in your Gemfile (~> *major*.*minor*.*patch*)

data/lib/bh/helpers/form/base_helper.rb

@@ -11,7 +11,7 @@ module Bh
         errors = (object.errors.get method if object) || {}
         label = label_for method, errors, options
         field = field_container(options) do
-          field_tags errors, field_type, &block
+          field_tags errors, field_type, options, &block
         end
         label_and_field = safe_join [label, field].compact
         label_and_field_container label_and_field, field_type, errors
@@ -27,29 +27,47 @@ module Bh
         end
       end
 
-      def field_tags(errors, field_type, &block)
-        tags = [@template.capture(&block)]
-        tags << error_icon_tag if errors.any? && show_error_icon?(field_type)
+      def field_tags(errors, field_type, options = {}, &block)
+        prefix, suffix = options.delete(:prefix), options.delete(:suffix)
+        field = @template.capture(&block)
+        tags = [field_in_group(field, prefix, suffix)]
+        tags << error_icon_tag if show_error_icon?(field_type, errors, suffix)
         tags << error_help_tag(errors) if errors.any? && show_error_help?
         safe_join tags
       end
 
+      def field_in_group(field, prefix, suffix)
+        input_group_container(prefix || suffix) do
+          safe_join [input_addon(prefix), field, input_addon(suffix)].compact
+        end
+      end
+
+      def input_addon(addon)
+        content_tag :span, addon, class: 'input-group-addon' if addon
+      end
+
+      def input_group_container(has_addons, &block)
+        if has_addons
+          content_tag :div, class: 'input-group', &block
+        else
+          yield
+        end
+      end
+
       def label_and_field_container(label_and_field, field_type, errors = {})
         klass = ['form-group']
-        if errors.any?
-          klass << 'has-error'
-          klass << 'has-feedback' if show_error_icon?(field_type)
-        end
+        klass << 'has-error' if errors.any?
+        klass << 'has-feedback' if show_error_icon?(field_type, errors)
         content_tag :div, label_and_field, class: klass.join(' ')
       end
 
 
-      def show_error_icon?(field_type)
-        hide = [:checkbox, :number_field, :radio_button, :select, :legend].include? field_type
-        @options.fetch(:errors, {}).fetch(:icons, true) && !hide
+      def show_error_icon?(field_type, errors, suffix = nil)
+        no_icon = %w(checkbox number_field radio_button select legend)
+        hide = no_icon.include?(field_type.to_s)
+        errors.any? && @options.fetch(:errors, {}).fetch(:icons, true) && !hide && suffix.nil?
       end
 
-
       def error_icon_tag
         glyphicon :remove, class: 'form-control-feedback'
       end

data/lib/bh/version.rb

@@ -1,3 +1,3 @@
 module Bh
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/helpers/form/field_helper_spec.rb

@@ -42,6 +42,20 @@ field_helpers_to_test.each do |form_field|
         it { expect(form).to include 'Given name</label>' }
       end
 
+      specify 'not given a prefix or suffix option, does not use an input group' do
+        expect(form).not_to include 'input-group'
+      end
+
+      context 'given a prefix option, prints the prefix before the field' do
+        let(:options) { {prefix: 'Mr.'} }
+        it { expect(form).to include '<div class="input-group"><span class="input-group-addon">Mr.</span><' }
+      end
+
+      context 'given a suffix option, prints the prefix after the field' do
+        let(:options) { {suffix: 'Jr'} }
+        it { expect(form).to match %r{<div class="input-group"><.+?><span class="input-group-addon">Jr</span></div>}m }
+      end
+
       specify 'not given an error, does not apply has-error to the form group' do
         expect(form).not_to include 'has-error'
       end
@@ -63,6 +77,11 @@ field_helpers_to_test.each do |form_field|
           it{ expect(form).not_to include 'has-feedback' }
         end
 
+        context 'given the suffix option, hides error icons (or they would overlap)' do
+          let(:options) { {suffix: 'Jr'} }
+          it{ expect(form).not_to include 'form-control-feedback' }
+        end
+
         context 'given an option to hide error messages, hides error messages' do
           let(:errors) { {messages: false} }
           it{ expect(form).not_to include 'help-block' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bh
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Claudio Baccigalupo