voom-presenters 0.1.11 → 2.0.1

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

@@ -4,8 +4,8 @@ module Voom
       module Components
         module Lists
           class Separator < Base
-            def initialize(context:, **attribs_, &block)
-              super(type: :separator, context: context, **attribs_, &block)
+            def initialize(**attribs_, &block)
+              super(type: :separator, **attribs_, &block)
               expand!
             end
           end

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

@@ -1,50 +1,80 @@
-require_relative 'mixins/event'
-require_relative 'mixins/tooltips'
-require_relative 'mixins/attaches'
-require_relative 'mixins/buttons'
-
 module Voom
   module Presenters
     module DSL
       module Components
         class Menu < Base
-          attr_accessor :items, :title, :position, :placement, :color, :open
+          attr_accessor :items, :title, :position, :placement, :color, :open, :hoisted
 
           def initialize(title=nil, **attribs_, &block)
             super(type: :menu, **attribs_, &block)
             @title = title
             @items = []
-            @position = attribs.delete(:position) || :left
-            @placement = attribs.delete(:placement) || :default
+            @position = attribs.delete(:position){:left}
+            @placement = attribs.delete(:placement){:default}
             @color = attribs.delete(:color)
-            @open = attributes.delete(:open){false}
+            @open = attributes.delete(:open) {false}
+            @hoisted = attributes.delete(:hoisted) {true}
             expand!
           end
-          
+
           def item(first_text = nil, text: nil, **attribs, &block)
             the_text = first_text || text
             @items << Item.new(parent: self, text: the_text,
-                               context: context,
                                **attribs, &block)
           end
 
           def divider(**attribs, &block)
             @items << Divider.new(parent: self,
-                                  context: context,
                                   **attribs, &block)
           end
 
           def label(**attribs, &block)
             return @label if locked?
             @label = Label.new(parent: self,
-                               context: context,
                                **attribs, &block)
           end
 
           private
 
+          module BaseMenuItem
+            attr_reader :position, :size, :color
+
+            private
+
+            VALID_POSITIONS = %i[top bottom].freeze
+            VALID_SIZES = %i[normal small].freeze
+
+            def validate_position(value)
+              return unless value
+
+              v = value.to_sym
+
+              unless VALID_POSITIONS.include?(v)
+                raise Errors::ParameterValidation,
+                      "Invalid item position! Valid positions include #{VALID_POSITIONS.join(', ')}"
+              end
+
+              v
+            end
+
+            def validate_size(value)
+              return unless value
+
+              v = value.to_sym
+
+              unless VALID_SIZES.include?(v)
+                raise Errors::ParameterValidation,
+                      "Invalid item size! Valid sizes include #{VALID_SIZES.join(', ')}"
+              end
+
+              v
+            end
+          end
+
           class Item < EventBase
             include Mixins::Tooltips
+            include Mixins::Typography
+            include BaseMenuItem
 
             attr_accessor :text, :disabled, :selected
 
@@ -52,14 +82,17 @@ module Voom
               super(type: :item, **attribs_, &block)
               @text = attribs.delete(:text)
               @disabled = attribs.delete(:disabled)
-              @selected = attribs.delete(:selected) { false }
+              @selected = attribs.delete(:selected) {false}
+              @position = validate_position(attribs.delete(:position) { :top })
+              @size = validate_size(attribs.delete(:size) { :normal })
+              @color = attribs.delete(:color) { :primary }
+              @components = []
               expand!
             end
 
             def icon(icon=nil, **attribs, &block)
               return @icon if locked?
               @icon = Icon.new(parent: self, icon: icon,
-                               context: context,
                                **attribs, &block)
             end
           end
@@ -67,15 +100,22 @@ module Voom
           class Label < Item
             def initialize(**attribs, &block)
               super(type: :label, **attribs, &block)
+              @position = validate_position(attribs.delete(:position) { :top })
+              @size = validate_size(attribs.delete(:size) { :normal })
+              @color = attribs.delete(:color) { :primary }
             end
           end
 
           class Divider < Base
+            include BaseMenuItem
+
             def initialize(**attribs, &block)
               super(type: :divider, **attribs, &block)
+              @position = validate_position(attribs.delete(:position) { :top })
+              @size = validate_size(attribs.delete(:size) { :normal })
+              @color = attribs.delete(:color) { :primary }
             end
           end
-
         end
       end
     end

data/lib/voom/presenters/dsl/components/mixins/append.rb

@@ -9,8 +9,8 @@ module Voom
               @components << comp
             end
 
-            def yield_to(&block)
-              instance_eval(&block) if block
+            def yield_to(*args, &block)
+              instance_exec(*args, &block) if block_given?
             end
           end
         end

data/lib/voom/presenters/dsl/components/mixins/attaches.rb

@@ -4,10 +4,14 @@ module Voom
       module Components
         module Mixins
           module Attaches
-            def attach(presenter, **context_, &yield_block)
+            include Namespace
+            def attach(presenter, **params, &yield_block)
               @_yield_block_ = yield_block
-              pom = Voom::Presenters::App[presenter].call.expand_child(parent: self, context: context.merge(context_))
-              @components += pom.components
+              fq_presenter = _expand_namespace_(presenter, namespace)
+              presenter = Presenters::App.registered?(fq_presenter) ? fq_presenter : presenter
+              pom = Voom::Presenters::App[presenter].call.expand_child(parent: self, context: context.merge(params))
+              @components += pom.components if @components
+              pom
             end
           end
         end

data/lib/voom/presenters/dsl/components/mixins/avatar.rb

@@ -5,10 +5,7 @@ module Voom
         module Mixins
           module Avatar
             def avatar(avatar = nil, **attribs, &block)
-              return @avatar if locked?
-              @avatar = Components::Avatar.new(parent: self, avatar: avatar,
-                                   context: context,
-                                   **attribs, &block)
+              self << Components::Avatar.new(parent: self, avatar: avatar, **attribs, &block)
             end
           end
         end

data/lib/voom/presenters/dsl/components/mixins/buttons.rb

@@ -5,7 +5,7 @@ module Voom
         module Mixins
           module Buttons
             def button(text=nil, **attributes, &block)
-              self << Components::Button.new(text: text, parent: self, context: context, **attributes, &block)
+              self << Components::Button.new(text: text, parent: self, **attributes, &block)
             end
           end
         end

data/lib/voom/presenters/dsl/components/mixins/chips.rb

@@ -1,5 +1,3 @@
-require_relative 'append'
-
 module Voom
   module Presenters
     module DSL
@@ -10,7 +8,6 @@ module Voom
 
             def chip(text= nil, **attribs, &block)
               self << Components::Chip.new(parent: self, text: text,
-                                                 context: context,
                                                  **attribs, &block)
             end
           end

data/lib/voom/presenters/dsl/components/mixins/chipset.rb

@@ -0,0 +1,19 @@
+require 'voom/presenters/dsl/components/mixins/append'
+
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Mixins
+          module Chipset
+            include Mixins::Append
+
+            def chipset(chipset_variant=nil, **attribs, &block)
+              self << Components::Chipset.new(chipset_variant, parent: self, **attribs, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/voom/presenters/dsl/components/mixins/common.rb

@@ -1,12 +1,3 @@
-require_relative 'append'
-require_relative 'toggles'
-require_relative 'typography'
-require_relative 'grids'
-require_relative 'buttons'
-require_relative 'expansion_panels'
-require_relative 'content'
-require_relative 'menus'
-
 module Voom
   module Presenters
     module DSL
@@ -21,26 +12,40 @@ module Voom
             include Mixins::ExpansionPanels
             include Mixins::Content
             include Mixins::Menus
-
+            include Mixins::TabBars
+            include Mixins::Images
+            include Mixins::Icons
+            include Mixins::ImageLists
+            include Mixins::Dialogs
+            include Mixins::Tables
+            
             def badge(badge=nil, **attributes, &block)
-              self << Components::Badge.new(parent: self, badge: badge, context: context, **attributes, &block)
+              self << Components::Badge.new(parent: self, badge: badge, **attributes, &block)
             end
 
             def card(**attributes, &block)
-              self << Components::Card.new(parent: self, context: context, **attributes, &block)
+              self << Components::Card.new(parent: self, **attributes, &block)
             end
 
             def form(id: nil, **attributes, &block)
-              self << Components::Form.new(parent: self, id: id, context: context, **attributes, &block)
+              self << Components::Form.new(parent: self, id: id, **attributes, &block)
             end
 
             def list(**attributes, &block)
               self << Components::List.new(parent: self,
-                                           context: context, **attributes, &block)
+                                           **attributes, &block)
             end
-
+            
             def table(**attributes, &block)
-              self << Components::Table.new(parent: self, context: context, **attributes, &block)
+              self << Components::Table.new(parent: self, **attributes, &block)
+            end
+
+            def unordered_list(**attributes, &block)
+              self << Components::UnorderedList.new(parent: self, **attributes, &block)
+            end
+
+            def avatar(avatar = nil, **attributes, &block)
+              self << Components::Avatar.new(parent: self, avatar: avatar, **attributes, &block)
             end
           end
         end

data/lib/voom/presenters/dsl/components/mixins/content.rb

@@ -5,7 +5,7 @@ module Voom
         module Mixins
           module Content
             def content(**attributes, &block)
-              self << Components::Content.new(parent: self, context: context, **attributes, &block)
+              self << Components::Content.new(parent: self, **attributes, &block)
             end
           end
         end

data/lib/voom/presenters/dsl/components/mixins/date_time_fields.rb

@@ -6,19 +6,16 @@ module Voom
           module DateTimeFields
             def datetime_field(**attribs, &block)
               self << Components::DatetimeField.new(parent: self,
-                                                    context: context,
                                                     **attribs, &block)
             end
 
             def date_field(**attribs, &block)
               self << Components::DateField.new(parent: self,
-                                                context: context,
                                                 **attribs, &block)
             end
 
             def time_field(**attribs, &block)
               self << Components::TimeField.new(parent: self,
-                                                context: context,
                                                 **attribs, &block)
             end
           end

data/lib/voom/presenters/dsl/components/mixins/dialogs.rb

@@ -1,5 +1,3 @@
-require_relative '../dialog'
-
 module Voom
   module Presenters
     module DSL
@@ -8,7 +6,6 @@ module Voom
           module Dialogs
             def dialog(**attributes, &block)
               @components << Components::Dialog.new(parent: self,
-                                                    context: context,
                                                     **attributes, &block)
             end
           end

data/lib/voom/presenters/dsl/components/mixins/event.rb

@@ -1,5 +1,3 @@
-require_relative '../event'
-
 module Voom
   module Presenters
     module DSL
@@ -7,9 +5,9 @@ module Voom
         module Mixins
           module Event
             attr_reader :events
-            def event(event, **params, &block)
+            def event(event, &block)
               @events ||= []
-              @events << Components::Event.new(parent: self, event: event, context: context&.merge(params), &block)
+              @events << Components::Event.new(parent: self, event: event, &block)
             end
           end
         end

data/lib/voom/presenters/dsl/components/mixins/expansion_panels.rb

@@ -5,7 +5,7 @@ module Voom
         module Mixins
           module ExpansionPanels
             def expansion_panel(text=nil, **attributes, &block)
-              self << Components::ExpansionPanel.new(parent: self, text: text, context: context, **attributes, &block)
+              self << Components::ExpansionPanel.new(parent: self, text: text, **attributes, &block)
             end
           end
         end

data/lib/voom/presenters/dsl/components/mixins/file_inputs.rb

@@ -0,0 +1,16 @@
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Mixins
+          module FileInputs
+            def file_input(**attribs, &block)
+              self << Components::FileInput.new(parent: self,
+                                                **attribs, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/voom/presenters/dsl/components/mixins/google_maps.rb

@@ -0,0 +1,15 @@
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Mixins
+          module GoogleMaps
+            def google_map(**attributes, &block)
+              self << Components::GoogleMap.new(parent: self, **attributes, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/voom/presenters/dsl/components/mixins/grids.rb

@@ -5,7 +5,7 @@ module Voom
         module Mixins
           module Grids
             def grid(color: nil, **attributes, &block)
-              self << Components::Grid.new(parent: self, color: color, context: context, **attributes, &block)
+              self << Components::Grid.new(parent: self, color: color, **attributes, &block)
             end
           end
         end

data/lib/voom/presenters/dsl/components/mixins/icons.rb

@@ -6,7 +6,6 @@ module Voom
           module Icons
             def icon(icon=nil, **attribs, &block)
               self << Components::Icon.new(parent: self, icon: icon,
-                                           context: context,
                                            **attribs, &block)
             end
           end

data/lib/voom/presenters/dsl/components/mixins/image_lists.rb

@@ -0,0 +1,15 @@
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Mixins
+          module ImageLists
+            def image_list(**attribs, &block)
+              self << Components::ImageList.new(parent: self, **attribs, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/voom/presenters/dsl/components/mixins/last_response.rb

@@ -0,0 +1,48 @@
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Mixins
+          module LastResponse
+            # Defines a client side dynamic parameter used by an action
+            # Example usage:
+            #     updates forte_path, params: params
+            #     updates update_portal_path(portal_id: portal.id, token: last_response.token)
+            class ActionParameter
+              include Voom::Serializer
+
+              attr_reader :type, :response_index, :value
+
+              def initialize(index=0)
+                @value = []
+                @type = :action_parameter
+                @response_index = index
+              end
+
+              def dynamic_parameter
+                true
+              end
+
+              def type
+                :action_parameter
+              end
+
+              def method_missing(name, *args, &block)
+                @value << name
+                self
+              end
+
+              def to_h
+                to_hash(false)
+              end
+            end
+
+            def last_response(index=0)
+              ActionParameter.new(index)
+            end
+          end
+        end
+      end
+    end
+  end
+end