voom-presenters 0.1.13 → 0.2.0

data/lib/voom/presenters/version.rb

@@ -1,5 +1,5 @@
 module Voom
   module Presenters
-    VERSION = '0.1.13'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

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

@@ -1,13 +1,12 @@
 require 'sinatra'
 require 'uri'
 require 'redcarpet'
+require "dry/inflector"
 require 'voom/trace'
 require 'voom/presenters/app'
-require "dry/inflector"
-
-require_relative 'router'
-require_relative 'markdown_render'
-require_relative '../errors/unprocessable'
+require 'voom/presenters/web_client/router'
+require 'voom/presenters/web_client/markdown_render'
+require 'voom/presenters/errors/unprocessable'
 
 module Voom
   module Presenters
@@ -17,7 +16,10 @@ module Voom
         set :root, File.expand_path('../../../../..', __FILE__)
         set :router_, WebClient::Router
         set :bind, '0.0.0.0'
-        set :views, Proc.new {File.join(root, "views", ENV['VIEW_ENGINE']||'mdc')}
+        set :views, Proc.new {File.join(root, "views", ENV['VIEW_ENGINE'] || 'mdc')}
+        configure do
+          enable :logging
+        end
 
         helpers do
           def markdown(text)
@@ -59,7 +61,7 @@ module Voom
             "v-#{comp.type}__secondary" if eq(comp.color, :secondary)
           end
 
-          def color_style(comp, affects=nil)
+          def color_style(comp, affects = nil)
             "#{affects}color: #{comp.color};" unless %w(primary secondary).include?(comp.color.to_s) || comp.color.nil?
           end
 
@@ -80,15 +82,27 @@ module Voom
 
           def transform(thing)
             case thing
-              when OpenStruct
-                to_hash(thing)
-              when Array
-                thing.map {|v| transform(v)}
-              else
-                thing
+            when OpenStruct
+              to_hash(thing)
+            when Array
+              thing.map {|v| transform(v)}
+            else
+              thing
             end
           end
 
+          def custom_css
+            custom_css_path = Presenters::Settings.config.presenters.web_client.custom_css
+            Dir.glob(custom_css_path).map do |file|
+              _build_css_link_(file)
+            end.join("\n") if custom_css_path
+          end
+
+          def _build_css_link_(path)
+            (<<~CSS)
+              <link rel="stylesheet" href="#{env['SCRIPT_NAME']}#{path.sub('public/','')}">
+            CSS
+          end
         end
 
         get '/' do
@@ -98,8 +112,24 @@ module Voom
         end
 
         get '/:_presenter_' do
-          pass unless Presenters::App.registered?(params[:_presenter_])
-          presenter = Presenters::App[params[:_presenter_]].call
+          fq_presenter = [params[:_presenter_], 'index'].join(':')
+          pass unless Presenters::App.registered?(params[:_presenter_]) || Presenters::App.registered?(fq_presenter)
+          presenter = (Presenters::App.registered?(fq_presenter) ? Presenters::App[fq_presenter] :
+                           Presenters::App[params[:_presenter_]]).call
+          render_presenter(presenter)
+        end
+
+        get '/:_namespace1_/:_presenter_' do
+          fq_presenter = [params[:_namespace1_], params[:_presenter_]].join(':')
+          pass unless Presenters::App.registered?(fq_presenter)
+          presenter = Presenters::App[fq_presenter].call
+          render_presenter(presenter)
+        end
+
+        get '/:_namespace1_/:_namespace2_/:_presenter_' do
+          fq_presenter = [params[:_namespace1_], params[:_namespace2_], params[:_presenter_]].join(':')
+          pass unless Presenters::App.registered?(fq_presenter)
+          presenter = Presenters::App[fq_presenter].call
           render_presenter(presenter)
         end
 
@@ -121,7 +151,7 @@ module Voom
             layout = !(request.env['HTTP_X_NO_LAYOUT'] == 'true')
             response.headers['X-Frame-Options'] = 'ALLOWALL' if ENV['ALLOWALL_FRAME_OPTIONS']
             erb :web, layout: layout
-          rescue Errors::Unprocessable => e
+          rescue Presenters::Errors::Unprocessable => e
             content_type :json
             status 422
             JSON.dump({error: e.message})
@@ -137,18 +167,18 @@ module Voom
           prepare_context.push(method(:scrub_context))
           context = params.dup
           prepare_context.reduce(context) do |params, context_proc|
-            context_proc.call(params, session, env)
+            context = context_proc.call(params, session, env)
           end
           context
         end
 
         def scrub_context(params, _session, _env)
-          %i(splat captures _presenter_ grid_nesting).each do |key|
-            params.delete(key)
+          %i(splat captures _presenter_ grid_nesting input_tag _namespace1_ _namespace2_).each do |key|
+            params.delete(key) {params.delete(key.to_s)}
           end
           params
         end
       end
     end
   end
-end
+end

data/lib/voom/presenters/web_client/markdown_render.rb

@@ -1,16 +1,29 @@
-class CustomRender < Redcarpet::Render::Safe
-  include Redcarpet::Render::SmartyPants
+unless defined?(CustomRender)
+  class CustomRender < Redcarpet::Render::Safe
+    # include Redcarpet::Render::SmartyPants
+    BR = '<br/>'
 
-  def initialize(extensions = {})
-    super(extensions)
-  end
-  
-  def paragraph(text)
-      text + '<br/>'
+    def initialize(extensions = {})
+      super(extensions)
+    end
+
+    def paragraph(text)
+      text + BR
+    end
+
+    def postprocess(full_document)
+      strip_trailing_br(colorize(full_document))
     end
 
-  def postprocess(full_document)
-    full_document.
-        gsub(/{c:([#\w]\w+)}([^{]+){\/c}/) {|m| "<span style=\"color:#{$1};\">#{$2}</span>"} # color
+    private
+
+    def colorize(doc)
+      doc.gsub(/{c:([#\w]\w+)}([^{]+){\/c}/) {|m| "<span style=\"color:#{$1};\">#{$2}</span>"}
+    end
+
+    def strip_trailing_br(doc)
+      return doc unless doc.reverse[0...BR.length]==BR.reverse
+      doc[0...doc.length-BR.length]
+    end
   end
 end

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

@@ -11,49 +11,16 @@ 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('captures')
           _params_.delete('presenter')
-          # _params_.delete('redirect')
           _params_.delete('action')
           _params_.delete('errors')
           _params_
@@ -61,33 +28,31 @@ module Voom
 
         private
 
-        def build_command_url(command, entity, params)
+        def build_command_url(command, params)
           return '' unless command
-          seperator = command.include?('?') ? '&' : '?'
-          "#{command}#{seperator}#{build_params(params, entity)}"
+          add_query_params(command, 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')
+          render = render.gsub(':', '/')
           seperator = render.start_with?('/') ? '' : '/'
           url = "#{base_url}#{seperator}#{render}"
-          query_params = build_params(params, entity)
-          if(query_params)
-            query_seperator = render.include?('?') ? '&' : '?'
+          add_query_params(url, params)
+        end
+
+        def add_query_params(url, params)
+          query_params = build_params(params)
+          if (!query_params.nil? && !query_params.empty?)
+            query_seperator = url.include?('?') ? '&' : '?'
             url = "#{url}#{query_seperator}#{query_params}"
           end
           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/serializer.rb

@@ -1,5 +1,5 @@
-require_relative 'parameters'
-require_relative 'trace'
+require 'voom/parameters'
+require 'voom/trace'
 
 module Voom
   # Simple serializer that will build add a to_hash method to an object by inspecting

data/lib/voom/trace.rb

@@ -1,4 +1,4 @@
-require_relative 'logger_methods'
+require 'voom/logger_methods'
 
 module Voom
   module Trace

data/presenters.gemspec

@@ -28,8 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency  'tzinfo', '~>1.2'
   spec.add_runtime_dependency  'tzinfo-data', '~>1.2018'
   spec.add_runtime_dependency  'redcarpet', '~>3.4'
-  
+
   spec.add_development_dependency 'rack-test', '~>0.8'
+  spec.add_development_dependency 'rack', '>= 2.0.6'
   spec.add_development_dependency 'pry', '~>0.10'
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 11.3'

data/public/style-bundle.js

@@ -65,9 +65,9 @@
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ (function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
 
-throw new Error("Module build failed: \n@import \"@material/base/mixins\";\n^\n      File to import not found or unreadable: /Users/derekgraham/rx/presenters/views/mdc/node_modules/@material/base/mixins.\n      in /Users/derekgraham/rx/presenters/views/mdc/node_modules/@material/floating-label/mdc-floating-label.scss (line 18, column 1)");
+module.exports = __webpack_require__.p + "../../public/bundle.css";
 
 /***/ })
 /******/ ]);

data/scripts/bump.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -euo pipefail
 # Docs: https://github.com/svenfuchs/gem-release#gem-release
 gem bump
 

data/scripts/changelog.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -euo pipefail
+# https://github.com/github-changelog-generator/github-changelog-generator
+github_changelog_generator rx/presenters --future-release $1
+

data/scripts/deploy-demo.sh

@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
+set -euo pipefail
 git push heroku master

data/scripts/release.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
+set -euo pipefail
 # Docs: https://github.com/svenfuchs/gem-release#gem-release
-gem tag
 gem release
 

data/scripts/tag.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -euo pipefail
+# Docs: https://github.com/svenfuchs/gem-release#gem-release
+gem tag
+

data/views/mdc/.babelrc

@@ -0,0 +1,8 @@
+{
+    "presets": [["env", {"modules": false}]],
+    "env": {
+        "test": {
+            "plugins": ["transform-es2015-modules-commonjs"]
+        }
+    }
+}

data/views/mdc/.eslintrc.yml

@@ -0,0 +1,23 @@
+---
+root: true
+extends: ["eslint:recommended", "google"]
+env:
+  es6: true
+  browser: true
+
+rules:
+  indent:
+    - warn
+    - 4
+  prefer-destructuring: off
+  brace-style:
+    - 2
+    - stroustrup
+    - allowSingleLine: false
+  require-jsdoc: 0
+  no-console: 0
+
+parserOptions:
+  sourceType: module
+
+

data/views/mdc/assets/js/app.js

@@ -1,10 +1,23 @@
-window.dialogPolyfill = require('./dialog-polyfill');
-window.componentHandler = require('./material');
-import {initialize} from './components/initialize';
+import isCompatible from './utils/compatibility';
+import config from './config';
 
-document.addEventListener("DOMContentLoaded", function(event) {
-    initialize();
-  });
+document.addEventListener('DOMContentLoaded', () => {
+    if (!isCompatible) {
+        const errorMessage = config.get(
+            'compatibility.errorMessage',
+            'Unsupported browser!',
+        );
+        document.body.innerHTML = `<p>${errorMessage}</p>`;
 
+        return;
+    }
 
+    document.documentElement.classList.remove('incompatible-browser');
 
+    window.dialogPolyfill = require('./dialog-polyfill');
+    require('material-design-lite/material');
+    require('./mdl-stepper');
+    require('babel-polyfill');
+
+    require('./components/initialize').initialize();
+});

data/views/mdc/assets/js/components/base-component.js

@@ -1,5 +1,28 @@
 export class VBaseComponent {
-    constructor(element) {
+    constructor(element, mdcComponent) {
         this.element = element;
+        this.mdcComponent = mdcComponent;
     }
-}
+
+    validate(formData) {
+        return true;
+    }
+}
+
+export function hookupComponents(selector, VoomClass, MdcClass) {
+
+    const components = document.querySelectorAll(selector);
+    for (let i = 0; i < components.length; i++) {
+        const component = components[i];
+        if (!component.mdcComponent) {
+            let mdcInstance = null;
+            if (MdcClass != null) {
+                mdcInstance = new MdcClass(component);
+            }
+            if (!component.vComponent) {
+                component.vComponent = new VoomClass(component, mdcInstance);
+            }
+        }
+    }
+}
+