ui_bibz 3.0.0.beta5 → 3.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ccac331a44d9938a4f9ea2787c60f399837b32fa9b841c1b4aa586b67aaa82a
-  data.tar.gz: a8acf6abd32f1e4c2e878e618a3e31fc56f61d349b7c835ef9c5339563339d23
+  metadata.gz: ab074570076dac77f62df00073048e54f4bf3d935a7d3d2c13438000ffdb8506
+  data.tar.gz: 91005c842ed00077ecc28ea4fadf1a8d766af041e2c59b573a9a5fbf93b57d46
 SHA512:
-  metadata.gz: 398d31ea38d03b1d8c7c5f2a66760fd806752a6a038d43c0a23268e62e888a53a8c4ad90be65c81af6d6ecf203f4d4e3f63953cc79e43dd3a0d6f314daa2dc5a
-  data.tar.gz: c0da50a80beb20a6368a7e667e8735125db964fc8ca1de5d5fe101237835b7f7e51e1c85c74d6c52f266ae8684122d2b690d194d65cd10fc1a6f6802b51d8bf4
+  metadata.gz: c52c51c4e4075e0ad2bcaa0445aa0201b188e961d96c7a46126626f501115fd11bc1c81877be36456c272e2d427592056a51f98844f39809b4315100dbe1624a
+  data.tar.gz: 13033afe527ecfb013e00a4772920d41b0ee3880fa795e5ef09c6934f4c51d5fb634240394a243c681091d573ac84ae0691341589cc6a3132881e5018ec9ac0f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.beta5)
+    ui_bibz (3.0.0.beta6)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4

data/lib/ui_bibz/infos.rb

@@ -12,6 +12,6 @@ module UiBibz
   REPO                = 'git+https://github.com/thooams/ui_bibz.git'
   EMAIL               = 'thomas@hummel.link'
   AUTHOR              = 'Thooams [Thomas HUMMEL]'
-  VERSION             = '3.0.0.beta5'
+  VERSION             = '3.0.0.beta6'
   AUTHORS = ['Thooams'].freeze
 end

data/lib/ui_bibz/ui/core/forms/files/file_field.rb

@@ -45,19 +45,17 @@ module UiBibz::Ui::Core::Forms::Files
 
     # Render html tag
     def pre_render
-      content_tag :div, html_options do
-        concat file_field_tag content, class: 'form-file-input', multiple: options[:multiple], disabled: disabled?
-        concat label_text_and_button
-      end
+      file_field_tag content, html_options
     end
 
     private
 
-    def label_text_and_button
-      label_tag label_name, class: 'form-file-label' do
-        concat content_tag(:span, format_value(options[:input_text] || options[:value]), class: 'form-file-text')
-        concat content_tag(:span, options[:button_text] || 'Browse', class: 'form-file-button')
-      end
+    def component_html_options
+      super.merge({
+                    multiple: options[:multiple],
+                    disabled: disabled?,
+                    value: format_value(options[:input_text] || options[:value])
+                  })
     end
 
     def format_value(value)
@@ -70,12 +68,8 @@ module UiBibz::Ui::Core::Forms::Files
       value.to_s
     end
 
-    def label_name
-      html_options[:id] || content
-    end
-
     def component_html_classes
-      super << 'form-file'
+      super << 'form-control'
     end
   end
 end

data/test/simple_form_test.rb

@@ -202,7 +202,7 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :ui_file_field
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_file_field optional user_name_fr\"><label class=\"control-label ui_file_field optional\" for=\"user_name_fr\">Name fr</label><div class=\"ui_file_field optional form-file\"><input type=\"file\" name=\"user[name_fr]\" id=\"user_name_fr\" class=\"form-file-input\" /><label class=\"form-file-label\" for=\"user_name_fr\"><span class=\"form-file-text\">test1</span><span class=\"form-file-button\">Browse</span></label></div></div></form>"
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_file_field optional user_name_fr\"><label class=\"control-label ui_file_field optional\" for=\"user_name_fr\">Name fr</label><input type=\"file\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_file_field optional form-control\" /></div></form>"
 
     assert_equal expected, actual
   end

data/test/ui/core/boxes/card_test.rb

@@ -69,7 +69,7 @@ class CardTest < ActionView::TestCase
       p.body do |b|
         b.title 'Special title treatment'
         b.subtitle 'The subtitle'
-        b.text _('With supporting text below as a natural lead-in to additional content.')
+        b.text 'With supporting text below as a natural lead-in to additional content.'
         b.link 'Go somewhere', url: '#go-somewhere', class: 'btn btn-primary'
       end
     end

data/test/ui/core/forms/files/file_field_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 class FileFieldTest < ActionView::TestCase
   test 'file_field' do
     actual = UiBibz::Ui::Core::Forms::Files::FileField.new('test').render
-    expected = "<div class=\"form-file\"><input type=\"file\" name=\"test\" id=\"test\" class=\"form-file-input\" /><label class=\"form-file-label\" for=\"test\"><span class=\"form-file-text\"></span><span class=\"form-file-button\">Browse</span></label></div>"
+    expected = "<input type=\"file\" name=\"test\" id=\"test\" value=\"\" class=\"form-control\" />"
 
     assert_equal expected, actual
   end

data/test/ui/core/navigations/navbar_test.rb

@@ -4,14 +4,14 @@ require 'test_helper'
 class NavbarTest < ActionView::TestCase
   test 'Navbar' do
     actual = UiBibz::Ui::Core::Navigations::Navbar.new
-    expected = "<nav class=\"navbar navbar-light navbar-expand-lg\"><div class=\"container\"><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"></div></div></nav>"
+    expected = "<nav class=\"navbar navbar-light navbar-expand-lg\"><div class=\"container\"><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"></div></div></nav>"
 
     assert_equal expected, actual.render
   end
 
   test 'Navbar with options' do
     actual = UiBibz::Ui::Core::Navigations::Navbar.new(title: 'Brand', expand_size: :xs, status: :primary, position: :top, brand_position: :right)
-    expected = "<nav class=\"bg-primary navbar navbar-light fixed-top navbar-expand-xs\"><div class=\"container\"><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-target=\"##{actual.id}\">☰</button><span class=\"navbar-brand\">Brand</span><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"></div></div></nav>"
+    expected = "<nav class=\"bg-primary navbar navbar-light fixed-top navbar-expand-xs\"><div class=\"container\"><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"##{actual.id}\">☰</button><span class=\"navbar-brand\">Brand</span><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"></div></div></nav>"
 
     assert_equal expected, actual.render
   end
@@ -30,7 +30,7 @@ class NavbarTest < ActionView::TestCase
       end
       nb.text 'test'
     end
-    expected = "<nav class=\"navbar navbar-light navbar-expand-lg\"><div class=\"container\"><span class=\"navbar-brand\">Brand</span><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"><ul class=\"navbar-nav\"><li class=\"nav-item\"><a href=\"#Home\" class=\"active nav-link\">Home</a></li><li class=\"nav-item\"><a href=\"#profile\" class=\"nav-link\">Profile</a></li><li class=\"nav-item\"><a href=\"#messages\" class=\"nav-link\">Messages</a></li></ul><form type=\"form_tag\" position=\"right\" class=\"d-flex\" action=\"#\" accept-charset=\"UTF-8\" method=\"post\"><button class=\"btn-secondary btn\">Search</button></form><span class=\"navbar-text\">test</span></div></div></nav>"
+    expected = "<nav class=\"navbar navbar-light navbar-expand-lg\"><div class=\"container\"><span class=\"navbar-brand\">Brand</span><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"><ul class=\"navbar-nav\"><li class=\"nav-item\"><a href=\"#Home\" class=\"active nav-link\">Home</a></li><li class=\"nav-item\"><a href=\"#profile\" class=\"nav-link\">Profile</a></li><li class=\"nav-item\"><a href=\"#messages\" class=\"nav-link\">Messages</a></li></ul><form type=\"form_tag\" position=\"right\" class=\"d-flex\" action=\"#\" accept-charset=\"UTF-8\" method=\"post\"><button class=\"btn-secondary btn\">Search</button></form><span class=\"navbar-text\">test</span></div></div></nav>"
 
     assert_equal expected, actual.render
   end
@@ -43,7 +43,7 @@ class NavbarTest < ActionView::TestCase
       end
     end
     expected =
-      "<nav class=\"bg-dark navbar navbar-dark navbar-expand-lg\"><div class=\"container\"><span class=\"navbar-brand\"><img src=\"/images/ruby-white\" /></span><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"><ul class=\"navbar-nav\"><li class=\"nav-item\"><a href=\"#link\" class=\"nav-link\">Link</a></li></ul></div></div></nav>"
+      "<nav class=\"bg-dark navbar navbar-dark navbar-expand-lg\"><div class=\"container\"><span class=\"navbar-brand\"><img src=\"/images/ruby-white\" /></span><button class=\"navbar-toggler hidden-sm-up\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"##{actual.id}\">☰</button><div class=\"navbar-collapse collapse\" id=\"#{actual.id}\"><ul class=\"navbar-nav\"><li class=\"nav-item\"><a href=\"#link\" class=\"nav-link\">Link</a></li></ul></div></div></nav>"
 
     assert_equal expected, actual.render
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta5
+  version: 3.0.0.beta6
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]