voom-presenters 0.2.0 → 2.1.0

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

@@ -1,56 +1,10 @@
-require 'rack'
+require 'voom/presenters/router'
 
 module Voom
   module Presenters
     module Api
-      class Router
-
-        attr_reader :base_url
-
-        def initialize(base_url: nil)
-          @base_url = base_url
-        end
-
-        def url(command: nil, render: nil, context:)
-          _params_ = context.dup
-          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('presenter')
-          _params_.delete('action')
-          _params_.delete('errors')
-          _params_
-        end
-
-        private
-
-        def build_command_url(command, params)
-          return '' unless command
-          seperator = command.include?('?') ? '&' : '?'
-          "#{command}#{seperator}#{build_params(params)}"
-        end
-
-        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)
-          if(query_params)
-            query_seperator = render.include?('?') ? '&' : '?'
-            url = "#{url}#{query_seperator}#{query_params}"
-          end
-          url
-        end
-
-        def build_params(params)
-          Rack::Utils.build_nested_query(scrub_params(params))
-        end
+      class Router <  Presenters::Router
       end
     end
   end
-end
+end

data/lib/voom/presenters/app.rb

@@ -34,13 +34,13 @@ module Voom
         def load(dir='app', root=ENV['VOOM_ROOT']||File.expand_path("../../../", __FILE__))
           path = File.expand_path(dir, root)
           trace {"Loading Presenters from: #{path}"}
-          Presenters::DSL.load(File.expand_path(dir, root))
-          Presenters::DSL.finalize
+          Presenters::Registry.load(File.expand_path(dir, root))
+          Presenters::Registry.finalize
         end
 
         def reset!
           super
-          Presenters::DSL.reset!
+          Presenters::Registry.reset!
         end
 
         private

data/lib/voom/presenters/cli.rb

@@ -0,0 +1,28 @@
+require 'thor'
+require_relative 'generators/plugin'
+
+module Voom
+  module Presenters
+    class SubCommandBase < Thor
+      def self.banner(command, namespace = nil, subcommand = false)
+        "#{basename} #{subcommand_prefix} #{command.usage}"
+      end
+
+      def self.subcommand_prefix
+        self.name.gsub(%r{.*::}, '').gsub(%r{^[A-Z]}) { |match| match[0].downcase }.gsub(%r{[A-Z]}) { |match| "-#{match[0].downcase}" }
+      end
+    end
+
+      class Generate < SubCommandBase
+        desc "plugin", "generates a plugin"
+        def plugin(name)
+          Generators::Plugin.start([name])
+        end
+      end
+      class Cli < Thor
+        desc "generate", "generate a plugin"
+        subcommand "generate", Generate
+      end
+    end
+  end
+

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

@@ -0,0 +1,48 @@
+require 'sinatra/base'
+
+module Voom
+  module Presenters
+    module Demo
+      class DragonDrop < Sinatra::Base
+        include Voom::Presenters::WebClient::Helpers::ExpandHash
+
+        configure do
+          enable :sessions
+          set :session_secret, '0e53ba1da13aa8eb8cf3d361e67b70d79265edca'
+        end
+
+        post('/_dragon_drop_change_order_') do
+          content_type :json
+          source_id = JSON.parse(params[:source_id]) if params[:source_id]
+          target_id = JSON.parse(params[:target_id]) if params[:target_id]
+          dragons = fetch_dragons
+          unless source_id == target_id
+            source = dragons.select {|d| d.id == source_id}.first
+            target = dragons.select {|d| d.id == target_id}.first
+
+            if source && target
+              starting_sort = target.sort
+              source.sort = starting_sort
+              dragons.each do |dragon|
+                next if dragon.id == source.id || dragon.sort < starting_sort
+                dragon.sort += 1
+              end
+            end
+            save(dragons)
+          end
+        end
+
+        def fetch_dragons
+          JSON.parse(session[:dragons], object_class: OpenStruct)
+        end
+
+        def save(dragons)
+          session[:dragons] = dragons.map {|d| expand_hash(d)}.to_json
+        end
+
+        # start the server if ruby file executed directly
+        run! if app_file == $0
+      end
+    end
+  end
+end

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

@@ -8,6 +8,8 @@ module Voom
       class Echo < Sinatra::Base
         post('/_echo_') do
           content_type :json
+          params[:echo] = JSON.parse(params[:echo]) if params[:echo]
+          status(params[:status]) if params[:status]
           JSON.dump(params)
         end
 

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

@@ -0,0 +1,18 @@
+require 'sinatra/base'
+
+module Voom
+  module Presenters
+    module Demo
+      class Slow < Sinatra::Base
+        post('/_slow_') do
+          sleep(Integer(params.fetch('seconds',5)))
+          content_type :json
+          JSON.dump(params)
+        end
+
+        # start the server if ruby file executed directly
+        run! if app_file == $0
+      end
+    end
+  end
+end

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

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

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