bootstrap_builders 0.0.59 → 0.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86eff598e9fcaf0e0d255d91c0d567fe7e04fb6e
-  data.tar.gz: 525e87bc8c7591baecc3aae24c8109f9d7a857a7
+  metadata.gz: b931613adf3a0e431b305e7c36dc97fc218a5388
+  data.tar.gz: 50990ef9f9be4ee5a8e0fdcfcbbea8289554caea
 SHA512:
-  metadata.gz: 1fb4958acd108f740dc045745b231641bbf0427010ea06ae9011412c7459eb155cd3715bf4a90d960303063683c610052f81faec7728468a97405ca4d55b007a
-  data.tar.gz: a062b52e8e6b6da121bf40d0c3ef2801d9ee1d823a5a286d7d6d594346c6b0da09a67781f01745b30de14696e8c3164746d4b6fdc0ed13333403d8e356cf1520
+  metadata.gz: db32506f27788225a1df4c51578d2e6736c67aab7c1ff4e7b338f37e26652bbfcda84e68447cc308e6c872ff188da4c4b2dd24f12a0375ed500f155cc0fc95f3
+  data.tar.gz: cf2a7beff524b9cf7b1026b0323b2f8ffcaeb22bd25259802d275543c4fe568f6885f57d76da2bcd4c1b33b59d5aa1404b18735c3cb37d9c14782102b6cc11d7

data/lib/bootstrap_builders/button_drop_down.rb

@@ -4,7 +4,7 @@ class BootstrapBuilders::ButtonDropDown
   def initialize(*args)
     args_parser = BootstrapBuilders::ArgumentsParser.new(
       arguments: args,
-      short_true_arguments: [:block, :danger, :link, :info, :primary, :sm, :warning]
+      short_true_arguments: [:block, :danger, :link, :info, :primary, :sm, :warning, :xs]
     )
 
     args_parser.arguments_hash[:label] ||= args.shift if args.first.is_a?(String)
@@ -43,28 +43,29 @@ class BootstrapBuilders::ButtonDropDown
         toggle: "dropdown"
       }
     )
-    main_button.add_str(@args.fetch(:label))
-    main_button.add_ele(:span, classes: ["caret"])
+    main_button.add_ele(:i, classes: ["fa", "fa-fw", "fa-#{@args.fetch(:icon)}"]) if @args[:icon].present?
+    main_button.add_str(@args.fetch(:label)) if @args[:label].present?
+    main_button.add_ele(:span, classes: ["caret"]) if !@args.key?(:caret) || @args[:cart]
 
     ul = btn_group.add_ele(:ul, classes: ["dropdown-menu"])
 
     @buttons.each do |button|
       li = ul.add_ele(:li)
 
-      url = button.fetch(:url)
-      url = view_context.polymorphic_url(url) if url.is_a?(Array)
-
-      a_href = li.add_ele(:a, attr: {href: url}, classes: BootstrapBuilders::ClassAttributeHandler.short(button[:class]))
-
-      a_href.data[:confirm] = I18n.t("are_you_sure") if button[:confirm]
-      a_href.data[:method] = button[:method] if button[:method].present?
-      a_href.data.merge!(button[:data]) if button[:data]
-
-      if button[:icon]
-        a_href.add_ele(:i, classes: ["fa", "fa-fw", "fa-#{button.fetch(:icon)}"])
+      link_args = {class: BootstrapBuilders::ClassAttributeHandler.short(button[:class])}
+      link_args.deep_merge!(data: {confirm: I18n.t("are_you_sure")}) if button[:confirm]
+      link_args.deep_merge!(data: {method: button[:method]}) if button[:method].present?
+      link_args.deep_merge!(data: button[:data]) if button[:data]
+
+      link = view_context.link_to(button.fetch(:url), link_args) do
+        if button[:icon]
+          view_context.safe_join [view_context.content_tag(:i, nil, class: ["fa", "fa-fw", "fa-#{button.fetch(:icon)}"]), " ", button.fetch(:label)]
+        else
+          button.fetch(:label)
+        end
       end
 
-      a_href.add_str(button.fetch(:label))
+      li.add_html(link)
     end
 
     btn_group.html

data/lib/bootstrap_builders/version.rb

@@ -1,3 +1,3 @@
 module BootstrapBuilders
-  VERSION = "0.0.59".freeze
+  VERSION = "0.0.60".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_builders
 version: !ruby/object:Gem::Version
-  version: 0.0.59
+  version: 0.0.60
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-22 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,8 +52,6 @@ files:
 - app/assets/javascripts/bootstrap_builders/bb-btn-responsive.js
 - app/assets/javascripts/bootstrap_builders/date-picker-input.es6
 - app/assets/javascripts/bootstrap_builders/tabs.js
-- app/assets/javascripts/bootstrap_builders/url-builder/README.md
-- app/assets/javascripts/bootstrap_builders/url-builder/lib/url-builder.es6
 - app/assets/javascripts/bootstrap_builders/view-port-detection.js
 - app/assets/stylesheets/bootstrap_builders.scss
 - app/assets/stylesheets/bootstrap_builders/bb-btn-responsive.scss

data/app/assets/javascripts/bootstrap_builders/url-builder/README.md

@@ -1,27 +0,0 @@
-# UrlBuilder
-
-## Usage
-
-Start by making a new object with any given URL
-
-```js
-var urlb = new UrlBuilder.new(window.location.href)
-```
-
-### Manipulate a query parameter
-
-```js
-urlb.queryParameters["someParameter"] = "newValue"
-```
-
-### Generate a new URL
-
-```js
-urlb.generateFullUrl() #=> "http://localhost:3000/?someParameter=newValue"
-```
-
-### Generate the path with query parameters
-
-```js
-urlb.pathWithQueryParameters #=> "/?someParameter=newValue"
-```

data/app/assets/javascripts/bootstrap_builders/url-builder/lib/url-builder.es6

@@ -1,140 +0,0 @@
-class UrlBuilder {
-  constructor(url) {
-    if (url) {
-      this.parseUrlFromString(url)
-    }
-  }
-
-  parseHostAndPortFromUrl() {
-    var match = this.matchAndRemove(/^([A-z\d-\.]+)(|:(\d+))($|\/)/)
-
-    if (match) {
-      this.host = match[1]
-
-      if (match[3]) {
-        this.port = parseInt(match[3])
-        this.portSpecified = true
-      } else {
-        if (this.protocol == "https") {
-          this.port = 443
-        } else {
-          this.port = 80
-        }
-      }
-    }
-  }
-
-  parsePathFromUrl() {
-    var match = this.matchAndRemove(/^([^\?]+)/)
-
-    if (match) {
-      this.path = "/" + match[1]
-    } else {
-      this.path = ""
-    }
-  }
-
-  parseProtocolFromUrl() {
-    var match = this.matchAndRemove(/^(.+?):\/\//)
-
-    if (match) {
-      this.protocol = match[1]
-    }
-  }
-
-  parseQueryParametersFromUrl() {
-    this.queryParameters = {}
-
-    if (this.matchAndRemove(/^\?/)) {
-      var pairs = this.url.split("&")
-
-      for(var pair in pairs) {
-        var match = pair.match(/^(.+?)=(.+)$/)
-        if (match) {
-          this.queryParameters[match[1]] = match[2]
-        }
-      }
-    }
-  }
-
-  parseUrlFromString(url) {
-    this.url = url
-
-    this.parseProtocolFromUrl()
-    this.parseHostAndPortFromUrl()
-    this.parsePathFromUrl()
-    this.parseQueryParametersFromUrl()
-  }
-
-  generateFullUrl() {
-    var url = this.protocol + "://" + this.host
-
-    if (this.portSpecified) {
-      url += ":" + this.port
-    }
-
-    url += this.path
-
-    if (this.hasQueryParameters()) {
-      url += "?"
-      url += this.queryParametersAsString()
-    }
-
-    return url
-  }
-
-  pathWithQueryParameters() {
-    var generatedPath = this.path
-
-    if (this.hasQueryParameters()) {
-      generatedPath += "?"
-      generatedPath += this.queryParametersAsString()
-    }
-
-    return generatedPath
-  }
-
-  matchAndRemove(regex) {
-    var match = this.url.match(regex)
-
-    if (match) {
-      this.url = this.url.replace(regex, "")
-      return match
-    } else {
-      return false
-    }
-  }
-
-  // Returns true if any query parameters has been saved
-  hasQueryParameters() {
-    if (this.queryParameters && Object.keys(this.queryParameters).length > 0) {
-      return true
-    } else {
-      return false
-    }
-  }
-
-  // Returns a hash containing the query parameters
-  queryParameters() {
-    this.queryParameters
-  }
-
-  queryParametersAsString() {
-    var queryParametersString = ""
-    var first = true
-
-    for(var key in this.queryParameters) {
-      var value = this.queryParameters[key]
-
-      if (first) {
-        first = false
-      } else {
-        queryParametersString += "&"
-      }
-
-      queryParametersString += key + "=" + value
-    }
-
-    return queryParametersString
-  }
-}