voom-presenters 0.2.0 → 2.0.0

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

@@ -1,4 +1,3 @@
-require 'voom/presenters/dsl/components/toggle_base'
 module Voom
   module Presenters
     module DSL

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

@@ -1,26 +1,20 @@
-require 'voom/presenters/dsl/components/text_field'
-
 module Voom
   module Presenters
     module DSL
       module Components
         class RichTextArea < TextField
-          attr_reader :placeholder
+          attr_reader :placeholder, :height, :resizable
 
           def initialize(**attribs_, &block)
             super(type: :rich_text_area, **attribs_, &block)
-            @rows = attribs.delete(:rows) || default(:rows)
             @placeholder = attribs.delete(:placeholder)
+            @rows = attribs.delete(:rows) || default(:rows)
+            @height = "#{@rows * 24}px"
+            @resizable = attribs.delete(:resizable) { false }
             expand!
           end
-
-          def height
-            return @height if locked?
-            @height = "#{@rows * 12}px"
-          end
-
         end
       end
     end
   end
-end
+end

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

@@ -1,17 +1,16 @@
-require 'voom/presenters/dsl/components/input'
-
 module Voom
   module Presenters
     module DSL
       module Components
         class Select < Input
 
-          attr_reader :required, :full_width, :options
+          attr_reader :required, :full_width, :options, :outlined
 
           def initialize(**attribs_, &block)
             super(type: :select, **attribs_, &block)
             @required = attribs.delete(:required)
             @full_width = attribs.delete(:full_width){ true }
+            @outlined = attribs.delete(:outlined){ true }
             @options = []
             expand!
           end
@@ -21,18 +20,27 @@ module Voom
             @label = text
           end
 
-          def icon(icon=nil, **attribs, &block)
-            return @icon if locked?
-            @icon = Components::Icon.new(parent: self, icon: icon,
-                                         **attribs, &block)
-          end
-
           def option(text=nil, **attribs, &block)
             @options << Option.new(parent: self,
                                    text: text,
                                    **attribs, &block)
           end
 
+          def value
+            @options.select(&:_selected?).first&.value
+          end
+
+          def hint(hint=nil)
+            return @hint if locked?
+            @hint = hint
+          end
+
+          def icon(icon=nil, **attribs, &block)
+            return @icon if locked?
+            @icon = Components::Icon.new(parent: self, icon: icon, position: attribs.delete(:position){:right},
+                                         **attribs, &block)
+          end
+
           class Option < Base
             attr_reader :selected, :disabled
 
@@ -54,6 +62,10 @@ module Voom
               return @text if locked?
               @text = text
             end
+
+            def _selected?
+              @selected
+            end
           end
         end
       end

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

@@ -0,0 +1,21 @@
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        class Separator < Base
+          attr_reader :padding
+
+          def initialize(**attribs_, &block)
+            super(type: :separator, **attribs_, &block)
+            padding = attribs.delete(:padding) {:full}
+            @padding = validate_padding(coerce_padding(padding)).uniq if padding != nil
+            expand!
+          end
+
+          private
+          include Mixins::Padding
+        end
+      end
+    end
+  end
+end

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

@@ -1,17 +1,16 @@
-require 'voom/presenters/dsl/components/mixins/event'
-require 'voom/presenters/dsl/components/mixins/tooltips'
-
 module Voom
   module Presenters
     module DSL
       module Components
-        class Slider < EventBase
-          include Mixins::Tooltips
-          attr_reader :name, :value_min, :value_max, :step, :show_tracker_marks, :discrete
+        class Slider < Input
+          attr_reader :value_min,
+                      :value_max,
+                      :step,
+                      :show_tracker_marks,
+                      :discrete
 
           def initialize(**attribs_, &block)
             super(type: :slider, **attribs_, &block)
-            @name = attribs.delete(:name)
             @value_min = attribs.delete(:value_min){0}
             @value_max = attribs.delete(:value_max){100}
             @step = attribs.delete(:step){nil}

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

@@ -1,7 +1,3 @@
-require 'voom/presenters/helpers/errors'
-require 'voom/presenters/dsl/components/button'
-require 'voom/presenters/dsl/components/content'
-
 module Voom
   module Presenters
     module DSL
@@ -77,12 +73,6 @@ module Voom
               def button(text = nil, stepper_type, **options, &block)
                 btn = StepperButton.new(stepper_type, parent: self, text: text,
                                                    **options, &block)
-
-                btn.instance_eval do
-                  event :click do
-                    stepper stepper_type
-                  end
-                end
                 @buttons << btn
               end
 

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

@@ -1,5 +1,3 @@
-require 'voom/presenters/dsl/components/toggle_base'
-
 module Voom
   module Presenters
     module DSL

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

@@ -1,6 +1,3 @@
-require 'voom/presenters/helpers/errors'
-require 'voom/presenters/dsl/components/mixins/common'
-
 module Voom
   module Presenters
     module DSL

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

@@ -1,20 +1,17 @@
-require 'voom/presenters/dsl/components/mixins/common'
-require 'voom/presenters/dsl/components/mixins/event'
-require 'voom/presenters/dsl/components/mixins/tooltips'
-require 'voom/presenters/dsl/components/mixins/chips'
-require 'voom/presenters/dsl/components/mixins/selects'
-require 'voom/presenters/dsl/components/mixins/icons'
-
 module Voom
   module Presenters
     module DSL
       module Components
         class Table < Base
-          attr_accessor :header, :rows, :selectable
+          include Mixins::Common
+          include Mixins::Event
+          attr_accessor :header, :rows, :selectable, :width, :border
 
           def initialize(**attribs_, &block)
             super(type: :table, **attribs_, &block)
             @selectable = attribs.delete(:selectable)
+            @border = attribs.delete(:border){ true }
+            @width = attribs.delete(:width)
             @rows = []
             expand!
           end
@@ -25,6 +22,12 @@ module Voom
                               **attribs, &block)
           end
 
+          def footer(**attribs, &block)
+            return @footer if locked?
+            @footer = Row.new(parent: self, type: :footer,
+                              **attribs, &block)
+          end
+
           def row(**attribs, &block)
             @rows << Row.new(parent: self, type: :row,
                              **attribs, &block)
@@ -55,41 +58,57 @@ module Voom
             def checkbox(**attributes, &block)
               return @checkbox if locked?
               field_name = @type == :header ? 'all' : "#{attributes.delete(:name)}[]"
+              tag = @type == :header ? '' : @parent.tag
               @checkbox = Components::Checkbox.new(parent: self,
                                                    name: field_name,
+                                                   tag: tag,
                                                    **attributes,
                                                    &block)
             end
 
             class Column < EventBase
               include Mixins::Tooltips
-              include Mixins::Chips
+              include Mixins::Chipset
               include Mixins::Selects
               include Mixins::Icons
+              include Mixins::Typography
+              include Mixins::Content
 
-              attr_accessor :numeric, :color, :components
+              attr_accessor :align, :color, :components, :colspan
 
               def initialize(**attribs_, &block)
                 super(type: :column, **attribs_, &block)
                 value = attribs.delete(:value)
-                @numeric = attribs.delete(:numeric){numeric?(value)}
-                self.value(value) if value
+                @align = validate_alignment(attribs.delete(:align){numeric?(value) ? :right : :left})
+                self.value(value, **attribs.slice(:markdown)) if value
                 @color = attribs.delete(:color)
+                @colspan = attribs.delete(:colspan)
                 @components = []
                 expand!
               end
 
               def value(*value, **attribs, &block)
                 return @value if locked?
-                @numeric = numeric?(*value) if value.size ==1
                 @value = Components::Typography.new(parent: self, type: :text, text: value, **attribs, &block)
               end
 
+              def numeric?(_value = value&.text)
+                return true if _value.is_a? Numeric
+                (_value.to_s.strip.sub(/\D/, '') =~ /^[\$]?[-+]?(,?[0-9])*\.?[0-9]+$/) != nil
+              end
+
               private
-              def numeric?(value)
-                return true if value.is_a? Numeric
-                (value.to_s.strip.sub(/\D/, '') =~ /^[\$]?[-+]?(,?[0-9])*\.?[0-9]+$/) != nil
+              VALID_ALIGNMENTS = %i[left center right].freeze
+
+              def validate_alignment(value)
+                return :left if value.nil?
+                unless VALID_ALIGNMENTS.include?(value.to_sym)
+                  raise Errors::ParameterValidation,
+                        "Invalid column alignment! Valid alignements include #{VALID_ALIGNMENTS.join(', ')}"
+                end
+                value
               end
+
             end
 
           end
@@ -141,16 +160,16 @@ module Voom
             end
 
             def button(icon_name, page, replace_id = @replace_id, replace_presenter = @replace_presenter)
-              __attribs__ = attribs.merge({page: page, page_size: @page_size})
-              Components::Icon.new(parent: self, icon: icon_name) do
+              __attribs__ = attribs.merge({ page: page, page_size: @page_size })
+              Components::Button.new(parent: self, type: :icon, icon: icon_name) do
                 event :click do
-                   replaces replace_id, replace_presenter, __attribs__
+                  replaces replace_id, replace_presenter, __attribs__
                 end
               end
             end
 
             def select(options, current_option, total_records, replace_id = @replace_id, replace_presenter = @replace_presenter)
-              __attribs__ = attribs.reject{|key,val| [:page_size, :page].include? key }
+              __attribs__ = attribs.reject{ |key,val| [:page_size, :page].include? key }
               Components::Select.new(parent: self, name: :page_size, full_width: false) do
                 options.each do |num|
                   option selected: (num == current_option) do

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

@@ -1,12 +1,10 @@
-require 'voom/presenters/dsl/components/text_field'
-
 module Voom
   module Presenters
     module DSL
       module Components
         class TextArea < TextField
           attr_reader :rows, :cols
-          
+
           def initialize(**attribs_, &block)
             super(type: :text_area, **attribs_, &block)
             @rows = attribs.delete(:rows) || default(:rows)

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

@@ -1,20 +1,26 @@
-require 'voom/presenters/dsl/components/input'
-
 module Voom
   module Presenters
     module DSL
       module Components
         class TextField < Input
 
-          attr_reader :required, :full_width, :password, :disabled, :auto_complete
+          attr_reader :required,
+                      :full_width,
+                      :auto_complete,
+                      :case_type,
+                      :behavior
+
+          VALID_CASE_TYPES = %i[mixed upper lower].freeze
 
           def initialize(**attribs_, &block)
             super(type: :text_field, **attribs_, &block)
             @required = attribs.delete(:required){ false }
             @full_width = attribs.delete(:full_width){ true }
-            @password = attribs.delete(:password){ false }
-            @disabled = attribs.delete(:disabled){ false }
-            @auto_complete = attribs.delete(:auto_complete){ true }
+            @case_type = validate_case_type(attribs.delete(:case_type) { :mixed })
+            @auto_complete = validate_auto_complete(attribs.delete(:auto_complete) { :off })
+            @behavior = determine_behavior(attribs.delete(:password), attribs.delete(:behavior))
+            label(attribs.delete(:label))if attribs.key?(:label)
+            value(attribs.delete(:value))if attribs.key?(:value)
             expand!
           end
 
@@ -44,12 +50,13 @@ module Voom
             @hint = hint
           end
 
-          def error(error=nil)
-            return @error if locked?
-            @error = error
+          def behavior
+            return "type=\"#{@behavior}\"" unless @behavior == 'currency'
+            return 'type="number" min="0.00" max="10000000000.00" step="0.01"'
           end
-          
+
           private
+
           def json_regexp(regexp)
             str = regexp.inspect.
                 sub('\\A', '^').
@@ -62,9 +69,45 @@ module Voom
                 gsub(/\s/, '')
             Regexp.new(str).source
           end
+
+          def validate_auto_complete(value)
+            case value
+            when false, :disabled, 'disabled', 'off', nil
+              :off
+            when true, :enabled, 'enabled', 'on'
+              :on
+            else # :on, :off, client-specific values
+              value
+            end
+          end
+
+          def validate_case_type(case_type)
+            return unless case_type
+            case_type = case_type.to_sym
+
+            raise Errors::ParameterValidation, "Invalid case type specified: #{case_type}" unless VALID_CASE_TYPES.include?(case_type)
+            case_type
+          end
+
+          def determine_behavior(password, behavior)
+            unless password.nil?
+              logger.warn(
+                'The `password` attribute of text_field is deprecated. ' \
+                'Use `text_field behavior: :password` instead.'
+              )
+            end
+
+            case password
+            when nil
+              behavior
+            when true
+              :password
+            when false
+              :text
+            end
+          end
         end
       end
     end
   end
 end
-

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

@@ -1,5 +1,3 @@
-require 'voom/presenters/dsl/components/datetime_base'
-
 module Voom
   module Presenters
     module DSL

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

@@ -1,20 +1,22 @@
-require 'voom/presenters/dsl/components/mixins/event'
-require 'voom/presenters/dsl/components/input'
-
 module Voom
   module Presenters
     module DSL
       module Components
         # Base class used by toggle classes
         class ToggleBase < Input
-          attr_accessor :text, :checked, :value, :disabled
-         
+          attr_accessor :text,
+                        :text_color,
+                        :checked,
+                        :value,
+                        :off_value
+
           def initialize(**attribs_, &block)
             super(**attribs_, &block)
             @text = attribs.delete(:text)
+            @text_color = attribs.delete(:text_color)
             @checked = attribs.delete(:checked) { false }
             @value = attribs.delete(:value)
-            @disabled = attribs.delete(:disabled) { false }
+            @off_value = attribs.delete(:off_value)
           end
         end
       end