bootstrap-sass-extras 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4937b4abaaa8a0e580656bf8b6a64043f5f7b653
-  data.tar.gz: b435215d1f1eff03e7a9be230ff6316856c0cf52
+SHA256:
+  metadata.gz: 83b3f7ce19029b2f212c749c14e38b51c11ca5478e3f8a8a04494c8644880aa9
+  data.tar.gz: 45dc961f7f3616e4e933fb4231855f1c689f2764049e5f7b6ca1ca518fb4cb46
 SHA512:
-  metadata.gz: 0f0b443310d60a9e33f20b2eccd8a4b574bc2d6335f0aa2205c2f0070cc0dce9c7a0e5aa283381ed87666900c8892095a38e1f2e39695f944ca2ed804ad1cf81
-  data.tar.gz: 01910047148af5c7d284887c8d5532aece5381a46aff058a91b056d6ff42d2581021e4202a9f3b066753b3fce54b6f1fb0970a430307b4dd0a055e97a196a2e0
+  metadata.gz: ab324f770c30db9789a28a3ee3f3956103ee456f030811f93233c5655fc856ffc5f9648fb1075bdb75461fc61dd0e0ecdaaa5902d9111fb352ad28276c8612a7
+  data.tar.gz: d9e551e802d1859661320e1ca9a2ef217c8ab64c92880110197421e8e7b999853ce4537acb632deaf596fca52a7347f9535ecc09a843310136584acb3a1b3b79

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
+cache: bundler
+sudo: false
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.2.0
-  - 2.3.0
+  - 2.5.7
+  - 2.6.5
+before_install:
+  - gem update --system
+  - bundle update --bundler

data/CHANGELOG.md

@@ -1,42 +1,52 @@
 # Changelog
 
+## Release 0.1.0
+
+- Avoid dangerous calling of methods [@dlackty][]
+- Fix Travis CI [@dlackty][]
+- Add nav_to option to force active state [@sharshenov][]
+- use `before_action` over `before_filter` [@cantonic][]
+- Treat space-separated class names the same as arrays of class names in
+  button_to_with_bootstrap [@marcp][]
+- Freeze ALERT_TYPES_MAP to save allocations
+
 ## Release 0.0.7
 
-* Added the ability to specify a custom view path for breadcrumbs [@fredwu][]
-* Put locale arg for String#pluralize in the view templates [@kayhide][]
-* Fix .haml themed template show.html.haml [@mskubenich][]
-* Augment button_to to generate the `btn` Bootstrap class. [@lowjoel][]
-* Given the nav helper, generate the appropriate Bootstrap tabs markup. [@lowjoel][]
-* Allow pills and tabs to be used in the same manner. [@lowjoel][]
+- Added the ability to specify a custom view path for breadcrumbs [@fredwu][]
+- Put locale arg for String#pluralize in the view templates [@kayhide][]
+- Fix .haml themed template show.html.haml [@mskubenich][]
+- Augment button_to to generate the `btn` Bootstrap class. [@lowjoel][]
+- Given the nav helper, generate the appropriate Bootstrap tabs markup.
+  [@lowjoel][]
+- Allow pills and tabs to be used in the same manner. [@lowjoel][]
 
 ## Release 0.0.6
 
-* Update to bootstrap 3.0
-* Add a `badge(badge_count)` helper by [@pdobb][]
-* Clean up codes by [@pdobb][]
+- Update to bootstrap 3.0
+- Add a `badge(badge_count)` helper by [@pdobb][]
+- Clean up codes by [@pdobb][]
 
 ## Release 0.0.5
 
-* Adjust bootstrap_flash to match bootstrap alerts by [@jonwaghorn][]
-* Rails Form Helper for Bootstrap META tag  by [@dabit][]
+- Adjust bootstrap_flash to match bootstrap alerts by [@jonwaghorn][]
+- Rails Form Helper for Bootstrap META tag by [@dabit][]
 
 ## Release 0.0.4
 
-* Fix BreadCrumbs Helper
+- Fix BreadCrumbs Helper
 
 ## Release 0.0.3
 
-* Add glyph, model and breadcrumbs helpers
-* Update templates
+- Add glyph, model and breadcrumbs helpers
+- Update templates
 
 ## Release 0.0.2
 
-* Add layout and views generators
+- Add layout and views generators
 
 ## Release 0.0.1
 
-* Initial version
-
+- Initial version
 
 [@lowjoel]: https://github.com/lowjoel
 [@mskubenich]: https://github.com/mskubenich

data/Gemfile.lock

@@ -1,129 +1,158 @@
 PATH
   remote: .
   specs:
-    bootstrap-sass-extras (0.0.7)
+    bootstrap-sass-extras (0.1.0)
       rails (>= 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
+    actioncable (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      actionview (= 6.0.3.1)
+      activejob (= 6.0.3.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.6)
-      actionview (= 4.2.6)
-      activesupport (= 4.2.6)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.6)
-      activesupport (= 4.2.6)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.3.1)
+      actionview (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.3.1)
+      activesupport (= 6.0.3.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.6)
-      activesupport (= 4.2.6)
-      globalid (>= 0.3.0)
-    activemodel (4.2.6)
-      activesupport (= 4.2.6)
-      builder (~> 3.1)
-    activerecord (4.2.6)
-      activemodel (= 4.2.6)
-      activesupport (= 4.2.6)
-      arel (~> 6.0)
-    activesupport (4.2.6)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.3.1)
+      activesupport (= 6.0.3.1)
+      globalid (>= 0.3.6)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activestorage (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      marcel (~> 0.3.1)
+    activesupport (6.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
-    builder (3.2.2)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.1)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.3)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    builder (3.2.4)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
+    diff-lcs (1.3)
+    erubi (1.9.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    loofah (2.5.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    method_source (0.8.2)
-    mime-types (2.99.1)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    pry (0.10.3)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.1)
+    nio4r (2.5.4)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.6)
-      actionmailer (= 4.2.6)
-      actionpack (= 4.2.6)
-      actionview (= 4.2.6)
-      activejob (= 4.2.6)
-      activemodel (= 4.2.6)
-      activerecord (= 4.2.6)
-      activesupport (= 4.2.6)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.6)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.6)
-      actionpack (= 4.2.6)
-      activesupport (= 4.2.6)
+      method_source (~> 0.9.0)
+    rack (2.2.2)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.3.1)
+      actioncable (= 6.0.3.1)
+      actionmailbox (= 6.0.3.1)
+      actionmailer (= 6.0.3.1)
+      actionpack (= 6.0.3.1)
+      actiontext (= 6.0.3.1)
+      actionview (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+      bundler (>= 1.3.0)
+      railties (= 6.0.3.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (11.1.1)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.1)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    slop (3.6.0)
-    sprockets (3.5.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    sqlite3 (1.4.1)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    websocket-driver (0.7.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -135,4 +164,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.11.2
+   1.17.2

data/README.md

@@ -206,6 +206,7 @@ In your views:
     Profile
   <% end %>
   <%= nav_to('Messages', controller: users, action: :messages) %>
+  <%= nav_to('Forced active state', some_path, active: true) %>
 <% end %>
 ```
 

data/app/helpers/bootstrap_flash_helper.rb

@@ -5,7 +5,7 @@ module BootstrapFlashHelper
     error: :danger,
     info: :info,
     warning: :warning
-  }
+  }.freeze
 
   def bootstrap_flash
     safe_join(flash.each_with_object([]) do |(type, message), messages|

data/app/helpers/nav_helper.rb

@@ -21,10 +21,17 @@ module NavHelper
   end
 
   def nav_to(name = nil, options = nil, html_options = nil, &block)
-    url_options = block_given? ? name : options
+    if block_given?
+      url_options, html_options = name, options
+    else
+      url_options = options
+    end
+
     url_options ||= {}
 
-    tab_class = current_page?(url_options) ? 'active' : nil
+    active = html_options.try(:delete, :active)
+    active = current_page?(url_options) if active.nil?
+    tab_class = active ? 'active' : nil
 
     content_tag(:li, role: 'presentation', class: tab_class) do
       link_to(name, options, html_options, &block)

data/app/helpers/url_helper.rb

@@ -17,6 +17,9 @@ module UrlHelper
     html_options[:class] ||= []
     html_options[:class] = [*html_options[:class]]
 
+    # Expand space-separated class strings so that each has its own spot in the class array
+    html_options[:class] = html_options[:class].map { |c| c.split }.flatten
+
     html_options[:class].unshift('btn') unless html_options[:class].include?('btn')
     if html_options[:class].select { |cls| UrlHelper::BUTTON_CLASSES.include?(cls) }.empty?
       html_options[:class] << 'btn-default'

data/lib/bootstrap-sass-extras/breadcrumbs.rb

@@ -10,7 +10,7 @@ module BootstrapSassExtras
     module ClassMethods
       def add_breadcrumb(name, url, options = {})
         class_name = self.name
-        before_filter options do |controller|
+        before_action options do |controller|
           if name.is_a?(Symbol)
             name = controller.send :translate_breadcrumb, name, class_name
           end
@@ -24,7 +24,7 @@ module BootstrapSassExtras
     def add_breadcrumb(name, url = '', options = {})
       @breadcrumbs ||= []
       name = translate_breadcrumb(name, self.class.name) if name.is_a?(Symbol)
-      url = send(url.to_s) if url =~ /_path|_url|@/
+      url = send(url) if url.is_a?(Symbol)
       @breadcrumbs << { name: name, url: url, options: options }
     end
 

data/lib/bootstrap-sass-extras/version.rb

@@ -1,3 +1,3 @@
 module BootstrapSassExtras
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+    //= link_tree ../images
+    //= link_directory ../javascripts .js
+    //= link_directory ../stylesheets .css

data/spec/dummy/config/application.rb

@@ -24,9 +24,6 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

data/spec/helpers/button_to_helper_spec.rb

@@ -15,5 +15,19 @@ describe UrlHelper, :type => :helper do
     it "does not emit a default if a button type is specified" do
       button_to("Test", "/test", class: 'btn-danger').should =~ pattern("Test", "btn-danger")
     end
+
+    it "does not emit a default if a button type is specified in a space-separated class" do
+      button_to("Test", "/test", class: 'xyz btn-primary').should =~ pattern("Test", "xyz btn-primary")
+    end
+
+    context "with arrays of classes" do
+      it "does not emit a default if a button type is specified as one of an array of classes" do
+        button_to("Test", "/test", class: ['xyz', 'btn-primary']).should =~ pattern("Test", "xyz btn-primary")
+      end
+
+      it "does not emit a default if a button type is specified within a space-separated class" do
+        button_to("Test", "/test", class: ['xyz btn-primary']).should =~ pattern("Test", "xyz btn-primary")
+      end
+    end
   end
 end

data/spec/helpers/nav_helper_spec.rb

@@ -52,5 +52,28 @@ describe NavHelper, :type => :helper do
         (pills class: 'nav-stacked').should == html
       end
     end
+
+    context "when nav tab_class given" do
+      let(:html) {
+        <<-TABS.strip_heredoc
+            <ul class="nav nav-tabs">
+              <li role="presentation"><a href="/">Name</a></li>
+              <li role="presentation" class="active"><a href="/profile">Profile</a></li>
+            </ul>
+        TABS
+      }
+
+      it "generates the correct tabs" do
+        (nav do
+          concat "\n  "
+          concat (nav_to 'Name', '/', active: false)
+          concat "\n  "
+          concat (nav_to '/profile', active: true do
+            'Profile'
+          end)
+          concat "\n"
+        end + "\n").should == html
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass-extras
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - doabit
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -113,6 +113,7 @@ files:
 - script/rails
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -164,7 +165,7 @@ files:
 homepage: https://github.com/doabit/bootstrap-sass-extras
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -179,14 +180,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: bootstrap-sass extras.
 test_files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css