voom-presenters 0.1.13 → 0.2.0

data/lib/voom/presenters.rb

@@ -2,12 +2,18 @@ require 'dry-container'
 require 'voom/container_methods'
 require 'voom/logger_methods'
 require 'voom/trace'
-require_relative 'presenters/version'
-require_relative 'presenters/settings'
-require_relative 'presenters/container_item'
-require_relative 'presenters/dsl'
-require_relative 'presenters/dsl/definer'
-require_relative 'presenters/dsl/definition'
-require_relative 'presenters/helpers'
-require_relative 'presenters/app'
-
+unless defined?(Voom::Presenters::Version)
+  require 'voom/presenters/version'
+  require 'voom/presenters/settings'
+  require 'voom/presenters/container_item'
+  require 'voom/presenters/dsl'
+  require 'voom/presenters/dsl/definer'
+  require 'voom/presenters/dsl/definition'
+  require 'voom/presenters/helpers'
+  require 'voom/presenters/app'
+  
+  module Voom
+    module Presenters
+    end
+  end
+end

data/lib/voom/presenters/api/app.rb

@@ -1,7 +1,7 @@
 require 'sinatra'
 require 'json'
-require_relative '../../presenters'
-require_relative 'router'
+require 'voom/presenters'
+require 'voom/presenters/api/router'
 
 module Voom
   module Presenters
@@ -13,15 +13,28 @@ module Voom
         set :bind, '0.0.0.0'
 
         get '/:_presenter_.pom' do
-          render_presenter
+          render_presenter(params[:_presenter_])
         end
 
+        get '/:_namespace1_/:_presenter_.pom' do
+          fq_presenter = [params[:_namespace1_], params[:_presenter_]].join(':')
+          pass unless Presenters::App.registered?(fq_presenter)
+          render_presenter(fq_presenter)
+        end
+
+        get '/:_namespace1_/:_namespace2_/:_presenter_.pom' do
+          fq_presenter = [params[:_namespace1_], params[:_namespace2_], params[:_presenter_]].join(':')
+          pass unless Presenters::App.registered?(fq_presenter)
+          render_presenter(fq_presenter)
+        end
+
+
         private
 
-        def render_presenter
+        def render_presenter(presenter)
           # puts "/presenters/api/#{params[:version]}/#{params[:presenter]}/"
           # puts "Parameters: #{params.inspect}"
-          presenter = Voom::Presenters::App[params[:_presenter_]].call
+          presenter = Voom::Presenters::App[presenter].call
           pom = presenter.expand(router: router, context: prepare_context)
           content_type :json
           JSON.dump(pom.to_hash)

data/lib/voom/presenters/api/router.rb

@@ -11,49 +11,15 @@ module Voom
           @base_url = base_url
         end
 
-        def url(command: nil, render: nil, entity: nil, context:)
+        def url(command: nil, render: nil, context:)
           _params_ = context.dup
-          # if it is a local page command
-          # return build_local_render(command, render, entity, _params_) if local_render?(render)
-          return build_render_url(render, entity, _params_) unless command
-          _params_[:redirect]=build_render_url(render, entity, _params_) if render
-          build_command_url(command, entity, _params_)
-        end
-
-        def local_render?(render)
-          return unless render
-          render.to_s.start_with?('#')
-        end
-
-        def build_local_render(command, render, entity, context)
-
-          client_command = render[/(.*?)\(/m, 1]
-
-          start_params = render.index('(')
-          end_params = render.rindex(')')
-          client_params = render[start_params+1..end_params-1]
-          client_params = client_params.split(',')
-
-          client_command += '('
-          client_params.each.with_index do |p, index|
-            client_command += ',' if index > 0
-            url_var = p[/{url\((.*?)\)}/m, 1]
-            client_command += build_client_url(url_var.strip, entity, context) if url_var && command.nil?
-            client_command += p.strip unless url_var
-          end
-          client_command += ')'
-        end
-
-        def join_errors
-          '<br/>'
+          return build_render_url(render, _params_) unless command
+          _params_[:redirect]=build_render_url(render, _params_) if render
+          build_command_url(command, _params_)
         end
 
         def scrub_params(_params_)
-          # _params_.delete('captures')
-          # _params_.delete('render')
-          # _params_.delete('view')
           _params_.delete('presenter')
-          # _params_.delete('redirect')
           _params_.delete('action')
           _params_.delete('errors')
           _params_
@@ -61,17 +27,19 @@ module Voom
 
         private
 
-        def build_command_url(command, entity, params)
+        def build_command_url(command, params)
           return '' unless command
-          "#{command}?#{build_params(params, entity)}"
+          seperator = command.include?('?') ? '&' : '?'
+          "#{command}#{seperator}#{build_params(params)}"
         end
 
-        def build_render_url(render_, entity, params)
+        def build_render_url(render_, params)
           return '#' unless render_
           render = render_.to_s
+          return render if render.start_with?('http')
           seperator = render.start_with?('/') ? '' : '/'
           url = "#{base_url}#{seperator}#{render}"
-          query_params = build_params(params, entity)
+          query_params = build_params(params)
           if(query_params)
             query_seperator = render.include?('?') ? '&' : '?'
             url = "#{url}#{query_seperator}#{query_params}"
@@ -79,13 +47,7 @@ module Voom
           url
         end
 
-        def build_client_url(render, entity, params)
-          return '#' unless render
-          "#{base_url}/web/#{render}?layout=false&#{build_params(params, entity)}"
-        end
-
-        def build_params(params, entity)
-          params = params.merge(entity_key: entity.id) if entity
+        def build_params(params)
           Rack::Utils.build_nested_query(scrub_params(params))
         end
       end

data/lib/voom/presenters/demo/echo.rb

@@ -11,6 +11,11 @@ module Voom
           JSON.dump(params)
         end
 
+        post('/_echo_snackbar_') do
+          content_type :json
+          JSON.dump(messages:{snackbar: [params[:snackbar_echo]]})
+        end
+
         delete('/_echo_') do
           content_type :json
           JSON.dump(params)

data/lib/voom/presenters/dsl.rb

@@ -2,8 +2,12 @@ require 'voom/trace'
 
 module Voom
   module Presenters
-    def self.define(name, &block)
-      DSL.define(name, &block)
+    def self.define(name, namespace: nil, &block)
+      unless namespace
+        namespace = name.to_s.split(':')
+        name = namespace.pop
+      end
+      DSL.define(name, namespace, &block)
     end
 
     module DSL
@@ -17,8 +21,10 @@ module Voom
         @registry
       end
 
-      def self.define(name, &block)
-        registry[name] = Voom::Presenters::DSL::Definition.new(&block)
+      def self.define(name, namespace, &block)
+        namespace = Array(namespace).map(&:to_s)
+        fq_name = namespace.any? ? namespace.join(':') + ':'+name.to_s : name.to_s
+        registry[fq_name] = Voom::Presenters::DSL::Definition.new(namespace, &block)
       end
 
       def self.load(directory)

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

@@ -0,0 +1,37 @@
+require 'voom/presenters/dsl/components/base'
+
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Actions
+          class Base < Components::Base
+            # Options are used by the actions
+            # Params are passed by the user
+            attr_reader :params, :options
+
+            def initialize(type:, **attribs_, &block)
+              super(type: type, **attribs_, &block)
+              @options = {}
+              extract_options!
+              @params = attribs.delete(:params) {{}}
+              @url = nil
+            end
+
+            def url
+              @parent.router.url(render: options[:presenter], command: options[:path], context: params)
+            end
+
+            private
+            def extract_options!
+              %i(path presenter target input_tag).each do |option|
+                optionValue = attribs.delete(option)
+                @options.merge!({option => optionValue}) if optionValue
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

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

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

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

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

@@ -0,0 +1,32 @@
+require 'voom/presenters/dsl/components/actions/base'
+require 'voom/presenters/namespace'
+
+
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Actions
+          class Loads < Actions::Base
+            include Namespace
+
+            def initialize(**attribs_, &block)
+              super(type: :loads, **attribs_, &block)
+            end
+
+            def url
+              @parent.router.url(render: parse_presenter, command: options[:path], context: params)
+            end
+
+            private
+
+            def parse_presenter
+              return options[:presenter] if options[:presenter].match(/^https?\:\/\//)
+              _expand_namespace_(options[:presenter], namespace).gsub(':','/')
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

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

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

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

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

@@ -0,0 +1,25 @@
+require 'voom/presenters/dsl/components/actions/base'
+require'voom/presenters/namespace'
+
+module Voom
+  module Presenters
+    module DSL
+      module Components
+        module Actions
+          class Replaces < Actions::Base
+            include Namespace
+
+            def initialize(**attribs_, &block)
+              super(type: :replaces, **attribs_, &block)
+            end
+
+            def url
+              presenter = _expand_namespace_(options[:presenter], namespace)
+              @parent.router.url(render: presenter, command: options[:path], context: params)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

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