comfy_bootstrap_form 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b46e1601a47190eba54fa3804050d1fe7d4e41c59103c00d15bc6521a4821abf
-  data.tar.gz: 1e8d951d30d7a8f6e2e35da527cfe488a04e1c427b497d9614678812ec1a6c74
+SHA1:
+  metadata.gz: 52ad6eec307301d06755be3fbd82a3c62372be79
+  data.tar.gz: 7b66272d0bea20d173bc39c64636c6fc79f3cb64
 SHA512:
-  metadata.gz: a7c2ae42c1fc4d80a5f55177999d820f60c7ff8cbb7088084bffc6fcb4c53cc8119756401de03c29898f99c14573d8cc5d119af53690e557598307c02a0ba90e
-  data.tar.gz: 3da9356128a9b8c475181e2615326703ae5ab5f7b1a10e7cbfea03f0e19459013b0137855339eb0263e0778750cf1d472be67ed4b8379bb67b19c604d730bdf8
+  metadata.gz: 4b74b016d644a1fadfa212ba3abf1cd97be4d252d8b03813105aa22d20f013bf55529e5b5394f4b8750cf131d8e612b0373924e8134c30d0d58f553be3ac4192
+  data.tar.gz: ce6aee4bef4cdb53e603c0d209c142f9f22955ed16d0036e83d76987728ece5758d5b8845d0f4ff564347acb922fc28af636c4a7309de1f43a4f686196e6855d

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
   Exclude:
     - demo/**/*
 
@@ -94,8 +94,8 @@ Style/AsciiComments:
 # -- Exceptions ----------------------------------------------------------------
 Performance/RedundantMerge:
   Exclude:
-    - 'lib/bootstrap_form/view_helper.rb'
+    - 'lib/comfy_bootstrap_form/view_helper.rb'
 
 Naming/AccessorMethodName:
   Exclude:
-    - 'lib/bootstrap_form/bootstrap_options.rb'
+    - 'lib/comfy_bootstrap_form/bootstrap_options.rb'

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 gemfile:
   - test/gemfiles/5.0.gemfile
   - test/gemfiles/5.1.gemfile

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 
 gemspec

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2018 Oleg Khabarov, Stephen Potenza
+Copyright 2018 Oleg Khabarov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -6,8 +6,6 @@
 [![Gem Version](https://img.shields.io/gem/v/comfy_bootstrap_form.svg?style=flat)](http://rubygems.org/gems/comfy_bootstrap_form)
 [![Gem Downloads](https://img.shields.io/gem/dt/comfy_bootstrap_form.svg?style=flat)](http://rubygems.org/gems/comfy_bootstrap_form)
 [![Build Status](https://img.shields.io/travis/comfy/comfy-bootstrap-form.svg?style=flat)](https://travis-ci.org/comfy/comfy-bootstrap-form)
-[![Dependency Status](https://img.shields.io/gemnasium/comfy/comfy-bootstrap-form.svg?style=flat)](https://gemnasium.com/comfy/comfy-bootstrap-form)
-[![Code Climate](https://img.shields.io/codeclimate/maintainability/comfy/comfy-bootstrap-form.svg?style=flat)](https://codeclimate.com/github/comfy/comfy-bootstrap-form)
 [![Coverage Status](https://img.shields.io/coveralls/comfy/comfy-bootstrap-form.svg?style=flat)](https://coveralls.io/r/comfy/comfy-bootstrap-form?branch=master)
 [![Gitter](https://badges.gitter.im/comfy/comfortable-mexican-sofa.svg)](https://gitter.im/comfy/comfortable-mexican-sofa)
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require "bundler/setup"
 rescue LoadError
@@ -8,7 +10,7 @@ require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = "rdoc"
-  rdoc.title    = "BootstrapForm"
+  rdoc.title    = "ComfyBootstrapForm"
   rdoc.options << "--line-numbers"
   rdoc.rdoc_files.include("README.md")
   rdoc.rdoc_files.include("lib/**/*.rb")

data/{bootstrap_form.gemspec → comfy_bootstrap_form.gemspec}

@@ -1,11 +1,13 @@
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require "bootstrap_form/version"
+require "comfy_bootstrap_form/version"
 
 Gem::Specification.new do |s|
   s.name        = "comfy_bootstrap_form"
-  s.version     = BootstrapForm::VERSION
+  s.version     = ComfyBootstrapForm::VERSION
   s.authors     = ["Oleg Khabarov"]
   s.email       = ["oleg@khabarov.ca"]
   s.homepage    = "https://github.com/comfy/comfy-bootstrap-form"
@@ -22,7 +24,7 @@ Gem::Specification.new do |s|
   s.bindir        = "exe"
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 2.2.2"
+  s.required_ruby_version = ">= 2.3.0"
 
   s.add_dependency "rails", ">= 5.0.0"
 end

data/lib/comfy_bootstrap_form.rb

@@ -1 +1,15 @@
-require_relative "./bootstrap_form"
+# frozen_string_literal: true
+
+require "comfy_bootstrap_form/form_builder"
+require "comfy_bootstrap_form/view_helper"
+
+module ComfyBootstrapForm
+  module Rails
+    class Engine < ::Rails::Engine
+    end
+  end
+end
+
+ActiveSupport.on_load(:action_view) do
+  include ComfyBootstrapForm::ViewHelper
+end

data/lib/{bootstrap_form → comfy_bootstrap_form}/bootstrap_options.rb

@@ -1,4 +1,6 @@
-module BootstrapForm
+# frozen_string_literal: true
+
+module ComfyBootstrapForm
   # Container for bootstrap specific form builder options. It controls options
   # that define form layout and grid sizing. They are passed-in into form helper
   # and field helpers via `:bootstrap` option. For example:

data/lib/{bootstrap_form → comfy_bootstrap_form}/form_builder.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require_relative "bootstrap_options"
 
-module BootstrapForm
+module ComfyBootstrapForm
   class FormBuilder < ActionView::Helpers::FormBuilder
 
     FIELD_HELPERS = %w[
@@ -15,7 +17,7 @@ module BootstrapForm
     attr_accessor :form_bootstrap
 
     def initialize(object_name, object, template, options)
-      @form_bootstrap = BootstrapForm::BootstrapOptions.new(options.delete(:bootstrap))
+      @form_bootstrap = ComfyBootstrapForm::BootstrapOptions.new(options.delete(:bootstrap))
       super(object_name, object, template, options)
     end
 
@@ -44,6 +46,9 @@ module BootstrapForm
     #
     def select(method, choices = nil, options = {}, html_options = {}, &block)
       bootstrap = form_bootstrap.scoped(options.delete(:bootstrap))
+
+      add_css_class!(html_options, "custom-select") if bootstrap.custom_control
+
       draw_form_group(bootstrap, method, html_options) do
         super(method, choices, options, html_options, &block)
       end
@@ -93,8 +98,8 @@ module BootstrapForm
       end
 
       fieldset_css_class = "form-group"
-      fieldset_css_class << " row" if bootstrap.horizontal?
-      fieldset_css_class << " #{bootstrap.inline_margin_class}" if bootstrap.inline?
+      fieldset_css_class += " row" if bootstrap.horizontal?
+      fieldset_css_class += " #{bootstrap.inline_margin_class}" if bootstrap.inline?
 
       content_tag(:fieldset, class: fieldset_css_class) do
         draw_control_column(bootstrap, offset: true) do
@@ -197,7 +202,7 @@ module BootstrapForm
       add_css_class!(options, "btn")
 
       form_group_class = "form-group"
-      form_group_class << " row" if bootstrap.horizontal?
+      form_group_class += " row" if bootstrap.horizontal?
 
       content_tag(:div, class: form_group_class) do
         draw_control_column(bootstrap, offset: true) do
@@ -241,8 +246,8 @@ module BootstrapForm
         end
 
       form_group_class = "form-group"
-      form_group_class << " row"      if bootstrap.horizontal?
-      form_group_class << " mr-sm-2"  if bootstrap.inline?
+      form_group_class += " row"      if bootstrap.horizontal?
+      form_group_class += " mr-sm-2"  if bootstrap.inline?
 
       content_tag(:div, class: form_group_class) do
         content = "".html_safe
@@ -265,8 +270,8 @@ module BootstrapForm
       end
 
       form_group_class = "form-group"
-      form_group_class << " row"      if bootstrap.horizontal?
-      form_group_class << " mr-sm-2"  if bootstrap.inline?
+      form_group_class += " row"      if bootstrap.horizontal?
+      form_group_class += " mr-sm-2"  if bootstrap.inline?
 
       content_tag(:div, class: form_group_class) do
         concat label
@@ -275,7 +280,8 @@ module BootstrapForm
     end
 
     def draw_errors(method)
-      return unless (errors = object && object.errors[method]).present?
+      return unless object.present?
+      return unless (errors = object.errors[method]).present?
 
       content_tag(:div, class: "invalid-feedback") do
         errors.join(", ")
@@ -327,7 +333,7 @@ module BootstrapForm
     def draw_control_column(bootstrap, offset:)
       return yield unless bootstrap.horizontal?
       css_class = bootstrap.control_col_class.to_s
-      css_class << " #{bootstrap.offset_col_class}" if offset
+      css_class += " #{bootstrap.offset_col_class}" if offset
       content_tag(:div, class: css_class) do
         yield
       end
@@ -393,13 +399,13 @@ module BootstrapForm
           label_css_class = "custom-control-label"
 
           form_check_css_class = "custom-control"
-          form_check_css_class <<
+          form_check_css_class +=
             case type
             when :radio_button then " custom-radio"
             when :check_box    then " custom-checkbox"
             end
 
-          form_check_css_class << " custom-control-inline" if bootstrap.check_inline
+          form_check_css_class += " custom-control-inline" if bootstrap.check_inline
 
           add_css_class!(html_options, "custom-control-input")
 
@@ -407,7 +413,7 @@ module BootstrapForm
           label_css_class = "form-check-label"
 
           form_check_css_class = "form-check"
-          form_check_css_class << " form-check-inline" if bootstrap.check_inline
+          form_check_css_class += " form-check-inline" if bootstrap.check_inline
 
           add_css_class!(html_options, "form-check-input")
         end

data/lib/comfy_bootstrap_form/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module ComfyBootstrapForm
+
+  VERSION = "4.0.4"
+
+end

data/lib/{bootstrap_form → comfy_bootstrap_form}/view_helper.rb

@@ -1,4 +1,6 @@
-module BootstrapForm
+# frozen_string_literal: true
+
+module ComfyBootstrapForm
   module ViewHelper
 
     # Wrapper for `form_with`. Passing in Bootstrap form builder.
@@ -11,7 +13,7 @@ module BootstrapForm
         css_classes = [css_classes, "form-inline"].compact.join(" ")
       end
 
-      form_options = options.reverse_merge(builder: BootstrapForm::FormBuilder)
+      form_options = options.reverse_merge(builder: ComfyBootstrapForm::FormBuilder)
       form_options.merge!(class: css_classes) unless css_classes.blank?
 
       supress_form_field_errors do
@@ -30,7 +32,7 @@ module BootstrapForm
         css_classes = [css_classes, "form-inline"].compact.join(" ")
       end
 
-      options.reverse_merge!(builder: BootstrapForm::FormBuilder)
+      options.reverse_merge!(builder: ComfyBootstrapForm::FormBuilder)
       options[:html].merge!(class: css_classes) unless css_classes.blank?
 
       supress_form_field_errors do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfy_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,13 +40,12 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- bootstrap_form.gemspec
-- lib/bootstrap_form.rb
-- lib/bootstrap_form/bootstrap_options.rb
-- lib/bootstrap_form/form_builder.rb
-- lib/bootstrap_form/version.rb
-- lib/bootstrap_form/view_helper.rb
+- comfy_bootstrap_form.gemspec
 - lib/comfy_bootstrap_form.rb
+- lib/comfy_bootstrap_form/bootstrap_options.rb
+- lib/comfy_bootstrap_form/form_builder.rb
+- lib/comfy_bootstrap_form/version.rb
+- lib/comfy_bootstrap_form/view_helper.rb
 homepage: https://github.com/comfy/comfy-bootstrap-form
 licenses:
 - MIT
@@ -59,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -67,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Rails form builder that makes it easy to style forms using Bootstrap 4

data/lib/bootstrap_form.rb

@@ -1,13 +0,0 @@
-require "bootstrap_form/form_builder"
-require "bootstrap_form/view_helper"
-
-module BootstrapForm
-  module Rails
-    class Engine < ::Rails::Engine
-    end
-  end
-end
-
-ActiveSupport.on_load(:action_view) do
-  include BootstrapForm::ViewHelper
-end

data/lib/bootstrap_form/version.rb

@@ -1,5 +0,0 @@
-module BootstrapForm
-
-  VERSION = "4.0.3".freeze
-
-end