mushy 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eaed069f8d37db0a6d58fea9c994e4a5135f43a18a7e7ad8421a601983bb954
-  data.tar.gz: 3224715b652898edaac99ad89a8378ccc4d2aa4ba21b891ca33fec0b99252a85
+  metadata.gz: dc571150c0fa3c2315c75186d48836987ca92d93045de5af848fe450c975a039
+  data.tar.gz: cbd83a5b9fa9c0106b6891afa33eeb16ddd947bba61c62f13b6ff7e7a574ee0e
 SHA512:
-  metadata.gz: df28cc21a604e023284ad3f88b2cd11a3ab4261c3cd9747a2033d07528203262de29daa2d12f82e404eb91109b79ee9a5e5a5bf71396c360e26ff270d08a2449
-  data.tar.gz: 05410eb4c9fee4afd4aa31397409b6c794bc152257cf599aa4fb1502cb7009c518b9fac2eb76b3f78ca1e58e2a31e28e6dcd6c5266febb8bddd7ea7fbe7fdea1
+  metadata.gz: 720fb42b4b3df8d46cd7e26a87b793e0d41111f12652d588c0378160a00af08de05bedcb32920d1ce01c2c0efe135caaa48a939edd6b25822f8383cac3acdd1a
+  data.tar.gz: 1707b73e264d067362a7bd00e48558a9981c807319ff925e92c4fc829cbf8129aac14f31dd0edaba53354893de2ec4be633eebe9da2d882ec568a6394e852d9f

data/lib/mushy.rb

@@ -8,10 +8,4 @@ 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

@@ -40,7 +40,17 @@ module Mushy
       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>
@@ -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,47 +264,64 @@ module Mushy
              for(var type in fluxTypes)
                 options.push(fluxTypes[type]);
 
-             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 },
-             };
-
-             var saveFlux = function(config, hey) {
-                 var nameOfTheSaveButton = hey.save.name;
-                 Vue.set(hey.save, 'name', 'Saving');
+             var saveTheFlux = function(input)
+             {
+                 var theApp = input.app;
+                 var config = input.config;
                  delete config.test_event;
-                 var setup = thingToData(app.setup);
+                 var setup = thingToData(theApp.setup);
                  var flux = {
                                 id: setup.id,
                                 name: setup.name,
                                 flux: setup.flux,
-                                parent: setup.parent,
+                                parents: setup.parents,
                                 config: config,
                  };
                  var index = -1;
-                 for(var i = 0; i < app.flow.fluxs.length; i++)
-                     if (app.flow.fluxs[i].id == flux.id)
+                 for(var i = 0; i < theApp.flow.fluxs.length; i++)
+                     if (theApp.flow.fluxs[i].id == flux.id)
                         index = i;
 
                  if (index < 0)
-                     app.flow.fluxs.push(flux);
+                     theApp.flow.fluxs.push(flux);
                  else
-                     app.flow.fluxs[index] = flux;
+                     theApp.flow.fluxs[index] = flux;
+             };
+
+             var saveTheFlow = function(input)
+             {
+                 var setup = input.setup;
+                 var flow = input.flow;
+                 axios.post('/save', flow)
+                     .then(function(result){});
+             };
 
-                 setTimeout(function(){
-                     Vue.set(hey.save, 'name', nameOfTheSaveButton);
-                     app.setup.id.value = '';
+             var saveFlux = function(config) {
+             };
+
+             var ignoreFlux = function(config) {
+             };
 
-                     Vue.set(app.setup, 'showFlux', false);
-                 }, 500);
+             var setup = {
+                   showFlux: false,
+                   id: { type: 'hide', value: '' },
+                   name: { type: 'text', value: '' },
+                   flux: { type: 'select', value: fluxdata.fluxs[0].name, options: options},
+                   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: saveFlux };
+                 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: '{}' };
 
@@ -319,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)
@@ -333,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 = [];
@@ -353,6 +394,7 @@ module Mushy
                          flux = {
                              id: uuidv4(),
                              name: '',
+                             parents: [],
                              config: {}
                          };
                          loadThisFlux({ flux: flux, setup: x.setup, configs: x.configs });
@@ -377,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/mushy.gemspec

@@ -4,7 +4,7 @@ require 'mushy/version'
 
 Gem::Specification.new do |s|
   s.name           = 'mushy'
-  s.version        = '0.1.4'
+  s.version        = '0.2.0'
   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.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Darren Cauthon