railsstrap 4.0.0.beta2 → 4.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b4484053d467f665b57114a7096c965a6f203637aba4cb244cb857dae9d2789
-  data.tar.gz: e3dbcf1ef81b7ad4dfc869feb5e3d90ba039bb9bf44162c49ccc2fe76c7e67fa
+  metadata.gz: 34a9242b16ded13eaa0e10e80737a5f289d7925cb8ad73ff5194dfdc3a602de4
+  data.tar.gz: ac0a0118896263220eb0edc24782e88c4aec99f6515da79c36e751dd3ca85de5
 SHA512:
-  metadata.gz: 2d5c6d25924aabea4ac83531ceb29f6c306f5a72f978b053491cb1ffd0d3bc62dd41f02fc36aea4fd373bdc8d52f2fd9931c0e125dd0e0c0dcc1d843f3da626f
-  data.tar.gz: 579343c8f0a3c68926beb709c40100e5493639a219a19408e96cde622a072c8414400a39405c50ca14825d81248e2a15f20a5b3f1e2ce15b9f60f50860eb9136
+  metadata.gz: 660f0cabbe043a7946995402d8a91d312db26c743212c51f6fefcd902028c3503ff39796d93d366f43c6e107d83abd8096d28a8528c417e6fb70617afdb4e98d
+  data.tar.gz: db56ed92b03270128f46190eb9c9cb1860be15010950e2f91b00abe3a0611e095ee0ad7f9535c7b579903a1e2f7eda5af59492238be5617f7149fb25d610972c

data/lib/railsstrap/classes/alert_box.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'railsstrap/classes/base'
 
 module Railsstrap

data/lib/railsstrap/classes/aside.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'railsstrap/classes/button'
 
 module Railsstrap
@@ -14,6 +16,11 @@ module Railsstrap
         super
       end
 
+      # @return [#to_s] appends .left or .right css class to the aside
+      def pin_to_class
+        Aside.pin_to[@options[:pin_to]]
+      end
+
       # @return [#to_s] the variant-related class to assign to the aside button.
       def button_variant_class
         Button.variants[@options.fetch(:button, {})[:variant]]
@@ -55,6 +62,13 @@ module Railsstrap
         end
       end
 
+      def self.pin_to
+        HashWithIndifferentAccess.new(:'left').tap do |klass|
+          klass[:left] = 'left'
+          klass[:right] = 'right'
+        end
+      end
+
       def extract_content_from(*args, &block)
         if block_given?
           super

data/lib/railsstrap/classes/badge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'railsstrap/classes/base'
 
 module Railsstrap

data/lib/railsstrap/classes/button.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'railsstrap/classes/base'
 
 module Railsstrap

data/lib/railsstrap/classes/button_group.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'railsstrap/classes/base'
 
 module Railsstrap

data/lib/railsstrap/classes/card.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'railsstrap/classes/base'
 
 module Railsstrap

data/lib/railsstrap/classes/card_group.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'railsstrap/classes/base'
 
 module Railsstrap

data/lib/railsstrap/classes/cdn.rb

@@ -61,11 +61,8 @@ module Railsstrap
 
       # fetches popper js
       def self.popper_js(options = {})
-        opts = {
-          version: '1.13.0',
-          path: 'ajax/libs/popper.js'
-        }.merge(options)
-        cdn_asset opts
+        options.merge!({version: '1.13.0'})
+        "https://cdnjs.cloudflare.com/ajax/libs/popper.js/#{options[:version]}/umd/popper.min.js"
       end
 
       # @return the url of the library from cdnjs.com

data/lib/railsstrap/classes/icon.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'railsstrap/classes/base'
 
 module Railsstrap

data/lib/railsstrap/classes/nav.rb

@@ -18,6 +18,11 @@ module Railsstrap
         Nav.layouts[@options[:layout]]
       end
 
+      # @return [#to_s] choose between using <nav>, <ol>, or <ul> tags
+      def tag
+        @options[:tag] || :nav
+      end
+
       # @return [Hash<Symbol, String>] the classes that Bootstrap requires to
       #   append to navs for each possible style.
 

data/lib/railsstrap/classes/navbar.rb

@@ -36,6 +36,7 @@ module Railsstrap
           variant_types.each do |v|
             klass[v] = :"bg-#{v}"
           end
+          klass[:none] = ""
         end
       end
 

data/lib/railsstrap/helpers/aside_helper.rb

@@ -2,7 +2,7 @@ require 'railsstrap/classes/aside'
 
 module Railsstrap
   module Helpers
-    # Displays a Bootstrap-styled aside. Asides inherit from Aside, but
+    # Displays a Bootstrap-styled aside. Asides inherit from Modal, but
     # are pinned to the left or right of the screen.
     # @see https://github.com/toadkicker/railsstrap/wiki/Aside-Helper
     # @return [String] the HTML to display a Bootstrap-styled aside.
@@ -39,7 +39,7 @@ module Railsstrap
 
     def aside(*args, &block)
       aside = Railsstrap::Aside.new self, *args, &block
-      aside.extract! :button, :size, :body, :title, :id
+      aside.extract! :button, :size, :pin_to, :body, :title, :id
 
       aside.extract_from :button, [:variant, :size, :layout, :caption]
       aside.append_class_to! :button, :btn
@@ -47,6 +47,7 @@ module Railsstrap
       aside.append_class_to! :button, aside.button_size_class
       aside.merge! button: {caption: aside.caption}
 
+      aside.append_class_to! :script, aside.pin_to_class
       aside.append_class_to! :div, :'aside-dialog'
       aside.append_class_to! :div, aside.dialog_size_class
       aside.merge! div: {title: aside.title, id: aside.id}

data/lib/railsstrap/helpers/card_helper.rb

@@ -28,7 +28,7 @@ module Railsstrap
     #   @param [Hash] options the options for the card (see above).
     #   @yieldreturn [#to_s] the content to display in the card.
     #   @example Display a card with HTML content.
-    #       card title: 'Thanks' do
+    #       card title: 'Thanks', button: {caption: icon('circle-plus', library: :fas), variant: :success} do
     #         content_tag :div, class: 'card-body' do
     #           content_tag :em, 'ou accepted the Terms of service.'
     #         end

data/lib/railsstrap/helpers/modal_helper.rb

@@ -17,7 +17,7 @@ module Railsstrap
     #     (alias `:lg`) or `:small` (alias `:sm`).
     #   @option options [Hash] :button the options for the toggle button.
     #     * :caption (#to_s) ('Modal') the caption of the toggle button.
-    #     * :context (#to_s) (:default) the contextual alternative to apply to
+    #     * :variant (#to_s) (:default) the variant alternative to apply to
     #        the toggle button. Can be `:danger`, `:info`, `:link`, `:primary`,
     #       `:success` or `:warning`.
     #     * :size (#to_s) the size of the toggle button. Can be `:extra_small`
@@ -25,7 +25,7 @@ module Railsstrap
     #     * :layout (#to_s) if set to `:block`, span the button for the full
     #       width of the parent.
     #   @example Display a simple modal toggled by a blue button.
-    #       modal 'You clicked me!', title: 'Click me', button: {context: :info}
+    #       modal 'You clicked me!', title: 'Click me', button: {variant: :info}
     # @overload modal(options = {}, &block)
     #   @param [Hash] options the options for the modal (see above).
     #   @yieldreturn [#to_s] the content to display in the modal.
@@ -37,7 +37,7 @@ module Railsstrap
     #       end
     def modal(*args, &block)
       modal = Railsstrap::Modal.new self, *args, &block
-      modal.extract! :button, :size, :body, :title, :id, :dismissable, :dismiss
+      modal.extract! :button, :size, :body, :title, :id, :dismissible, :dismiss
 
       modal.extract_from :button, [:variant, :size, :layout, :caption]
       modal.append_class_to! :button, :btn

data/lib/railsstrap/helpers/nav_helper.rb

@@ -19,16 +19,14 @@ module Railsstrap
     #   end
     def nav(options = {}, &block)
       nav = Railsstrap::Nav.new(self, options, &block)
-      nav.extract! :as, :layout
+      nav.extract! :as, :layout, :tag
 
       nav.append_class! :nav
       nav.append_class! nav.style_class
       nav.append_class! nav.layout_class
       nav.merge! role: :navigation
 
-
-
-      nav.render_tag :nav
+      nav.render_tag nav.tag
     end
   end
 end

data/lib/railsstrap/version.rb

@@ -1,3 +1,3 @@
 module Railsstrap
-  VERSION = '4.0.0.beta2'
+  VERSION = '4.0.0.beta3'
 end

data/lib/railsstrap/views/railsstrap/_aside.html.erb

@@ -1,14 +1,25 @@
 <button class="<%= button[:class] %>" data-toggle="modal" data-target="#<%= div[:id] %>"><%= button[:caption] %></button>
-<aside class="aside fade" id="<%= div[:id] %>" tabindex="-1" role="dialog" aria-labelledby="label-<%= div[:id] %>" aria-hidden="true">
+<aside class="aside" id="<%= div[:id] %>" tabindex="-1" role="dialog" aria-labelledby="label-<%= div[:id] %>" aria-hidden="true">
   <div class="<%= div[:class] %>">
     <div class="aside-content">
       <div class="aside-header">
-        <button type="button" class="close" data-dismiss="modal">
+        <h4 class="aside-title" id="label-<%= div[:id] %>"><%= div[:title] %></h4>
+        <button type="button" class="close" data-dismiss="modal" data-target="#<%= div[:id] %>">
           <span aria-hidden="true">&times;</span><span class="sr-only">Close</span>
         </button>
-        <h4 class="aside-title" id="label-<%= div[:id] %>"><%= div[:title] %></h4>
       </div>
       <%= content %>
     </div>
   </div>
-</aside>
+</aside>
+<script>
+  document.addEventListener("DOMContentLoaded", function () {
+    $("[data-target='#<%=div[:id]%>']").on('click', function (e) {
+      $("#<%=div[:id]%>").modal('hide');
+    });
+
+    $("#<%= div[:id] %>").on('show.bs.modal', function (e) {
+      $(e.currentTarget).addClass("<%= script[:class] %>")
+    });
+  })
+</script>

data/spec/shared/aside_helper.rb

@@ -14,22 +14,7 @@ end
 
 shared_examples_for 'no aside options' do
   specify 'sets the role and the class to "aside", uses a generated ID and uses "Aside" as the title and caption' do
-    html = <<-EOT.strip_heredoc.strip
-      <button class="btn btn-primary" data-toggle="modal" data-target="#(.+)">Aside<\/button>
-      <aside class="aside fade" id="\\1" tabindex="-1" role="dialog" aria-labelledby="label-\\1" aria-hidden="true">
-        <div class="aside-dialog">
-          <div class="aside-content">
-            <div class="aside-header">
-              <button type="button" class="close" data-dismiss="modal">
-                <span aria-hidden="true">&times;<\/span><span class="sr-only">Close<\/span>
-              <\/button>
-              <h4 class="aside-title" id="label-\\1">Aside<\/h4>
-            <\/div>
-            (<div class=\"aside-body\">)*content(</div>)*
-          <\/div>
-        <\/div>
-      <\/aside>
-    EOT
+    html = %r{(button.*data-toggle="modal".*data-target)*(aside)}
     expect(:aside).to generate %r{#{html}}
   end
 end

data/spec/shared/modal_helper.rb

@@ -88,8 +88,8 @@ shared_examples_for 'the button: :class modal option' do
   end
 end
 
-shared_examples_for 'the :dismissable modal option' do
-  specify 'renders the dismissable button on the modal button' do
+shared_examples_for 'the :dismissible modal option' do
+  specify 'renders the dismissible button on the modal button' do
     html = %r{.*(class="close").*(dismiss="modal")}
     expect(modal: {dismissible: true, dismiss: :modal}).to generate html
   end

data/vendor/assets/stylesheets/aside/aside.scss

@@ -82,7 +82,7 @@ $zindex-aside:                      1050 !default;
       right: 0;
       left: auto;
       visibility: visible;
-      @include animated;
+      @include animated();
       @extend .slideInRight;
     }
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railsstrap
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - Todd Baur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement