simple_form-bootstrap 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a661ed8effde4d148bc4742b5830e7d3ad159424
-  data.tar.gz: 6f46a48bfc692ef807c69c0efa0c3b367e911405
+  metadata.gz: bdfdf05aca09c195d5c6ee957ac8e7cab9cea7b0
+  data.tar.gz: 97d050a70a8db896ef75331994b08bce0acce573
 SHA512:
-  metadata.gz: 261fdb832ac3350e5f14354c3e1713b98ae529a7db33e61162f090b36a58a748b86cff640f8d3970f5a94f80fe5990e8e20799535c85dfe3212381ca7dda66ed
-  data.tar.gz: 5a36a3a2245b91af251ed9c8716f4caa94c1fda3513e1a0c7ae45cfdc5d9b45e1b08d3839df7af59c76f8dcd06eecac15ff03909236c8ed3668e8a85be9257ea
+  metadata.gz: d3b8d5ddf01e8bac354cde128819e84525fd3147a1fac346e5d0f26abb53f9155c87f6b1d061d556ed9df630a1b95ad9c3e90e790d2eb3bea20895da7121253d
+  data.tar.gz: 3c16f939607cb67e2145d2d7927a324627568ff661f77664e1cf5069c61d1c2c08293b45c7483884d23058c4dde68727f117c45114e82ec72d10a0fe5f4bbacb

data/.travis.yml

@@ -2,8 +2,9 @@ sudo: false
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.6
-  - 2.2.2
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,8 +1,14 @@
 ## master
 
+## 1.4.0
+
 ### enhancements
+ * Fix JavaScript lints.
+ * Tests against newest Rubies.
 
 ### bug fixes
+ * Fix tests running new RSpec versions.
+ * Support Rails 5' attributes API.
 
 ## 1.3.0
 

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

@@ -18,7 +18,7 @@
     tokenfields.tokenfield();
   }
 
-  $(document).on('ready', function(e) {
+  $(document).on('ready', function() {
     initializeComponents(document);
   });
   $(document).on('DOMNodeInserted', function(e) {

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

@@ -32,7 +32,7 @@
       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'))
+      this.parent().prev('label').attr('for', this.attr('id'));
 
       return this;
     },

data/lib/simple_form/bootstrap/form_builders/date_time.rb

@@ -1,18 +1,21 @@
 module SimpleForm::Bootstrap::FormBuilders::DateTime
   DATE_TIME_COLUMN_TYPES = [
+    :datetime,
     'datetime',
     'timestamp',
     'timestamp without time zone'
   ].freeze
 
   DATE_COLUMN_TYPES = [
+    :date,
     'date'
   ].freeze
 
   def default_input_type(attribute_name, column, options, *args, &block)
     if (options.is_a?(Hash) ? options[:as] : @options[:as]).nil? && !column.nil?
-      return :bootstrap_date_time if DATE_TIME_COLUMN_TYPES.include?(column.sql_type)
-      return :bootstrap_date if DATE_COLUMN_TYPES.include?(column.sql_type)
+      type = column.respond_to?(:type) ? column.type : column.sql_type
+      return :bootstrap_date_time if DATE_TIME_COLUMN_TYPES.include?(type)
+      return :bootstrap_date if DATE_COLUMN_TYPES.include?(type)
     end
 
     super(attribute_name, column, options, *args, &block)

data/lib/simple_form/bootstrap/version.rb

@@ -1,4 +1,4 @@
 module SimpleForm; end
 module SimpleForm::Bootstrap
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/spec/rails_helper.rb

@@ -12,6 +12,10 @@ require 'simple_form'
 require 'simple_form/bootstrap'
 SimpleForm.setup do; end
 
+class TestApplication < Rails::Application
+  secrets.secret_key_base = SecureRandom.base64(10)
+end
+
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
 # run as spec files by default. This means that files in spec/support that end

data/spec/simple_form/bootstrap/form_builders/date_time_spec.rb

@@ -14,7 +14,11 @@ RSpec.describe 'date_time', type: :view do
     end
 
     def column_for_attribute(*)
-      Struct.new(:sql_type).new(@column_sql_type)
+      if @column_sql_type.is_a?(Symbol)
+        Struct.new(:type).new(@column_sql_type)
+      else
+        Struct.new(:sql_type).new(@column_sql_type)
+      end
     end
 
     def has_attribute?(*)
@@ -34,35 +38,39 @@ RSpec.describe 'date_time', type: :view do
   end
 
   context 'when the database column is a datetime' do
-    let(:object) { DateTimeModel.new('datetime') }
-    it 'displays the text field' do
-      expect(rendered).to have_tag('div.form-group.bootstrap_date_time') do
-        with_tag('input.bootstrap_date_time', with: { value: object.test })
+    ['datetime', :datetime].each do |type|
+      let(:object) { DateTimeModel.new(type) }
+      it 'displays the text field' do
+        expect(rendered).to have_tag('div.form-group.bootstrap_date_time') do
+          with_tag('input.bootstrap_date_time', with: { value: object.test })
+        end
       end
-    end
 
-    it 'has a hidden datepicker control' do
-      selector = 'div.form-group.bootstrap_date_time div.input-group'
-      required_style = { style: 'display: none' }
+      it 'has a hidden datepicker control' do
+        selector = 'div.form-group.bootstrap_date_time div.input-group'
+        required_style = { style: 'display: none' }
 
-      expect(rendered).to have_tag(selector, with: required_style) do
-        with_tag('input.bootstrap_date_time', with: { type: 'hidden' })
+        expect(rendered).to have_tag(selector, with: required_style) do
+          with_tag('input.bootstrap_date_time', with: { type: 'hidden' })
+        end
       end
     end
   end
 
   context 'when the database column is a date' do
-    let(:object) { DateTimeModel.new('date') }
-    it 'displays the text field' do
-      expect(rendered).to have_tag('div.form-group.bootstrap_date') do
-        with_tag('input.bootstrap_date', with: { value: object.test })
+    ['date', :date].each do |type|
+      let(:object) { DateTimeModel.new(type) }
+      it 'displays the text field' do
+        expect(rendered).to have_tag('div.form-group.bootstrap_date') do
+          with_tag('input.bootstrap_date', with: { value: object.test })
+        end
       end
     end
   end
 
   context 'when the database column is not a datetime' do
     let(:object) { DateTimeModel.new('string') }
-    it 'does not have a  datepicker control' do
+    it 'does not have a datepicker control' do
       expect(rendered).not_to have_tag('div.form-group.bootstrap_date_time')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form-bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Joel Low
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Initialises Simple Form to automatically produce Bootstrap 3-friendly markup.