mushy 0.14.1 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9d05fad5e439c79124d9e762ce2e9c51d3106f4ddf1dba5ccbbb34accd239f9
-  data.tar.gz: 44f5cad4ce973f6ad5c4ab72c6f26c37b7382b906ecb4f717ee62cacc0f196ba
+  metadata.gz: 4b743e14b0d41b727255550df74d33edc0c5eb33b4426e31d4eea41830aa167e
+  data.tar.gz: 26e61eb0310e6a512deca465c0bb375c94b28ce58a3ee296e677b60a4fea5fc3
 SHA512:
-  metadata.gz: d29d3659cc0d739c0ae6f846a5c3843f8e3707228b6a0831d3b77c8f6f7d1d726e68d3dd203537e581d9104a6a8b863606c230986e7e605ddf0f18f25fa7a836
-  data.tar.gz: 5950e7aca5a68d6b87dbb6d271b6bb164f7bdc1625610e844d53af868570b3f89a2db2000418e9eba6cc30f659bf528225b4bc4d8131ba294d817adb97b93dea
+  metadata.gz: 9bcfe3677a5ca79b2e0249e1b03dec50bc2a019a06f8c61dcb0b4d6e76fc7f11f28f86f32c908d666ba163427a020630f43f73d0ad2c429a35a6f66bf047eab9
+  data.tar.gz: 421e40fea84d8ed8e18f0f60584d55b21bb540139c6e9c28cfcf5ce8770a3102e6a92d17efe4b44fae4706bc36b9e2d080b036ba9208162ac5efe60e3c04a657

data/bin/mushy

@@ -44,6 +44,11 @@ get '/' do
   Mushy::Builder::Index.file
 end
 
+get '/bulma.css' do
+  content_type :css
+  Mushy::Builder::Bulma.file
+end
+
 get '/dark.css' do
   content_type :css
   Mushy::Builder::Dark.file

data/lib/mushy/builder/api.rb

@@ -80,18 +80,49 @@ module Mushy
         puts "trying to get: #{file}"
         file = "#{file}.mushy" unless file.downcase.end_with?('.mushy')
         data = JSON.parse File.open(file).read
-        data['fluxs']
+
+        data['fluxs'] = standardize_these data['fluxs']
+        data['fluxs'] = organize_as_a_flattened_tree_based_on_parents data['fluxs']
+
+        data
+      rescue
+        { fluxs: [] }
+      end
+
+      def self.standardize_these fluxs
+        fluxs
           .reject { |x| x['parents'] }
           .each   { |x| x['parents'] = [x['parent']].select { |y| y } }
-        data['fluxs']
+        fluxs
           .select { |x| x['parent'] }
           .each   { |x| x.delete 'parent' }
-        data['fluxs']
+        fluxs
           .select { |x| x['parents'] }
           .each   { |x| x['parents'] = x['parents'].select { |y| y } }
-        data
-      rescue
-        { fluxs: [] }
+
+        fluxs
+      end
+
+      def self.organize_as_a_flattened_tree_based_on_parents fluxs
+        fluxs = fluxs.sort_by { |x| x['parents'].count }
+
+        new_fluxs = [fluxs.first]
+
+        loop do
+
+          next_fluxs = fluxs.select { |x| x['parents'].include? new_fluxs[-1]['id'] }
+
+          unless next_fluxs.any?
+            next_fluxs = [fluxs.reject { |x| new_fluxs.map { |y| y['id'] }.include?(x['id']) }[0]].select { |x| x }
+          end
+
+          new_fluxs = [new_fluxs, next_fluxs].flatten
+
+          break unless next_fluxs.any?
+
+        end
+
+        new_fluxs
       end
 
       def self.get_fluxs

data/lib/mushy/builder/index.rb

@@ -56,25 +56,26 @@ module Mushy
                 <div class="columns">
                     <div class="column is-half">
                         <mip-heavy :data="setup"></mip-heavy>
-                        <mip-mediumred v-for="(data, id) in configs" v-show="setup.flux.value === id" :data="data" medium="hey"></mip-medium>
+                        <mip-mediumred v-for="(data, id) in configs" v-show="setup.flux.value === id" :data="data" medium="hey"></mip-mediumred>
                     </div>
                     <div class="column is-half">
-                        <mip-mediumgreen v-for="(data, id) in configs" v-show="setup.flux.value === id" :data="data" medium="hey"></mip-medium>
+                        <mip-mediumgreen v-for="(data, id) in configs" v-show="setup.flux.value === id" :data="data" medium="hey"></mip-mediumgreen>
 
                         <div v-bind:class="setup.testResultModal">
                             <div class="modal-background"></div>
                             <div class="modal-card">
                                 <header class="modal-card-head">
-                                    <p class="modal-card-title">Modal title</p>
+                                    <p class="modal-card-title">Test Results</p>
+                                    <div v-if="results.errorMessage"></div>
+                                    <div v-else>{{results.length}} result{{results.length == 1 ? "" : "s"}}</div>
                                     <button class="delete" aria-label="close" v-on:click.prevent.stop="setup.testResultModal['is-active'] = false"></button>
                                 </header>
                                 <section class="modal-card-body">
                                     <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>
                                 </section>
                                 <footer class="modal-card-foot">
-                                    <button class="button is-success">GO</button>
+                                    <button class="button is-primary" v-on:click.prevent.stop="setup.testResultModal['is-active'] = false">Done</button>
                                 </footer>
                             </div>
                         </div>
@@ -398,20 +399,9 @@ module Mushy
 
              for (var key in configs)
              {
-                 configs[key].save = { type: 'button', name: 'Save Changes', foghat: 'free', color: 'is-primary', 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', foghat: 'free', color: 'is-warning', click: function() {
-                         app.setup.showFlux = false;
-                     }
-                 };
-
                  configs[key].test_event = { type: 'json', value: '{}', default: '{}', medium: 'hey' };
 
-                 configs[key].run_test = { type: 'button', name: 'Test Run This Flux', click: function(c, hey) {
+                 configs[key].run_test = { type: 'button', name: 'Test Run This Flux', medium: 'hey', color: 'is-link', click: function(c, hey) {
                                       var previousName = hey.run_test.name;
                                       Vue.set(hey.run_test, 'name', 'Loading');
                                       app.results = [];
@@ -420,7 +410,7 @@ module Mushy
                                       the_setup.event = c.test_event;
                                       axios.post('/run', { config: c, setup: the_setup })
                                        .then(function(r){
-                                           app.setup.testResultModal["is-active"] = true;
+                                           Vue.set(app.setup.testResultModal, 'is-active', true);
                                            var index = 1;
                                            for (var key in r.data.result)
                                            {
@@ -436,6 +426,18 @@ module Mushy
                                            Vue.set(hey.run_test, 'name', previousName);
                                         });
                                      } };
+
+                 configs[key].save = { type: 'button', name: 'Save Changes', foghat: 'free', medium: 'hey', color: 'is-primary', 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', foghat: 'free', medium: 'hey', color: 'is-warning', click: function() {
+                         app.setup.showFlux = false;
+                     }
+                 };
+
              }
 
              var loadThisFlux = function(args)

data/lib/mushy/fluxs/filter.rb

@@ -21,13 +21,27 @@ module Mushy
                  type:        'keyvalue',
                  value:       {},
                },
+          contains: {
+                 description: 'Provide key/value pairs that must be contained.',
+                 shrink:      true,
+                 label:       'Contains',
+                 type:        'keyvalue',
+                 value:       {},
+               },
+          notcontains: {
+                 description: 'Provide key/value pairs that must NOT be contained.',
+                 shrink:      true,
+                 label:       'Not Contains',
+                 type:        'keyvalue',
+                 value:       {},
+               },
         },
       }
     end
 
     def process event, config
 
-      differences = [:equal, :notequal]
+      differences = [:equal, :notequal, :contains, :notcontains]
         .select { |x| config[x].is_a? Hash }
         .map { |x| config[x].map { |k, v| { m: x, k: k, v1: v } } }
         .flatten
@@ -42,7 +56,7 @@ module Mushy
     def equal a, b
       [a, b]
         .map { |x| numeric?(x) ? x.to_f : x }
-        .map { |x| x.to_s.strip.downcase }
+        .map { |x| nice_string x }
         .group_by { |x| x }
         .count == 1
     end
@@ -51,10 +65,23 @@ module Mushy
       equal(a, b) == false
     end
 
+    def contains a, b
+      return false unless b
+      nice_string(b).include? a.downcase
+    end
+
+    def notcontains a, b
+      contains(a, b) == false
+    end
+
     def numeric? value
       Float(value) != nil rescue false
     end
 
+    def nice_string value
+      value.to_s.strip.downcase
+    end
+
   end
 
 end

data/lib/mushy/fluxs/stdout.rb

@@ -0,0 +1,26 @@
+module Mushy
+  
+  class Stdout < Flux
+
+    def self.details
+      {
+        name: 'Stdout',
+        description: 'Standard Out',
+        config: {
+          message: {
+                     description: 'The message to display.',
+                     type:        'text',
+                     value:       '{{message}}',
+                   },
+        },
+      }
+    end
+
+    def process event, config
+      puts config[:message]
+      nil
+    end
+
+  end
+
+end

data/mushy.gemspec

@@ -4,7 +4,7 @@ require 'mushy/version'
 
 Gem::Specification.new do |s|
   s.name           = 'mushy'
-  s.version        = '0.14.1'
+  s.version        = '0.15.3'
   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.14.1
+  version: 0.15.3
 platform: ruby
 authors:
 - Darren Cauthon
@@ -210,6 +210,7 @@ files:
 - lib/mushy/fluxs/sense_hat_led_matrix.rb
 - lib/mushy/fluxs/simple_python_program.rb
 - lib/mushy/fluxs/smtp.rb
+- lib/mushy/fluxs/stdout.rb
 - lib/mushy/fluxs/times.rb
 - lib/mushy/fluxs/write_file.rb
 - lib/mushy/fluxs/write_json.rb