ui_bibz 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f23d2e21aaf908e81c6352e44b1514fa0c246de87daa580b293b6369a9fed54d
-  data.tar.gz: fd181dff7011dd315c8d705348d7beb30d4a1c1734036067f8006e4463b7b25d
+  metadata.gz: 7abead1ee77c880302afa08b5a3bc9f4242528ce569382c5eca9e5f803a8178c
+  data.tar.gz: 1cbd5bd4eeba8c2eef04ac1d76d44afb3bacdb6bd06200473f869d543a69d9c8
 SHA512:
-  metadata.gz: 3014f68569378b7897cc87412640e82c1a8d7402b1ef8c7289f5a523eb5801b364d68a256eac6941f0da264bfeabaf62fb13469c1ea291f51d2339cdfcc21f30
-  data.tar.gz: 6ea5553d97fe5b5610d4c4b0a4057a4096174c60dd5062e27f3d5b99a7f7e79b36004aa5decdd316f68a154b2f37bdd83f5e18b9e18f79243bacb4a7b1459e47
+  metadata.gz: 6c3a56b199df127a44dd65898fa4a30d0ce584bc5c75e92aa8e5819df1626a9fafa854bd5e8c2eae52e98fe218a6c25c80c3ba3a4159a5ba86153eee26a08382
+  data.tar.gz: 4d2a53a411dff110be62589a26a973a06ca05c42c2c777af42f172e88570d937ee7133c24a97235dc4d62a0661ced34ff2d7a2d29d63bbeb7baa6aaf02c81951

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (2.3.2)
+    ui_bibz (2.3.3)
       bootstrap (= 4.3.1)
       haml
       haml-rails
@@ -58,7 +58,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    autoprefixer-rails (9.4.7)
+    autoprefixer-rails (9.4.8)
       execjs
     awesome_print (1.8.0)
     bootstrap (4.3.1)

data/app/assets/stylesheets/fix_addon.sass

@@ -70,6 +70,16 @@ $input-group-btn-border-color: $input-border-color
 .input-group-sm > .input-group-btn > .btn
   @extend .form-control-sm
 
+.input-group > .form-control,
+.input-group > .input-group-addon,
+.input-group > .input-group-btn > .btn
+  padding: $input-btn-padding-y $input-btn-padding-x
+  @include border-radius($input-border-radius)
+
+  svg
+    //font-size: 1.4em
+    margin-top: 0.1rem
+
 
 //
 // Text input groups
@@ -104,8 +114,13 @@ $input-group-btn-border-color: $input-border-color
     font-size: $font-size-lg
     @include border-radius($input-border-radius-lg)
 
+    svg
+      font-size: 1.5rem
+      margin-top: 0.1rem
+
   svg
     font-size: 1.3rem
+    margin-top: 0.1rem
 
 
   // scss-lint:disable QualifyingElement
@@ -127,6 +142,7 @@ $input-group-btn-border-color: $input-border-color
 .input-group-btn:not(:last-child) > .btn,
 .input-group-btn:not(:last-child) > .btn-group > .btn,
 .input-group-btn:not(:last-child) > .dropdown-toggle,
+.input-group .bootstrap-select:not(:last-child) > .dropdown-toggle,
 .input-group-btn:not(:first-child) > .btn:not(:last-child):not(.dropdown-toggle),
 .input-group-btn:not(:first-child) > .btn-group:not(:last-child) > .btn
   @include border-right-radius(0)
@@ -139,6 +155,7 @@ $input-group-btn-border-color: $input-border-color
 .input-group-btn:not(:first-child) > .btn,
 .input-group-btn:not(:first-child) > .btn-group > .btn,
 .input-group-btn:not(:first-child) > .dropdown-toggle,
+.input-group .bootstrap-select:not(:first-child) > .dropdown-toggle,
 .input-group-btn:not(:last-child) > .btn:not(:first-child),
 .input-group-btn:not(:last-child) > .btn-group:not(:first-child) > .btn
   @include border-left-radius(0)

data/app/assets/stylesheets/forms.sass

@@ -31,8 +31,11 @@
   display: inline-block
   margin-right: 10px
 
-.input-group-btn
-  .input-refresh-button
+.input-refresh-button
+  border-width: 0px !important
+  min-height: 40px
+  svg
+    margin: 0.28rem 0.25rem !important
     //padding: 10px 16px
 
 .input-group-btn
@@ -46,12 +49,20 @@
   min-width: 104px
 
 .ui_surround_field
+  .custom-control
+    .custom-control-label
+      margin-left: 0px !important
+      padding-right: 10px
+      margin-right: 0
+    .custom-control-label:after, .custom-control-label:before
+      right: 0
+      left: 0
+
   flex-wrap: nowrap
   .mr-sm-2
     margin-right: 0px !important
   input:not(:first-child):not(:last-child)
     border-radius: 0px
-  .abc-radio.input-group-addon, .abc-checkbox.input-group-addon
     input
       margin-left: 0.5rem
   select:not(:first-child):not(:last-child)
@@ -72,9 +83,9 @@
     content: none
 
 // fix button bug
-.bootstrap-select .dropdown-toggle:after
-  margin-top: 0.44rem
-  margin-bottom: 0.44rem
+
+.bootstrap-select button
+  min-height: 40px
 
 .bootstrap-select .dropdown-menu li a
   min-height: 32px

data/app/assets/stylesheets/notifications.sass

@@ -12,6 +12,12 @@
 .glyph
   vertical-align: middle
 
+.btn
+  svg
+    margin: 0.25rem 0.25rem
+.input-group-btn button svg
+  margin: 0.4rem 0.25rem
+
 .dropdown-item
   .glyph
     margin-right: 1rem
@@ -26,8 +32,8 @@
 span:not(.input-group-addon, .btn) .glyph
   margin-top: -0.1rem
 
-.input-group-btn span svg
-  margin: 0.25rem
+// .input-group-btn span svg
+//   margin: 0.25rem
 
 .toast .toast-header img
   width: 20px

data/lib/ui_bibz/concerns/models/searchable.rb

@@ -120,9 +120,18 @@ module UiBibz::Concerns::Models::Searchable
         sql_subquery = []
         @searchable_attributes.each do |attribute|
           if attribute.kind_of?(Hash)
-            key_name = attribute.keys.first.to_s.pluralize
-            sql_subquery << "lower(#{ key_name }.#{ attribute.values.first }) LIKE :#{ key_name }_#{ attribute.values.first }_#{ i }"
-            sql_attributes = sql_attributes.merge(Hash["#{ key_name }_#{ attribute.values.first }_#{ i }".to_sym, "%#{ pattern }%"])
+            if attribute == :as
+              attribute.values.each do |value|
+                sql_subquery << "lower(#{ value }) LIKE :#{ value }_#{ i }"
+                sql_attributes = sql_attributes.merge(Hash["#{ value }_#{ i }".to_sym, "%#{ pattern }%"])
+              end
+            else
+              key_name = attribute.keys.first.to_s.pluralize
+              attribute.values.each do |value|
+                sql_subquery << "lower(#{ key_name }.#{ value }) LIKE :#{ key_name }_#{ value }_#{ i }"
+                sql_attributes = sql_attributes.merge(Hash["#{ key_name }_#{ value }_#{ i }".to_sym, "%#{ pattern }%"])
+              end
+            end
           else
             sql_subquery << "lower(#{ self.to_s.underscore.pluralize.split('/').last }.#{ attribute }) LIKE :#{ attribute }_#{ i }"
             sql_attributes = sql_attributes.merge(Hash["#{ attribute }_#{ i }".to_sym, "%#{ pattern }%"])
@@ -154,6 +163,15 @@ module UiBibz::Concerns::Models::Searchable
   end
 
   module ClassMethods
+
+    # => searchable_attributes :name, :address
+    # or
+    # => searchable_attributes user: :name
+    # or
+    # => searchable_attributes user: [:name, :address]
+    # or
+    # => search_attributes :name, as: [:mybuildcolumn1, :mybuild_column2]
+    #
     def searchable_attributes *args
       @searchable_attributes ||= args
     end

data/lib/ui_bibz/infos.rb

@@ -1,6 +1,6 @@
 module UiBibz
   NAME                = "Ui Bibz"
-  VERSION             = "2.3.2"
+  VERSION             = "2.3.3"
   DESCRIPTION         = "A Rails Interface Framework using Bootstrap."
   SUMMARY             = "Create your project with Ui Bibz. Over a thirty reusable components built to provide iconography, dropdowns, input groups, navigation, alerts, and much more."
   LICENSE             = "MIT"

data/lib/ui_bibz/ui/core/notifications/components/bar.rb

@@ -55,7 +55,7 @@ module UiBibz::Ui::Core::Notifications::Components
   private
 
     def component_html_classes
-      ['progress-bar', striped, animated]
+      ['progress-bar', striped, animated, status]
     end
 
     def component_html_options
@@ -83,7 +83,11 @@ module UiBibz::Ui::Core::Notifications::Components
     end
 
     def status
-      "bg-#{ options[:status] }" unless options[:status].nil?
+      if options[:statuses]
+        "bg-#{ statuses.fetch(statuses.size*value/100, statuses.last) }"
+      else
+        "bg-#{ options[:status] }" unless options[:status].nil?
+      end
     end
 
     def text
@@ -96,5 +100,9 @@ module UiBibz::Ui::Core::Notifications::Components
       end
     end
 
+    def statuses
+      options[:statuses] == true ? %i(success primary info warning danger) : options[:statuses]
+    end
+
   end
 end

data/lib/ui_bibz/ui/ux/tables/components/as.rb

@@ -35,7 +35,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def progress_render
-      UiBibz::Ui::Core::Progress.new(@content, status: (@col.status || :primary)).render
+      UiBibz::Ui::Core::Notifications::ProgressBar.new(@content, @col.progress_options).render
     end
 
   end

data/lib/ui_bibz/ui/ux/tables/components/column.rb

@@ -1,7 +1,7 @@
 module UiBibz::Ui::Ux::Tables
   class Column < UiBibz::Ui::Core::Component
 
-    attr_accessor :hidden, :link, :status, :name, :input_options, :class, :as, :data_index, :date_format, :sort, :format, :date_format, :count, :custom_sort, :parent, :id
+    attr_accessor :hidden, :link, :name, :input_options, :class, :as, :data_index, :date_format, :sort, :format, :date_format, :count, :custom_sort, :parent, :id, :progress_options
 
     def initialize content = nil, options = nil, html_options = nil, &block
       super
@@ -20,7 +20,7 @@ module UiBibz::Ui::Ux::Tables
       @class         = @options[:class]
       @hidden        = @options[:hidden]
       @input_options = @options[:input_options]
-      @status         = @options[:status]
+      @progress_options = @options[:progress_options] || {}
     end
 
     def linkable?

data/test/ui/core/notifications/progress_bar_test.rb

@@ -49,4 +49,25 @@ class ProgressBarTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
+  test 'progress bar with statuses and 20%' do
+    actual = ui_progress_bar 20, statuses: true
+    expected = "<div class=\"progress\"><div class=\"bg-primary progress-bar\" aria-valuenow=\"20.0\" aria-valuemin=\"0\" aria-valuemax=\"100\" style=\"width: 20.0%\" role=\"progressbar\">20.0%</div></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'progress bar with statuses and 80%' do
+    actual = ui_progress_bar 80, statuses: true
+    expected = "<div class=\"progress\"><div class=\"bg-danger progress-bar\" aria-valuenow=\"80.0\" aria-valuemin=\"0\" aria-valuemax=\"100\" style=\"width: 80.0%\" role=\"progressbar\">80.0%</div></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'progress bar with custom statuses' do
+    actual = ui_progress_bar 80, statuses: [:info, :warning]
+    expected = "<div class=\"progress\"><div class=\"bg-warning progress-bar\" aria-valuenow=\"80.0\" aria-valuemin=\"0\" aria-valuemax=\"100\" style=\"width: 80.0%\" role=\"progressbar\">80.0%</div></div>"
+
+    assert_equal expected, actual
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Thooams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails