bh 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 990dc7edcfb65b8cf34d156eec8abc3f18e32c9f
-  data.tar.gz: 9ad5be9c224508ed6cd2f43406561e36ed6eb688
+  metadata.gz: 5dbec09a6678b044a06696b74f7c18c46f1c9070
+  data.tar.gz: 3a436df4e36cf008209893a402edf43d6183f555
 SHA512:
-  metadata.gz: b31c41c110c0f70965c0a5172d6c1bc6f7c84f652da0c8335a434e6d6b6f75d567464e60c87b04a4e0001f8454c5cf1085669bae83069cbb400cb2975155ca72
-  data.tar.gz: cf475af91cb93ffb13a82177c35dd33415c021fd264928ce4b8e9973654efab0e77dcc9128d385a253613083274b8485bdef66745e152bd1d84e913d2b89ecbb
+  metadata.gz: 3ca0661cd8f9edfd02f43d8370b6935aba98dd5d2335d4aa9e0e072cb348a5dd289fd08625c0d0caaa75096ef3c16929f72556ff3175f4bc3f5796c7883175f9
+  data.tar.gz: 0d094eccbaa4acd9f58f67d5fbb7fba6c2e4cc8a33452b2dbc53fb9f826f29191e550bd588a787ba1988c736f744c3a18be7216d32aca3f16deb0fd3dd603e5f

data/.travis.yml

@@ -1,9 +1,15 @@
 language: ruby
 notifications:
   email: true
+sudo: false
 matrix:
   include:
   - rvm: 1.9.3
     gemfile: gemfiles/Gemfile.rails-3.x
+    before_install:
+      - gem update --system 2.4.8
   - rvm: 2.0.0
-    gemfile: gemfiles/Gemfile.rails-4.x
+    gemfile: gemfiles/Gemfile.rails-4.x
+  - rvm: 2.2.4
+    gemfile: gemfiles/Gemfile.rails-5.x
+    env: ONLY_RAILS=true

data/CHANGELOG.md

@@ -6,7 +6,11 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
-## 1.3.4 - 2014-06-23
+## 1.3.5 - 2015-12-18
+
+* [ENHANCEMENT] Replace `errors.get(:field)` with `errors[:field]` since the former is deprecated in Rails 5.
+
+## 1.3.4 - 2015-06-23
 
 * [BUGFIX] Security: don’t always assume that the content of `link_to` is safe
 
@@ -18,21 +22,21 @@ link `link_to '<img src="logo.png">', '/'`, then the image will not display
 anymore, since Bh now correctly escapes the HTML content (as Rails and Padrino
 do). In this case, you should use `link_to image_tag('logo.png'), '/'` instead.
 
-## 1.3.3 - 2014-03-11
+## 1.3.3 - 2015-03-11
 
 * [BUGFIX] Correctly align the "X" icon at the right of the field in basic forms
 
-## 1.3.2 - 2014-03-05
+## 1.3.2 - 2015-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
+## 1.3.1 - 2015-02-03
 
 * [BUGFIX] Do not render the `:offset` option of the field helpers in the DOM
 * [BUGFIX] Do not render the `:label` option of the field helpers in the DOM
 * [ENHANCEMENT] Add `:label_options` option to customize the wrapping label of a field
 
-## 1.3.0 - 2014-02-02
+## 1.3.0 - 2015-02-02
 
 * [FEATURE] Extend `form_for` to be wrapped in <li> when inside a `nav`, just like `link_to`
 * [FEATURE] Extend `button_to` to be wrapped in <li> when inside a `nav`, just like `link_to`

data/README.md

@@ -48,7 +48,7 @@ Bh is compatible with **Rails 3.2**, **Rails 4**, **Padrino** and **Middleman**.
 
 To include the Bh gem in your project:
 
-1. Add `gem 'bh', '~> 1.2'` to the `Gemfile` file of your Rails, Padrino or Middleman project.
+1. Add `gem 'bh', '~> 1.3'` to the `Gemfile` file of your Rails, Padrino or Middleman project.
 2. *Only if you are using Middleman*: open `config.rb` and add `activate :bh`.
 3. *Only if you are using Padrino*: open `app.rb` and add `register Bh`.
 

data/bh.gemspec

@@ -30,12 +30,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake',            '~> 10.3'
   spec.add_development_dependency 'yard',            '~> 0.8.7'
   spec.add_development_dependency 'coveralls',       '~> 0.7.1'
+  spec.add_development_dependency 'tins',            '~> 1.5.4'
   spec.add_development_dependency 'activemodel'      # versioned in gemfiles/
 
-  # For spec/dummy
-  spec.add_development_dependency 'middleman-core'   # versioned in gemfiles/
+  unless ENV['ONLY_RAILS']
+    # For spec/dummy
+    spec.add_development_dependency 'middleman-core'   # versioned in gemfiles/
 
-  # For Middleman/Padrino tests
-  spec.add_development_dependency 'padrino-helpers', '~> 0.12.4'
-  spec.add_development_dependency 'padrino-routing', '~> 0.5.0'
+    # For Middleman/Padrino tests
+    spec.add_development_dependency 'padrino-helpers', '~> 0.12.4'
+    spec.add_development_dependency 'padrino-routing', '~> 0.5.0'
+  end
 end

data/gemfiles/Gemfile.rails-3.x

@@ -4,5 +4,6 @@ gem 'activesupport', '~> 3.2'
 gem 'actionpack', '~> 3.2'
 gem 'activemodel', '~> 3.2'
 gem 'middleman-core', '~> 3.2.2'
+gem 'tins', '< 1.6.0'
 
 gemspec path: '../'

data/gemfiles/Gemfile.rails-4.x

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'activesupport', '~> 4.0'
-gem 'actionpack', '~> 4.0'
-gem 'activemodel', '~> 4.0'
+gem 'activesupport', '>= 4.0', '< 4.2'
+gem 'actionpack', '>= 4.0', '< 4.2'
+gem 'activemodel', '>= 4.0', '< 4.2'
 gem 'middleman-core', '~> 3.3.0'
 
 gemspec path: '../'

data/gemfiles/Gemfile.rails-5.x

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gem 'activesupport', '>= 5.0.0.beta1'
+gem 'actionpack', '>= 5.0.0.beta1'
+gem 'activemodel', '>= 5.0.0.beta1'
+
+gemspec path: '../'

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

@@ -10,7 +10,7 @@ module Bh
     private
 
       def base_field(method, field_type, options = {}, &block)
-        errors = (object.errors.get method if object) || {}
+        errors = (object.errors[method] if object) || {}
         label = label_for method, errors, field_type, options
         field = field_container(options) do
           field_tags errors, field_type, options, &block

data/lib/bh/version.rb

@@ -1,3 +1,3 @@
 module Bh
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 end

data/spec/padrino_spec.rb

@@ -26,4 +26,4 @@ describe 'When used in Padrino or Middleman' do
   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
+end unless ENV['ONLY_RAILS']

data/spec/rails/button_to_helper.rb

@@ -9,7 +9,7 @@ end
 
 shared_examples_for 'no button_to options (Rails)' do
   specify 'uses the original button_to helper' do
-    html = %r{^<form action="/" class="button_to" method="post"><div><(input|button) type="submit"(>| value=")content(" />|</button>)</div></form>$}
+    html = %r{^<form(?:| action="/") class="button_to" method="post"(?:| action="/")>(?:|<div>)<(input|button) type="submit"(>| value=")content(" />|</button>)(?:|</div>)</form>$}
     expect(:button_to).to generate html
   end
 end

data/spec/rails/form/field_helper_spec.rb

@@ -101,21 +101,21 @@ field_helpers_to_test.each do |form_field|
     describe 'given a basic layout' do
       let(:layout) { :basic }
       specify 'applies form-group to the container, form-control to the input' do
-        expect(form).to match %r{<div class="form-group"><label.+?>Name</label><(input|textarea) class="form-control"}
+        expect(form).to match %r{<div class="form-group"><label.+?>Name</label><(input|textarea)(?:| placeholder="Name") class="form-control"}
       end
     end
 
     describe 'given a horizontal layout' do
       let(:layout) { :horizontal }
       specify 'applies form-group to the container, form-control to the input, 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) class="form-control"}
+        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)(?:| placeholder="Name") class="form-control"}
       end
     end
 
     describe 'given an inline layout' do
       let(:layout) { :inline }
       specify 'applies form-group to the container, form-control to the input, sr-only to the label' do
-        expect(form).to match %r{<div class="form-group"><label class="sr-only".+?>Name</label><(input|textarea) class="form-control"}
+        expect(form).to match %r{<div class="form-group"><label class="sr-only".+?>Name</label><(input|textarea)(?:| placeholder="Name") class="form-control"}
       end
 
       context 'given a help message' do

data/spec/rails/form/submit_helper_spec.rb

@@ -12,12 +12,12 @@ describe 'submit' do
     let(:layout) { :whatever }
 
     specify 'applies .btn.btn-primary to the button' do
-      expect(form).to include 'input class="btn btn-primary"'
+      expect(form).to match %r{input.+? class="btn btn-primary"}
     end
 
     context 'given a context option, applies the context class' do
       let(:options) { {context: :info} }
-      it { expect(form).to include 'input class="btn btn-info"' }
+      it { expect(form).to match %r{input.+? class="btn btn-info"} }
     end
   end
 

data/spec/rails_helper.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 
-
 class User
   require 'active_model'
 

data/spec/spec_helper.rb

@@ -10,7 +10,9 @@ SimpleCov.start
 require 'bh'
 
 Dir['./spec/shared/**/*.rb'].each {|f| require f}
-Dir['./spec/support/**/*.rb'].each {|f| require f}
+require './spec/support/matchers.rb'
+require './spec/support/padrino.rb' unless ENV['ONLY_RAILS']
+require './spec/support/rails.rb'
 
 RSpec.configure do |config|
   config.order = 'random'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bh
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Claudio Baccigalupo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -208,6 +222,7 @@ files:
 - examples/rails/log/.keep
 - gemfiles/Gemfile.rails-3.x
 - gemfiles/Gemfile.rails-4.x
+- gemfiles/Gemfile.rails-5.x
 - lib/bh.rb
 - lib/bh/classes/alert_box.rb
 - lib/bh/classes/base.rb
@@ -322,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Bh provides a set of powerful helpers that streamlines the use of Bootstrap