comfy_bootstrap_form 4.0.0.beta1 → 4.0.0.beta2

data/test/bootstrap_form/submit_test.rb

@@ -0,0 +1,59 @@
+require_relative "../test_helper"
+
+class SubmitTest < ActionView::TestCase
+
+  setup do
+    @user     = User.new
+    @builder  = BootstrapForm::FormBuilder.new(:user, @user, self, {})
+  end
+
+  def test_submit
+    expected = <<-HTML
+      <div class="form-group">
+        <input class="btn" data-disable-with="Create User" name="commit" type="submit" value="Create User" />
+      </div>
+    HTML
+    assert_xml_equal expected, @builder.submit
+  end
+
+  def test_primary
+    expected = <<-HTML
+      <div class="form-group">
+        <input class="btn-primary btn" data-disable-with="Create User" name="commit" type="submit" value="Create User" />
+      </div>
+    HTML
+    assert_xml_equal expected, @builder.primary
+  end
+
+  def test_submit_with_label
+    expected = <<-HTML
+      <div class="form-group">
+        <input class="btn" data-disable-with="Test" name="commit" type="submit" value="Test" />
+      </div>
+    HTML
+    assert_xml_equal expected, @builder.submit("Test")
+  end
+
+  def test_submit_with_css_class
+    expected = <<-HTML
+      <div class="form-group">
+        <input class="custom btn" data-disable-with="Create User" name="commit" type="submit" value="Create User" />
+      </div>
+    HTML
+    assert_xml_equal expected, @builder.submit(class: "custom")
+  end
+
+  def test_submit_with_block
+    actual = @builder.submit do
+      %{<a href="/" class="btn btn-link">Cancel</a>}.html_safe
+    end
+    expected = <<-HTML
+      <div class="form-group">
+        <input class="btn" data-disable-with="Create User" name="commit" type="submit" value="Create User"/>
+        <a href="/" class="btn btn-link">Cancel</a>
+      </div>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+end

data/test/bootstrap_form/view_helpers_test.rb

@@ -0,0 +1,99 @@
+require_relative "../test_helper"
+
+class ViewHelpersTest < ActionView::TestCase
+
+  include BootstrapForm::ViewHelper
+
+  def test_bootstrap_form_with
+    actual = bootstrap_form_with(url: "/test"){ }
+    expected = <<-HTML
+      <form action="/test" accept-charset="UTF-8" data-remote="true" method="post">
+        <input name="utf8" type="hidden" value="&#x2713;" />
+      </form>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_bootstrap_form_with_and_field
+    actual = bootstrap_form_with(url: "/test") do |form|
+      form.text_field :value
+    end
+    expected = <<-HTML
+      <form accept-charset="UTF-8" action="/test" data-remote="true" method="post">
+        <input name="utf8" type="hidden" value="&#x2713;"/>
+        <div class="form-group">
+          <label for="value">Value</label>
+          <input class="form-control" id="value" name="value" type="text"/>
+        </div>
+      </form>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_bootstrap_form_as_horizontal
+    actual = bootstrap_form_with(url: "/test", bootstrap: {layout: :horizontal}) do |form|
+      form.text_field :value
+    end
+    expected = <<-HTML
+      <form accept-charset="UTF-8" action="/test" data-remote="true" method="post">
+        <input name="utf8" type="hidden" value="&#x2713;"/>
+        <div class="form-group row">
+          <label class="col-form-label col-sm-2 text-sm-right" for="value">Value</label>
+          <div class="col-sm-10">
+            <input class="form-control" id="value" name="value" type="text"/>
+          </div>
+        </div>
+      </form>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_bootstrap_form_with_inline
+    actual = bootstrap_form_with(url: "/test", bootstrap: {layout: :inline}) do |form|
+      form.text_field :value
+      form.submit
+    end
+    expected = <<-HTML
+      <form accept-charset="UTF-8" action="/test" class=" form-inline" data-remote="true" method="post">
+        <input name="utf8" type="hidden" value="&#x2713;"/>
+        <div class="form-group">
+          <input class="btn" data-disable-with="Save " name="commit" type="submit" value="Save "/>
+        </div>
+      </form>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_bootstrap_form_with_supress_field_errors
+    user = User.new
+    user.errors.add(:test, "invalid")
+    actual = bootstrap_form_with(model: user, url: "/test") do |form|
+      form.text_field :test
+    end
+    expected = <<-HTML
+      <form accept-charset="UTF-8" action="/test" data-remote="true" method="post">
+        <input name="utf8" type="hidden" value="&#x2713;"/>
+        <div class="form-group">
+          <label for="user_test">Test</label>
+          <input class="form-control is-invalid" id="user_test" name="user[test]" type="text"/>
+          <div class="invalid-feedback">invalid</div>
+        </div>
+      </form>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+  def test_bootstrap_form_with_builder_override
+    actual = bootstrap_form_with(url: "/test", builder: ActionView::Helpers::FormBuilder) do |form|
+      form.text_field :value
+    end
+    expected = <<-HTML
+      <form accept-charset="UTF-8" action="/test" data-remote="true" method="post">
+        <input name="utf8" type="hidden" value="&#x2713;"/>
+        <input id="value" name="value" type="text"/>
+      </form>
+    HTML
+    assert_xml_equal expected, actual
+  end
+
+end

data/test/gemfiles/5.2.gemfile

@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+
+gemspec path: "../../"
+
+gem "rails", "~> 5.2.0.rc1"
+
+group :test do
+  gem "minitest"
+  gem "diffy"
+  gem "equivalent-xml"
+  gem "sqlite3"
+  gem "coveralls", require: false
+end

data/test/test_helper.rb

@@ -1,86 +1,48 @@
-require 'timecop'
+ENV["RAILS_ENV"] = "test"
+
+require 'coveralls'
+Coveralls.wear!
+
 require 'diffy'
 require 'nokogiri'
 require 'equivalent-xml'
-require 'mocha/mini_test'
 
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require_relative "../demo/config/environment.rb"
 require "rails/test_help"
 
 Rails.backtrace_cleaner.remove_silencers!
 
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+class ActionView::TestCase
 
-def setup_test_fixture
-  @user = User.new(email: 'steve@example.com', password: 'secret', comments: 'my comment')
-  @builder = BootstrapForm::FormBuilder.new(:user, @user, self, {})
-  @horizontal_builder = BootstrapForm::FormBuilder.new(:user, @user, self, { layout: :horizontal, label_col: "col-sm-2", control_col: "col-sm-10" })
-  I18n.backend.store_translations(:en, {
-    activerecord: {
-      attributes: {
-        user: {
-          email: "Email"
-        }
-      },
-      help: {
-        user: {
-          password: "A good password should be at least six characters long"
-        }
-      }
-    }
-  })
-end
+  # Expected and actual are wrapped in a root tag to ensure proper XML structure
+  def assert_xml_equal(expected, actual)
+    expected_xml = Nokogiri::XML("<test-xml>\n#{expected}\n</test-xml>", &:noblanks)
+    actual_xml   = Nokogiri::XML("<test-xml>\n#{actual}\n</test-xml>", &:noblanks)
 
-def sort_attributes doc
-  doc.dup.traverse do |node|
-    if node.is_a?(Nokogiri::XML::Element)
-      attributes = node.attribute_nodes.sort_by(&:name)
-      attributes.each do |attribute|
-        node.delete(attribute.name)
-        node[attribute.name] = attribute.value
-      end
-    end
-    node
+    equivalent = EquivalentXml.equivalent?(expected_xml, actual_xml)
+    assert equivalent, lambda {
+      # using a lambda because diffing is expensive
+      Diffy::Diff.new(
+        sort_attributes(expected_xml.root).to_xml(indent: 2),
+        sort_attributes(actual_xml.root).to_xml(indent: 2)
+      ).to_s
+    }
   end
-end
 
-class ActionView::TestCase
-  def assert_equivalent_xml(expected, actual)
-    expected_xml = Nokogiri::XML(expected)
-    actual_xml = Nokogiri::XML(actual)
-    ignored_attributes = %w(style data-disable-with)
-    equivalent = EquivalentXml.equivalent?(expected_xml, actual_xml, {
-      ignore_attr_values: ignored_attributes
-    }) do |a, b, result|
-      if result === false && b.is_a?(Nokogiri::XML::Element)
-        if b.attr('name') == 'utf8'
-          # Handle wrapped utf8 hidden field for Rails 4.2+
-          result = EquivalentXml.equivalent?(a.child, b)
-        end
-        if b.delete('data-disable-with')
-          # Remove data-disable-with for Rails 5+
-          # Workaround because ignoring in EquivalentXml doesn't work
-          result = EquivalentXml.equivalent?(a, b)
-        end
-        if a.attr('type') == 'datetime' && b.attr('type') == 'datetime-local'
-          a.delete('type')
-          b.delete('type')
-          # Handle new datetime type for Rails 5+
-          result = EquivalentXml.equivalent?(a, b)
+private
+
+  def sort_attributes(doc)
+    return if doc.blank?
+    doc.dup.traverse do |node|
+      if node.is_a?(Nokogiri::XML::Element)
+        attributes = node.attribute_nodes.sort_by(&:name)
+        attributes.each do |attribute|
+          node.delete(attribute.name)
+          node[attribute.name] = attribute.value
         end
       end
-      result
+      node
     end
-    assert equivalent, lambda {
-      # using a lambda because diffing is expensive
-      Diffy::Diff.new(
-        sort_attributes(expected_xml.root),
-        sort_attributes(actual_xml.root)
-      ).to_s(:color)
-    }
   end
+
 end

metadata

@@ -1,227 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: comfy_bootstrap_form
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.beta2
 platform: ruby
 authors:
+- Oleg Khabarov
 - Stephen Potenza
-- Carlos Lopes
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 5.2.rc1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: diffy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.rc1
 description: bootstrap_form is a rails form builder that makes it super easy to create
-  beautiful-looking forms using Twitter Bootstrap 4
+  beautiful-looking forms using Bootstrap 4
 email:
-- potenza@gmail.com
-- carlos.el.lopes@gmail.com
+- oleg@khabarov.ca
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
+- ".gitignore"
+- ".travis.yml"
+- CONTRIBUTING.md
+- Gemfile
+- LICENSE.md
 - README.md
 - Rakefile
-- app/assets/stylesheets/rails_bootstrap_forms.css
+- bootstrap_form.gemspec
+- demo/README.md
+- demo/Rakefile
+- demo/app/controllers/application_controller.rb
+- demo/app/controllers/bootstrap_controller.rb
+- demo/app/models/application_record.rb
+- demo/app/models/user.rb
+- demo/app/views/bootstrap/form.html.erb
+- demo/app/views/layouts/application.html.erb
+- demo/bin/bundle
+- demo/bin/rails
+- demo/bin/rake
+- demo/bin/setup
+- demo/bin/update
+- demo/bin/yarn
+- demo/config.ru
+- demo/config/application.rb
+- demo/config/boot.rb
+- demo/config/database.yml
+- demo/config/environment.rb
+- demo/config/environments/development.rb
+- demo/config/environments/test.rb
+- demo/config/initializers/application_controller_renderer.rb
+- demo/config/initializers/assets.rb
+- demo/config/initializers/backtrace_silencers.rb
+- demo/config/initializers/cookies_serializer.rb
+- demo/config/initializers/filter_parameter_logging.rb
+- demo/config/initializers/inflections.rb
+- demo/config/initializers/mime_types.rb
+- demo/config/initializers/wrap_parameters.rb
+- demo/config/locales/en.yml
+- demo/config/puma.rb
+- demo/config/routes.rb
+- demo/config/spring.rb
+- demo/config/storage.yml
+- demo/db/schema.rb
+- demo/log/.keep
+- demo/package.json
+- demo/public/favicon.ico
 - lib/bootstrap_form.rb
-- lib/bootstrap_form/aliasing.rb
 - lib/bootstrap_form/form_builder.rb
-- lib/bootstrap_form/helper.rb
-- lib/bootstrap_form/helpers/bootstrap.rb
-- lib/bootstrap_form/helpers/nested_form.rb
 - lib/bootstrap_form/version.rb
+- lib/bootstrap_form/view_helper.rb
 - lib/comfy_bootstrap_form.rb
-- test/bootstrap_checkbox_test.rb
-- test/bootstrap_fields_test.rb
-- test/bootstrap_form_group_test.rb
-- test/bootstrap_form_test.rb
-- test/bootstrap_other_components_test.rb
-- test/bootstrap_radio_button_test.rb
-- test/bootstrap_selects_test.rb
-- test/dummy/Gemfile
-- test/dummy/Gemfile.lock
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/address.rb
-- test/dummy/app/models/faux_user.rb
-- test/dummy/app/models/super_user.rb
-- test/dummy/app/models/user.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/generic_migration.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/db/migrate/20130703191909_create_users.rb
-- test/dummy/db/migrate/20130703191937_create_addresses.rb
-- test/dummy/db/migrate/20130912171202_add_preferences_to_user.rb
-- test/dummy/db/migrate/20140327190145_add_terms_to_user.rb
-- test/dummy/db/migrate/20140922133133_add_type_to_users.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/seeds.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/robots.txt
-- test/dummy/test/fixtures/addresses.yml
-- test/dummy/test/fixtures/users.yml
-- test/dummy/test/models/address_test.rb
-- test/dummy/test/models/user_test.rb
-- test/dummy/test/test_helper.rb
-- test/special_form_class_models_test.rb
+- test/bootstrap_form/fields_test.rb
+- test/bootstrap_form/fields_with_errors_test.rb
+- test/bootstrap_form/form_builder_test.rb
+- test/bootstrap_form/horizontal_form_test.rb
+- test/bootstrap_form/inline_form_test.rb
+- test/bootstrap_form/input_group_test.rb
+- test/bootstrap_form/radios_and_checkboxes_test.rb
+- test/bootstrap_form/submit_test.rb
+- test/bootstrap_form/view_helpers_test.rb
+- test/gemfiles/5.2.gemfile
 - test/test_helper.rb
-homepage: http://github.com/comfy/comfy-rails-bootstrap-forms
-licenses: []
+homepage: https://github.com/comfy/comfy-bootstrap-form
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -231,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -239,71 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
-summary: Rails form builder that makes it easy to style forms using Twitter Bootstrap
-  3+
-test_files:
-- test/bootstrap_form_group_test.rb
-- test/bootstrap_other_components_test.rb
-- test/test_helper.rb
-- test/bootstrap_selects_test.rb
-- test/special_form_class_models_test.rb
-- test/dummy/config/application.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/generic_migration.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/routes.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/boot.rb
-- test/dummy/Rakefile
-- test/dummy/test/models/address_test.rb
-- test/dummy/test/models/user_test.rb
-- test/dummy/test/test_helper.rb
-- test/dummy/test/fixtures/users.yml
-- test/dummy/test/fixtures/addresses.yml
-- test/dummy/db/schema.rb
-- test/dummy/db/migrate/20140922133133_add_type_to_users.rb
-- test/dummy/db/migrate/20130703191909_create_users.rb
-- test/dummy/db/migrate/20140327190145_add_terms_to_user.rb
-- test/dummy/db/migrate/20130703191937_create_addresses.rb
-- test/dummy/db/migrate/20130912171202_add_preferences_to_user.rb
-- test/dummy/db/seeds.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/robots.txt
-- test/dummy/bin/rake
-- test/dummy/bin/rails
-- test/dummy/bin/bundle
-- test/dummy/Gemfile.lock
-- test/dummy/Gemfile
-- test/dummy/config.ru
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/models/user.rb
-- test/dummy/app/models/address.rb
-- test/dummy/app/models/faux_user.rb
-- test/dummy/app/models/super_user.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/README.rdoc
-- test/bootstrap_checkbox_test.rb
-- test/bootstrap_form_test.rb
-- test/bootstrap_radio_button_test.rb
-- test/bootstrap_fields_test.rb
+summary: Rails form builder that makes it easy to style forms using Bootstrap 4
+test_files: []