voom-presenters 0.1.13 → 0.2.0

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

@@ -7,7 +7,6 @@ module Voom
 
           def initialize(**attribs_, &block)
             super(type: :header,
-                  context: context,
                   **attribs_, &block)
             self.title(attribs.delete(:title)) if attribs.key?(:title)
             @image = attribs.delete(:image)
@@ -16,26 +15,24 @@ module Voom
 
           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
 
         end

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

@@ -1,4 +1,4 @@
-require_relative 'input'
+require 'voom/presenters/dsl/components/input'
 
 module Voom
   module Presenters
@@ -8,7 +8,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,6 +1,6 @@
-require_relative 'mixins/event'
-require_relative 'mixins/tooltips'
-require_relative 'icon_base'
+require 'voom/presenters/dsl/components/mixins/event'
+require 'voom/presenters/dsl/components/mixins/tooltips'
+require 'voom/presenters/dsl/components/icon_base'
 
 module Voom
   module Presenters
@@ -10,8 +10,7 @@ module Voom
           include Mixins::Tooltips
 
           def initialize(**attribs_, &block)
-            super(context: context,
-                  **attribs_, &block)
+            super(**attribs_, &block)
             expand!
           end
         end

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

@@ -1,5 +1,5 @@
-require_relative 'mixins/event'
-require_relative 'mixins/tooltips'
+require 'voom/presenters/dsl/components/mixins/event'
+require 'voom/presenters/dsl/components/mixins/tooltips'
 
 module Voom
   module Presenters
@@ -10,7 +10,7 @@ module Voom
           attr_reader :icon, :color, :size, :position
 
           def initialize(**attribs_, &block)
-            super(type: :icon, context: context,
+            super(type: :icon,
                   **attribs_, &block)
             @icon = attribs.delete(:icon)
             @color    = attribs.delete(:color)

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

@@ -1,4 +1,4 @@
-require_relative 'toggle_base'
+require 'voom/presenters/dsl/components/toggle_base'
 
 module Voom
   module Presenters
@@ -8,7 +8,7 @@ module Voom
           attr_accessor :icon, :selected, :disabled
 
           def initialize(**attribs_, &block)
-            super(type: :icon_toggle, context: context, **attribs_, &block)
+            super(type: :icon_toggle, **attribs_, &block)
             @icon = attribs.delete(:icon)
             @selected = attribs.delete(:selected) { false }
             @disabled = attribs.delete(:disabled) { false }

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

@@ -1,5 +1,5 @@
-require_relative 'mixins/event'
-require_relative 'mixins/tooltips'
+require 'voom/presenters/dsl/components/mixins/event'
+require 'voom/presenters/dsl/components/mixins/tooltips'
 
 module Voom
   module Presenters
@@ -11,7 +11,7 @@ module Voom
           attr_accessor :image, :height, :width, :position, :selected, :url
 
           def initialize(**attribs_, &block)
-            super(type: :image, context: context,
+            super(type: :image,
                   **attribs_, &block)
             @image = attribs.delete(:image)
             @height = attribs.delete(:height)

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

@@ -1,5 +1,5 @@
-require_relative 'mixins/event'
-require_relative 'mixins/tooltips'
+require 'voom/presenters/dsl/components/mixins/event'
+require 'voom/presenters/dsl/components/mixins/tooltips'
 
 module Voom
   module Presenters

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

@@ -1,9 +1,9 @@
-require_relative 'lists/line'
-require_relative 'lists/separator'
-require_relative 'lists/header'
-require_relative 'mixins/content'
-require_relative 'mixins/append'
-require_relative 'mixins/attaches'
+require 'voom/presenters/dsl/components/lists/line'
+require 'voom/presenters/dsl/components/lists/separator'
+require 'voom/presenters/dsl/components/lists/header'
+require 'voom/presenters/dsl/components/mixins/content'
+require 'voom/presenters/dsl/components/mixins/append'
+require 'voom/presenters/dsl/components/mixins/attaches'
 
 module Voom
   module Presenters
@@ -14,11 +14,14 @@ module Voom
           include Mixins::Append
           include Mixins::Attaches
           
-          attr_reader :lines, :lines_only, :selectable, :total_lines
+          attr_reader :lines, :lines_only, :color, :border, :selectable, :total_lines
           attr_accessor :components
           
           def initialize(**attribs_, &block)
             super(type: :list, **attribs_, &block)
+            @color  = attribs.delete(:color) { nil }
+            @border = attribs.delete(:border) { nil }
+
             @lines_only = attribs.delete(:lines_only) { false }
             @selectable = attribs.delete(:selectable) { false }
             @lines = []
@@ -31,17 +34,16 @@ module Voom
           def add_select_control!(text)
             return unless @selectable && !@lines_only
             @lines << Lists::Header.new(parent: self,
-                                        context: context,
                                         total_lines: @total_lines,
                                         checkbox: {text: text})
           end
 
           def line(text=nil, **attribs, &block)
-            @lines << Lists::Line.new(parent:self, context: context, text: text, selectable: selectable, **attribs, &block)
+            @lines << Lists::Line.new(parent:self, text: text, selectable: selectable, **attribs, &block)
           end
 
           def separator(**attribs, &block)
-            @lines << Lists::Separator.new(parent:self, context: context, **attribs, &block)
+            @lines << Lists::Separator.new(parent:self, **attribs, &block)
           end
         end
       end

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

@@ -1,5 +1,5 @@
-require_relative '../icon'
-require_relative '../icon_toggle'
+require 'voom/presenters/dsl/components/icon'
+require 'voom/presenters/dsl/components/icon_toggle'
 
 
 module Voom
@@ -19,7 +19,6 @@ module Voom
               return @icon if locked?
               @action_type = :icon
               @icon = Icon.new(parent: self, icon: icon,
-                               context: context,
                                **attribs, &block)
             end
 
@@ -27,41 +26,41 @@ module Voom
             def menu(**attribs, &block)
               return @menu if locked?
               @action_type = :menu
-              @menu = Menu.new(parent: self, context: context,
+              @menu = Menu.new(parent: self, 
                                **attribs, &block)
             end
 
             def checkbox(**attribs, &block)
               return @checkbox if locked?
               @action_type = :checkbox
-              @checkbox = Checkbox.new(parent: self, context: context,
+              @checkbox = Checkbox.new(parent: self, 
                                        **attribs, &block)
             end
 
             def radio_button(**attribs, &block)
               return @radio_button if locked?
               @action_type = :radio_button
-              @radio_button = RadioButton.new(parent: self, context: context,
+              @radio_button = RadioButton.new(parent: self, 
                                               **attribs, &block)
             end
 
             def switch(**attribs, &block)
               return @switch if locked?
               @action_type = :switch
-              @switch = Switch.new(parent: self, context: context,
+              @switch = Switch.new(parent: self,
                                    **attribs, &block)
             end
 
             def icon_toggle(icon=nil, **attribs, &block)
               return @icon_toggle if locked?
               @action_type = :icon_toggle
-              @icon_toggle = IconToggle.new(parent: self, icon: icon, context: context, **attribs, &block)
+              @icon_toggle = IconToggle.new(parent: self, icon: icon, **attribs, &block)
             end
 
             def button(text=nil, **attribs, &block)
               return @button if locked?
               @action_type = :button
-              @button = Components::Button.new(text: text, parent: self, context: context, **attribs, &block)
+              @button = Components::Button.new(text: text, parent: self, **attribs, &block)
             end
           end
         end

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

@@ -1,4 +1,4 @@
-require_relative 'action'
+require 'voom/presenters/dsl/components/lists/action'
 
 module Voom
   module Presenters
@@ -14,44 +14,44 @@ module Voom
 
 
             def icon(icon=nil, **attribs, &block)
-              action = Lists::Action.new(parent: self, context: context)
+              action = Lists::Action.new(parent: self)
               action.icon(icon, **attribs, &block)
               @actions << action
             end
 
 
             def menu(**attribs, &block)
-              action = Lists::Action.new(parent: self, context: context)
+              action = Lists::Action.new(parent: self)
               action.menu(**attribs, &block)
               @actions << action
             end
 
             def checkbox(**attribs, &block)
-              action = Lists::Action.new(parent: self, context: context)
+              action = Lists::Action.new(parent: self)
               action.checkbox(**attribs, &block)
               @actions << action
             end
 
             def radio_button(**attribs, &block)
-              action = Lists::Action.new(parent: self, context: context)
+              action = Lists::Action.new(parent: self)
               action.radio_button(**attribs, &block)
               @actions << action
             end
 
             def switch(**attribs, &block)
-              action = Lists::Action.new(parent: self, context: context)
+              action = Lists::Action.new(parent: self)
               action.switch(**attribs, &block)
               @actions << action
             end
 
             def icon_toggle(icon=nil, **attribs, &block)
-              action = Lists::Action.new(parent: self, context: context)
+              action = Lists::Action.new(parent: self)
               action.icon_toggle(icon, **attribs, &block)
               @actions << action
             end
 
             def button(text=nil, **attribs, &block)
-              action = Lists::Action.new(parent: self, context: context)
+              action = Lists::Action.new(parent: self)
               action.button(text, **attribs, &block)
               @actions << action
             end

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

@@ -6,8 +6,8 @@ module Voom
           class Header < Line
             attr_accessor :total_lines
 
-            def initialize(context:, **attribs_, &block)
-              super(type: :header, context: context, **attribs_, &block)
+            def initialize(**attribs_, &block)
+              super(type: :header, **attribs_, &block)
               @total_lines = attribs.delete(:total_lines) || 0
               expand!
             end

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

@@ -1,8 +1,9 @@
-require_relative 'actions'
-require_relative '../icon'
-require_relative '../avatar'
-require_relative '../typography'
-require_relative '../mixins/event'
+require 'voom/presenters/dsl/components/lists/actions'
+require 'voom/presenters/dsl/components/icon'
+require 'voom/presenters/dsl/components/avatar'
+require 'voom/presenters/dsl/components/typography'
+require 'voom/presenters/dsl/components/mixins/event'
+require 'voom/presenters/dsl/components/mixins/tooltips'
 
 module Voom
   module Presenters
@@ -11,6 +12,7 @@ module Voom
         module Lists
           class Line < EventBase
             extend Gem::Deprecate
+            include Mixins::Tooltips
 
             attr_accessor :selected, :selectable
 
@@ -25,7 +27,7 @@ module Voom
               self.avatar(attribs.delete(:avatar)) if attribs.key?(:avatar)
               self.icon(attribs.delete(:icon)) if attribs.key?(:icon)
               self.checkbox(attribs.delete(:checkbox)) if attribs.key?(:checkbox) && !@selectable
-              self.checkbox(attribs.slice(:name, :value)) if @selectable
+              self.checkbox(attribs.slice(:name, :value, :checked)) if @selectable
 
               @actions = []
               expand!
@@ -33,35 +35,33 @@ 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 subtitle(*text, **attribs, &block)
               return @subtitle if locked?
-              @subtitle = Components::Typography.new(parent: self, type: :subtitle, text: text, context: context, **attribs, &block)
+              @subtitle = Components::Typography.new(parent: self, type: :subtitle, text: text, **attribs, &block)
             end
 
             def info(*text, **attribs, &block)
               return @info if locked?
-              @info = Components::Typography.new(parent: self, type: :info, text: text, context: context, **attribs, &block)
+              @info = Components::Typography.new(parent: self, type: :info, text: text, **attribs, &block)
             end
 
             def body(*text, **attribs, &block)
               return @body if locked?
-              @body = Components::Typography.new(parent: self, type: :body, text: text, context: context, **attribs, &block)
+              @body = Components::Typography.new(parent: self, type: :body, text: text, **attribs, &block)
             end
 
             def avatar(avatar = nil, **attribs, &block)
               return @avatar if locked?
               @avatar = Avatar.new(parent: self, avatar: avatar,
-                                   context: context,
                                    **attribs, &block)
             end
 
             def icon(icon=nil, **attribs, &block)
               return @icon if locked?
               @icon = Icon.new(parent: self, icon: icon,
-                               context: context,
                                **attribs, &block)
             end
 
@@ -69,7 +69,6 @@ module Voom
               return @checkbox if locked?
               field_name = @selectable ? "#{attributes.delete(:name)}[]" : attributes.delete(:name)
               @checkbox = Components::Checkbox.new(parent: self,
-                                                   context: context,
                                                    name: field_name,
                                                    **attributes,
                                                    &block)
@@ -77,14 +76,12 @@ module Voom
 
             def menu(**attributes, &block)
               return @menu if locked?
-              @menu = Components::Menu.new(parent: self, context: context, **attributes, &block)
+              @menu = Components::Menu.new(parent: self, **attributes, &block)
             end
 
             def actions(**attribs, &block)
               return @actions if locked?
-              Actions.new(@actions, parent: self,
-                          context: context,
-                          **attribs, &block)
+              Lists::Actions.new(@actions, parent: self, **attribs, &block)
             end
             alias action actions
             deprecate :action, :actions, 2018, 8

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,7 +1,8 @@
-require_relative 'mixins/event'
-require_relative 'mixins/tooltips'
-require_relative 'mixins/attaches'
-require_relative 'mixins/buttons'
+require 'voom/presenters/dsl/components/mixins/event'
+require 'voom/presenters/dsl/components/mixins/tooltips'
+require 'voom/presenters/dsl/components/mixins/attaches'
+require 'voom/presenters/dsl/components/mixins/buttons'
+require 'voom/presenters/dsl/components/mixins/typography'
 
 module Voom
   module Presenters
@@ -17,27 +18,24 @@ module Voom
             @position = attribs.delete(:position) || :left
             @placement = attribs.delete(:placement) || :default
             @color = attribs.delete(:color)
-            @open = attributes.delete(:open){false}
+            @open = attributes.delete(:open) {false}
             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
 
@@ -45,6 +43,7 @@ module Voom
 
           class Item < EventBase
             include Mixins::Tooltips
+            include Mixins::Typography
 
             attr_accessor :text, :disabled, :selected
 
@@ -52,14 +51,14 @@ 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}
+              @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
@@ -75,7 +74,6 @@ module Voom
               super(type: :divider, **attribs, &block)
             end
           end
-
         end
       end
     end