bh 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3044213572c129233bf23c8f9d4e9ddf67307c3c
-  data.tar.gz: 3dce30164e6a204a736c4dda91b775d427ac0c0e
+  metadata.gz: 7f5835cd462fb3d11c1aed1d680b9cad2e07118a
+  data.tar.gz: a790bdc43c1d08155d6768fb871c4c1317dfd3f8
 SHA512:
-  metadata.gz: 5716a1e8ee975c605c011b967f10d2e01b878504837e1bbbb8dc763c8aff9de5d682243f9e73fc4e75e94fe955cffec358241e39d918d587175a10f7a5668bc4
-  data.tar.gz: 664b527fb7fac7619fe9e1f7917cc784d0cfc35476f1a37dbc45c5f376282323ce21f2a73267720b6d27fd23ce211e300c383bd14b2d586d89f9ada2501e4346
+  metadata.gz: ccf655fafab88fbb6b66c7e5b65fca87bcec689a4e23f3d75b934555146d703e3b01509491b8d348cb4f1a113491e7f4c572eafbedd62a01669e639543c94b0d
+  data.tar.gz: 9286a9d3ae256ba18927d8c5f2b9dfcfa29b2ef2455c83f00cd65e8f052481a36322fc8129181e5496147ba52b0722389f146201eb48bddb3abbf2c48fd84d35

data/CHANGELOG.md

@@ -6,6 +6,14 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 1.3.3 - 2014-03-11
+
+* [BUGFIX] Correctly align the "X" icon at the right of the field in basic forms
+
+## 1.3.2 - 2014-03-05
+
+* [BUGFIX] Respect the original behavior of Padrino/Rails when calling `link_to` with `nil` as the name
+
 ## 1.3.1 - 2014-02-03
 
 * [BUGFIX] Do not render the `:offset` option of the field helpers in the DOM

data/lib/bh/classes/link_to.rb

@@ -17,6 +17,10 @@ module Bh
           request.path_info == @app.url_for(@url)
         end
       end
+
+      def content
+        super if @content
+      end
     end
   end
 end

data/lib/bh/core_ext/rails/form/base_helper.rb

@@ -11,7 +11,7 @@ module Bh
 
       def base_field(method, field_type, options = {}, &block)
         errors = (object.errors.get method if object) || {}
-        label = label_for method, errors, options
+        label = label_for method, errors, field_type, options
         field = field_container(options) do
           field_tags errors, field_type, options, &block
         end
@@ -35,7 +35,9 @@ module Bh
         help_text = options.delete(:help)
         field = @template.capture(&block)
         tags = [field_in_group(field, prefix, suffix)]
-        tags << error_icon_tag if show_error_icon?(field_type, errors, suffix)
+        if show_error_icon?(field_type, errors, suffix) && !basic_form?
+          tags << error_icon_tag
+        end
         if errors.any? && show_error_help?
           tags << help_tag(errors.to_sentence)
         elsif help_text
@@ -86,10 +88,18 @@ module Bh
         content_tag :span, help_text, class: klass.join(' ')
       end
 
-      def label_for(method, errors, options)
+      # Rails wraps the label in <div class='field_with_errors'> in case of
+      # error, which messes up the error icon in Bootstrap basic forms unless
+      # the icon is appended to the label itself, rather than at the end.
+      def label_for(method, errors, field_type, options)
         if options.delete(:use_label) { true }
-           args = [method, options.delete(:label), label_options(errors)]
-           label *args.compact
+          args = [method, options.delete(:label), label_options(errors)]
+          label(*args.compact).tap do |label|
+            error_icon = show_error_icon? field_type, errors, options[:suffix]
+            if (index = label =~ %r{</div>$}) && error_icon && basic_form?
+              label.insert index, error_icon_tag
+            end
+          end
         end
       end
 

data/lib/bh/version.rb

@@ -1,3 +1,3 @@
 module Bh
-  VERSION = '1.3.1'
+  VERSION = '1.3.3'
 end

data/spec/padrino/link_to_helper.rb

@@ -0,0 +1,12 @@
+shared_examples_for 'the link_to helper (Padrino)' do
+  all_tests_pass_with 'no link_to caption (Padrino)'
+end
+
+#--
+
+shared_examples_for 'no link_to caption (Padrino)' do
+  specify 'uses the original link_to helper which sets an empty link text' do
+    html = '<a href="/"></a>'
+    expect(link_to: :nil_name).to generate html
+  end
+end

data/spec/padrino_spec.rb

@@ -24,5 +24,6 @@ describe 'When used in Padrino or Middleman' do
   all_tests_pass_for 'the vertical helper'
 
   all_tests_pass_for 'the button_to helper (Padrino)'
+  all_tests_pass_for 'the link_to helper (Padrino)'
   all_tests_pass_for 'the link_to helper'
 end

data/spec/rails/link_to_helper.rb

@@ -0,0 +1,12 @@
+shared_examples_for 'the link_to helper (Rails)' do
+  all_tests_pass_with 'no link_to caption (Rails)'
+end
+
+#--
+
+shared_examples_for 'no link_to caption (Rails)' do
+  specify 'uses the original link_to helper which sets the link to the caption' do
+    html = '<a href="/">/</a>'
+    expect(link_to: :nil_name).to generate html
+  end
+end

data/spec/rails_spec.rb

@@ -24,5 +24,6 @@ describe 'When used in Rails' do
   all_tests_pass_for 'the vertical helper'
 
   all_tests_pass_for 'the button_to helper (Rails)'
+  all_tests_pass_for 'the link_to helper (Rails)'
   all_tests_pass_for 'the link_to helper'
 end

data/spec/support/matchers.rb

@@ -4,7 +4,10 @@ RSpec::Matchers.define :generate do |html|
       helper, options = helper.keys.first, helper.values.first
     end
 
-    if helper == :link_to || helper == :button_to
+    if helper == :link_to && options == :nil_name
+      @inline = bh.send helper, nil, '/'
+      @block = @inline
+    elsif helper == :link_to || helper == :button_to
       @inline = bh.send helper, *['content', '/', options].compact
       if bh.test_button_to_with_block
         @block = bh.send(helper, *['/', options].compact) { 'content' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bh
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Claudio Baccigalupo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -265,6 +265,7 @@ files:
 - lib/bh/views/bh/_modal.html.erb
 - lib/bh/views/bh/_navbar.html.erb
 - spec/padrino/button_to_helper.rb
+- spec/padrino/link_to_helper.rb
 - spec/padrino_spec.rb
 - spec/rails/button_to_helper.rb
 - spec/rails/form/check_box_helper_spec.rb
@@ -278,6 +279,7 @@ files:
 - spec/rails/form/static_control_helper_spec.rb
 - spec/rails/form/submit_helper_spec.rb
 - spec/rails/form_for_helper_spec.rb
+- spec/rails/link_to_helper.rb
 - spec/rails_helper.rb
 - spec/rails_spec.rb
 - spec/shared/alert_box_helper.rb
@@ -327,6 +329,7 @@ summary: Bh provides a set of powerful helpers that streamlines the use of Boots
   components in Rails views.
 test_files:
 - spec/padrino/button_to_helper.rb
+- spec/padrino/link_to_helper.rb
 - spec/padrino_spec.rb
 - spec/rails/button_to_helper.rb
 - spec/rails/form/check_box_helper_spec.rb
@@ -340,6 +343,7 @@ test_files:
 - spec/rails/form/static_control_helper_spec.rb
 - spec/rails/form/submit_helper_spec.rb
 - spec/rails/form_for_helper_spec.rb
+- spec/rails/link_to_helper.rb
 - spec/rails_helper.rb
 - spec/rails_spec.rb
 - spec/shared/alert_box_helper.rb