voom-presenters 0.1.13 → 0.2.0

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

@@ -1,15 +1,16 @@
-require_relative 'text_field'
+require 'voom/presenters/dsl/components/text_field'
 
 module Voom
   module Presenters
     module DSL
       module Components
         class TextArea < TextField
-          attr_reader :rows
+          attr_reader :rows, :cols
           
           def initialize(**attribs_, &block)
             super(type: :text_area, **attribs_, &block)
-            @rows = attribs.delete(:rows) || 3
+            @rows = attribs.delete(:rows) || default(:rows)
+            @cols = attribs.delete(:cols) || default(:cols) unless full_width
             expand!
           end
         end

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

@@ -1,4 +1,4 @@
-require_relative 'input'
+require 'voom/presenters/dsl/components/input'
 
 module Voom
   module Presenters
@@ -6,13 +6,15 @@ module Voom
       module Components
         class TextField < Input
 
-          attr_reader :required, :full_width, :password
+          attr_reader :required, :full_width, :password, :disabled, :auto_complete
 
           def initialize(**attribs_, &block)
             super(type: :text_field, **attribs_, &block)
-            @required = attribs.delete(:required)
+            @required = attribs.delete(:required){ false }
             @full_width = attribs.delete(:full_width){ true }
-            @password = attribs.delete(:password)
+            @password = attribs.delete(:password){ false }
+            @disabled = attribs.delete(:disabled){ false }
+            @auto_complete = attribs.delete(:auto_complete){ true }
             expand!
           end
 
@@ -23,8 +25,7 @@ module Voom
 
           def icon(icon=nil, **attribs, &block)
             return @icon if locked?
-            @icon = Components::Icon.new(parent: self, icon: icon,
-                                         context: context,
+            @icon = Components::Icon.new(parent: self, icon: icon, position: attribs.delete(:position){:right},
                                          **attribs, &block)
           end
 
@@ -47,12 +48,7 @@ module Voom
             return @error if locked?
             @error = error
           end
-
-          def readonly(readonly=nil)
-            return @readonly if locked?
-            @readonly = readonly
-          end
-
+          
           private
           def json_regexp(regexp)
             str = regexp.inspect.

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

@@ -1,4 +1,4 @@
-require_relative 'datetime_base'
+require 'voom/presenters/dsl/components/datetime_base'
 
 module Voom
   module Presenters

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

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

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

@@ -7,7 +7,6 @@ module Voom
 
           def initialize(**attribs_, &block)
             super(type: :tooltip,
-                  context: context,
                   **attribs_, &block)
             @position = attribs.delete(:position){ :left }
             self.text(attribs.delete(:text)) if attribs.key?(:text)
@@ -16,7 +15,7 @@ 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
         end
       end

data/lib/voom/presenters/dsl/components/typography.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,10 +10,10 @@ module Voom
 
           attr_accessor :text, :level, :color, :position
 
-          def initialize(parent:, **attribs_, &block)
+          def initialize(parent:, level: nil, **attribs_, &block)
             super(type: :text, parent: parent, **attribs_, &block)
             @text = Array(attribs.delete(:text)||'').flatten.join("\n\n").split("\n\n")
-            @level = attribs.delete(:level){1}
+            @level = level
             @color = attribs.delete(:color)
             @position = Array(attribs.delete(:position)).compact
             expand!
@@ -22,7 +22,6 @@ module Voom
           def icon(icon=nil, **attribs, &block)
             return @icon if locked?
             @icon = Components::Icon.new(parent: self, icon: icon,
-                                         context: context,
                                          **attribs, &block)
           end
         end

data/lib/voom/presenters/dsl/definer.rb

@@ -1,5 +1,5 @@
-require_relative 'components/base'
-require_relative 'components/event_base'
+require 'voom/presenters/dsl/components/base'
+require 'voom/presenters/dsl/components/event_base'
 Dir[__dir__ + "/components/*.rb"].each {|file| require file }
 
 module Voom

data/lib/voom/presenters/dsl/definition.rb

@@ -1,4 +1,4 @@
-require_relative 'user_interface'
+require 'voom/presenters/dsl/user_interface'
 
 module Voom
   module Presenters
@@ -7,8 +7,9 @@ module Voom
       # This class is held in the container. When a request to render a UI comes in
       # It creates a new UserInterface instance, binding it to the router and context of the request
       class Definition
-        def initialize(&block)
+        def initialize(namespace, &block)
           @block = block
+          @namespace = namespace
         end
 
         def build
@@ -16,13 +17,14 @@ module Voom
         end
 
         def expand(router: , context:{}, &block)
-          presenter = UserInterface.new(router: router, context: context,  &@block)
+          presenter = UserInterface.new(router: router, context: context,  namespace: @namespace, &@block)
           yield(presenter) if block
           presenter.expand_instance
         end
 
+        # Used by attach
         def expand_child(parent:, context: {})
-          presenter = UserInterface.new(parent: parent, context: context, &@block)
+          presenter = UserInterface.new(parent: parent, context: context, namespace: @namespace, &@block)
           presenter.expand_instance(freeze: false)
         end
       end

data/lib/voom/presenters/dsl/user_interface.rb

@@ -1,12 +1,13 @@
 require 'ice_nine'
-require_relative 'definer'
-require_relative 'components/mixins/common'
-require_relative 'components/mixins/helpers'
-require_relative 'components/mixins/dialogs'
-require_relative 'components/mixins/snackbars'
-require_relative 'components/mixins/text_fields'
-require_relative 'components/mixins/date_time_fields'
-require_relative 'invalid_presenter'
+require 'voom/presenters/dsl/definer'
+require 'voom/presenters/dsl/components/mixins/common'
+require 'voom/presenters/dsl/components/mixins/helpers'
+require 'voom/presenters/dsl/components/mixins/dialogs'
+require 'voom/presenters/dsl/components/mixins/snackbars'
+require 'voom/presenters/dsl/components/mixins/text_fields'
+require 'voom/presenters/dsl/components/mixins/date_time_fields'
+require 'voom/presenters/dsl/components/mixins/attaches'
+require 'voom/presenters/dsl/invalid_presenter'
 
 require 'voom/serializer'
 require 'voom/trace'
@@ -24,16 +25,16 @@ module Voom
         include Components::Mixins::Icons
         include Components::Mixins::TextFields
         include Components::Mixins::DateTimeFields
-
+        include Components::Mixins::Attaches
 
         include Voom::Serializer
         include Voom::Trace
 
-        attr_reader :router, :context, :components
-        private :context, :router
+        attr_reader :router, :context, :components, :namespace
+        private :context, :router, :namespace
         alias params context
 
-        def initialize(parent: nil, router: nil, context:, &block)
+        def initialize(context:, parent: nil, router: nil, namespace: [], &block)
           @parent = parent
           @router = router || @parent&.send(:router)
           @context = context
@@ -42,26 +43,24 @@ module Voom
           @drawer = nil
           @components = []
           @footer = nil
+          @namespace = namespace
           add_global_helpers
         end
 
         def page(title=nil, **attribs, &block)
           return @page if locked?
-          @page = Components::Page.new(parent: self, context: context,
-                                       **attribs, &block)
+          @page = Components::Page.new(parent: self, **attribs, &block)
         end
 
         def header(title=nil, **attribs, &block)
           return @header if locked?
           @header = Components::Header.new(parent: self, title: title,
-                                           context: context,
                                            **attribs, &block)
         end
 
         def drawer(name=nil, **attribs, &block)
           return @drawer if locked?
           @drawer = Components::Drawer.new(parent: self, title: name,
-                                           context: context,
                                            **attribs, &block)
         end
 
@@ -70,17 +69,14 @@ module Voom
         def footer(**attribs, &block)
           return @footer if locked?
           @footer = Components::Footer.new(parent: self,
-                                           context: context,
                                            **attribs, &block)
         end
 
-        def attach(presenter, **context_, &yield_block)
-          @_yield_block_ = yield_block
-          pom = Voom::Presenters::App[presenter].call.expand_child(parent: self, context: context.merge(context_))
+        def attach(presenter, **params, &yield_block)
+          pom = super
           @header ||= pom.header
           @drawer ||= pom.drawer
           @footer ||= pom.footer
-          @components += pom.components
         end
 
         # Called by the definition.expand method to evaluate a user interface with a different context

data/lib/voom/presenters/errors/parameter_validation.rb

@@ -1,4 +1,4 @@
-require_relative 'unprocessable'
+require 'voom/presenters/errors/unprocessable'
 
 module Voom
   module Presenters

data/lib/voom/presenters/helpers.rb

@@ -1,7 +1,7 @@
-require_relative 'helpers/date'
-require_relative 'helpers/time'
-require_relative 'helpers/inflector'
-require_relative 'helpers/errors'
+require 'voom/presenters/helpers/date'
+require 'voom/presenters/helpers/time'
+require 'voom/presenters/helpers/inflector'
+require 'voom/presenters/helpers/errors'
 
 module Voom
   module Presenters
@@ -10,7 +10,7 @@ module Voom
       include Helpers::Date
       include Helpers::Errors
       if defined?(Rails)
-        require_relative 'helpers/rails'
+        require 'voom/presenters/helpers/rails'
         include Voom::Presenters::Helpers::Rails
       end
     end

data/lib/voom/presenters/helpers/date.rb

@@ -2,10 +2,10 @@ module Voom
   module Presenters
     module Helpers
       module Date
-        LONG_FORMAT='%m/%d/%Y'
-        SHORT_FORMAT='%d %b %Y'
+        LONG_FORMAT='%B %e, %Y'
+        SHORT_FORMAT='%e %b'
 
-        def format_date(date, format: '%m/%d/%Y')
+        def format_date(date, format: LONG_FORMAT)
           date ? date.strftime(format) : ''
         end
 

data/lib/voom/presenters/helpers/rails.rb

@@ -1,6 +1,7 @@
 if defined?(Rails)
-  require_relative 'rails/currency'
-  require_relative 'rails/model_table'
+  require 'voom/presenters/helpers/rails/currency'
+  require 'voom/presenters/helpers/rails/model_table'
+  require 'voom/presenters/namespace'
 
   module Voom
     module Presenters
@@ -9,11 +10,15 @@ if defined?(Rails)
           include ActionView::Helpers::AssetUrlHelper
           include Voom::Presenters::Helpers::Rails::Currency
           include Voom::Presenters::Helpers::Rails::ModelTable
+          include Namespace
           def default_url_options
             {}
           end
 
           def presenters_path(presenter, **params)
+            presenter = _expand_namespace_(presenter, namespace)
+            presenter = presenter.gsub(':','/')
+
             path = voom_presenters_web_client_app_path(params)
             if path.include?('?')
               path = path.sub('?', "#{presenter}?")

data/lib/voom/presenters/helpers/rails/model_table.rb

@@ -5,8 +5,9 @@ module Voom
         module ModelTable
           # Build a a table from a Rails model
           def table_for(query_,
-                        empty_icon: nil,
+                        empty_icon: 'far fa-folder-open fa-rotate-180',
                         except: [:id, :created_at, :updated_at],
+                        timezone: nil, # The timezone to covnert _at and _on values
                         selectable: false, &block)
             row1 = query_.first
             if row1
@@ -16,27 +17,34 @@ module Voom
 
                 query_.each do |item_|
                   row do
-                    _table_row_(__columns__, block, except, item_)
+                    _table_row_(__columns__, block, except, item_, timezone: timezone)
                   end
                 end
               end
             else
-              body "You have no #{query_.arel_table.name.pluralize}", level: 2
-              icon empty_icon, size: '10rem' if empty_icon
+              icon empty_icon, size: '6rem' if empty_icon
+              body "You have no #{query_.arel_table.name.pluralize.humanize}"
             end
           end
 
 
           private
-          def _table_row_(__columns__, block, except, item_)
+          def _table_row_(__columns__, block, except, item_, timezone: nil)
             __columns__.each do |col|
               next if except.include?(col.name.to_sym)
-              column item_.send(col.name.to_sym) do
+                value = format_value(col.name,item_.send(col.name.to_sym), timezone: timezone)
+              column value do
                 self.instance_exec(item_, col.name.to_sym, &block) if block
               end
             end
           end
 
+          def format_value(col_name, value, timezone:)
+            return format_time_long(value, timezone: timezone) if timezone &&
+                col_name.ends_with?('_at') || col_name.ends_with?('_on')
+            value
+          end
+
           def _table_header_(__columns__, except)
             header do
               __columns__.each do |col|

data/lib/voom/presenters/helpers/route.rb

@@ -1,8 +1,14 @@
+require 'voom/presenters/namespace'
+
 module Voom
   module Presenters
     module Helpers
       module Route
+        include Namespace
+
         def presenters_path(presenter, **params)
+          presenter = _expand_namespace_(presenter, namespace)
+          presenter = presenter.gsub(':','/')
           router.url(render: presenter, context: params)
         end
       end

data/lib/voom/presenters/helpers/time.rb

@@ -7,7 +7,7 @@ module Voom
         LONG_FORMAT='%m/%d/%Y %I:%M:%S %p %Z'
         SHORT_FORMAT='%d %b %H:%M %Z'
 
-        def format_time(time, format: '%m/%d/%Y %I:%M:%S %p %Z', timezone: nil)
+        def format_time(time, format: LONG_FORMAT, timezone: nil)
           return '' unless time
           time = time.in_time_zone(timezone) if timezone
           time.strftime(format)

data/lib/voom/presenters/namespace.rb

@@ -0,0 +1,12 @@
+module Voom
+  module Presenters
+    module Namespace
+      def _expand_namespace_(presenter, namespace)
+        presenter = presenter.to_s
+        return presenter if presenter.split(':').size > 1
+        return presenter if presenter.split('/').size > 1
+        namespace.any? ? namespace.join(':')+':'+presenter : presenter
+      end
+    end
+  end
+end

data/lib/voom/presenters/settings.rb

@@ -1,49 +1,70 @@
 include Voom::Trace
 trace {"Loading Presenters Settings"}
-require_relative 'helpers/route'
+require 'voom/presenters/helpers/route'
 
-module Voom
-  module Presenters
-    class Settings
-      extend Dry::Configurable
-      setting :presenters do
-        setting :root, []
-        # You can add helpers that will automatically be included
-        # For example:
-        # For example:
-        # Voom::Presenters::Settings.configure do |config|
-        #   config.presenters.helpers << YourHelperModule # Passing a module
-        #   config.presenters.helpers << &->{ def foo; :foo; end } # Passing a block
-        # end
-        setting :helpers, [Voom::Presenters::Helpers::Route]
-        setting :deep_freeze, true
-        setting :id_generator, ->(node) {"id-#{SecureRandom.hex}"}
-        setting :web_client do
-          # Add lambda's to modify the context for the presenters
+unless defined?(Voom::Presenters::Settings)
+  module Voom
+    module Presenters
+      class Settings
+        extend Dry::Configurable
+        setting :presenters do
+          setting :root, []
+          # You can add helpers that will automatically be included
+          # For example:
           # For example:
           # Voom::Presenters::Settings.configure do |config|
-          #   config.presenters.web_client.prepare_context << ->(context, session, _env){
-          #     identity_id = session[:aaa_identity]
-          #     context.merge(aaa_identity: identity_id)
-          #   }
+          #   config.presenters.helpers << YourHelperModule # Passing a module
+          #   config.presenters.helpers << &->{ def foo; :foo; end } # Passing a block
           # end
-          setting :prepare_context, []
-        end
-        setting :components do
-          setting :defaults do
-            setting :datetime do
-              setting :format, 'F j, Y h:i K'
-              setting :time_24hr, false
-            end
-            setting :date do
-              setting :format, 'F j, Y'
-            end
-            setting :time do
-              setting :format, 'h:i K'
-              setting :time_24hr, false
+          setting :helpers, [Voom::Presenters::Helpers::Route]
+          setting :deep_freeze, true
+          setting :id_generator, ->(node) {"id-#{SecureRandom.hex}"}
+          setting :web_client do
+            # Add lambda's to modify the context for the presenters
+            # For example:
+            # Voom::Presenters::Settings.configure do |config|
+            #   config.presenters.web_client.prepare_context << ->(context, session, _env){
+            #     identity_id = session[:aaa_identity]
+            #     context.merge(aaa_identity: identity_id)
+            #   }
+            # end
+            setting :prepare_context, []
+            setting     :custom_css, 'public/presenters/*.css'
+          end
+          setting :components do
+            setting :defaults do
+              setting :datetime do
+                setting :format, 'M j, y h:i K'
+                setting :time_24hr, false
+              end
+              setting :date do
+                setting :format, 'F j, Y'
+              end
+              setting :time do
+                setting :format, 'h:i K'
+                setting :time_24hr, false
+              end
+              setting :text_area do
+                setting :rows, 3
+                setting :cols, 80
+              end
+              # Typography
+              setting :headline do
+                setting :level, 5
+              end
+              setting :title do
+                setting :level, 6
+              end
+              setting :rich_text_area do
+                setting :rows, 25
+              end
             end
           end
         end
+
+        def self.default(type, key)
+          config.presenters.components.defaults&.public_send(type)&.public_send(key)
+        end
       end
     end
   end