marty 4.0.0.rc2 → 5.1.0

data/spec/models/rule_spec.rb

@@ -11,9 +11,11 @@ module Marty::RuleSpec
                           'grid_sum', 'c1', 'sr2']
       @ruleopts_xyz = ['bvlength', 'bv']
     end
+
     after(:all) do
       restore_clean_db(@save_file)
     end
+
     before(:each) do
       dt = DateTime.parse('2017-1-1')
       p = File.expand_path('../../fixtures/csv/rule', __FILE__)
@@ -23,6 +25,7 @@ module Marty::RuleSpec
       end
       Marty::Tag.do_create('2017-01-01', 'tag')
     end
+
     context 'validation' do
       subject do
         guards = (@g_array   ? { 'g_array' => @g_array } : {}) +
@@ -37,6 +40,7 @@ module Marty::RuleSpec
                                start_dt: @start_dt || '2013-1-1',
                                end_dt:   @end_dt,
                                simple_guards: guards,
+                               simple_guards_options: @simple_guards_options || {},
                                computed_guards: @computed_guards || {},
                                grids: @grids || {},
                                results: @results || {}
@@ -121,18 +125,85 @@ module Marty::RuleSpec
         exp = /Grids - Bad grid name 'xyz' for 'grid1'/
         expect { subject }.to raise_error(exp)
       end
+
+      describe 'simple_guards_options' do
+        before do
+          @rule_type = 'SimpleRule'
+        end
+
+        let(:simple_guards_options) do
+          {
+            'g_array' => { 'not' => true },
+            'g_string' => { 'not' => true },
+            'g_range' => { 'not' => true },
+            'g_integer' => { 'not' => true },
+            'g_bool' => { 'not' => true }
+          }
+        end
+
+        it 'detects wrong simple guards options value' do
+          @simple_guards_options = simple_guards_options.merge(
+            'g_array' => { 'not' => 'wrong_type' }
+          )
+
+          exp = Regexp.new(
+            "Error in rule 'testrule' 'simple_guard_options' ->"\
+            " 'g_array' -> 'not' field must be a boolean"
+          )
+
+          expect { subject }.to raise_error(exp)
+        end
+
+        it 'detects wrong simple guards options field' do
+          @simple_guards_options = {
+            'g_integer_wrong' => { 'not' => true }
+          }
+
+          exp = Regexp.new(
+            "Error in rule 'testrule' 'simple_guard_options' -> "\
+            "'g_integer_wrong' -> 'not'.Guard 'g_integer_wrong' doesn't exist."
+          )
+
+          expect { subject }.to raise_error(exp)
+        end
+
+        it 'detects wrong simple guards options field2' do
+          @simple_guards_options = {
+            'g_nullbool' => { 'not' => true }
+          }
+
+          exp = Regexp.new(
+            "Error in rule 'testrule' 'simple_guard_options' ->"\
+            " 'g_nullbool' -> 'not'. True value is not allowed"
+          )
+          expect { subject }.to raise_error(exp)
+        end
+
+        it 'saves' do
+          @simple_guards_options = simple_guards_options
+          expect { subject }.to_not raise_error
+        end
+      end
+
       it 'sets guard defaults correctly' do
         vals = Gemini::MyRule.all.map do |r|
           [r.name, r.simple_guards['g_has_default']]
         end
-        expect(vals.sort).to eq([['Rule1', 'different'],
-                                 ['Rule2', 'string default'],
-                                 ['Rule2a', 'string default'],
-                                 ['Rule2b', 'string default'],
-                                 ['Rule2c', 'string default'],
-                                 ['Rule3', 'string default'],
-                                 ['Rule4', 'string default'],
-                                 ['Rule5', 'foo']].sort)
+        expect(vals.sort).to eq(
+          [
+            ['NotRule1', 'foo'],
+            ['NotRule2', 'foo'],
+            ['NotRule3', 'foo'],
+            ['Rule1', 'different'],
+            ['Rule2', 'string default'],
+            ['Rule2a', 'string default'],
+            ['Rule2b', 'string default'],
+            ['Rule2c', 'string default'],
+            ['Rule3', 'string default'],
+            ['Rule4', 'string default'],
+            ['Rule5', 'foo']
+          ].sort
+        )
       end
     end
     context 'validation (xyz type)' do
@@ -176,6 +247,7 @@ module Marty::RuleSpec
         expect(rule.compute_xyz('infinity', true)).to be false
         expect(rule.compute_xyz('infinity', false)).to be true
       end
+
       it 'no error' do
         @rule_type = 'XRule'
         @results = { 'x' => '1' }
@@ -250,7 +322,7 @@ module Marty::RuleSpec
         expect(lookup.first.name).to eq('Rule2c')
         lookup = Gemini::MyRule.get_matches('infinity',
                                             { 'rule_type' => 'SimpleRule' }, {})
-        expect(lookup.to_a.count).to eq(5)
+        expect(lookup.to_a.count).to eq(8)
         lookup = Gemini::MyRule.get_matches('infinity',
                                             { 'rule_dt' => '2017-3-1 02:00:00' },
                                             {})
@@ -273,8 +345,43 @@ module Marty::RuleSpec
                                             'g_nbool_def' => true)
         expect(lookup.to_a.count).to eq(1)
         expect(lookup.pluck(:name).first).to eq('Rule1')
+
+        #####
+        # NOT lookups
+        #####
+        lookup = Gemini::MyRule.get_matches('infinity', {},
+                                            'g_bool_def' => true,
+                                            'g_integer' => 3757)
+        expect(lookup.to_a.count).to eq(2)
+        expect(lookup.pluck(:name).sort).to eq(['NotRule1', 'Rule5'])
+
+        lookup = Gemini::MyRule.get_matches('infinity', {},
+                                            'g_bool_def' => true,
+                                            'g_integer' => 100500)
+        expect(lookup.to_a.count).to eq(2)
+        expect(lookup.pluck(:name).sort).to eq(['NotRule2', 'NotRule3'])
+
+        lookup = Gemini::MyRule.get_matches('infinity', {},
+                                            'g_string' => 'wrong',
+                                            'g_range' => 20
+        )
+        expect(lookup.to_a.count).to eq(2)
+        expect(lookup.pluck(:name).sort).to eq(['NotRule1', 'NotRule2'])
+
+        lookup = Gemini::MyRule.get_matches('infinity', {},
+                                            'g_string' => 'wrong',
+        )
+        expect(lookup.to_a.count).to eq(3)
+        expect(lookup.pluck(:name).sort).to eq(['NotRule1', 'NotRule2', 'NotRule3'])
+
+        lookup = Gemini::MyRule.get_matches('infinity', {},
+                                            'g_range' => 250,
+                                            'g_string' => 'wrong')
+        expect(lookup.to_a.count).to eq(1)
+        expect(lookup.pluck(:name).sort).to eq(['NotRule3'])
       end
     end
+
     context 'rule compute' do
       let(:complex) do
         Gemini::MyRule.get_matches('infinity',

data/spec/spec_helper.rb

@@ -11,8 +11,8 @@ require "#{support}/shared_connection"
 
 Dummy::Application.initialize! unless Dummy::Application.initialized?
 
-ActiveRecord::Migrator.migrate File.expand_path('../../db/migrate/', __FILE__)
-ActiveRecord::Migrator.migrate File.expand_path('../dummy/db/migrate/', __FILE__)
+ActiveRecord::Migration.migrate File.expand_path('../../db/migrate/', __FILE__)
+ActiveRecord::Migration.migrate File.expand_path('../dummy/db/migrate/', __FILE__)
 
 require 'rspec/retry'
 

data/spec/support/netzke.rb

@@ -18,7 +18,7 @@ module Marty; module RSpec; module Netzke
   end
 
   def log_in(username, password)
-    wait_for_ready(10)
+    wait_for_ready(25)
 
     begin
       if first("a[data-qtip='Current user']")
@@ -52,8 +52,9 @@ module Marty; module RSpec; module Netzke
   def press button_name, index_of = 0
     wait_for_element do
       begin
-        cmp = first("a[data-qtip='#{button_name}']")
-        cmp ||= first(:xpath, './/a', text: button_name.to_s)
+        cmp = first("a[data-qtip='#{button_name}']") rescue nil
+        cmp ||= all(:xpath, './/a', text: button_name.to_s).
+                  detect { |c| c.text == button_name.to_s } rescue nil
         cmp ||= find(:btn, button_name, match: :first)
         cmp.click
         true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 5.1.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,80 +14,80 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: aws-sigv4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: netzke
+  name: axlsx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.5.0.0
+        version: 3.0.0pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.5.0.0
+        version: 3.0.0pre
 - !ruby/object:Gem::Dependency
-  name: axlsx
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0pre
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0pre
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: delorean_lang
+  name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mcfly
+  name: delayed_cron_job
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: coderay
+  name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: delorean_lang
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,21 +115,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ldap
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: mcfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: net-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,41 +157,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sigv4
+  name: netzke
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: daemons
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: delayed_cron_job
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -205,7 +199,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
+  name: zip-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -230,10 +224,10 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ssh-docker/.keep"
 - ".travis.yml"
 - Dockerfile.dummy
 - Gemfile
-- Gemfile.lock
 - INDEPENDENCE_ISSUES.md
 - MIT-LICENSE
 - Makefile
@@ -255,7 +249,9 @@ files:
 - app/components/marty/auth_app.rb
 - app/components/marty/auth_app/client/auth_app.js
 - app/components/marty/base_rule_view.rb
+- app/components/marty/base_rule_view/client/base_rule_view.js
 - app/components/marty/config_view.rb
+- app/components/marty/data_grid_user_view.rb
 - app/components/marty/data_grid_view.rb
 - app/components/marty/data_grid_view/client/data_grid_edit.js
 - app/components/marty/delorean_rule_view.rb
@@ -394,6 +390,7 @@ files:
 - db/migrate/105_create_marty_grid_index_booleans.rb
 - db/migrate/106_make_grid_indexes_nullable.rb
 - db/migrate/107_add_data_grid_constraint.rb
+- db/migrate/108_add_data_grid_perms.rb
 - db/migrate/200_create_marty_event_operation_enum.rb
 - db/migrate/201_create_marty_events.rb
 - db/migrate/202_add_completion_status_to_event.rb
@@ -412,6 +409,8 @@ files:
 - db/migrate/505_add_cron_to_delayed_jobs.rb
 - db/migrate/506_create_marty_delayed_job_schedules.rb
 - db/migrate/507_migrate_marty_roles_to_enum.rb
+- db/migrate/508_add_not_to_data_grids_tables.rb
+- db/migrate/509_update_dg_plpgsql_v1_fns.rb
 - db/seeds.rb
 - db/sql/lookup_grid_distinct_v1.sql
 - db/sql/query_grid_dir_v1.sql
@@ -462,6 +461,7 @@ files:
 - marty.gemspec
 - other/marty/api/base.rb
 - other/marty/diagnostic/aws/ec2_instance.rb
+- other/marty/diagnostic/aws/error.rb
 - other/marty/diagnostic/base.rb
 - other/marty/diagnostic/collection.rb
 - other/marty/diagnostic/connections.rb
@@ -560,6 +560,7 @@ files:
 - spec/dummy/db/migrate/20171221095312_create_gemini_my_rules.rb
 - spec/dummy/db/migrate/20171221095359_create_gemini_xyz_rules.rb
 - spec/dummy/db/migrate/20171222150100_add_rule_indices.rb
+- spec/dummy/db/migrate/20190702115241_add_simple_guards_options_to_rules.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/delorean/base_code.dl
 - spec/dummy/delorean/blame_report.dl
@@ -1688,12 +1689,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A framework for working with versioned data