foundation_rails_helper 1.2.1 → 1.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f7634ed75432e1905b3d92d6349fa9eaae18518d
+  data.tar.gz: f1dda957b096788682c423a1c980e867b794345e
+SHA512:
+  metadata.gz: add778ac067c4d80c54a09c05c5abf264482a9f17708b4a7b87502e9b3014789d70e1dd1d95615cce4c13df182b7a2b2b5255170189017a49432e99a93e6e952
+  data.tar.gz: b1af3344fd2bb825aecb4ddff12aa4775b677bf2954ab383695bb43b143a61ee2658473e89ae09aa0372bd6b08637e1277e7c1714aa1905f61ff910ddd8c5d31

data/.travis.yml

@@ -1,5 +1,25 @@
+language: ruby
+branches:
+  only:
+    - master
 rvm:
   - 1.9.3
-  - 2.1.0
-  - 2.2.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
+  - 2.4.0-preview1
+env:
+  - "RAILS_VERSION=4.1.0"
+  - "RAILS_VERSION=4.2.0"
+  - "RAILS_VERSION=5.0.0"
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      env: "RAILS_VERSION=5.0.0"
+    - rvm: 2.1.9
+      env: "RAILS_VERSION=5.0.0"
+    - rvm: 2.4.0-preview1
+      env: "RAILS_VERSION=4.1.0"
+    - rvm: 2.4.0-preview1
+      env: "RAILS_VERSION=4.2.0"
 sudo: false

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.2.2
+* Fix Rails 5 deprecation warnings about alias_method_chain
+* Allow Capybara to be upgraded beyond 2.6.x
+
 ## Version 1.2.1
 * Lock Capybara at 2.6.x
 

data/foundation_rails_helper.gemspec

@@ -16,13 +16,23 @@ Gem::Specification.new do |gem|
   gem.version       = FoundationRailsHelper::VERSION
   gem.license       = 'MIT'
 
-  gem.add_dependency 'railties',      '>= 4.1'
-  gem.add_dependency 'actionpack',    '>= 4.1'
-  gem.add_dependency 'activemodel',   '>= 4.1'
-  gem.add_dependency 'activesupport', '>= 4.1'
+  # Allow different versions of the rails gems to be specified, for testing:
+  rails_version = ENV["RAILS_VERSION"] || "default"
+
+  rails = case rails_version
+          when "default"
+            ">= 4.1"
+          else
+            "~> #{rails_version}"
+          end
+
+  gem.add_dependency 'railties',      rails
+  gem.add_dependency 'actionpack',    rails
+  gem.add_dependency 'activemodel',   rails
+  gem.add_dependency 'activesupport', rails
   gem.add_dependency 'tzinfo',        '~> 1.2', '>= 1.2.2'
 
   gem.add_development_dependency 'rspec-rails', '>= 3.1'
   gem.add_development_dependency 'mime-types',  '~> 2'
-  gem.add_development_dependency 'capybara',    '~> 2.6.0'
+  gem.add_development_dependency 'capybara',    '~> 2.7'
 end

data/lib/foundation_rails_helper/action_view_extension.rb

@@ -1,26 +1,4 @@
-module ActionView
-  module Helpers
-    module FormHelper
-      def form_for_with_foundation(record, options = {}, &block)
-        options[:builder] ||= FoundationRailsHelper::FormBuilder
-        options[:html] ||= {}
-        options[:auto_labels] = true unless options.has_key? :auto_labels
-        form_for_without_foundation(record, options, &block)
-      end
-
-      def fields_for_with_foundation(record_name, record_object = nil, options = {}, &block)
-        options[:builder] ||= FoundationRailsHelper::FormBuilder
-        options[:html] ||= {}
-        options[:html][:attached_labels] = options[:attached_labels]
-        options[:auto_labels] = true unless options.has_key? :auto_labels
-        fields_for_without_foundation(record_name, record_object, options, &block)
-      end
-
-      alias_method_chain :form_for, :foundation
-      alias_method_chain :fields_for, :foundation
-    end
-  end
-end
+ActionView::Base.default_form_builder = FoundationRailsHelper::FormBuilder
 ActionView::Base.field_error_proc = Proc.new do |html_tag, instance_tag|
   html_tag
-end
+end

data/lib/foundation_rails_helper/form_builder.rb

@@ -214,7 +214,8 @@ module FoundationRailsHelper
     end
 
     def field(attribute, options, html_options = nil, &block)
-      if @options[:auto_labels] || options[:label]
+      auto_labels = true unless @options[:auto_labels] == false
+      if auto_labels || options[:label]
         html = custom_label(attribute, options[:label], options[:label_options])
       else
         html = ''.html_safe

data/lib/foundation_rails_helper/version.rb

@@ -1,3 +1,3 @@
 module FoundationRailsHelper
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/foundation_rails_helper/form_builder_spec.rb

@@ -20,20 +20,41 @@ describe "FoundationRailsHelper::FormHelper" do
     end
   end
 
-  it "should not display labels by if there are options without auto_labels: false" do
+  it "should display labels if auto_labels: true is set" do
+    form_for(@author, auto_labels: true) do |builder|
+      node = Capybara.string builder.text_field(:login)
+      expect(node).to have_css('label[for="author_login"]', :text => "Login")
+    end
+  end
+
+  it "should display labels if there are options without auto_labels: false" do
     form_for(@author, {html: {class: 'myclass'}}) do |builder|
       node = Capybara.string builder.text_field(:login)
       expect(node).to have_css('label[for="author_login"]', :text => "Login")
     end
   end
 
-  it "should not display labels by if there are options without auto_labels: false" do
+  it "should not display labels if there are options with auto_labels: false" do
     form_for(@author, {html: {class: 'myclass'}, auto_labels: false}) do |builder|
       node = Capybara.string builder.text_field(:login)
       expect(node).to_not have_css('label[for="author_login"]', :text => "Login")
     end
   end
 
+  it "should display labels if :auto_labels is set to nil" do
+    form_for(@author, auto_labels: nil) do |builder|
+      node = Capybara.string builder.text_field(:login)
+      expect(node).to have_css('label[for="author_login"]', :text => "Login")
+    end
+  end
+
+  it "should display labels if :auto_labels is set to a string" do
+    form_for(@author, auto_labels: "false") do |builder|
+      node = Capybara.string builder.text_field(:login)
+      expect(node).to have_css('label[for="author_login"]', :text => "Login")
+    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
@@ -177,7 +198,7 @@ describe "FoundationRailsHelper::FormHelper" do
       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
 
@@ -283,7 +304,7 @@ describe "FoundationRailsHelper::FormHelper" do
     it "should generate check_box input" do
       form_for(@author) do |builder|
         node = Capybara.string builder.check_box(:active)
-        expect(node).to have_css('label[for="author_active"] input[type="hidden"][name="author[active]"][value="0"]')
+        expect(node).to have_css('label[for="author_active"] input[type="hidden"][name="author[active]"][value="0"]', :visible => false)
         expect(node).to have_css('label[for="author_active"] input[type="checkbox"][name="author[active]"]')
         expect(node).to have_css('label[for="author_active"]', :text => "Active")
       end
@@ -291,7 +312,7 @@ describe "FoundationRailsHelper::FormHelper" do
     it "should generate check_box input without a label" do
       form_for(@author) do |builder|
         node = Capybara.string builder.check_box(:active, :label => false)
-        expect(node).to have_css('input[type="hidden"][name="author[active]"][value="0"]')
+        expect(node).to have_css('input[type="hidden"][name="author[active]"][value="0"]', :visible => false)
         expect(node).to have_css('input[type="checkbox"][name="author[active]"]')
         expect(node).to_not have_css('label[for="author_active"]')
       end
@@ -400,7 +421,7 @@ describe "FoundationRailsHelper::FormHelper" do
       form_for(@author) do |builder|
         node = Capybara.string  builder.datetime_field(:forty_two)
         expect(node).to have_css('label[for="author_forty_two"]', :text => "Forty two")
-        expect(node).to have_css('input[type="datetime"][name="author[forty_two]"]')
+        expect(node).to have_css('input[type^="datetime"][name="author[forty_two]"]')
         value = DateTime.parse( node.find_field('author_forty_two').value)
         expect(value).to eq @author.forty_two.to_s
       end

metadata

@@ -1,150 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: foundation_rails_helper
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.2.2
 platform: ruby
 authors:
 - Sebastien Gruhier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.7'
 description: Rails for zurb foundation CSS framework. Form builder, flash message,
   ...
 email:
@@ -153,9 +136,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -178,27 +161,26 @@ files:
 homepage: http://github.com/sgruhier/foundation_rails_helper
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.30
+rubygems_version: 2.6.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails helpers for zurb foundation CSS framework
 test_files:
 - spec/foundation_rails_helper/configuration_spec.rb
@@ -206,3 +188,4 @@ test_files:
 - spec/foundation_rails_helper/form_builder_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock_rails.rb
+has_rdoc: