mushy 0.0.5 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 971693353748e8d21c56dfa911cf669b79a10fce38530eaeb9c8ab019c69be73
-  data.tar.gz: 58ef99b38f1ebc13fbd68bca3e6597b43ba4310313e780ab38c55e14dcc31b07
+  metadata.gz: 2eaed069f8d37db0a6d58fea9c994e4a5135f43a18a7e7ad8421a601983bb954
+  data.tar.gz: 3224715b652898edaac99ad89a8378ccc4d2aa4ba21b891ca33fec0b99252a85
 SHA512:
-  metadata.gz: f124d798c6d44e1ecefc2b5b44726c20f7c5e07ed25182776cf2db69e230ef646d84d45627f5d645ff04be725c7db891bf597c4317bd42f9372a070b425cc72c
-  data.tar.gz: f7a5875f509dd43c1543c89636a9e435ff0cabec094fe109113f173fb26e6eef6bd0a0f0634dc35f1ee78f9c71f6e7e6fd166515f222383f3fcef8d4be4f4deb
+  metadata.gz: df28cc21a604e023284ad3f88b2cd11a3ab4261c3cd9747a2033d07528203262de29daa2d12f82e404eb91109b79ee9a5e5a5bf71396c360e26ff270d08a2449
+  data.tar.gz: 05410eb4c9fee4afd4aa31397409b6c794bc152257cf599aa4fb1502cb7009c518b9fac2eb76b3f78ca1e58e2a31e28e6dcd6c5266febb8bddd7ea7fbe7fdea1

data/bin/mushy

@@ -3,18 +3,20 @@
 require 'thor'
 require 'mushy'
 
-class RailsCLI < Thor
+class MushyCLI < Thor
+
+  argument :file, optional: true, type: :string
+  argument :values, optional: true, type: :hash
 
   desc "start FILE", "Run this workflow file."
-  def start file
-    content = File.open(file).read
-    puts content
+  def start
+    Mushy::Builder::Api.start file, values
   end
 
   desc "build FILE", 'Build a flow.'
-  def build file
+  def build
 
-    RailsCLI.set_special( { method: 'build', file: file } )
+    MushyCLI.set_special( { method: 'build', file: file } )
 
   end
 
@@ -28,14 +30,14 @@ class RailsCLI < Thor
 
 end
 
-RailsCLI.start(ARGV)
+MushyCLI.start(ARGV)
 
-exit unless RailsCLI.get_special
+exit unless MushyCLI.get_special
 
 require 'sinatra'
 enable :run
 
-the_file = RailsCLI.get_special[:file]
+the_file = MushyCLI.get_special[:file]
 
 get '/' do
   Mushy::Builder::Index.file

data/lib/mushy/builder/api.rb

@@ -28,6 +28,15 @@ module Mushy
 
       end
 
+      def self.start file, event
+        file = "#{file}.json" unless file.downcase.end_with?('.json')
+        flow = File.open(file).read
+        flow = Mushy::Flow.parse flow
+        flux = flow.fluxs.select { |x| x.type == 'Cli' }.first
+
+        Mushy::Runner.new.start event, flux, flow
+      end
+
       def self.get_flow file
         puts "trying to get: #{file}"
         file = "#{file}.json" unless file.downcase.end_with?('.json')
@@ -40,14 +49,14 @@ module Mushy
         {
           fluxs: Mushy::Flux.all.select { |x| x.respond_to? :details }.map do |flux|
                          details = flux.details
-                         details[:config][:incoming_split] = { type: 'text', description: 'Split an incoming event into multiple events by this key, an each event will be processed independently.', default: '' }
-                         details[:config][:outgoing_split] = { type: 'text', description: 'Split an outgoing event into multiple events by this key.', default: '' }
-                         details[:config][:merge] = { type: 'text', description: 'A comma-delimited list of fields from the event to carry through. Use * to merge all fields.', default: '' }
-                         details[:config][:group] = { type: 'text', description: 'Group events by a field, which is stored in a key. The format is group_by|group_key.', default: '' }
-                         details[:config][:limit] = { type: 'integer', description: 'Limit the number of events to this number.', default: '' }
-                         details[:config][:join] = { type: 'text', description: 'Join all of the events from this flux into one event, under this name.', default: '' }
-                         details[:config][:sort] = { type: 'text', description: 'Sort by this key.', default: '' }
-                         details[:config][:model] = { type: 'keyvalue', description: 'Reshape the outgoing events.', value: {}, default: {} }
+                         details[:config][:incoming_split] = { type: 'text', shrink: true, description: 'Split an incoming event into multiple events by this key, an each event will be processed independently.', default: '' }
+                         details[:config][:outgoing_split] = { type: 'text', shrink: true, description: 'Split an outgoing event into multiple events by this key.', default: '' }
+                         details[:config][:merge] = { type: 'text', shrink: true, description: 'A comma-delimited list of fields from the event to carry through. Use * to merge all fields.', default: '' }
+                         details[:config][:group] = { type: 'text', shrink: true, description: 'Group events by a field, which is stored in a key. The format is group_by|group_key.', default: '' }
+                         details[:config][:limit] = { type: 'integer', shrink: true, description: 'Limit the number of events to this number.', default: '' }
+                         details[:config][:join] = { type: 'text', shrink: true, description: 'Join all of the events from this flux into one event, under this name.', default: '' }
+                         details[:config][:sort] = { type: 'text', shrink: true, description: 'Sort by this key.', default: '' }
+                         details[:config][:model] = { type: 'keyvalue', shrink: true, description: 'Reshape the outgoing events.', value: {}, default: {} }
 
                          details[:config]
                                 .select { |_, v| v[:type] == 'keyvalue' }

data/lib/mushy/builder/index.rb

@@ -12,19 +12,28 @@ module Mushy
     </head>
     <body>
         <div id="app">
-            <table>
+            <table v-if="setup.showFlux == false">
+                <tr>
+                    <th>Name</th>
+                    <th>Receives Events From</th>
+                    <th>Actions</th>
+                </tr>
                 <tr v-for="flux in flow.fluxs">
                     <td>{{flux.name}}</td>
-                    <td>{{flux.flux}}</td>
-                    <td><a href="#" v-on:click.prevent.stop="edit({ flux: flux, setup: setup, configs: configs })">[Edit]</a></td>
+                    <td>{{flux_name_for(flux.parent, flow.fluxs)}}</td>
+                    <td>
+                        <button v-on:click.prevent.stop="editFlux({ flux: flux, setup: setup, configs: configs })">Edit</button>
+                        <button v-on:click.prevent.stop="deleteFlux({ flux: flux, flow: flow })">Delete</button>
+                    </td>
                 </tr>
             </table>
-            <a href="#" v-if="setup.showFlux == false" v-on:click.prevent.stop="startNew({ setup: setup, configs: configs })">[New]</a>
-            <a href="#" v-if="setup.showFlux == false" v-on:click.prevent.stop="saveFlow({ setup: setup, flow: flow })">[Save]</a>
+            <button v-if="setup.showFlux == false" v-on:click.prevent.stop="startNew({ setup: setup, configs: configs })">Start a New Flux</button>
+            <button v-if="setup.showFlux == false" v-on:click.prevent.stop="saveFlow({ setup: setup, flow: flow })">Save This Flow</button>
+            <button v-if="setup.showFlux" v-on:click.prevent.stop="setup.showFlux = false">&lt; Go Back To List</button>
             <div v-if="setup.showFlux">
                 <mip-heavy :data="setup"></mip-heavy>
                 <mip-heavy v-for="(data, id) in configs" v-show="setup.flux.value === id" :data="data"></mip-heavy>
-                <div v-if="results.loading">Loading...</div>
+                <div v-if="results.errorMessage">{{results.errorMessage}}</div>
                 <div v-else>{{results.length}} result{{results.length == 1 ? "" : "s"}}</div>
                 <mip-heavy v-for="data in results" :data="data"></mip-heavy>
             </div>
@@ -48,28 +57,48 @@ module Mushy
 
    var components = {
        label: {
-           props: ['label', 'description'],
-           template: '<label :for="id" v-if="label != \\'\\'">{{label || ' + fancyName('id') + '}} <i v-show="description">({{description}})</i></label>'
+           props: ['label', 'description', 'hide_description'],
+           template: '<label :for="id" v-if="label != \\'\\'">{{label || ' + fancyName('id') + '}} <i v-show="description && !hide_description">({{description}})</i></label>'
+       },
+       h1: {
+           props: ['label', 'description', 'hide_description'],
+           template: '<h1 v-if="label != \\'\\'">{{label || ' + fancyName('id') + '}} <i v-show="description && !hide_description">({{description}})</i></h1>'
+       },
+       h2: {
+           props: ['label', 'description', 'hide_description'],
+           template: '<h2 v-if="label != \\'\\'">{{label || ' + fancyName('id') + '}} <i v-show="description && !hide_description">({{description}})</i></h2>'
+       },
+       h3: {
+           props: ['label', 'description', 'hide_description'],
+           template: '<h3 v-if="label != \\'\\'">{{label || ' + fancyName('id') + '}} <i v-show="description && !hide_description">({{description}})</i></h3>'
+       },
+       h4: {
+           props: ['label', 'description', 'hide_description'],
+           template: '<h4 v-if="label != \\'\\'">{{label || ' + fancyName('id') + '}} <i v-show="description && !hide_description">({{description}})</i></h4>'
        },
        text:  {
-           props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label><input type="text" :name="id" :placeholder="placeholder" v-bind:value="value" v-on:input="$emit(\\'update:value\\', $event.target.value);" :disabled="disabled == \\'true\\'" :readonly="readonly == \\'true\\'"></div>'
+           props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description', 'shrink'],
+           template: '<div><mip-label :id="id" :label="label" :description="description" :hide_description="shrink"></mip-label> <a href="#" v-on:click.prevent.stop="shrink=false" v-show="shrink && !value">[^]</a><input type="text" :name="id" v-if="value || !shrink" :placeholder="placeholder" v-bind:value="value" v-on:input="$emit(\\'update:value\\', $event.target.value);" :disabled="disabled == \\'true\\'" :readonly="readonly == \\'true\\'"></div>'
+       },
+       hide:  {
+           props: ['label', 'description'],
+           template: '<mip-label :id="id" :label="label" :description="description" v-if="false"></mip-label>'
        },
        integer:  {
-           props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label><input type="text" :name="id" :placeholder="placeholder" v-bind:value="value" v-on:input="$emit(\\'update:value\\', $event.target.value);" :disabled="disabled == \\'true\\'" :readonly="readonly == \\'true\\'"></div>'
+           props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description', 'shrink'],
+           template: '<div><mip-label :id="id" :label="label" :description="description" :hide_description="shrink"></mip-label> <a href="#" v-on:click.prevent.stop="shrink=false" v-show="shrink && !value">[^]</a><input type="text" :name="id" v-if="value || !shrink" :placeholder="placeholder" v-bind:value="value" v-on:input="$emit(\\'update:value\\', $event.target.value);" :disabled="disabled == \\'true\\'" :readonly="readonly == \\'true\\'"></div>'
        },
        email: {
-           props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label><input type="email" :name="id" :placeholder="placeholder" v-bind:value="value" v-on:input="$emit(\\'update:value\\', $event.target.value)" :disabled="disabled == \\'true\\'" :readonly="readonly == \\'true\\'"></div>'
+           props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description', 'shrink'],
+           template: '<div><mip-label :id="id" :label="label" :description="description" :hide_description="shrink"></mip-label> <a href="#" v-on:click.prevent.stop="shrink=false" v-show="shrink && !value">[^]</a><input type="email" :name="id" v-if="value || !shrink" :placeholder="placeholder" v-bind:value="value" v-on:input="$emit(\\'update:value\\', $event.target.value)" :disabled="disabled == \\'true\\'" :readonly="readonly == \\'true\\'"></div>'
        },
        textarea: {
-           props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label><textarea :name="id" :placeholder="placeholder" v-bind:value="value" v-on:input="$emit(\\'update:value\\', $event.target.value)" :disabled="disabled == \\'true\\'" :readonly="readonly == \\'true\\'"></textarea></div>'
+           props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description', 'shrink'],
+           template: '<div><mip-label :id="id" :label="label" :description="description" :hide_description="shrink"></mip-label> <a href="#" v-on:click.prevent.stop="shrink=false" v-show="shrink && !value">[^]</a><textarea :name="id" v-if="value || !shrink" :placeholder="placeholder" v-bind:value="value" v-on:input="$emit(\\'update:value\\', $event.target.value)" :disabled="disabled == \\'true\\'" :readonly="readonly == \\'true\\'"></textarea></div>'
        },
        json: {
-           props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label><pre><code>{{value}}</code></pre><textarea :name="id" :placeholder="placeholder" v-bind:value="value" v-on:input="$emit(\\'update:value\\', $event.target.value)" :disabled="disabled == \\'true\\'" :readonly="readonly == \\'true\\'"></textarea></div>'
+           props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description', 'shrink'],
+           template: '<div><mip-label :id="id" :label="label" :description="description" :hide_description="shrink"></mip-label> <a href="#" v-on:click.prevent.stop="shrink=false" v-show="shrink && !value">[^]</a><textarea :name="id" v-if="value || !shrink" :placeholder="placeholder" v-bind:value="value" v-on:input="$emit(\\'update:value\\', $event.target.value)" :disabled="disabled == \\'true\\'" :readonly="readonly == \\'true\\'"></textarea></div>'
        },
        jsonview: {
            data: function() {
@@ -80,23 +109,23 @@ module Mushy
                };
            },
            props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description', 'view'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label> <a href="#" v-on:click.prevent.stop="view=toggle(view)">{{(view == \\'beautiful\\' ? \\'>\\' : \\'^\\')}}</a><a href="#" v-on:click.prevent.stop="copy(view, value)">copy</a><pre><code>{{show(view, value)}}</code></pre></div>'
+           template: '<div><mip-h4 :id="id" :label="label" :description="description"></mip-h4> <pre><code>{{show(view, value)}}</code></pre><button :disabled="view==\\'beautiful\\'" v-on:click.prevent.stop="view=toggle(view)">{{(view == \\'beautiful\\' ? \\'View Smaller\\' : \\'View Pretty\\')}}</button><button :disabled="view!=\\'beautiful\\'" v-on:click.prevent.stop="view=toggle(view)">View Smaller</button><button v-on:click.prevent.stop="copy(view, value)">Copy</button></div>'
        },
        radio: {
-           props: ['label', 'value', 'options', 'description'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label><div v-for="option in options"><input type="radio" :name="id" v-bind:value="option" v-on:input="$emit(\\'update:value\\', $event.target.value)" :checked="value == option"> <label for="option">{{option}}</label></div></div>'
+           props: ['label', 'value', 'options', 'description', 'shrink'],
+           template: '<div><mip-label :id="id" :label="label" :description="description" :hide_description="shrink"></mip-label> <a href="#" v-on:click.prevent.stop="shrink=false" v-show="shrink && !value">[^]</a><div v-for="option in options"><input type="radio" :name="id" v-bind:value="option" v-if="value || !shrink" v-on:input="$emit(\\'update:value\\', $event.target.value)" :checked="value == option"> <label for="option">{{option}}</label></div></div>'
        },
        select: {
-           props: ['label', 'value', 'options', 'description'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label><select :name="id" v-on:input="$emit(\\'update:value\\', $event.target.value)"><option v-for="option in options" v-bind:value="option" :selected="value == option">{{option}}</option></select></div>'
+           props: ['label', 'value', 'options', 'description', 'shrink'],
+           template: '<div><mip-label :id="id" :label="label" :description="description" :hide_description="shrink"></mip-label> <a href="#" v-on:click.prevent.stop="shrink=false" v-show="shrink && !value">[^]</a><select :name="id" v-if="value || !shrink" v-on:input="$emit(\\'update:value\\', $event.target.value)"><option v-for="option in options" v-bind:value="option" :selected="value == option">{{option}}</option></select></div>'
        },
        selectrecord: {
-           props: ['label', 'value', 'options', 'description'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label><select :name="id" v-on:input="$emit(\\'update:value\\', $event.target.value)"><option v-for="option in options" v-bind:value="option.id" :selected="value == option.id">{{option.name}}</option></select></div>'
+           props: ['label', 'value', 'options', 'description', 'shrink'],
+           template: '<div><mip-label :id="id" :label="label" :description="description" :hide_description="shrink"></mip-label> <a href="#" v-on:click.prevent.stop="shrink=false" v-show="shrink && !value">[^]</a><select :name="id" v-if="value || !shrink" v-on:input="$emit(\\'update:value\\', $event.target.value)"><option v-for="option in options" v-bind:value="option.id" :selected="value == option.id">{{option.name}}</option></select></div>'
        },
        boolean: {
-           props: ['label', 'value', 'options', 'description'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label><select :name="id" v-on:input="$emit(\\'update:value\\', $event.target.value)"><option v-for="option in [true, false]" v-bind:value="option" :selected="value == option">{{option}}</option></select></div>'
+           props: ['label', 'value', 'options', 'description', 'shrink'],
+           template: '<div><mip-label :id="id" :label="label" :description="description" :hide_description="shrink"></mip-label> <a href="#" v-on:click.prevent.stop="shrink=false" v-show="shrink && !value">[^]</a><select :name="id" v-if="(value != undefined && value != null && value != \\'\\') || !shrink" v-on:input="$emit(\\'update:value\\', $event.target.value)"><option v-for="option in [true, false]" v-bind:value="option" :selected="value == option">{{option}}</option></select></div>'
        },
        table: {
            props: ['value', 'description'],
@@ -117,12 +146,13 @@ module Mushy
                                                 }
                };
            },
-           props: ['value', 'editors', 'label', 'description'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label><table><tr><th v-for="(d, i) in value[0]">{{' + fancyName('i') + '}}</th></tr><tr v-for="(v, z) in value"><td v-for="(d, i) in v">{{d}}</td><td><a href="#" v-on:click.prevent.stop="removeRecord(v, value, z)">[x]</a></td></tr><tr><td v-for="editor in editors"><mip-thing :data="editor.field" :id="editor.id"></mip-thing></td><td><a href="#" v-on:click.prevent.stop="addRecord(editors, value)">[Add]</a></td></tr></table></div>'
+           props: ['value', 'editors', 'label', 'description', 'shrink'],
+           template: '<div><mip-label :id="id" :label="label" :description="description" :hide_description="shrink"></mip-label> <a href="#" v-on:click.prevent.stop="shrink=false" v-show="shrink && value.length == 0">[^]</a><table v-if="value.length > 0 || !shrink"><tr><th v-for="(d, i) in value[0]">{{' + fancyName('i') + '}}</th></tr><tr v-for="(v, z) in value"><td v-for="(d, i) in v">{{d}}</td><td><a href="#" v-on:click.prevent.stop="removeRecord(v, value, z)">[x]</a></td></tr><tr><td v-for="editor in editors"><mip-thing :data="editor.field" :id="editor.id"></mip-thing></td><td><a href="#" v-on:click.prevent.stop="addRecord(editors, value)">[Add]</a></td></tr></table></div>'
        },
        keyvalue: {
            data: function() {
                return {
+                   actionText: function(value, others) { found = false; for(var i in others){ if (i == value) found = true; } return found ? 'Replace' : 'Add'; },
                    removeRecord: function(data, key) { Vue.delete(data, key) },
                    addRecord: function(editors, data) {
                                                    Vue.set(data, editors[0].field.value, editors[1].field.value)
@@ -131,12 +161,12 @@ module Mushy
                                                 }
                };
            },
-           props: ['value', 'label', 'editors', 'description'],
-           template: '<div><mip-label :id="id" :label="label" :description="description"></mip-label><table><tr v-for="(v, k) in value"><td>{{k}}</td><td>{{v}}</td><td><a href="#" v-on:click.prevent.stop="removeRecord(value, k)">[x]</a></td></tr><tr><td v-for="editor in editors"><mip-thing :data="editor.field" :id="editor.id"></mip-thing></td><td><a href="#" v-on:click.prevent.stop="addRecord(editors, value)" v-show="editors[0].field.value">[Add]</a></td></tr></table></div>'
+           props: ['value', 'label', 'editors', 'description', 'shrink'],
+           template: '<div><mip-label :id="id" :label="label" :description="description" :hide_description="shrink"></mip-label> <a href="#" v-on:click.prevent.stop="shrink=false" v-show="shrink">[^]</a><table v-if="JSON.stringify(value) != \\'{}\\' || !shrink"><tr v-for="(v, k) in value"><td>{{k}}</td><td>{{v}}</td><td><button v-on:click.prevent.stop="removeRecord(value, k)">Remove {{k}}</button></td></tr><tr><td v-for="editor in editors"><mip-thing :data="editor.field" :id="editor.id"></mip-thing></td><td><button v-on:click.prevent.stop="addRecord(editors, value)" v-show="editors[0].field.value">{{actionText(editors[0].field.value, value)}} {{editors[0].field.value}}</button></td></tr></table></div>'
        },
        button: {
-           props: ['click', 'description'],
-           template: '<button v-on:click.prevent.stop="click(pull(this))">{{id}}</button>'
+           props: ['click', 'description', 'name'],
+           template: '<button v-on:click.prevent.stop="click(pull(this), thisComponent())">{{name || id}}</button>'
        }
    };
 
@@ -156,6 +186,7 @@ module Mushy
                       return {
                           console: console,
                           pull: function(x) { return thingToData(foundIt.data); },
+                          thisComponent: function() { return foundIt.data; },
                       }
                   },
             props: props,
@@ -188,32 +219,6 @@ module Mushy
         template: '<div><mip-thing v-for="(d, id) in data" :data="d" :id="id"></mip-thing></div>',
     });
 
-    var sample = {
-                     email: { type: 'email', value: 'darren@cauthon.com' },
-                     first_name: { type: 'text', value: 'Darren' },
-                     description: { type: 'textarea', value: 'more data' },
-                     size: { type: 'select', value: 'medium', options: ['small', 'medium', 'large']},
-                     heynow: { type: 'keyvalue',
-                             value: {
-                                 first_name: 'John',
-                                 last_name: 'Doe',
-                             },
-                             editors: [
-                                         { id: 'new_key', target: 'key', field: { type: 'text', value: '', default: '' } },
-                                         { id: 'new_value', target: 'value', field: { type: 'text', value: '', default: '' } }
-                                      ] },
-                     past: { type: 'editgrid',
-                             value: [
-                                 { name: 'Godzilla', quantity: 1 },
-                                 { name: 'Mothra', quantity: 2 },
-                             ],
-                             editors: [
-                                         { id: 'new_name', target: 'name', field: { type: 'text', value: '', default: '' } },
-                                         { id: 'new_quantity', target: 'quantity', field: { type: 'select', value: '1', options: [1, 2, 3], default: 1 } }
-                                      ] },
-                     super_action: { type: 'button', click: function(x) { console.log(x) } },
-                 };
-
     var app = null;
 
     axios.get('/fluxs')
@@ -237,51 +242,80 @@ module Mushy
 
              var setup = {
                    showFlux: false,
-                   event: { type: 'json', value: '{}' },
-                   id: { type: 'text', value: '' },
+                   id: { type: 'hide', value: '' },
                    name: { type: 'text', value: '' },
                    flux: { type: 'select', value: fluxdata.fluxs[0].name, options: options},
-                   parent: { type: 'selectrecord', value: '', options: flowdata.fluxs },
+                   parent: { type: 'selectrecord', label: 'Receive Events From', value: '', options: flowdata.fluxs },
+             };
+
+             var saveFlux = function(config, hey) {
+                 var nameOfTheSaveButton = hey.save.name;
+                 Vue.set(hey.save, 'name', 'Saving');
+                 delete config.test_event;
+                 var setup = thingToData(app.setup);
+                 var flux = {
+                                id: setup.id,
+                                name: setup.name,
+                                flux: setup.flux,
+                                parent: setup.parent,
+                                config: config,
+                 };
+                 var index = -1;
+                 for(var i = 0; i < app.flow.fluxs.length; i++)
+                     if (app.flow.fluxs[i].id == flux.id)
+                        index = i;
+
+                 if (index < 0)
+                     app.flow.fluxs.push(flux);
+                 else
+                     app.flow.fluxs[index] = flux;
+
+                 setTimeout(function(){
+                     Vue.set(hey.save, 'name', nameOfTheSaveButton);
+                     app.setup.id.value = '';
+
+                     Vue.set(app.setup, 'showFlux', false);
+                 }, 500);
              };
 
              for (var key in configs)
              {
-                 configs[key].go = { type: 'button', click: function(c) {
+                 configs[key].save = { type: 'button', name: 'Save This Flux', click: saveFlux };
+
+                 configs[key].test_event = { type: 'json', value: '{}', default: '{}' };
+
+                 configs[key].run_test = { type: 'button', name: 'Test Run This Flux', click: function(c, hey) {
+                                      var previousName = hey.run_test.name;
+                                      Vue.set(hey.run_test, 'name', 'Loading');
                                       app.results = [];
-                                      Vue.set(app.results, 'loading', true);
-                                      axios.post('/run', { config: c, setup: thingToData(app.setup) })
+                                      Vue.set(app.results, 'errorMessage', '');
+                                      var the_setup = thingToData(app.setup);
+                                      the_setup.event = c.test_event;
+                                      axios.post('/run', { config: c, setup: the_setup })
                                        .then(function(r){
-                                           Vue.set(app.results, 'loading', false);
+                                           var index = 1;
                                            for (var key in r.data.result)
-                                               app.results.push({darren: { type:'jsonview', value: r.data.result[key], view: 'thin' }});
+                                           {
+                                              var result = {};
+                                              result['event_' + index] = { type: 'jsonview', label: 'Event ' + index + ' of ' + r.data.result.length, value: r.data.result[key], view: 'thin' };
+                                              app.results.push(result);
+                                              index += 1;
+                                           }
+                                        }).catch(function(r){
+                                            console.log(r);
+                                            Vue.set(app.results, 'errorMessage', 'This app failed while trying to execute your flux.');
+                                        }).then(function(){
+                                           Vue.set(hey.run_test, 'name', previousName);
                                         });
                                      } };
-
-                 configs[key].save = { type: 'button', click: function(config) {
-                     var setup = thingToData(app.setup);
-                                       var flux = {
-                                           id: setup.id,
-                                           name: setup.name,
-                                           flux: setup.flux,
-                                           parent: setup.parent,
-                                           config: config,
-                                       };
-                     var index = -1;
-                     for(var i = 0; i < app.flow.fluxs.length; i++)
-                        if (app.flow.fluxs[i].id == flux.id)
-                            index = i;
-                     if (index < 0)
-                         app.flow.fluxs.push(flux);
-                     else
-                         app.flow.fluxs[index] = flux;
-
-                     app.setup.id.value = '';
-                                     }
-                 };
              }
 
-             var loadThisFlux = function(flux, setup, config)
+             var loadThisFlux = function(args)
              {
+                 var flux = args.flux;
+                 var setup = args.setup;
+                 var config = args.config;
+
                  Vue.set(setup.id, 'value', flux.id);
                  Vue.set(setup.name, 'value', flux.name);
                  Vue.set(setup.flux, 'value', flux.flux);
@@ -294,12 +328,15 @@ module Mushy
                      else
                          Vue.set(applicable_config[key], 'value', applicable_config[key].default);
 
+                 if (applicable_config)
+                     Vue.set(applicable_config.test_event, 'value', '{}');
 
                  options = flowdata.fluxs.filter(function(x){ return x.id != flux.id });
                  options.unshift( { id: '', name: '' } );
                  setup.parent.options = options;
 
                  Vue.set(setup, 'showFlux', true);
+                 app.results = [];
              };
 
              function uuidv4() {
@@ -315,15 +352,19 @@ module Mushy
                      startNew: function(x) {
                          flux = {
                              id: uuidv4(),
-                             name: 'you',
+                             name: '',
                              config: {}
                          };
-                         loadThisFlux(flux, x.setup, x.configs);
+                         loadThisFlux({ flux: flux, setup: x.setup, configs: x.configs });
                      },
-                     edit: function(x) {
+                     editFlux: function(x) {
                          var flux = x.flux;
 
-                         loadThisFlux(x.flux, x.setup, x.configs);
+                         loadThisFlux({ flux: x.flux, setup: x.setup, configs: x.configs });
+                     },
+                     deleteFlux: function(x) {
+                         var set = x.flow.fluxs.filter( function(v){ return v.id != x.flux.id } );
+                         Vue.set(x.flow, 'fluxs', set);
                      },
                      saveFlow: function(input)
                      {
@@ -331,11 +372,15 @@ module Mushy
                          var flow = input.flow;
                          axios.post('/save', flow)
                             .then(function(result){
-                                Vue.set(setup, 'show', false);
+                                Vue.set(setup, 'showFlux', false);
                             });
                      },
                      configs: configs,
                      setup: setup,
+                     flux_name_for: function(id, fluxes) {
+                         var flux = fluxes.filter(function(x){ return x.id == id })[0];
+                         return flux != undefined ? flux.name : '';
+                     },
                      results: [],
                  }
             });

data/lib/mushy/flow.rb

@@ -18,8 +18,10 @@ module Mushy
     end
 
     def self.build_flux record
-      flux = Object.const_get("Mushy::#{record[:type] || record['type'] || 'Flux'}").new
+      type = record[:type] || record['type'] || record[:flux] || record['flux'] || 'Flux'
+      flux = Object.const_get("Mushy::#{type}").new
       flux.id = record[:id] || record['id'] || flux.id
+      flux.type = type
       flux.config = SymbolizedHash.new(record[:config] || record['config'])
       flux
     end

data/lib/mushy/flux.rb

@@ -3,6 +3,7 @@ module Mushy
   class Flux
 
     attr_accessor :id
+    attr_accessor :type
     attr_accessor :parent_fluxs
     attr_accessor :subscribed_to
     attr_accessor :config

data/lib/mushy/fluxs/browser.rb

@@ -17,16 +17,25 @@ module Mushy
           headless: {
                       description: 'Run this browser headless.',
                       type:        'boolean',
+                      shrink:      true,
                       value:       'true',
                     },
+          timeout: {
+                     description: 'The default timeout (in seconds) before closing the browser. Default is 5 seconds.',
+                     type:        'integer',
+                     shrink:      true,
+                     value:       '',
+                   },
           execute: {
                      description: 'Javascript to run after the page is loaded.',
                      type:        'textarea',
+                     shrink:      true,
                      value:       '',
                    },
           cookies: {
                      description: 'Cookies for the web request. These can be received from a previous browser event with {{cookies}}, or can be typed manually.',
                      type:        'editgrid',
+                     shrink:      true,
                      value:       [],
                      editors: [
                                  { id: 'name', target: 'name', field: { type: 'text', value: '', default: '' } },
@@ -40,27 +49,30 @@ module Mushy
                                  { id: 'sameSite', target: 'sameSite', field: { type: 'text', value: 'None', default: 'None' } },
                                  { id: 'priority', target: 'priority', field: { type: 'text', value: 'Medium', default: 'Medium' } },
                               ],
-                     #{"name":"1P_JAR","value":"2021-01-21-13","domain":".google.com","path":"/","expires":1613828458.870408,"size":19,"httpOnly":false,"secure":true,"session":false,"sameSite":"None","priority":"Medium"
                    },
           carry_cookies_from: {
                      description: 'Carry the cookies from this path in the event.',
                      type:        'text',
+                     shrink:      true,
                      value:       'cookies',
                    },
           headers: {
                      description: 'Headers for the web request. These can be received from a previous browser event with {{headers}}, or can be typed manually.',
                      type:        'keyvalue',
+                     shrink:      true,
                      value:       {},
                    },
           carry_headers_from: {
                      description: 'Carry the headers from this path in the event.',
                      type:        'text',
+                     shrink:      true,
                      value:       'headers',
                    },
           wait_before_closing: {
                                  description: 'Wait this many seconds before closing the browser.',
                                  type:        'integer',
-                                 value:       'cookies',
+                                 shrink:      true,
+                                 value:       '',
                                },
         },
       }
@@ -68,7 +80,11 @@ module Mushy
 
     def process event, config
 
-      browser = Ferrum::Browser.new(headless: (config[:headless].to_s != 'false'))
+      timeout = config[:timeout] ? config[:timeout].to_i : 5
+
+      browser = Ferrum::Browser.new(
+        headless: (config[:headless].to_s != 'false'),
+        timeout: timeout)
 
       get_the_cookies_from(event, config).each { |c| browser.cookies.set(c) }
 
@@ -78,15 +94,17 @@ module Mushy
 
       browser.execute(config[:execute]) if config[:execute]
 
+      sleep(config[:wait_before_closing].to_i) if config[:wait_before_closing] && config[:wait_before_closing].to_i > 0
+
       result = {
         url: browser.url,
+        status: browser.network.status,
+        title: browser.frames[0].title,
         cookies: browser.cookies.all.map { |k, v| v.instance_variable_get('@attributes') },
         headers: browser.headers.get,
         body: browser.body
       }
 
-      sleep(config[:wait_before_closing].to_i) if config[:wait_before_closing] && config[:wait_before_closing].to_i > 0
-
       browser.quit
 
       result

data/lib/mushy/fluxs/cli.rb

@@ -0,0 +1,20 @@
+module Mushy
+  
+  class Cli < Flux
+
+    def self.details
+      {
+        name: 'Cli',
+        description: 'Accept CLI arguments from the run command.',
+        config: {
+        },
+      }
+    end
+
+    def process event, config
+      event
+    end
+
+  end
+
+end

data/lib/mushy/fluxs/filter.rb

@@ -2,6 +2,29 @@ module Mushy
   
   class Filter < Flux
 
+    def self.details
+      {
+        name: 'Filter',
+        description: 'Filters events based on criteria.',
+        config: {
+          equal: {
+                 description: 'Provide key/value pairs that must match in the event.',
+                 shrink:      true,
+                 label:       'Equal To',
+                 type:        'keyvalue',
+                 value:       {},
+               },
+          notequal: {
+                 description: 'Provide key/value pairs that must NOT match in the event.',
+                 shrink:      true,
+                 label:       'Not Equal To',
+                 type:        'keyvalue',
+                 value:       {},
+               },
+        },
+      }
+    end
+
     def process event, config
 
       differences = [:equal, :notequal]

data/mushy.gemspec

@@ -4,7 +4,7 @@ require 'mushy/version'
 
 Gem::Specification.new do |s|
   s.name           = 'mushy'
-  s.version        = '0.0.5'
+  s.version        = '0.1.4'
   s.date           = '2020-11-23'
   s.summary        = 'Process streams of work using common modules.'
   s.description    = 'This tool assists in the creation and processing of workflows.'
@@ -17,9 +17,11 @@ Gem::Specification.new do |s|
   s.license        = 'MIT'
 
   s.add_development_dependency 'minitest'
+  s.add_runtime_dependency 'sinatra'
+  s.add_runtime_dependency 'symbolized'
   s.add_runtime_dependency 'thor'
   s.add_runtime_dependency 'liquid'
   s.add_runtime_dependency 'ferrum'
   s.add_runtime_dependency 'nokogiri'
   s.add_runtime_dependency 'faraday'
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mushy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.4
 platform: ruby
 authors:
 - Darren Cauthon
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: symbolized
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +142,7 @@ files:
 - lib/mushy/fluxs/bash.rb
 - lib/mushy/fluxs/browser.rb
 - lib/mushy/fluxs/build_csv.rb
+- lib/mushy/fluxs/cli.rb
 - lib/mushy/fluxs/collection.rb
 - lib/mushy/fluxs/filter.rb
 - lib/mushy/fluxs/format.rb