voom-presenters 0.2.0 → 2.0.0

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

@@ -1,5 +1,3 @@
-require 'voom/presenters/dsl/components/base'
-
 module Voom
   module Presenters
     module DSL
@@ -8,13 +6,15 @@ module Voom
           class Base < Components::Base
             # Options are used by the actions
             # Params are passed by the user
-            attr_reader :params, :options
+            attr_reader :params, :dynamic_params, :options
 
             def initialize(type:, **attribs_, &block)
               super(type: type, **attribs_, &block)
               @options = {}
               extract_options!
-              @params = attribs.delete(:params) {{}}
+              _params_ = attribs.delete(:params) {{}}
+              @dynamic_params = extract_dynamic_params(_params_)
+              @params = extract_params(_params_)
               @url = nil
             end
 
@@ -23,10 +23,38 @@ module Voom
             end
 
             private
+
             def extract_options!
-              %i(path presenter target input_tag).each do |option|
-                optionValue = attribs.delete(option)
-                @options.merge!({option => optionValue}) if optionValue
+              %i(path presenter target input_tag headers).each do |option|
+                option_value = attribs.delete(option){:not_found}
+                @options.merge!({option => option_value}) unless option_value==:not_found
+              end
+            end
+
+            def extract_dynamic_params(hash)
+              HashExt::Traverse.traverse(hash) do |k, v|
+                if v.respond_to?(:to_hash) || v.respond_to?(:dynamic_parameter)
+                  [k, clean_dynamic_values(v.to_hash)]
+                else
+                  [nil, nil]
+                end
+              end
+            end
+
+            # This is an attempt to fix an intermittent bug where "params" would end up in the list of
+            # values when using `last_response`.
+            def clean_dynamic_values(hash)
+              hash[:value].delete(:params) if hash.has_key?(:value) && hash[:value].is_a?(Array)
+              hash
+            end
+
+            def extract_params(hash)
+              HashExt::Traverse.traverse(hash) do |k, v|
+                if v.respond_to?(:dynamic_parameter)
+                  [nil, nil]
+                else
+                  [k, v]
+                end
               end
             end
           end
@@ -34,4 +62,4 @@ module Voom
       end
     end
   end
-end
+end

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

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

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

@@ -0,0 +1,17 @@
+require 'voom/presenters/dsl/components/actions/base'
+
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Actions
+          class CloseDialog < Actions::Base
+            def initialize(**attribs_, &block)
+              super(type: :close_dialog, **attribs_, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

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

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

@@ -1,7 +1,3 @@
-require 'voom/presenters/dsl/components/actions/base'
-require 'voom/presenters/namespace'
-
-
 module Voom
   module Presenters
     module DSL
@@ -12,17 +8,20 @@ module Voom
 
             def initialize(**attribs_, &block)
               super(type: :loads, **attribs_, &block)
+              option_value = attribs.delete(:wait_for_download){:not_found}
+              @options.merge!(wait_for_download: option_value) unless option_value==:not_found
+              @host = @params.fetch(:host, false)
             end
 
             def url
-              @parent.router.url(render: parse_presenter, command: options[:path], context: params)
+              @parent.router.url(render: parse_presenter, command: options[:path], context: params, host: @host)
             end
 
             private
 
             def parse_presenter
               return options[:presenter] if options[:presenter].match(/^https?\:\/\//)
-              _expand_namespace_(options[:presenter], namespace).gsub(':','/')
+              _expand_namespace_(options[:presenter], namespace).gsub(':', '/')
             end
           end
         end

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

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

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

@@ -0,0 +1,17 @@
+require 'voom/presenters/dsl/components/actions/base'
+
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Actions
+          class PostMessage < Actions::Base
+            def initialize(**attribs_, &block)
+              super(type: :post_message, **attribs_, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,3 @@
-require 'voom/presenters/dsl/components/actions/base'
-
 module Voom
   module Presenters
     module DSL
@@ -9,6 +7,11 @@ module Voom
             def initialize(**attribs_, &block)
               super(type: :post, **attribs_, &block)
             end
+
+            # Posts posts its parameters as form data, so context should be empty
+            # def url
+            #   @parent.router.url(render: options[:presenter], command: options[:path], context:{})
+            # end
           end
         end
       end

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

@@ -0,0 +1,15 @@
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Actions
+          class PromptIfDirty < Actions::Base
+            def initialize(**attribs_, &block)
+              super(type: :prompt_if_dirty, **attribs_, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -1,6 +1,3 @@
-require 'voom/presenters/dsl/components/actions/base'
-require'voom/presenters/namespace'
-
 module Voom
   module Presenters
     module DSL
@@ -11,11 +8,14 @@ module Voom
 
             def initialize(**attribs_, &block)
               super(type: :replaces, **attribs_, &block)
+              option_value = attribs.delete(:ignore_input_values) { :not_found }
+              @options.merge!(ignore_input_values: option_value) unless option_value == :not_found
+              @host = @params.fetch(:host, false)
             end
 
             def url
               presenter = _expand_namespace_(options[:presenter], namespace)
-              @parent.router.url(render: presenter, command: options[:path], context: params)
+              @parent.router.url(render: presenter, command: options[:path], context: params, host: @host)
             end
           end
         end

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

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

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

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

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

@@ -0,0 +1,15 @@
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Actions
+          class ToggleDisabled < Actions::Base
+            def initialize(**attribs_, &block)
+              super(type: :toggle_disabled, **attribs_, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -1,5 +1,3 @@
-require 'voom/presenters/dsl/components/actions/base'
-
 module Voom
   module Presenters
     module DSL
@@ -9,6 +7,11 @@ module Voom
             def initialize(**attribs_, &block)
               super(type: :update, **attribs_, &block)
             end
+
+            # Updates posts its parameters as form data, so context should be empty
+            # def url
+            #   @parent.router.url(render: options[:presenter], command: options[:path], context:{})
+            # end
           end
         end
       end

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

@@ -1,7 +1,3 @@
-require 'voom/presenters/dsl/components/event_base'
-require 'voom/presenters/dsl/components/mixins/event'
-require 'voom/presenters/dsl/components/mixins/tooltips'
-
 module Voom
   module Presenters
     module DSL
@@ -13,10 +9,10 @@ module Voom
 
           def initialize(**attribs_, &block)
             super(type: :avatar, **attribs_, &block)
-            @avatar = attribs.delete(:avatar)
-            @color = attribs.delete(:color)
-            @size = attribs.delete(:size)
-            @position    = Array(attribs.delete(:position)).compact
+            @avatar   = attribs.delete(:avatar)
+            @color    = attribs.delete(:color)
+            @size     = attribs.delete(:size){ :default }
+            @position = Array(attribs.delete(:position)).compact
             expand!
           end
         end

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

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

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

@@ -1,10 +1,5 @@
 require 'securerandom'
 
-require 'voom/serializer'
-require 'voom/trace'
-require 'voom/presenters/dsl/lockable'
-require 'voom/presenters/dsl/components/mixins/yield_to'
-
 module Voom
   module Presenters
     module DSL
@@ -18,18 +13,23 @@ module Voom
           include LoggerMethods
           include Trace
           include Mixins::YieldTo
+          extend Pluggable
+
+          attr_reader :type, :id, :tag, :attributes, :draggable, :drop_zone, :css_class
 
-          attr_reader :type, :id, :tag, :attributes
-          
           alias attribs attributes
 
           def initialize(type:, parent:, id: nil, tag: nil, **attributes, &block)
-            @id = h(id) || generate_id
+            @draggable = attributes.delete(:draggable) {nil}
+            @drop_zone = attributes.delete(:drop_zone) {nil}
+            @css_class = Array(attributes.delete(:class) {nil})
+            @id = id || generate_id
             @tag = tag
-            @type = h(type)
+            @type = type
             @parent = parent
-            @attributes = escape(attributes)
+            @attributes = attributes
             @block = block
+            initialize_plugins
           end
 
           def expand!
@@ -39,19 +39,14 @@ module Voom
 
           private
 
-          def h(text)
-            return text unless text.is_a? String
-            CGI::escapeHTML(text)
-          end
-
-          def escape(attributes)
-            attributes.map {|k, v| [k, h(v)]}.to_h
+          def initialize_plugins
+            self.class.include_plugins(:DSLComponents, :DSLHelpers, plugins: _plugins_)
           end
 
           def generate_id
             Voom::Presenters::Settings.config.presenters.id_generator.call(self)
           end
-      
+
           protected
 
           def parent(for_type)
@@ -63,6 +58,10 @@ module Voom
             @parent.send(:router)
           end
 
+          def name
+            @parent.send(:name)
+          end
+
           def namespace
             @parent.send(:namespace)
           end
@@ -70,6 +69,7 @@ module Voom
           def context
             @parent.send(:context)
           end
+
           alias params context
 
 
@@ -82,6 +82,13 @@ module Voom
             @parent.send(:_helpers_) if @parent
           end
 
+          def plugin(*plugin_names)
+            @parent.send(:plugin, *plugin_names) if @parent
+          end
+
+          def _plugins_
+            @parent.send(:_plugins_) if @parent
+          end
 
           def default(key)
             Settings.default(type, key)

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

@@ -1,37 +1,37 @@
-require 'voom/presenters/dsl/components/mixins/common'
-require 'voom/presenters/dsl/components/mixins/tooltips'
-
 module Voom
   module Presenters
     module DSL
       module Components
         class Button < EventBase
           include Mixins::Tooltips
+          include Mixins::Padding
 
           BUTTON_TYPES = %i(raised flat fab icon)
 
-          attr_accessor :text, :icon, :button_type, :color, :disabled, :size, :position, :full_width, :hidden
+          attr_accessor :text, :icon, :button_type, :color, :background_color, :disabled,
+                        :size, :position, :full_width, :hidden, :wrap_text, :disabled_on_post_finished
 
           def initialize(type: nil, **attribs_, &block)
-            @button_type = h(type) || ((attribs_[:icon] && !attribs_[:text]) ? :icon : nil) || :flat
+            @button_type = type || ((attribs_[:icon] && !attribs_[:text]) ? :icon : nil) || :flat
             super(type: :button, **attribs_, &block)
-            self.icon(attribs.delete(:icon)) if attribs.key?(:icon)
-            @text = attribs.delete(:text)
             @color = attribs.delete(:color)
+            @background_color = attribs.delete(:background_color)
+            self.icon(attribs.delete(:icon), color: color) if attribs.key?(:icon)
+            @text = attribs.delete(:text)
             @disabled = attribs.delete(:disabled) {false}
             @hidden = attribs.delete(:hidden) {false}
             @size = attribs.delete(:size)
             @full_width = attribs.delete(:full_width) {false}
-            @position = Array(attribs.delete(:position)).compact
+            @wrap_text = attribs.delete(:wrap_text) {true}
+            @position = Array(default_position).compact
+            @disabled_on_post_finished = attribs.delete(:disabled_on_post_finished) {false}
             expand!
             @event_parent_id = self.parent(:form)&.id || id
           end
 
           def icon(icon = nil, **attribs, &block)
             return @icon if locked?
-            @icon = Components::Icon.new(parent: self, icon: icon,
-                                         **attribs, &block)
-
+            @icon = Components::Icon.new(parent: self, icon: icon, **attribs, &block)
           end
 
           def image(image = nil, **attribs, &block)
@@ -46,6 +46,10 @@ module Voom
 
           private
 
+          def default_position
+            attribs.delete(:position){button_type == :fab ? %i(top right) : nil}
+          end
+
           def menu_position
             position.include?(:right) ? :right : nil
           end