mushy 0.14.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4c62a636d8faf6ca9d33417aedbda1eb581230b6ab315a86a4ff1658728cf8a
-  data.tar.gz: cc21350ef0fa4b63f76f7fe164d056cb4f74130d70c1983adbee10174703c11b
+  metadata.gz: 4c7413fc5021f3f75a4bc76d587e8cf608cf16d39c91bab9caf3916d0eebcc97
+  data.tar.gz: c4480bd98782f580b3949e4f956c9aab3cce8387ccf923a284ae4b113e316bab
 SHA512:
-  metadata.gz: 40a53dfcca4cca13cfb31bb002502952bf7b8cf5d8ec1362cf4628c245bf924c385ffd3fd332097e38aef6b2c54066afd19d4767f6c4a58916139d3786b25f41
-  data.tar.gz: 4383e6eebc85f2395d0c2f960d37464888f7d208dd13be5dde55815e1d7977e9f79e415054cca4ae892bb68d7cfb19530a0b7062ced690ea38ae22f54263b496
+  metadata.gz: 0e9a557ea1b36bd47af03d8b392d2f74e7ad2eefa7c83fa3a81130e8cb5b5bda8be8750bdb649bd8b1ead65cb295ed9d45ce6fe0a89c419d3073e68d9e242b4b
+  data.tar.gz: bb0f6fc0ac8d21049841d27ffa991a39ad3328c16313799926d25a0b6b1646c12705bc5e4206afce2e5c12b4badb42b6ea969fe7ac20842bce1aed5bd88af986

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/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/mushy.gemspec

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