marty 2.9.3 → 3.0.0

data/spec/models/import_type_spec.rb

@@ -13,13 +13,13 @@ module Marty
   end
 
   describe ImportType do
-    let(:role_id) { Marty::Role.first.id }
+    let(:role) { Marty::RoleType.get_all.first }
 
     before(:each) do
       @import = ImportType.new
       @import.name = 'Test1'
       @import.db_model_name = 'Marty::ARTestModel'
-      @import.role_id = role_id
+      @import.role = role
       @import.save!
     end
 
@@ -29,14 +29,14 @@ module Marty
         expect(it).to_not be_valid
         expect(it.errors[:name].any?).to be true
         expect(it.errors[:db_model_name].any?).to be true
-        expect(it.errors[:role_id].any?).to be true
+        expect(it.errors[:role].any?).to be true
       end
 
       it 'require a unique name' do
         it = ImportType.new
         it.name = 'Test1'
         it.db_model_name = 'Marty::ARTestModel'
-        it.role_id = role_id
+        it.role = role
         expect(it).to_not be_valid
         expect(it.errors[:name].any?).to be true
       end
@@ -45,7 +45,7 @@ module Marty
         it = ImportType.new
         it.name = 'Test1'
         it.db_model_name = 'Marty::TestModel'
-        it.role_id = role_id
+        it.role = role
         expect(it).to_not be_valid
         expect(it.errors[:base][0]).to eq 'bad model name'
       end

data/spec/spec_helper.rb

@@ -64,12 +64,14 @@ RSpec.configure do |config|
   config.verbose_retry = true
   config.display_try_failure_messages = true
 
-  config.around :each, :js do |ex|
-    ex.run_with_retry retry: 3
-  end
-
-  config.retry_callback = proc do |ex|
-    # run some additional clean up task - can be filtered by example metadata
-    Capybara.reset! if ex.metadata[:js]
+  if ENV['RSPEC_AUTO_RETRY_JS'] == 'true'
+    config.around :each, :js do |ex|
+      ex.run_with_retry retry: 3
+    end
+
+    config.retry_callback = proc do |ex|
+      # run some additional clean up task - can be filtered by example metadata
+      Capybara.reset! if ex.metadata[:js]
+    end
   end
 end

data/spec/support/users.rb

@@ -11,7 +11,7 @@ module Marty; module RSpec; module Users
         user.active = true
         user.save
 
-        role = Marty::Role.find_by_name(role_name.to_s)
+        role = Marty::RoleType[role_name.to_s]
 
         raise "Oops unknown role: #{role_name}. Was db seeded?" unless role
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.9.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -257,6 +257,7 @@ files:
 - app/components/marty/base_rule_view.rb
 - app/components/marty/config_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
 - app/components/marty/event_view.rb
 - app/components/marty/extras/layout.rb
@@ -344,7 +345,7 @@ files:
 - app/models/marty/posting.rb
 - app/models/marty/posting_type.rb
 - app/models/marty/promise.rb
-- app/models/marty/role.rb
+- app/models/marty/role_type.rb
 - app/models/marty/script.rb
 - app/models/marty/tag.rb
 - app/models/marty/token.rb
@@ -352,6 +353,8 @@ files:
 - app/models/marty/user_role.rb
 - app/models/marty/vw_promise.rb
 - app/services/marty/background_job/update_schedule.rb
+- app/services/marty/data_grid/constraint.rb
+- app/services/marty/data_grid_view/save_grid.rb
 - app/services/marty/jobs/schedule.rb
 - app/services/marty/promises/delorean.rb
 - app/services/marty/promises/delorean/create.rb
@@ -390,6 +393,7 @@ files:
 - db/migrate/104_create_marty_grid_index_strings.rb
 - 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/200_create_marty_event_operation_enum.rb
 - db/migrate/201_create_marty_events.rb
 - db/migrate/202_add_completion_status_to_event.rb
@@ -407,6 +411,7 @@ files:
 - db/migrate/504_remove_plv8_extension.rb
 - 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/seeds.rb
 - db/sql/lookup_grid_distinct_v1.sql
 - db/sql/query_grid_dir_v1.sql
@@ -1582,6 +1587,7 @@ files:
 - spec/dummy/spec/features/javascripts
 - spec/dummy/tmp/.gitkeep
 - spec/features/auth_app_spec.rb
+- spec/features/data_grid_spec.rb
 - spec/features/data_import_spec.rb
 - spec/features/endpoint_access.rb
 - spec/features/enum_spec.rb
@@ -1598,7 +1604,20 @@ files:
 - spec/fixtures/csv/rule/DataGrid.csv
 - spec/fixtures/csv/rule/MyRule.csv
 - spec/fixtures/csv/rule/XyzRule.csv
+- spec/fixtures/json/data_grid.json
 - spec/fixtures/json/rpc_controller.json
+- spec/fixtures/misc/data_grid_1.txt
+- spec/fixtures/misc/data_grid_2.txt
+- spec/fixtures/misc/data_grid_3.txt
+- spec/fixtures/misc/data_grid_4.txt
+- spec/fixtures/misc/data_grid_5.txt
+- spec/fixtures/misc/grid1_final_data.json
+- spec/fixtures/misc/grid1_final_meta.json
+- spec/fixtures/misc/grid2_final_data.json
+- spec/fixtures/misc/grid2_final_meta.json
+- spec/fixtures/misc/grid5_final_data.json
+- spec/fixtures/misc/grid5_final_meta.json
+- spec/fixtures/misc/grid_log_errs.json
 - spec/fixtures/misc/struct_compare_tests.txt
 - spec/fixtures/scripts/load_tests/namespace/nested_namespace/script3.dl
 - spec/fixtures/scripts/load_tests/script1.dl

data/app/models/marty/role.rb

@@ -1,6 +0,0 @@
-class Marty::Role < Marty::Base
-  extend Marty::Enum
-
-  validates_uniqueness_of :name
-  # FIXME: should have before_destroy
-end