mushy 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b0ff90e9b20233f5744ec73d94137a2a117dc5bbdcb1962242caf5d3fdec8f3
-  data.tar.gz: dd834f5294cf131393881c7647a25c27d54275e7c510c2b19bac233b9193be43
+  metadata.gz: 1e6ffdfb09e494e5ddbbf2a6dde4c33c2b29a0ac19af467bd00cb77b6f899067
+  data.tar.gz: 4835fd407a77f62612d629994f323d37d4ea1b8f2053fa10c2b47141898659fe
 SHA512:
-  metadata.gz: 41b4cdfd6d24547838ba11b0bbdb3515ec8baee305ab5b97079d040019951354d29074d9a93c88cf94be9b70c0875220f3b76630097c9cc697ddf4ea4cef550f
-  data.tar.gz: 1ec8aab8a0ac9281d1ed036b84add01be639c6223ef46db6f7132d4140f09c10d2ea0a6707bca99aa79b3db024efa2f4cf34ce5430c68e8838953be21f125dd2
+  metadata.gz: 236092d1c7ee52ec2f19815cd3e48f90d1178943b02ddfd8c966034599770ad4cadd43dace1ae2a66b960fadd75a5f382911eeb1d7667219d3bc65964d191a75
+  data.tar.gz: 4e5a52fed081e20c0096ad4e6df08c5c46236776ccb0d4d01a3c69ac1e9244e628525ba8328df2bd201ed711a5afec05d3e41aa2156c279e8b00f2c01ee7ac8b

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.rb

@@ -3,15 +3,9 @@ require 'symbolized'
 
 Dir[File.dirname(__FILE__) + '/mushy/*.rb'].each { |f| require f }
 
-important_flux_files = ['bash'].map { |x| "#{x}.rb" }
+important_flux_files = ['bash', 'browser'].map { |x| "#{x}.rb" }
 Dir[File.dirname(__FILE__) + '/mushy/fluxs/*.rb']
   .sort_by { |f| important_flux_files.any? { |x| f.end_with?(x) } ? 0 : 1 }
   .each { |f| require f }
 
-Dir[File.dirname(__FILE__) + '/mushy/builder/*.rb'].each { |f| require f }
-
-module Mushy
-  def self.hi
-    puts 'hello'
-  end
-end
+Dir[File.dirname(__FILE__) + '/mushy/builder/*.rb'].each { |f| require f }

data/lib/mushy/builder/api.rb

@@ -28,10 +28,29 @@ 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')
-        JSON.parse File.open(file).read
+        data = JSON.parse File.open(file).read
+        data['fluxs']
+          .reject { |x| x['parents'] }
+          .each   { |x| x['parents'] = [x['parent']].select { |y| y } }
+        data['fluxs']
+          .select { |x| x['parent'] }
+          .each   { |x| x.delete 'parent' }
+        data['fluxs']
+          .select { |x| x['parents'] }
+          .each   { |x| x['parents'] = x['parents'].select { |y| y } }
+        data
       rescue
         { fluxs: [] }
       end

data/lib/mushy/builder/index.rb

@@ -20,16 +20,14 @@ module Mushy
                 </tr>
                 <tr v-for="flux in flow.fluxs">
                     <td>{{flux.name}}</td>
-                    <td>{{flux_name_for(flux.parent, flow.fluxs)}}</td>
+                    <td>{{flux_name_for(flux.parents, 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>
-            <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>
+            <button v-if="setup.showFlux == false" v-on:click.prevent.stop="startNew({ setup: setup, configs: configs })">Add a New Flux To This Flow</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>
@@ -109,7 +107,7 @@ module Mushy
                };
            },
            props: ['label', 'placeholder', 'disabled', 'readonly', 'value', 'description', 'view'],
-           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>'
+           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 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', 'shrink'],
@@ -123,6 +121,32 @@ module Mushy
            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>'
        },
+       selectmanyrecords: {
+           data: function() {
+               return {
+                   selectedValue: '',
+                   remove: function(value, set) {
+                       if (set.includes(value) == false) return;
+                       for(var i = 0; i < set.length; i++)
+                       {
+                           if (set[i] === value)
+                           {
+                               set.splice(i, 1);
+                               i--;
+                           }
+                       }
+                       return set;
+                    },
+                   doit: function(value, set) {
+                       if (set.includes(value) == false)
+                           set.push(value);
+                       return set;
+                    },
+               };
+           },
+           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> <span v-for="option in options" v-if="value && value.includes(option.id)">{{option.name}} <a href="#" v-on:click.prevent.stop="remove(option.id, value);$emit(\\'update:value\\', value)">[X]</a> </span> <a href="#" v-on:click.prevent.stop="doit(selectedValue, value);$emit(\\'update:value\\', value)">ADD</a> <select :name="id" v-if="value || !shrink" v-on:input="selectedValue=$event.target.value;"><option v-for="option in options" v-bind:value="option.id">{{option.name}}</option></select></div>'
+       },
        boolean: {
            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>'
@@ -240,44 +264,63 @@ module Mushy
              for(var type in fluxTypes)
                 options.push(fluxTypes[type]);
 
+             var saveTheFlux = function(input)
+             {
+                 var theApp = input.app;
+                 var config = input.config;
+                 delete config.test_event;
+                 var setup = thingToData(theApp.setup);
+                 var flux = {
+                                id: setup.id,
+                                name: setup.name,
+                                flux: setup.flux,
+                                parents: setup.parents,
+                                config: config,
+                 };
+                 var index = -1;
+                 for(var i = 0; i < theApp.flow.fluxs.length; i++)
+                     if (theApp.flow.fluxs[i].id == flux.id)
+                        index = i;
+
+                 if (index < 0)
+                     theApp.flow.fluxs.push(flux);
+                 else
+                     theApp.flow.fluxs[index] = flux;
+             };
+
+             var saveTheFlow = function(input)
+             {
+                 var setup = input.setup;
+                 var flow = input.flow;
+                 axios.post('/save', flow)
+                     .then(function(result){});
+             };
+
+             var saveFlux = function(config) {
+             };
+
+             var ignoreFlux = function(config) {
+             };
+
              var setup = {
                    showFlux: false,
                    id: { type: 'hide', value: '' },
                    name: { type: 'text', value: '' },
                    flux: { type: 'select', value: fluxdata.fluxs[0].name, options: options},
-                   parent: { type: 'selectrecord', label: 'Receive Events From', value: '', options: flowdata.fluxs },
+                   parents: { type: 'selectmanyrecords', label: 'Receive Events From', value: '', options: flowdata.fluxs },
              };
 
              for (var key in configs)
              {
-                 configs[key].save = { type: 'button', name: 'Save This Flux', click: 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);
-                                     }
+                 configs[key].save = { type: 'button', name: 'Save Changes', click: function(config) {
+                         saveTheFlux({ app: app, config: config });
+                         saveTheFlow({ setup: app.setup, flow: app.flow });
+                         app.setup.showFlux = false;
+                     }
+                 };
+                 configs[key].cancel = { type: 'button', name: 'Ignore Changes', click: function() {
+                         app.setup.showFlux = false;
+                     }
                  };
 
                  configs[key].test_event = { type: 'json', value: '{}', default: '{}' };
@@ -317,7 +360,7 @@ module Mushy
                  Vue.set(setup.id, 'value', flux.id);
                  Vue.set(setup.name, 'value', flux.name);
                  Vue.set(setup.flux, 'value', flux.flux);
-                 Vue.set(setup.parent, 'value', flux.parent);
+                 Vue.set(setup.parents, 'value', flux.parents);
 
                  var applicable_config = configs[flux.flux];
                  for(var key in applicable_config)
@@ -331,7 +374,7 @@ module Mushy
 
                  options = flowdata.fluxs.filter(function(x){ return x.id != flux.id });
                  options.unshift( { id: '', name: '' } );
-                 setup.parent.options = options;
+                 setup.parents.options = options;
 
                  Vue.set(setup, 'showFlux', true);
                  app.results = [];
@@ -351,6 +394,7 @@ module Mushy
                          flux = {
                              id: uuidv4(),
                              name: '',
+                             parents: [],
                              config: {}
                          };
                          loadThisFlux({ flux: flux, setup: x.setup, configs: x.configs });
@@ -375,9 +419,9 @@ module Mushy
                      },
                      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 : '';
+                     flux_name_for: function(ids, fluxes) {
+                         var fluxs = fluxes.filter(function(x){ return ids.includes(x.id) });
+                         return fluxs.map(function(x){ return x.name }).join(', ');
                      },
                      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
@@ -28,14 +30,14 @@ module Mushy
       data = JSON.parse data
 
       data_fluxs = data['fluxs'] || []
-      data_fluxs.select { |x| x['parent'] }.map { |r| r["parent_fluxs"] = [r["parent"]] }
+      data_fluxs.select { |x| x['parent'] }.map { |r| r["parents"] = [r["parent"]] }
 
       flow = new
 
       flow.fluxs = data_fluxs.map { |s| build_flux s }
 
       fluxs_with_parent_ids = flow.fluxs.reduce({}) { |t, i| t[i.id] = []; t }
-      data_fluxs.map { |r| fluxs_with_parent_ids[r['id']] = r['parent_fluxs'] || [] }
+      data_fluxs.map { |r| fluxs_with_parent_ids[r['id']] = r['parents'] || [] }
 
       flow.fluxs.each do |flux|
         flux.parent_fluxs = flow.fluxs.select { |x| fluxs_with_parent_ids[flux.id].include?(x.id) }

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

@@ -20,6 +20,12 @@ module Mushy
                       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',
@@ -74,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) }
 
@@ -88,16 +98,24 @@ module Mushy
 
       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
       }
 
+      result = special_browser_action browser, result
+
       browser.quit
 
       result
     end
 
+    def special_browser_action browser, result
+      result
+    end
+
     def get_the_cookies_from event, config
       cookies = (event[config[:carry_cookies_from].to_sym])
       cookies = [] unless cookies.is_a?(Array)

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/lib/mushy/fluxs/screenshot.rb

@@ -0,0 +1,46 @@
+module Mushy
+
+  class Screenshot < Browser
+
+    def self.details
+      details = Browser.details
+      details['name'] = 'Screenshot'
+      details['description'] = 'Take a screenshot of the browser.'
+
+      details[:config][:path] = {
+         description: 'The path of the file to save.',
+         type:        'text',
+         value:       'picture.jpg',
+      }
+      details[:config][:quality] = {
+         description: 'The quality of the image, a value beteen 0-100. Only applies to jpg.',
+         type:        'integer',
+         shrink:      true,
+         value:       '',
+      }
+      details[:config][:full] = {
+         description: 'Take a screenshot of the entire page. If false, the screenshot is limited to the viewport.',
+         type:        'boolean',
+         shrink:      true,
+         value:       '',
+      }
+      details
+    end
+
+    def special_browser_action browser, result
+
+      options = {
+          path:    config[:path],
+          full:    ['true', ''].include?(config[:full].to_s),
+          quality: (config[:quality].to_s == '' ? '100' : config[:quality]).to_i
+      }
+
+      browser.screenshot options
+
+      options
+
+    end
+
+  end
+
+end

data/mushy.gemspec

@@ -4,7 +4,7 @@ require 'mushy/version'
 
 Gem::Specification.new do |s|
   s.name           = 'mushy'
-  s.version        = '0.1.0'
+  s.version        = '0.2.2'
   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.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mushy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Darren Cauthon
@@ -142,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
@@ -149,6 +150,7 @@ files:
 - lib/mushy/fluxs/ls.rb
 - lib/mushy/fluxs/parse_html.rb
 - lib/mushy/fluxs/read_csv.rb
+- lib/mushy/fluxs/screenshot.rb
 - lib/mushy/fluxs/write_file.rb
 - lib/mushy/masher.rb
 - lib/mushy/run.rb