bh 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d19ffd1af7584fc65268ba67ae824b0c2f961cbe
-  data.tar.gz: dc511c0f04f95149ce54c4ed3bf603cbaa9eb901
+  metadata.gz: 391d2887c75ed952c021d758e428f486de5f5f15
+  data.tar.gz: 15037d24fab141aaf1d7623e39aad31e44312197
 SHA512:
-  metadata.gz: 8e21c514874f252828111769a977e9ddf4fa319b28463a2d13d1e31a6b623ed67ee596ab17a49a7bacf3f1d118a47dba512792281b6a98478fd7685f24fcad14
-  data.tar.gz: d7607b91299a8b4bfafc883c78427461a078d4e5526388c135b0a25eaca0ff64de0874c4268360bbdd9e69eec9f5ad80c793c93c715384ebfdcdef88d1097a19
+  metadata.gz: b525dc2a2c86b8952d65e078e808a39e3c3cfa8eaa25d3b2d4fac61bb8a412594375a367cc3478d6d0b79a35c8b1ab2a3decd688c356cc0dfd5ddafce0596ccf
+  data.tar.gz: 5acccce283c5abaae55615bb02c3fece400ffac531c94456cd334893bfa2f1bef71e55949b8faf7d0245c133f6160bebd89bb14f1ca046baa0780b7be3721b72

data/CHANGELOG.md

@@ -6,6 +6,11 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 1.0.1 - 2014-09-14
+
+* [BUGFIX] Remove `form-control` class from `file_field` (#20)
+* [BUGFIX] Allow `record_object` to be passed to `fields_for` (#22)
+
 ## 1.0.0 - 2014-09-09
 
 * No changes

data/README.md

@@ -2,7 +2,7 @@ Bh · Bootstrap Helpers
 ======================
 
 Bh provides a set of helpers that streamlines the use of
-[Bootstrap components](http://getbootstrap.com/components) in Ruby views.
+[Bootstrap 3 components](http://getbootstrap.com/components) in Ruby views.
 
 The **full documentation** is available at [rubydoc.info](http://rubydoc.info/github/Fullscreen/bh/master/frames).
 
@@ -13,7 +13,7 @@ The **full documentation** is available at [rubydoc.info](http://rubydoc.info/gi
 [![Online docs](http://img.shields.io/badge/docs-✓-green.svg)](http://rubydoc.info/github/Fullscreen/bh/master/frames)
 [![Gem Version](http://img.shields.io/gem/v/bh.svg)](http://rubygems.org/gems/bh)
 
-Bootstrap is a great framework, but requires to write many lines of HTML code
+Bootstrap 3 is a great framework, but requires many lines of HTML code
 even for simple components.
 For instance, you need to write the following HTML to show a _dismissible alert_:
 
@@ -27,19 +27,18 @@ For instance, you need to write the following HTML to show a _dismissible alert_
 </div>
 ```
 
-Writing this for every _dismissible alert_ in a web site is cumbersome,
+Writing this for every _dismissible alert_ is cumbersome,
 repetitive, and prone to errors.
 
-Bh offers a solution to this problem by means of a set of helper methods.
-The example above can be rewritten with just one line of code:
+With Bh, you can achieve the same thing with just one line of code:
 
 ```rhtml
 <%= alert_box 'You accepted the Terms of service.', dismissible: true %>
 ```
 
-`alert_box` is only of the helpers provided by Bh and described below.
-You can use only the ones you need and even mix-and-match the "standard way"
-of writing Bootstrap components (many HTML lines) with the "Bh way".
+`alert_box` is only one of the helpers provided by Bh.
+You can use the helpers you need and even mix-and-match the "standard way"
+of writing Bootstrap 3 components (many HTML lines) with the "Bh way".
 
 A comprehensive guide to Bh helpers
 ===================================
@@ -56,12 +55,11 @@ How to install
 
 Bh is meant to be included in Rails apps by adding this line to the Gemfile:
 
-    gem 'bh', '~> 1.0.0'
+    gem 'bh', '~> 1.0'
 
-Since the gem follows [Semantic Versioning](http://semver.org),
-indicating the full version in your Gemfile (~> *major*.*minor*.*patch*)
-guarantees that your project won’t occur in any error when you `bundle update`
-and a new version of Bh is released.
+Since the gem follows [Semantic Versioning](http://semver.org), indicating the
+version number in your Gemfile in the *'~> major.minor'* format guarantees
+that your project won’t break when you `bundle update` to a new version.
 
 Adding `bh` to your Gemfile is all you need!
 From now on, you will be able to use any Bh helper in your ERB views.
@@ -93,8 +91,12 @@ document the changes in CHANGELOG.md and README.md, bump the version, then run
     rake release
 
 Remember that the bh gem follows [Semantic Versioning](http://semver.org).
-Any new release that is fully backward-compatible should bump the *patch* version (1.0.x).
-Any new version that breaks compatibility should bump the *minor* version (1.x.0)
+
+Any new release that makes backward-compatible bug fixes should bump the *patch* version (1.0.x).
+
+Any new release that adds backward-compatible features should bump the *minor* version (1.x.0).
+
+Any new version that breaks compatibility should bump the *major* version (2.0.0)
 
 How to contribute
 =================

data/lib/bh/form_builders/form_builder.rb

@@ -2,6 +2,7 @@ require 'bh/helpers/form/check_box_helper'
 require 'bh/helpers/form/field_helper'
 require 'bh/helpers/form/fieldset_helper'
 require 'bh/helpers/form/fields_for_helper'
+require 'bh/helpers/form/file_field_helper'
 require 'bh/helpers/form/legend_helper'
 require 'bh/helpers/form/radio_button_helper'
 require 'bh/helpers/form/select_helper'
@@ -14,6 +15,7 @@ module Bh
     include Form::FieldHelper
     include Form::FieldsetHelper
     include Form::FieldsForHelper
+    include Form::FileFieldHelper
     include Form::LegendHelper
     include Form::RadioButtonHelper
     include Form::SelectHelper
@@ -24,7 +26,7 @@ module Bh
     #   strings in ActionView 3
     def self.textual_field_helpers
       non_textual_field_helpers = %w(label hidden_field range_field check_box
-        radio_button select submit fields_for label)
+        file_field radio_button select submit fields_for label)
       field_helpers.map(&:to_s) - non_textual_field_helpers
     end
 

data/lib/bh/helpers/alert_helper.rb

@@ -11,7 +11,7 @@ module Bh
     #
     # The message to display in the alert can either be passed as the first
     # parameter (in which case, the options are the second parameter), or as
-    # a block (in which case, the options are the first paramter).
+    # a block (in which case, the options are the first parameter).
     # @example An alert with a plain-text message passed as the first parameter.
     #   alert 'User updated successfully', dismissible: true
     # @example An alert with an HTML message passed as a block.

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

@@ -6,11 +6,15 @@ module Bh
       include BaseHelper
       include FieldsetHelper # for fieldset
 
-      def fields_for(record_object = nil, fields_options = {}, &block)
+      def fields_for(record_name, record_object = nil, fields_options = {}, &block)
+        if record_object.is_a?(Hash) && record_object.extractable_options?
+          record_object, fields_options = nil, record_object
+        end
+
         fields_options[:layout] ||= @options[:layout]
         fields_options[:errors] ||= @options[:errors]
-        title = fields_options.delete(:title) { record_object.to_s.humanize }
-        fieldset(title) { super record_object, fields_options, &block }
+        title = fields_options.delete(:title) { record_name.to_s.humanize }
+        fieldset(title) { super record_name, record_object, fields_options, &block }
       end
     end
   end

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

@@ -0,0 +1,15 @@
+require 'bh/helpers/form/base_helper'
+
+module Bh
+  module Form
+    module FileFieldHelper
+      include BaseHelper
+
+      def file_field(method, options={})
+        base_field method, :file, options do
+          super method, options
+        end
+      end
+    end
+  end
+end

data/lib/bh/version.rb

@@ -1,3 +1,3 @@
 module Bh
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/helpers/form/field_helper_spec.rb

@@ -3,7 +3,7 @@ require 'bh/helpers/form_for_helper'
 include Bh::FormForHelper
 
 def self.field_helpers_to_test
-  types = %w(email file number password phone search telephone text url)
+  types = %w(email number password phone search telephone text url)
   if defined?(ActionView::VERSION) # only defined in ActionView >=4
     # types.concat %w(color date datetime datetime_local month time week)
   end

data/spec/helpers/form/fields_for_helper_spec.rb

@@ -4,7 +4,8 @@ include Bh::FormForHelper
 
 describe 'fields_for' do
   let(:protect_against_forgery?) { false }
-  let(:form) { form_for User.new, layout: layout, url: '/', &block }
+  let(:form) { form_for user, layout: layout, url: '/', &block }
+  let(:user) { User.new }
   let(:layout) { :whatever }
   let(:block) { Proc.new {|f| f.fields_for :address, options, &fields_block } }
   let(:options) { {} }
@@ -32,4 +33,17 @@ describe 'fields_for' do
     let(:options) { {layout: :horizontal} }
     it { expect(form).to match %r{<div class="form-group"><label class="col-sm-3 control-label" for.+?>Street</label>} }
   end
+
+  context 'given a record object' do
+    let(:block) { Proc.new {|f| f.fields_for :address, user.name, options, &fields_block } }
+
+    specify 'and no other options, uses the provided record object' do
+      expect(form).to include 'fieldset class="panel panel-default">'
+    end
+
+    context 'and other options, uses the provided record object and options' do
+      let(:options) { {title: 'Your address'} }
+      it { expect(form).to include '<div class="panel-heading">Your address</div>' }
+    end
+  end
 end

data/spec/helpers/form/file_field_helper_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+require 'bh/helpers/form_for_helper'
+include Bh::FormForHelper
+
+describe 'file_field' do
+  let(:protect_against_forgery?) { false }
+  let(:form) { form_for user, layout: layout, errors: errors, url: '/', &block }
+  let(:user) { User.new }
+  let(:errors) { {} }
+  let(:block) { Proc.new {|f| f.file_field :name, accept: 'text/html'} }
+
+  describe 'given a basic layout' do
+    let(:layout) { :basic }
+    specify 'applies form-group to the container to the input' do
+      expect(form).to match %r{<div class="form-group"><label.+?>Name</label><(input|textarea)}
+    end
+
+    specify 'does not apply form-control to the input' do
+      expect(form).not_to match 'form-control'
+    end
+  end
+
+  describe 'given a horizontal layout' do
+    let(:layout) { :horizontal }
+    specify 'applies form-group to the container, col-sm-3.control-label to the label and col-sm-9 to the field container' do
+      expect(form).to match %r{<div class="form-group"><label class="col-sm-3 control-label".+?>Name</label><div class="col-sm-9"><(input|textarea)}
+    end
+
+    specify 'does not apply form-control to the input' do
+      expect(form).not_to match 'form-control'
+    end
+  end
+
+  describe 'given an inline layout' do
+    let(:layout) { :inline }
+    specify 'applies form-group to the container, sr-only to the label' do
+      expect(form).to match %r{<div class="form-group"><label class="sr-only".+?>Name</label><(input|textarea)}
+    end
+
+    specify 'does not apply form-control to the input' do
+      expect(form).not_to match 'form-control'
+    end
+
+    context 'given an error' do
+      before { user.errors.add :name, 'cannot be nil' }
+
+      specify 'applies sr-only to the error message' do
+        expect(form).to include '<span class="help-block text-left sr-only">cannot be nil</span>'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bh
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Claudio Baccigalupo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -151,6 +151,7 @@ files:
 - lib/bh/helpers/form/field_helper.rb
 - lib/bh/helpers/form/fields_for_helper.rb
 - lib/bh/helpers/form/fieldset_helper.rb
+- lib/bh/helpers/form/file_field_helper.rb
 - lib/bh/helpers/form/legend_helper.rb
 - lib/bh/helpers/form/radio_button_helper.rb
 - lib/bh/helpers/form/select_helper.rb
@@ -174,6 +175,7 @@ files:
 - spec/helpers/form/field_helper_spec.rb
 - spec/helpers/form/fields_for_helper_spec.rb
 - spec/helpers/form/fieldset_helper_spec.rb
+- spec/helpers/form/file_field_helper_spec.rb
 - spec/helpers/form/legend_helper_spec.rb
 - spec/helpers/form/radio_button_helper_spec.rb
 - spec/helpers/form/select_helper_spec.rb
@@ -221,6 +223,7 @@ test_files:
 - spec/helpers/form/field_helper_spec.rb
 - spec/helpers/form/fields_for_helper_spec.rb
 - spec/helpers/form/fieldset_helper_spec.rb
+- spec/helpers/form/file_field_helper_spec.rb
 - spec/helpers/form/legend_helper_spec.rb
 - spec/helpers/form/radio_button_helper_spec.rb
 - spec/helpers/form/select_helper_spec.rb