voom-presenters 0.1.13 → 2.0.3

data/lib/voom/presenters/dsl/components/event_base.rb

@@ -1,5 +1,3 @@
-require_relative 'mixins/event'
-
 module Voom
   module Presenters
     module DSL
@@ -9,7 +7,7 @@ module Voom
           attr_reader :event_parent_id
 
           def initialize(**attribs_, &block)
-            super(type: :icon, context: context,
+            super(type: :icon,
                   **attribs_, &block)
             @event_parent_id = @id
           end

data/lib/voom/presenters/dsl/components/expansion_panel.rb

@@ -1,6 +1,3 @@
-require_relative 'mixins/common'
-require_relative 'mixins/attaches'
-
 module Voom
   module Presenters
     module DSL
@@ -20,17 +17,17 @@ module Voom
 
           def text(*text, **attribs, &block)
             return @text if locked?
-            @text = Components::Typography.new(parent: self, type: :text, text: text, context: context, **attribs, &block)
+            @text = Components::Typography.new(parent: self, type: :text, text: text, **attribs, &block)
           end
 
           def secondary_text(*text, **attribs, &block)
             return @secondary_text if locked?
-            @secondary_text = Components::Typography.new(parent: self, type: :text, text: text, context: context, **attribs, &block)
+            @secondary_text = Components::Typography.new(parent: self, type: :text, text: text,  **attribs, &block)
           end
 
           def content(**attribs, &block)
             return @content if locked?
-            @content = Content.new(parent: self, context: context, **attribs, &block)
+            @content = Content.new(parent: self, **attribs, &block)
           end
 
           class Content < EventBase

data/lib/voom/presenters/dsl/components/file_input.rb

@@ -0,0 +1,34 @@
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        class FileInput < Input
+          include Mixins::Append
+          include Mixins::Buttons
+          include Mixins::Grids
+
+          attr_reader :accept, :preview, :components
+
+          def initialize(**attribs_, &block)
+            super(type: :file_input, **attribs_, &block)
+
+            @accept =  attribs.delete(:accept) { nil }
+            @preview = attribs.delete(:preview) { nil }
+            @components = []
+            expand!
+            default_button
+          end
+
+          def value(value=nil)
+            return @value if locked?
+            @value = value
+          end
+          private
+          def default_button
+            button(icon: :cloud_upload) unless components.any?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/voom/presenters/dsl/components/footer.rb

@@ -6,7 +6,7 @@ module Voom
           attr_accessor :footer_type, :menus
 
           def initialize(type: nil, **attribs_, &block)
-            @footer_type = h(type) ||  :small
+            @footer_type = type ||  :small
             super(type: :footer, **attribs_, &block)
             @menus = []
             expand!
@@ -14,7 +14,7 @@ module Voom
 
           def menu(title=nil, **attribs, &block)
             return @menus if locked?
-            @menus << Menu.new(title,parent: self, context: context,
+            @menus << Menu.new(title,parent: self,
                                **attribs, &block)
           end
 

data/lib/voom/presenters/dsl/components/form.rb

@@ -1,19 +1,3 @@
-require_relative 'hidden_field'
-require_relative 'text_field'
-require_relative 'text_area'
-require_relative 'mixins/event'
-require_relative 'mixins/grids'
-require_relative 'mixins/append'
-require_relative 'mixins/text_fields'
-require_relative 'mixins/selects'
-require_relative 'mixins/buttons'
-require_relative 'mixins/toggles'
-require_relative 'mixins/attaches'
-require_relative 'mixins/expansion_panels'
-require_relative 'mixins/content'
-require_relative 'mixins/typography'
-require_relative 'mixins/date_time_fields'
-
 module Voom
   module Presenters
     module DSL
@@ -30,6 +14,9 @@ module Voom
           include Mixins::ExpansionPanels
           include Mixins::Content
           include Mixins::Typography
+          include Mixins::FileInputs
+          include Mixins::Images
+          include Mixins::Tables
 
           attr_reader :components, :shows_errors
 

data/lib/voom/presenters/dsl/components/grid.rb

@@ -1,54 +1,84 @@
-require_relative 'mixins/common'
-require_relative 'mixins/images'
-require_relative 'mixins/icons'
-require_relative 'mixins/event'
-require_relative 'mixins/attaches'
-require_relative 'mixins/dialogs'
-require_relative 'mixins/chips'
-require_relative 'mixins/snackbars'
-require_relative 'mixins/selects'
-require_relative 'mixins/text_fields'
-require_relative 'mixins/date_time_fields'
-
 module Voom
   module Presenters
     module DSL
       module Components
-        class Grid < Base
+        class Grid < EventBase
           include Mixins::Attaches
           include Mixins::Dialogs
           include Mixins::Snackbars
-          
-          attr_accessor :columns, :color, :padded
+          include Mixins::Progress
+          include Mixins::Padding
+
+          attr_reader   :columns,
+                        :color,
+                        :padding,
+                        :wide,
+                        :gutter,
+                        :height
 
           def initialize(color: nil, **attribs_, &block)
             super(type: :grid, **attribs_, &block)
             @columns = []
-            @color = h(color)
-            @padded = attribs.delete(:padded)
+            @color = color
+            padding = attribs.delete(:padding) {nil}
+            @padding = validate_padding(coerce_padding(padding, default_level: 3)).uniq if padding != nil
+            @wide = attribs.delete(:wide) {false}
+            @gutter = coerce_gutter(attribs.delete(:gutter) {nil})
+            @height = attribs.delete(:height) {nil}
             expand!
           end
 
           def column(size, color: nil, **attribs, &block)
             attribs = size.respond_to?(:keys) ? attribs.merge(size) : attribs.merge(size: size)
             @columns << Column.new(parent: self, color: color,
-                                   context: context, **attribs, &block)
+                                   **attribs, &block)
           end
 
+          private
+
+          def coerce_gutter(gutter)
+            case gutter
+            when true, :full, :all
+              true
+            when false, :none
+              false
+            when nil
+              nil
+            else
+              raise Errors::ParameterValidation, "Grid gutter was: #{gutter}. "\
+                          'Allowed gutter values are true, false, :full, :all, :none! and nil'
+            end
+          end
+
+          include Mixins::Padding
           class Column < EventBase
             include Mixins::Common
-            include Mixins::Images
             include Mixins::Icons
             include Mixins::Attaches
             include Mixins::Dialogs
-            include Mixins::Chips
+            include Mixins::Chipset
             include Mixins::TextFields
             include Mixins::DateTimeFields
             include Mixins::Selects
             include Mixins::Toggles
             include Mixins::Snackbars
-            
-            attr_reader :size, :desktop, :tablet, :phone, :color, :components
+            include Mixins::Steppers
+            include Mixins::Sliders
+            include Mixins::FileInputs
+            include Mixins::Avatar
+            include Mixins::Progress
+            include Mixins::Padding
+
+            attr_reader :size,
+                        :desktop,
+                        :tablet,
+                        :phone,
+                        :color,
+                        :components,
+                        :padding,
+                        :align,
+                        :overflow,
+                        :height
 
             def initialize(**attribs_, &block)
               super(type: :column, **attribs_, &block)
@@ -57,9 +87,21 @@ module Voom
               @tablet = attribs.delete(:tablet)
               @phone = attribs.delete(:phone)
               @color = attribs.delete(:color)
+              @align = validate_alignment(attribs.delete(:align) {:left})
+              @overflow = attribs.delete(:overflow){true}
               @components = []
+              padding = attribs.delete(:padding) {nil}
+              @padding = validate_padding(coerce_padding(padding)).uniq if padding != nil
+              @height = attribs.delete(:height) {nil}
               expand!
             end
+
+            def validate_alignment(align)
+              valid_alignment = %i(right left)
+              raise "Invalid value for column alignment: #{align}. "\
+                      "Valid values are #{valid_alignment.join(' ,')}." unless valid_alignment.include?(align)
+              align
+            end
           end
         end
       end

data/lib/voom/presenters/dsl/components/header.rb

@@ -3,41 +3,54 @@ module Voom
     module DSL
       module Components
         class Header < Base
-          attr_accessor :title, :image
+          attr_accessor :title, :image, :placement
+
+          VALID_PLACEMENTS = %i[static fixed].freeze
 
           def initialize(**attribs_, &block)
             super(type: :header,
-                  context: context,
                   **attribs_, &block)
             self.title(attribs.delete(:title)) if attribs.key?(:title)
             @image = attribs.delete(:image)
+            @placement = validate_placement(attribs.delete(:placement) { :static })
             expand!
           end
 
           def button(icon=nil, **attributes, &block)
             return @button if locked?
-            @button = Components::Button.new(icon: icon, position:[:top, :right], parent: self, context: context, **attributes, &block)
+            @button = Components::Button.new(icon: icon, parent: self, **attributes, &block)
           end
 
           def menu(**attribs, &block)
             return @menu if locked?
             @menu = Components::Menu.new(parent: self,
-                             context: context,
                              **attribs, &block)
           end
 
           def nav(**attribs, &block)
             return @nav if locked?
             @nav = Components::Menu.new(parent: self,
-                                         context: context,
                                          **attribs, &block)
           end
 
           def title(*text, **attribs, &block)
             return @title if locked?
-            @title = Components::Typography.new(parent: self, type: :text, text: text, context: context, **attribs, &block)
+            @title = Components::Typography.new(parent: self, type: :text, text: text, **attribs, &block)
           end
 
+          private
+
+          def validate_placement(value)
+            return unless value
+
+            placement = value.to_sym
+
+            unless VALID_PLACEMENTS.include?(placement)
+              raise Errors::ParameterValidation, "Invalid placement specified: #{placement}"
+            end
+
+            placement
+          end
         end
       end
     end

data/lib/voom/presenters/dsl/components/hidden_field.rb

@@ -1,5 +1,3 @@
-require_relative 'input'
-
 module Voom
   module Presenters
     module DSL
@@ -8,7 +6,7 @@ module Voom
           attr_reader :name
 
           def initialize(**attribs_, &block)
-            super(type: :hidden_field, context: context,
+            super(type: :hidden_field,
                   **attribs_, &block)
             expand!
           end

data/lib/voom/presenters/dsl/components/icon.rb

@@ -1,17 +1,14 @@
-require_relative 'mixins/event'
-require_relative 'mixins/tooltips'
-require_relative 'icon_base'
-
 module Voom
   module Presenters
     module DSL
       module Components
         class Icon < IconBase
           include Mixins::Tooltips
+          attr_accessor :text
 
           def initialize(**attribs_, &block)
-            super(context: context,
-                  **attribs_, &block)
+            super(**attribs_, &block)
+            @text = attribs.delete(:text)
             expand!
           end
         end

data/lib/voom/presenters/dsl/components/icon_base.rb

@@ -1,21 +1,19 @@
-require_relative 'mixins/event'
-require_relative 'mixins/tooltips'
-
 module Voom
   module Presenters
     module DSL
       module Components
         class IconBase < EventBase
           include Mixins::Tooltips
-          attr_reader :icon, :color, :size, :position
+          attr_reader :icon, :color, :size, :position, :hidden
 
           def initialize(**attribs_, &block)
-            super(type: :icon, context: context,
+            super(type: :icon,
                   **attribs_, &block)
-            @icon = attribs.delete(:icon)
+            @icon     = attribs.delete(:icon)
             @color    = attribs.delete(:color)
-            @size    = attribs.delete(:size)
-            @position    = Array(attribs.delete(:position)).compact
+            @size     = attribs.delete(:size){ :default }
+            @position = Array(attribs.delete(:position)).compact
+            @hidden = attribs.delete(:hidden) {false}
           end
         end
       end

data/lib/voom/presenters/dsl/components/icon_toggle.rb

@@ -1,17 +1,15 @@
-require_relative 'toggle_base'
-
 module Voom
   module Presenters
     module DSL
       module Components
         class IconToggle < ToggleBase
-          attr_accessor :icon, :selected, :disabled
+          attr_accessor :icon, :on_icon, :selected
 
           def initialize(**attribs_, &block)
-            super(type: :icon_toggle, context: context, **attribs_, &block)
+            super(type: :icon_toggle, **attribs_, &block)
             @icon = attribs.delete(:icon)
+            @on_icon = attribs.delete(:on_icon) { @icon }
             @selected = attribs.delete(:selected) { false }
-            @disabled = attribs.delete(:disabled) { false }
             expand!
           end
         end

data/lib/voom/presenters/dsl/components/image.rb

@@ -1,6 +1,3 @@
-require_relative 'mixins/event'
-require_relative 'mixins/tooltips'
-
 module Voom
   module Presenters
     module DSL
@@ -8,27 +5,78 @@ module Voom
         class Image < EventBase
           include Mixins::Tooltips
 
-          attr_accessor :image, :height, :width, :position, :selected, :url
+          VALID_FIT_TYPES = %i[contain cover fill fit].freeze
+          DEFAULT_POSITION = :center
+
+          attr_accessor :image,
+                        :description,
+                        :url,
+                        :min_height,
+                        :height,
+                        :max_height,
+                        :min_width,
+                        :width,
+                        :max_width,
+                        :border,
+                        :border_color,
+                        :border_radius,
+                        :fit,
+                        :position
 
           def initialize(**attribs_, &block)
-            super(type: :image, context: context,
-                  **attribs_, &block)
+            super(type: :image, **attribs_, &block)
+
             @image = attribs.delete(:image)
-            @height = attribs.delete(:height)
-            @width = attribs.delete(:width)
-            @position = Array(attribs.delete(:position)).compact
-            @selected = attribs.delete(:selected)
+            @description = attribs.delete(:description)
+
+            @min_width = validate_size(attribs.delete(:min_width))
+            @width = validate_size(attribs.delete(:width))
+            @max_width = validate_size(attribs.delete(:max_width))
+
+            @min_height = validate_size(attribs.delete(:min_height))
+            @height = validate_size(attribs.delete(:height))
+            @max_height = validate_size(attribs.delete(:max_height))
+
+            @border = attribs.delete(:border)
+            @border_color = attribs.delete(:border_color) { :primary }
+            @border_radius = attribs.delete(:border_radius)
+
+            @fit = validate_fit(attribs.delete(:fit) { :contain })
+            @position = Array(attribs.delete(:position) { DEFAULT_POSITION }).compact
+
             @url = build_url
+
             expand!
           end
-          
+
           private
+
           def build_url
-            return nil unless image
-            return image if image.start_with?('/') || @image.start_with?('http')
+            return unless image
+            return image if image.start_with?('/') || image.start_with?('http')
+
             @parent.router.url(render: image, context: {})
           end
 
+          def validate_fit(fit)
+            return unless fit
+
+            fit = fit.to_sym
+
+            unless VALID_FIT_TYPES.include?(fit)
+              raise Errors::ParameterValidation, "Invalid image fit specified: #{fit}"
+            end
+
+            fit
+          end
+
+          # Ensure all size values have a unit, defaulting to pixels.
+          def validate_size(value)
+            return unless value
+            return "#{value}px" if value.to_s.match?(/\A\d+\Z/)
+
+            value
+          end
         end
       end
     end