bootstrap_builders 0.0.61 → 0.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250f6cde716d39a305a42b3345c8a388b38bf623
-  data.tar.gz: bab587be818ec8b518ae3641aebc9d3a4d7a2cfc
+  metadata.gz: 8da1df445bfcf916c18945583429d5167bddd3e3
+  data.tar.gz: 893a4347741f1ca24df5a3e781bcaae691ca5e60
 SHA512:
-  metadata.gz: 17963e7e6bde475d527cfebeee201ea02f66bbc87bb25faf799a594261274973b9c791ea2a72632675bc65b362ec28ae508f6eb751723445a46a6feb2acd2f78
-  data.tar.gz: 5cfe540f4accaac79d0e2d837e74e9701bbe239802d58b6d180eb0ccf5449208139d02cb1d11582ec22b48daaecaf144270c13d731e5c4269353cfdaa6464a23
+  metadata.gz: d260cf53ba5b4c270b079e9d85ad7f3aa3fc4cd375c941ba1bb72d2ba2e0de7ea2ce33d818d9334fba2ebf275df6ae8297d417e029759bd395c7a242c807225b
+  data.tar.gz: c922ba4d441a1b02667552307c670afaafeba0db54ef6c4273fa151ad201def4cc207b0c0a47dabf405c935b59d2d02eb0055d2e2f2afdabe72f42830a30a2ec

data/Rakefile

@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 load "rails/tasks/statistics.rake"
 

data/app/assets/javascripts/bootstrap_builders/tabs.js

@@ -12,7 +12,8 @@ function loadAjaxTab(li) {
   })
 }
 
-$(document).ready(function() {
+// Makes sure the correct tab is loaded on page load
+function loadActiveAjaxTabOnPageLoad() {
   //Loads the dynamic content of a tab when activated and sets the URL to the tab ID
   $("body").on("click", ".bb-tabs-container .nav li", function() {
     var li = $(this)
@@ -22,7 +23,6 @@ $(document).ready(function() {
     } else if(li.data("specific-id-given")) {
       var urlb = new UrlBuilder(window.location.href)
       urlb.queryParameters["bb_selected_tab"] = $(this).data("tab-container-id")
-
       window.history.pushState({active_tab: li.data("tab-container-id"), event: "bb-tab-change"}, null, urlb.pathWithQueryParameters())
     }
 
@@ -31,6 +31,14 @@ $(document).ready(function() {
     }
   })
 
+  var active_tab = $(".bb-tabs-container .nav li.active[data-ajax-url]")
+
+  if (active_tab.length > 0) {
+    loadAjaxTab(active_tab)
+  }
+}
+
+$(document).ready(function() {
   // Changes the tab on 'back' and 'forward' events
   $(window).bind("popstate", function(e) {
     if (e.originalEvent.state && e.originalEvent.state.event == "bb-tab-change") {
@@ -55,11 +63,8 @@ $(document).ready(function() {
       $("a", li).click()
     }
   })
+})
 
-  // Makes sure the correct tab is loaded on page load
-  var active_tab = $(".bb-tabs-container .nav li.active[data-ajax-url]")
-
-  if (active_tab.length > 0) {
-    loadAjaxTab(active_tab)
-  }
+document.addEventListener("turbolinks:load", function() {
+  loadActiveAjaxTabOnPageLoad()
 })

data/lib/bb_date_picker_input.rb

@@ -43,7 +43,7 @@ class BbDatePickerInput < SimpleForm::Inputs::Base
 
       html << template.text_field_tag("", val, class: classes, data: {date_format: "yyyy-mm-dd", provide: "datepicker"})
 
-      html.html_safe
+      html.html_safe # rubocop:disable Rails/OutputSafety
     end
 
     content_tag

data/lib/bb_date_time_picker_input.rb

@@ -47,7 +47,7 @@ class BbDateTimePickerInput < SimpleForm::Inputs::Base
 
       html << template.text_field_tag("", val, class: classes, data: {date_format: "yyyy-mm-dd", provide: "datepicker"})
 
-      html.html_safe
+      html.html_safe # rubocop:disable Rails/OutputSafety
     end
 
     content_tag

data/lib/bootstrap_builders/arguments_parser.rb

@@ -10,9 +10,7 @@ class BootstrapBuilders::ArgumentsParser
       @arguments_hash = {}
     end
 
-    if @arguments.last.is_a?(Hash)
-      @arguments_hash = @arguments_hash.merge(@arguments.pop)
-    end
+    @arguments_hash = @arguments_hash.merge(@arguments.pop) if @arguments.last.is_a?(Hash)
 
     @arguments << @arguments_hash
 

data/lib/bootstrap_builders/attribute_rows.rb

@@ -46,7 +46,7 @@ class BootstrapBuilders::AttributeRows
     end
 
     html = elements.join("\n")
-    html = html.html_safe if html.respond_to?(:html_safe)
+    html = html.html_safe if html.respond_to?(:html_safe) # rubocop:disable Rails/OutputSafety
     html
   end
 

data/lib/bootstrap_builders/button.rb

@@ -13,9 +13,7 @@ class BootstrapBuilders::Button
     is_an_active_record = BootstrapBuilders::IsAChecker.is_a?(args.first, "ActiveRecord::Base")
     is_a_baza_model = BootstrapBuilders::IsAChecker.is_a?(args.first, "BazaModels::Model")
 
-    if args.first.is_a?(Array) || args.first.is_a?(String) || is_an_active_record || is_a_baza_model
-      args_parser.arguments_hash[:url] ||= args.shift
-    end
+    args_parser.arguments_hash[:url] ||= args.shift if args.first.is_a?(Array) || args.first.is_a?(String) || is_an_active_record || is_a_baza_model
 
     args_parser.arguments_hash[:label] ||= args.shift if args.first.is_a?(String)
     args_parser.arguments_hash
@@ -83,11 +81,9 @@ class BootstrapBuilders::Button
       html = ""
       html << @context.content_tag(:i, nil, class: ["fa", "fa-#{@icon}"]) if @icon
 
-      if @label && !@mini
-        html << @context.content_tag(:span, " #{@label}", class: "bb-btn-label")
-      end
+      html << @context.content_tag(:span, " #{@label}", class: "bb-btn-label") if @label && !@mini
 
-      html.strip.html_safe
+      html.strip.html_safe # rubocop:disable Rails/OutputSafety
     end
   end
 
@@ -121,7 +117,7 @@ private
         can_object_from_url
       end
 
-      @can_object = false unless @can_object
+      @can_object ||= false
     end
 
     @can_object

data/lib/bootstrap_builders/button_drop_down.rb

@@ -20,9 +20,7 @@ class BootstrapBuilders::ButtonDropDown
 
     args = args_parser.arguments
 
-    if args.first.is_a?(Array) || args.first.is_a?(String) || is_an_active_record || is_a_baza_model
-      args_parser.arguments_hash[:url] ||= args.shift
-    end
+    args_parser.arguments_hash[:url] ||= args.shift if args.first.is_a?(Array) || args.first.is_a?(String) || is_an_active_record || is_a_baza_model
 
     args_parser.arguments_hash[:label] ||= args.shift if args.first.is_a?(String)
 

data/lib/bootstrap_builders/class_attribute_handler.rb

@@ -28,7 +28,7 @@ class BootstrapBuilders::ClassAttributeHandler
 private
 
   def convert_to_array(argument)
-    return unless argument.present?
+    return if argument.blank?
     return argument.split(/\s+/) if argument.is_a?(String)
     return argument if argument.is_a?(Array)
     return [] if args.fetch(:class).nil?

data/lib/bootstrap_builders/flash.rb

@@ -25,7 +25,7 @@ class BootstrapBuilders::Flash
       end
     end
     @context.flash.clear
-    flash_messages.join("\n").html_safe
+    flash_messages.join("\n").html_safe # rubocop:disable Rails/OutputSafety
   end
 
 private

data/lib/bootstrap_builders/panel.rb

@@ -51,7 +51,7 @@ class BootstrapBuilders::Panel
     html = @panel.html
 
     if html.respond_to?(:html_safe)
-      html.html_safe
+      html.html_safe # rubocop:disable Rails/OutputSafety
     else
       html
     end
@@ -112,7 +112,7 @@ private
   end
 
   def collapse_id
-    @_collapse_id ||= "bb-collapse-#{SecureRandom.hex(4)}"
+    @collapse_id ||= "bb-collapse-#{SecureRandom.hex(4)}"
   end
 
   def container_classes

data/lib/bootstrap_builders/progress_bar.rb

@@ -1,6 +1,6 @@
 class BootstrapBuilders::ProgressBar
   def self.with_parsed_args(*opts)
-    percent = opts.shift if opts.first.is_a?(Integer) || opts.first.is_a?(Float) || opts.first.is_a?(Fixnum)
+    percent = opts.shift if opts.first.is_a?(Integer) || opts.first.is_a?(Float) || opts.first.is_a?(Integer)
 
     args_parser = BootstrapBuilders::ArgumentsParser.new(
       arguments: opts,

data/lib/bootstrap_builders/version.rb

@@ -1,3 +1,3 @@
 module BootstrapBuilders
-  VERSION = "0.0.61".freeze
+  VERSION = "0.0.62".freeze
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_builders
 version: !ruby/object:Gem::Version
-  version: 0.0.61
+  version: 0.0.62
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2018-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: html_gen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 0.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 0.0.16
 - !ruby/object:Gem::Dependency
-  name: html_gen
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 4.0.0
 description: A library to generate Bootstrap HTML for Rails.
 email:
 - kaspernj@gmail.com