foundation_rails_helper 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7634ed75432e1905b3d92d6349fa9eaae18518d
-  data.tar.gz: f1dda957b096788682c423a1c980e867b794345e
+  metadata.gz: eaf080baa48830a883681c55c892a30b366deabc
+  data.tar.gz: 84a7e2dd8b70cbbe2b622a41bc9d3500bae8f396
 SHA512:
-  metadata.gz: add778ac067c4d80c54a09c05c5abf264482a9f17708b4a7b87502e9b3014789d70e1dd1d95615cce4c13df182b7a2b2b5255170189017a49432e99a93e6e952
-  data.tar.gz: b1af3344fd2bb825aecb4ddff12aa4775b677bf2954ab383695bb43b143a61ee2658473e89ae09aa0372bd6b08637e1277e7c1714aa1905f61ff910ddd8c5d31
+  metadata.gz: b578327401357039bf3ec51d10c45c86f36183f86f682ea0b303c181da14278a7a3f4de4223c92c7c451d7dccba539eec8e7799c490c855bc7a9eabd7b70cfbc
+  data.tar.gz: b8d41f62ad350069855247e1bdc1672c6ae08d549424768123dd67500e79eb5e1bcea1dbe820ef4e79822ec04a251f6eddf67cdde003c40bbc28e3fb725fbdbf

data/.rubocop.yml

@@ -0,0 +1,19 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.3
+  Include:
+    - Rakefile
+    - Gemfile
+    - '*.gemspec'
+  Exclude:
+    - 'vendor/**/*'
+
+# A quick fix for not having magic comments at the top of each file
+# # frozen_string_literal: true
+# https://github.com/bbatsov/rubocop/issues/3284
+FrozenStringLiteralComment:
+  Enabled: false
+
+Documentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,67 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-09-14 16:08:41 -0700 using RuboCop version 0.42.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 3
+Lint/NestedMethodDefinition:
+  Exclude:
+    - 'spec/support/mock_rails.rb'
+
+# Offense count: 3
+Metrics/AbcSize:
+  Max: 179
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 186
+
+# Offense count: 1
+Metrics/CyclomaticComplexity:
+  Max: 7
+
+# Offense count: 157
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 163
+
+# Offense count: 5
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 55
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 102
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 8
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 8
+
+# Offense count: 3
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'spec/support/mock_rails.rb'
+
+# Offense count: 1
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Style/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/foundation_rails_helper/form_builder.rb'

data/.travis.yml

@@ -3,7 +3,6 @@ branches:
   only:
     - master
 rvm:
-  - 1.9.3
   - 2.1.9
   - 2.2.5
   - 2.3.1
@@ -14,8 +13,6 @@ env:
   - "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

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## Version 2.0
+This will be used for Foundation 5 support
+
+### Breaking changes:
+* Dropped support for Ruby 1.9.3
+
+### Features:
+* Add Rubocop code style linting
+
 ## Version 1.2.2
 * Fix Rails 5 deprecation warnings about alias_method_chain
 * Allow Capybara to be upgraded beyond 2.6.x

data/README.md

@@ -16,6 +16,8 @@ So far it includes:
 * Only Rails 4.1/4.2/5 and Foundation 5 are fully supported
 * Some features may work with Foundation 4 and older, but results may vary, and markup which exists only for those versions will be gradually removed
 * Legacy branches exist for Rails 3 and 4.0 (see the rails3 and rails4.0 branches). These are not actively supported, and fixes are not retroactively applied, but pull requests are welcome.
+* We test against ruby versions 2.1 and up. This gem may still work fine on
+  1.9.3, but your mileage may vary
 
 
 ## Screenshots

data/Rakefile

@@ -1,6 +1,8 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+RuboCop::RakeTask.new(:rubocop)
+task default: [:spec, :rubocop]

data/foundation_rails_helper.gemspec

@@ -2,26 +2,26 @@
 require File.expand_path('../lib/foundation_rails_helper/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Sebastien Gruhier"]
-  gem.email         = ["sebastien.gruhier@xilinus.com"]
-  gem.description   = %q{Rails for zurb foundation CSS framework. Form builder, flash message, ...}
-  gem.summary       = %q{Rails helpers for zurb foundation CSS framework}
-  gem.homepage      = "http://github.com/sgruhier/foundation_rails_helper"
+  gem.authors       = ['Sebastien Gruhier']
+  gem.email         = ['sebastien.gruhier@xilinus.com']
+  gem.description   = 'Rails for zurb foundation CSS framework. Form builder, flash message, ...'
+  gem.summary       = 'Rails helpers for zurb foundation CSS framework'
+  gem.homepage      = 'http://github.com/sgruhier/foundation_rails_helper'
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "foundation_rails_helper"
-  gem.require_paths = ["lib"]
+  gem.name          = 'foundation_rails_helper'
+  gem.require_paths = ['lib']
   gem.version       = FoundationRailsHelper::VERSION
   gem.license       = 'MIT'
 
   # Allow different versions of the rails gems to be specified, for testing:
-  rails_version = ENV["RAILS_VERSION"] || "default"
+  rails_version = ENV['RAILS_VERSION'] || 'default'
 
   rails = case rails_version
-          when "default"
-            ">= 4.1"
+          when 'default'
+            '>= 4.1'
           else
             "~> #{rails_version}"
           end
@@ -35,4 +35,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-rails', '>= 3.1'
   gem.add_development_dependency 'mime-types',  '~> 2'
   gem.add_development_dependency 'capybara',    '~> 2.7'
+  gem.add_development_dependency 'rubocop',     '> 0.41'
 end

data/lib/foundation_rails_helper.rb

@@ -1,8 +1,8 @@
-require "foundation_rails_helper/version"
-require "foundation_rails_helper/configuration"
-require "foundation_rails_helper/form_builder"
-require "foundation_rails_helper/flash_helper"
-require "foundation_rails_helper/action_view_extension"
+require 'foundation_rails_helper/version'
+require 'foundation_rails_helper/configuration'
+require 'foundation_rails_helper/form_builder'
+require 'foundation_rails_helper/flash_helper'
+require 'foundation_rails_helper/action_view_extension'
 ActiveSupport.on_load(:action_view) do
   include FoundationRailsHelper::FlashHelper
 end

data/lib/foundation_rails_helper/action_view_extension.rb

@@ -1,4 +1,4 @@
 ActionView::Base.default_form_builder = FoundationRailsHelper::FormBuilder
-ActionView::Base.field_error_proc = Proc.new do |html_tag, instance_tag|
+ActionView::Base.field_error_proc = proc do |html_tag, _instance_tag|
   html_tag
 end

data/lib/foundation_rails_helper/flash_helper.rb

@@ -7,14 +7,14 @@ module FoundationRailsHelper
     #   <a href="" class="close">&times;</a>
     # </div>
     DEFAULT_KEY_MATCHING = {
-      :alert     => :alert,
-      :notice    => :success,
-      :info      => :info,
-      :secondary => :secondary,
-      :success   => :success,
-      :error     => :alert,
-      :warning   => :warning
-    }
+      alert: :alert,
+      notice: :success,
+      info: :info,
+      secondary: :secondary,
+      success: :success,
+      error: :alert,
+      warning: :warning
+    }.freeze
     def display_flash_messages(key_matching = {})
       key_matching = DEFAULT_KEY_MATCHING.merge(key_matching)
       key_matching.default = :standard
@@ -28,18 +28,17 @@ module FoundationRailsHelper
       end
     end
 
-  private
+    private
 
     def alert_box(value, alert_class)
-      content_tag :div, :data => { :alert => "" }, :class => "alert-box #{alert_class}" do
+      content_tag :div, data: { alert: '' }, class: "alert-box #{alert_class}" do
         concat value
         concat close_link
       end
     end
 
     def close_link
-      link_to("&times;".html_safe, "#", :class => :close)
+      link_to('&times;'.html_safe, '#', class: :close)
     end
-
   end
 end

data/lib/foundation_rails_helper/form_builder.rb

@@ -37,9 +37,7 @@ module FoundationRailsHelper
       options[:label_options] ||= {}
       label_options = options.delete(:label_options).merge!(value: tag_value)
       label_text = options.delete(:label)
-      unless label_text == false
-        l = label(attribute, label_text, label_options)
-      end
+      l = label(attribute, label_text, label_options) unless label_text == false
       r = @template.radio_button(@object_name, attribute, tag_value,
                                  objectify_options(options))
 
@@ -48,26 +46,26 @@ module FoundationRailsHelper
 
     def password_field(attribute, options = {})
       field attribute, options do |opts|
-        super(attribute, opts.merge(:autocomplete => :off))
+        super(attribute, opts.merge(autocomplete: :off))
       end
     end
 
     def datetime_select(attribute, options = {}, html_options = {})
       field attribute, options, html_options do |html_opts|
-        super(attribute, options, html_opts.merge(:autocomplete => :off))
+        super(attribute, options, html_opts.merge(autocomplete: :off))
       end
     end
 
     def date_select(attribute, options = {}, html_options = {})
       field attribute, options, html_options do |html_opts|
-        super(attribute, options, html_opts.merge(:autocomplete => :off))
+        super(attribute, options, html_opts.merge(autocomplete: :off))
       end
     end
 
     def time_zone_select(attribute, priorities = nil, options = {}, html_options = {})
       field attribute, options, html_options do |html_opts|
         super(attribute, priorities, options,
-              html_opts.merge(:autocomplete => :off))
+              html_opts.merge(autocomplete: :off))
       end
     end
 
@@ -96,8 +94,8 @@ module FoundationRailsHelper
 
     def autocomplete(attribute, url, options = {})
       field attribute, options do |opts|
-        opts.merge!(:update_elements => opts[:update_elements],
-                    :min_length => 0, :value => object.send(attribute))
+        opts.merge!(update_elements: opts[:update_elements],
+                    min_length: 0, value: object.send(attribute))
         autocomplete_field(attribute, url, opts)
       end
     end
@@ -107,7 +105,7 @@ module FoundationRailsHelper
       super(value, options)
     end
 
-  private
+    private
 
     def has_error?(attribute)
       object.respond_to?(:errors) && !object.errors[attribute].blank?
@@ -121,11 +119,11 @@ module FoundationRailsHelper
 
       error_messages = object.errors[attribute].join(', ')
       error_messages = error_messages.html_safe if options[:html_safe_errors]
-      content_tag(:small, error_messages, :class => class_name)
+      content_tag(:small, error_messages, class: class_name)
     end
 
-    def custom_label(attribute, text, options, &block)
-      return block_given? ? block.call.html_safe : ''.html_safe if text == false
+    def custom_label(attribute, text, options)
+      return block_given? ? yield.html_safe : ''.html_safe if text == false
       if text.nil? || text == true
         text =
           if object.class.respond_to?(:human_attribute_name)
@@ -134,31 +132,52 @@ module FoundationRailsHelper
             attribute.to_s.humanize
           end
       end
-      text = block.call.html_safe + " #{text}" if block_given?
+      text = yield.html_safe + " #{text}" if block_given?
       options ||= {}
       label(attribute, text, options)
     end
 
     def column_classes(options)
-      classes = ''
-      if options[:small].present? && options[:small].to_i < 12
-        classes += "small-#{options[:small]} "
+      classes = SizeClassCalcluator.new(options).classes
+      classes + ' columns'
+    end
+
+    class SizeClassCalcluator
+      def initialize(size_options)
+        @small = size_options[:small]
+        @medium = size_options[:medium]
+        @large = size_options[:large]
+      end
+
+      def classes
+        [small_class, medium_class, large_class].compact.join(' ')
+      end
+
+      private
+
+      def small_class
+        "small-#{@small}" if valid_size(@small)
       end
-      if options[:medium].present? && options[:medium].to_i < 12
-        classes += "medium-#{options[:medium]} "
+
+      def medium_class
+        "medium-#{@medium}" if valid_size(@medium)
       end
-      if options[:large].present? && options[:large].to_i < 12
-        classes += "large-#{options[:large]} "
+
+      def large_class
+        "large-#{@large}" if valid_size(@large)
+      end
+
+      def valid_size(value)
+        value.present? && value.to_i < 12
       end
-      classes + 'columns'
     end
 
     def tag_from_options(name, options)
       return ''.html_safe unless options && options[:value].present?
 
       content_tag(:div,
-                  content_tag(:span, options[:value], :class => name),
-                  :class => "#{ column_classes( options ) }")
+                  content_tag(:span, options[:value], class: name),
+                  class: column_classes(options).to_s)
     end
 
     def decrement_input_size(input, column, options)
@@ -191,12 +210,12 @@ module FoundationRailsHelper
       postfix = tag_from_options('postfix', postfix_options)
 
       input_size = calculate_input_size(prefix_options, postfix_options)
-      klass = "#{column_classes(input_size.marshal_dump)}"
-      input = content_tag(:div, block, :class => klass)
+      klass = column_classes(input_size.marshal_dump).to_s
+      input = content_tag(:div, block, class: klass)
 
       html =
         if input_size.changed?
-          content_tag(:div, prefix + input + postfix, :class => "row collapse")
+          content_tag(:div, prefix + input + postfix, class: 'row collapse')
         else
           block
         end
@@ -206,20 +225,18 @@ module FoundationRailsHelper
 
     def error_and_hint(attribute, options = {})
       html = ''
-      if options[:hint]
-        html += content_tag(:span, options[:hint], :class => :hint)
-      end
+      html += content_tag(:span, options[:hint], class: :hint) if options[:hint]
       html += error_for(attribute, options) || ''
       html.html_safe
     end
 
-    def field(attribute, options, html_options = nil, &block)
+    def field(attribute, options, html_options = nil)
       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
-      end
+      html = if auto_labels || options[:label]
+               custom_label(attribute, options[:label], options[:label_options])
+             else
+               ''.html_safe
+             end
       class_options = html_options || options
 
       if has_error?(attribute)

data/lib/foundation_rails_helper/version.rb

@@ -1,3 +1,3 @@
 module FoundationRailsHelper
-  VERSION = "1.2.2"
+  VERSION = '2.0.0'.freeze
 end