myg 2.5.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b95564b61fc2a5e745ac2aaa4e7ba29cb6df63c8fa3f7c353091910757386104
-  data.tar.gz: 829b65c8e26568c1e713a24a697d1c91ba0e677895b744359cfc77d44ae4163c
+  metadata.gz: 66ef34aff3aa0db415984360e708fec7e9ef1e9a51f2ee8e8586df1d8c439536
+  data.tar.gz: f88a8fc86c73d011ea1eafd9ab54e067e372330e7a0652905cb9b778bf42c0e7
 SHA512:
-  metadata.gz: 35edb7ecdcd272849988e763b6d366ebe91958338d84427d82e1f03d87990cd1875e9ea298d3c1c6055108f6fad0170907b518a6392453466eeb8eeaa73d62f6
-  data.tar.gz: 37684fa4aad5ce4281b4aa4e52cadb56feedddd32fa7c5ca8c6eeaa5a7576e3ada0b2a555e436ba5d1ed8dcbc60b59b13e0d9a87f202f4314c5ca1b7b46f4f9a
+  metadata.gz: c12b67b108bb9e46e551353a0b1914ea0d5981f0dee9eb7d686b0eb171fa51ca32459ba242c406a8130326ad865dac1f417b8d411bc99ce0a5e8bb8ddd9228d3
+  data.tar.gz: '09894914422a24c4e4ade92cf4e8c2bb7c363704e9f56bd171f467e8dd8c47b94ed8143ca6cd21f9d33cf5eaf8dde2bca8ec1238bfee1429cf8eb372e741def2'

data/CHANGELOG.md

@@ -4,6 +4,14 @@
 
 * nothing yet
 
+### 2.6.0 - 2018/03/07
+
+* features
+    * add `titlebar` component
+    * add `file` option to `form-field` component
+* bugfixes
+    * fixed `tabs` generator
+
 ### 2.5.2 - 2018/03/05
 
 * bugfixes

data/README.md

@@ -83,6 +83,7 @@ These are the components currently supported by Myg on Rails:
 * [`slider`](components/myg/slider.md)
 * [`switch`](components/myg/switch.md)
 * [`tabs`](components/myg/tabs.md)
+* [`titlebar`](components/myg/titlebar.md)
 * [`toast`](components/myg/toast.md)
 * [`toolbar`](components/myg/toolbar.md)
 

data/app/views/mozaic/myg/_checkbox.html.erb

@@ -1,25 +1,26 @@
-<% class_name = options.delete :class_name %>
-<% attribute = options.delete :attribute %>
-<% name = class_name ? "#{class_name.to_s.downcase}[#{attribute}]" : "#{attribute}" %>
-<% id = class_name ? "#{class_name.to_s.downcase}_#{attribute}" : "#{attribute}" %>
-<% wrapper_html = {
-    class: ['myg-checkbox mdc-checkbox', options.dig(:wrapper_html, :class), ('mdc-checkbox--disabled' if options.dig(:input_html, :disabled))].join(' ')
-} %>
-<% input_html = {
-    type: 'checkbox',
-    class: ['mdc-checkbox__native-control', options.dig(:input_html, :class)].join(' '),
-    value: 1,
-    name: name,
-    id: id
-} %>
-
-<%= content_tag 'div', (options[:wrapper_html] || {}).merge(wrapper_html) do %>
-    <input value="0" type="hidden" name="<%= name %>" />
-    <%= tag 'input', (options[:input_html] || {}).merge(input_html) %>
-    <div class="mdc-checkbox__background">
-        <svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">
-            <path class="mdc-checkbox__checkmark__path" fill="none" stroke="white" d="M1.73,12.91 8.1,19.28 22.79,4.59"/>
-        </svg>
-        <div class="mdc-checkbox__mixedmark"></div>
-    </div>
-<% end %>
+<% class_name = options.delete :class_name %>
+<% attribute = options.delete :attribute %>
+<% values = options.delete(:values) || [0, 1] %>
+<% name = class_name ? "#{class_name.to_s.downcase}[#{attribute}]" : "#{attribute}" %>
+<% id = class_name ? "#{class_name.to_s.downcase}_#{attribute}" : "#{attribute}" %>
+<% wrapper_html = {
+    class: ['myg-checkbox mdc-checkbox', options.dig(:wrapper_html, :class), ('mdc-checkbox--disabled' if options.dig(:input_html, :disabled))].join(' ')
+} %>
+<% input_html = {
+    type: 'checkbox',
+    class: ['mdc-checkbox__native-control', options.dig(:input_html, :class)].join(' '),
+    name: name,
+    id: id,
+    value: values.last
+} %>
+
+<%= content_tag 'div', (options[:wrapper_html] || {}).merge(wrapper_html) do %>
+    <input value="<%= values.first %>" type="hidden" name="<%= name %>" />
+    <%= tag 'input', (options[:input_html] || {}).merge(input_html) %>
+    <div class="mdc-checkbox__background">
+        <svg class="mdc-checkbox__checkmark" viewBox="0 0 24 24">
+            <path class="mdc-checkbox__checkmark__path" fill="none" stroke="white" d="M1.73,12.91 8.1,19.28 22.79,4.59"/>
+        </svg>
+        <div class="mdc-checkbox__mixedmark"></div>
+    </div>
+<% end %>

data/app/views/mozaic/myg/_form-field.html.erb

@@ -1,13 +1,15 @@
 <% wrapper_html = {
-    class: ['myg-form-field', ('myg-form-field--inline-label' if options[:inline_label]), ('myg-form-field--floating-label' if options[:floating_label]), options.dig(:wrapper_html, :class)].join(' ')
+    class: ['myg-form-field', ('myg-form-field--inline-label' if options[:inline_label]), ('myg-form-field--floating-label' if options[:floating_label]), ('myg-form-field--file' if options[:file]), options.dig(:wrapper_html, :class)].join(' ')
 } %>
 <% if options[:floating_label] %><% input_html = {
     class_name: options[:class_name],
     attribute: options[:attribute],
+    type: ('file' if options[:file]),
     placeholder: options[:floating_label]
 } %><% else %><% input_html = {
     class_name: options[:class_name],
-    attribute: options[:attribute]
+    attribute: options[:attribute],
+    type: ('file' if options[:file])
 } %><% end %>
 <% label_html = {
     class_name: options[:class_name],
@@ -32,7 +34,15 @@
             <% end %>
         <% end %>
     <% end %>
-    <%= component "myg/#{options[:as]}", (options[:input_html] || {}).merge(input_html) %>
+    <% if options[:floating_label] %>
+        <%= content_tag 'div', class: 'myg-input--container' do %>
+            <%= component "myg/#{options[:as]}", (options[:input_html] || {}).merge(input_html) %>
+            <%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:floating_label] %><% end %>
+        <% end %>
+    <% else %>
+        <%= component "myg/#{options[:as]}", (options[:input_html] || {}).merge(input_html) %>
+        <% if options[:file] %><%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:file] %><% end %><% end %>
+    <% end %>
     <% if options[:inline_label] %>
         <% unless options[:inline_label].is_a? Array %>
             <%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:inline_label] %><% end %>
@@ -44,5 +54,4 @@
             <% end %>
         <% end %>
     <% end %>
-    <% if options[:floating_label] %><%= component 'myg/label', (options[:label_html] || {}).merge(label_html) do %><%= options[:floating_label] %><% end %><% end %>
 <% end %>

data/app/views/mozaic/myg/_tabs.html.erb

@@ -10,11 +10,11 @@
         <% tab_html = {
             class: ['mdc-tab', options.dig(:tab_html, :class), ('mdc-tab--active' if tab[:active])].join(' '),
             aria: {
-                controls: tab[:id]
+                controls: tab[:name].underscore
             },
             role: 'tab'
         } %>
-        <%= link_to tab[:name], tab[:href] || "##{tab[:id]}", (options[:tab_html] || {}).merge(tab_html) %>
+        <%= link_to tab[:name], tab[:href] || "##{tab[:name].underscore}", (options[:tab_html] || {}).merge(tab_html) %>
     <% end %>
     <span class="mdc-tab-bar__indicator"></span>
 <% end %>
@@ -29,7 +29,7 @@
         <% options[:tabs]&.each do |tab| %>
             <% panel_html = {
                 class: ['myg-tabs--panel', options.dig(:panel_html, :class), ('myg-tabs--shown' if tab[:active])].join(' '),
-                id: tab[:id],
+                id: tab[:name].underscore,
                 role: 'tabpanel',
                 aria: {
                     hidden: (tab[:active] ? false : true)

data/app/views/mozaic/myg/_titlebar.html.erb

@@ -0,0 +1,12 @@
+<% html = {
+    class: ['myg-titlebar welcomer', options[:class]].join(' ')
+} %>
+
+<%= content_tag 'div', options.merge(html) do %>
+    <%= block %>
+    <% if options[:close] %>
+        <div class="welcomer--close">
+            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px" height="20px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve"><g transform="translate(0, 0)"><polygon fill="#fff" points="10.1,4.5 8,6.6 5.9,4.5 4.5,5.9 6.6,8 4.5,10.1 5.9,11.5 8,9.4 10.1,11.5 11.5,10.1 9.4,8 11.5,5.9 "></polygon></g></svg>
+        </div>
+    <% end %>
+<% end %>

data/lib/generators/myg/tabs_generator.rb

@@ -14,9 +14,9 @@ class Myg::TabsGenerator < Rails::Generators::Base
     def create_templates
         template '_tabs.html.erb', "app/views/#{options[:controller]}/_tabs.html.erb"
         options[:method_names]&.each do |name|
-            @name = name[:id]
-            template 'tab.html.erb', "app/views/#{options[:controller]}/_#{@name}.html.erb"
-            template '_tab.html.erb', "app/views/#{options[:controller]}/#{@name}.html.erb"
+            @name = name[:name].underscore
+            template 'tab.html.erb', "app/views/#{options[:controller]}/#{@name}.html.erb"
+            template '_tab.html.erb', "app/views/#{options[:controller]}/_#{@name}.html.erb"
         end
     end
 

data/lib/generators/templates/install/stylesheets/_myg.sass

@@ -60,9 +60,11 @@
 // +myg-label--classes
 // +myg-layout--classes
 // +myg-radio--classes
+// +myg-switch--classes
 // +myg-tabs--classes
 // +myg-text--classes
 // +myg-theme--classes
+// +myg-titlebar--classes
 // +myg-toast--classes
 // +myg-toolbar--classes
 // +myg-tooltip--classes

data/lib/generators/templates/tabs/_tabs.html.erb

@@ -1,5 +1,5 @@
 <h1>Title</h1>
 
-<%%= component 'myg/tabs', async: true, success: local_assigns[:success], tabs: <%= options[:method_names]&.map! { |t| { name: t.titleize, href: root_url } } %> do %>
+<%%= component 'myg/tabs', async: true, success: local_assigns[:success], tabs: <%= options[:method_names]&.map! { |t| { name: t.titleize, href: '' } } %> do %>
     <p>An error occured</p>
 <%% end %>

data/lib/myg/railtie.rb

@@ -15,6 +15,7 @@ module Myg
                 config.define_component 'myg/slider', discrete: false, disabled: false, value: 0, min: 0, max: 50, label: 'Select value'
                 config.define_component 'myg/switch'
                 config.define_component 'myg/tabs', async: false
+                config.define_component 'myg/titlebar', close: true
                 config.define_component 'myg/toast'
                 config.define_component 'myg/toolbar'
             end

data/lib/myg/version.rb

@@ -1,5 +1,5 @@
 module Myg
 
-    VERSION = '2.5.2'
+    VERSION = '2.6.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myg
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Jonas Hübotter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -115,6 +115,7 @@ files:
 - app/views/mozaic/myg/_slider.html.erb
 - app/views/mozaic/myg/_switch.html.erb
 - app/views/mozaic/myg/_tabs.html.erb
+- app/views/mozaic/myg/_titlebar.html.erb
 - app/views/mozaic/myg/_toast.html.erb
 - app/views/mozaic/myg/_toolbar.html.erb
 - lib/generators/myg/install_generator.rb