simple_form-bootstrap 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6ea0957545a4c17950bdf09f9237b1b9d65aa21
-  data.tar.gz: db3a33a12b1795eabd4815608cb34fab6a8e6ed5
+  metadata.gz: 26489ef93ca2d29986f6fc2d779623da2c704f43
+  data.tar.gz: a454186a41d7d02312d8112171226a86eae7ce2d
 SHA512:
-  metadata.gz: d4cecfc6d0e988e6887a37f92bf69ded8cd6684745037394b26c684b7496c06c933e9403d953a3e46325f326fa7d860b68a90bbbed5328d7b04cb2b6b74c17c1
-  data.tar.gz: db340e776a16319c2a82c7fd824b9daf20fd3c98d13ac4189cb24fe8d711f33df0acbef15bcdab878c3a98601de3b37aa1ff9117a526574f57aab27af4bf9c42
+  metadata.gz: 07fa325718226174d0578ee1a50e63303ef02496a428c848a6eade551e3f10e3692af548120d27ff0157778d5ac09c7513dc81d229f98fc1d1f91e693eb22634
+  data.tar.gz: da29bb5246335fa3a0133618bf87932e7c1db353ff949393b07d3a77eb8b2fcc92bd3bf8c0a36d2309e69677a62e436c42f85292bc56a33947cf011557f296e0

data/.gitignore

@@ -0,0 +1,34 @@
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,17 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.6
+  - 2.2.2
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+bundler_args: "--jobs=3 --retry=3"
+
+before_install:
+  - bundle config build.nokogiri --use-system-libraries
+
+script:
+  - bundle exec rake spec

data/CHANGELOG.md

@@ -0,0 +1,34 @@
+## master
+
+### enhancements
+
+### bug fixes
+
+## 1.2.0
+
+### enhancements
+  * It allows `submit` buttons to accept blocks. When a block is specified, the submit button will
+    use a \<button> tag instead of an \<input> tag. [@lowjoel](https://github.com/lowjoel)
+
+### bug fixes
+
+## 1.1.2
+
+### bug fixes
+  * The proper ID for date/time pickers should be generated for non-JavaScript aware browsers first;
+    Browsers with JavaScript would reassign the label to the hidden date/time picker. This fixes
+    tests written using Capybara, without JavaScript support.
+  * Specifying the button size (e.g. `btn-lg`) should still generate the appropriate button class
+  (`btn-default` or `btn-primary`). [@lowjoel](https://github.com/lowjoel)
+
+## 1.1.1
+
+Never released.
+
+## 1.1.0
+
+### enhancements
+  * There is no longer a need to retain a Simple Form initialiser, as well as a Simple 
+  Form-Bootstrap initialiser. Just call `SimpleForm::setup` and the Bootstrap defaults would be 
+  automatically applied. [@lowjoel](https://github.com/lowjoel)
+  * Started writing specs and running them on Travis!  

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Joel Low
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/README.md

@@ -0,0 +1,36 @@
+simple_form-bootstrap
+===
+[![Build Status](https://travis-ci.org/lowjoel/simple_form-bootstrap.svg?branch=master)](https://travis-ci.org/lowjoel/simple_form-bootstrap) [![Coverage Status](https://coveralls.io/repos/lowjoel/simple_form-bootstrap/badge.svg)](https://coveralls.io/r/lowjoel/simple_form-bootstrap) [![Code Climate](https://codeclimate.com/github/lowjoel/simple_form-bootstrap/badges/gpa.svg)](https://codeclimate.com/github/lowjoel/simple_form-bootstrap)
+
+Integrating Bootstrap-looking form controls with Simple Form.
+
+## Installation
+
+ 1. Add to your application's Gemfile: `gem 'simple_form-bootstrap'`. The following types of
+    input controls are supported, so long they are properly installed in your application. Ensure
+    that the control is included in your `application.js` _before_ the Simple Form-Bootstrap
+    JavaScript.
+
+    1. If you want to use Date/Time pickers, install the `bootstrap3-datetimepicker-rails` gem.
+    2. If you want to use the nicely styled Bootstrap Select picker, install the
+       `bootstrap-select-rails` gem.
+
+ 2. Add to your application's javascript: `//= require simple_form-bootstrap`
+ 3. Empty the Simple Form initializer:
+    ```ruby
+# config/initializers/simple_form.rb
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+end
+    ```
+
+    1. You can still put configuration settings in, but it should no longer be necessary.
+
+ 4. Restart your development server.
+
+## Features
+
+ 1. It adds the appropriate button styling to all buttons. By default, the `btn` and `btn-default`
+    styles are added to all buttons. Submit buttons get `btn-primary` instead of `btn-default`.
+ 2. It allows `submit` buttons to accept blocks. When a block is specified, the submit button will
+    use a \<button> tag instead of an \<input> tag.

data/Rakefile

@@ -1,12 +1,12 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new
-
-task :default => :spec
-task :test => :spec
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task :default => :spec
+task :test => :spec

data/app/assets/javascripts/simple_form-bootstrap.js

@@ -1,24 +1,24 @@
-//= require simple_form-bootstrap/date_time_input
-
-(function($) {
-  'use strict';
-  function initializeComponents(node) {
-    // Enable our date/time pickers
-    var datePickers = $('input.bootstrap-datepicker', node);
-    datePickers.datetimepicker();
-
-    // Enable our styled Bootstrap select controls, except Twitter Typeahead controls.
-    var selects = $('select.form-control:not(.typeahead)', node);
-    selects.selectpicker();
-  }
-
-  $(document).on('ready', function(e) {
-    initializeComponents(document);
-  });
-  $(document).on('DOMNodeInserted', function(e) {
-    initializeComponents(e.target);
-  });
-  $(document).on('nested:fieldAdded', function(e) {
-    initializeComponents(e.field);
-  });
-})(jQuery);
+//= require simple_form-bootstrap/date_time_input
+
+(function($) {
+  'use strict';
+  function initializeComponents(node) {
+    // Enable our date/time pickers
+    var datePickers = $('input.bootstrap-datepicker', node);
+    datePickers.datetimepicker();
+
+    // Enable our styled Bootstrap select controls, except Twitter Typeahead controls.
+    var selects = $('select.form-control:not(.typeahead)', node);
+    selects.selectpicker();
+  }
+
+  $(document).on('ready', function(e) {
+    initializeComponents(document);
+  });
+  $(document).on('DOMNodeInserted', function(e) {
+    initializeComponents(e.target);
+  });
+  $(document).on('nested:fieldAdded', function(e) {
+    initializeComponents(e.field);
+  });
+})(jQuery);

data/app/assets/javascripts/simple_form-bootstrap/date_time_input.js

@@ -1,77 +1,77 @@
-// Hijacks the default Bootstrap date-time picker to always format dates in the specified format
-// through the use of a hidden field.
-(function($) {
-  'use strict';
-  /* global moment */
-
-  // Machine-readable formats used to store dates in hidden fields
-  var DATE_FORMAT = 'YYYY-MM-DD';
-  var DATETIME_FORMAT = 'YYYY-MM-DDTHH:mm:ssZZ';
-  var DATETIME_FORMAT_RAILS = 'YYYY-MM-DD HH:mm:ss ZZ';
-
-  var oldDateTimePicker = $.fn.datetimepicker;
-  if (!oldDateTimePicker) {
-    return;
-  }
-
-  var methods = {
-    initialise: function(arg) {
-      // Synchronise the proper display format
-      this.each(methods.initialiseFormat);
-
-      // Create the controls
-      arg = arg || {};
-      oldDateTimePicker.call(
-        this.filter(':not(input.bootstrap-timepicker)').parent(),
-        $.extend({}, arg, { pickTime: false }));
-      oldDateTimePicker.call(
-        this.filter('input.bootstrap-timepicker').parent(),
-        arg);
-
-      // Hide the backing date picker and show the actual date picker.
-      this.attr('type', 'text');
-      this.parent().css('display', '');
-      this.parent().next('input[type=text]').attr('type', 'hidden');
-      this.parent().prev('label').attr('for', this.attr('id'))
-
-      return this;
-    },
-
-    initialiseFormat: function() {
-      var $textField = $(this);
-      var displayFormat = $textField.data('dateFormat');
-
-      // Parse date in field (if provided)
-      var thisDate = moment($textField.val(), [DATETIME_FORMAT_RAILS, displayFormat]);
-      if (thisDate.isValid()) {
-        // Set displayed text field
-        $textField.val(thisDate.format(displayFormat));
-
-        // Set hidden field
-        var hiddenFormat = $textField.hasClass('bootstrap-timepicker') ? DATETIME_FORMAT :
-          DATE_FORMAT;
-        $textField.parent().next('input').val(thisDate.format(hiddenFormat));
-      }
-    }
-  };
-
-  // Replace the datetimepicker prototypes
-  $.fn.datetimepicker = function(arg) {
-    return methods.initialise.call(this, arg);
-  };
-  $.fn.datetimepicker.defaults = oldDateTimePicker.defaults;
-
-  // Ensure that the dates are properly formatted in the text field.
-  $(document).on('dp.change dp.show', '.bootstrap-datepicker:' +
-  'not(.bootstrap-timepicker)', function (e) {
-    var date = e.date;
-    var rails_date_format = date.format(DATE_FORMAT);
-    $(this).next('input[type=hidden]').val(rails_date_format);
-  });
-
-  $(document).on('dp.change dp.show', '.bootstrap-timepicker', function (e) {
-    var date = e.date;
-    var rails_date_format = date.format(DATETIME_FORMAT);
-    $(this).next('input[type=hidden]').val(rails_date_format);
-  });
-}(jQuery));
+// Hijacks the default Bootstrap date-time picker to always format dates in the specified format
+// through the use of a hidden field.
+(function($) {
+  'use strict';
+  /* global moment */
+
+  // Machine-readable formats used to store dates in hidden fields
+  var DATE_FORMAT = 'YYYY-MM-DD';
+  var DATETIME_FORMAT = 'YYYY-MM-DDTHH:mm:ssZZ';
+  var DATETIME_FORMAT_RAILS = 'YYYY-MM-DD HH:mm:ss ZZ';
+
+  var oldDateTimePicker = $.fn.datetimepicker;
+  if (!oldDateTimePicker) {
+    return;
+  }
+
+  var methods = {
+    initialise: function(arg) {
+      // Synchronise the proper display format
+      this.each(methods.initialiseFormat);
+
+      // Create the controls
+      arg = arg || {};
+      oldDateTimePicker.call(
+        this.filter(':not(input.bootstrap-timepicker)').parent(),
+        $.extend({}, arg, { pickTime: false }));
+      oldDateTimePicker.call(
+        this.filter('input.bootstrap-timepicker').parent(),
+        arg);
+
+      // Hide the backing date picker and show the actual date picker.
+      this.attr('type', 'text');
+      this.parent().css('display', '');
+      this.parent().next('input[type=text]').attr('type', 'hidden');
+      this.parent().prev('label').attr('for', this.attr('id'))
+
+      return this;
+    },
+
+    initialiseFormat: function() {
+      var $textField = $(this);
+      var displayFormat = $textField.data('dateFormat');
+
+      // Parse date in field (if provided)
+      var thisDate = moment($textField.val(), [DATETIME_FORMAT_RAILS, displayFormat]);
+      if (thisDate.isValid()) {
+        // Set displayed text field
+        $textField.val(thisDate.format(displayFormat));
+
+        // Set hidden field
+        var hiddenFormat = $textField.hasClass('bootstrap-timepicker') ? DATETIME_FORMAT :
+          DATE_FORMAT;
+        $textField.parent().next('input').val(thisDate.format(hiddenFormat));
+      }
+    }
+  };
+
+  // Replace the datetimepicker prototypes
+  $.fn.datetimepicker = function(arg) {
+    return methods.initialise.call(this, arg);
+  };
+  $.fn.datetimepicker.defaults = oldDateTimePicker.defaults;
+
+  // Ensure that the dates are properly formatted in the text field.
+  $(document).on('dp.change dp.show', '.bootstrap-datepicker:' +
+  'not(.bootstrap-timepicker)', function (e) {
+    var date = e.date;
+    var rails_date_format = date.format(DATE_FORMAT);
+    $(this).next('input[type=hidden]').val(rails_date_format);
+  });
+
+  $(document).on('dp.change dp.show', '.bootstrap-timepicker', function (e) {
+    var date = e.date;
+    var rails_date_format = date.format(DATETIME_FORMAT);
+    $(this).next('input[type=hidden]').val(rails_date_format);
+  });
+}(jQuery));

data/app/assets/javascripts/simple_form-bootstrap/select_input.js

@@ -1,12 +1,12 @@
-// Hijacks the default Bootstrap date-time picker to always format dates in the specified format
-// through the use of a hidden field.
-(function($) {
-  'use strict';
-  if ($.fn.selectpicker) {
-    return;
-  }
-
-  $.fn.selectpicker = function(arg) {
-    return methods.initialise.call(this, arg);
-  };
-}(jQuery));
+// Hijacks the default Bootstrap date-time picker to always format dates in the specified format
+// through the use of a hidden field.
+(function($) {
+  'use strict';
+  if ($.fn.selectpicker) {
+    return;
+  }
+
+  $.fn.selectpicker = function(arg) {
+    return methods.initialise.call(this, arg);
+  };
+}(jQuery));

data/lib/simple_form/bootstrap.rb

@@ -1,26 +1,26 @@
-module SimpleForm::Bootstrap
-  extend ActiveSupport::Autoload
-
-  autoload :Setup
-  autoload :FormBuilders
-
-  eager_autoload do
-    autoload :Inputs
-  end
-
-  # Because we are augmenting Simple Form with our input fields, we need to load even when eager
-  # loading is not enabled
-  SimpleForm::Bootstrap::FormBuilders.load!
-end
-
-module SimpleForm
-  class << self
-    # Extend the normal Simple Form configuration options with ours.
-    prepend SimpleForm::Bootstrap::Setup
-  end
-end
-
-if defined?(Rails)
-  require 'simple_form/bootstrap/railtie'
-  require 'simple_form/bootstrap/engine'
-end
+module SimpleForm::Bootstrap
+  extend ActiveSupport::Autoload
+
+  autoload :Setup
+  autoload :FormBuilders
+
+  eager_autoload do
+    autoload :Inputs
+  end
+
+  # Because we are augmenting Simple Form with our input fields, we need to load even when eager
+  # loading is not enabled
+  SimpleForm::Bootstrap::FormBuilders.load!
+end
+
+module SimpleForm
+  class << self
+    # Extend the normal Simple Form configuration options with ours.
+    prepend SimpleForm::Bootstrap::Setup
+  end
+end
+
+if defined?(Rails)
+  require 'simple_form/bootstrap/railtie'
+  require 'simple_form/bootstrap/engine'
+end