marty 3.1.0 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acc8f6db12c19c31f0689c9490ac58111dd10bb74f464a3dc911148646a71d0f
-  data.tar.gz: cc6ba69d0f2cdad1d64b81fc500b595ba3752ab357528efe28a9e78fa53c526f
+  metadata.gz: 2e88119aa409a4b6e0b108e44f821c9ae6f3c402bde7a0b5982aaac317f8c0c0
+  data.tar.gz: f0e0a25f744a13ed98e647aa379c2421a54edc1dd8bf01e84262e4f952ce7ae2
 SHA512:
-  metadata.gz: 440d3cac5ac80a0664ccea8250c890fe9899dbc45f3850bf9e8ddf2f5f9c5025414ea7a0ff6e5a44aecde547c15bfbaba8786c6a855eaf8f84a289e2b037d721
-  data.tar.gz: 86e9790e0d676b7a05244332199c70b8176648abce3496a05d7652ce1b5493872c192d0dbf1753f8dcedc63f641d77d74810ce8e85cc4535f374026f566da2bf
+  metadata.gz: cbfd7f8b4c3fcc8f7060f7913bd2330635517a52710acae731638d6190f05726174fddfca0447bc0400d06770e10c72dd371e24e0da4f9e2699495473041a3eb
+  data.tar.gz: e17fa1789a98f3f67fa324b2b67e7bcc1a98c48101d62088a1c1196e9d148f9275b8c3a1134a03ed7b6022d7757cfc737b2598bfc071cfd22df215ce62876293

data/.gitignore

@@ -31,10 +31,3 @@ spec/dummy/.sass-cache
 # Files with command history for docker
 .bash_history.docker
 .pry_history.docker
-
-# Keep empty for for ssh keys in docker
-/.ssh-docker/*
-!/.ssh-docker/.keep
-
-# Ignore Gemfile.lock
-Gemfile.lock

data/.rubocop.yml

@@ -1,5 +1,4 @@
 inherit_from: .rubocop_todo.yml
-require: rubocop-performance
 
 AllCops:
   TargetRubyVersion: 2.3.3

data/.rubocop_todo.yml

@@ -48,7 +48,7 @@ Layout/ExtraSpacing:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentFirstHashElement:
+Layout/IndentHash:
   Exclude:
     - 'app/components/marty/extras/layout.rb'
     - 'lib/marty/data_change.rb'
@@ -508,7 +508,7 @@ Performance/TimesMap:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Style/UnneededSort:
+Performance/UnneededSort:
   Exclude:
     - 'app/models/marty/event.rb'
 
@@ -934,6 +934,19 @@ Style/Next:
 Style/NumericLiterals:
   MinDigits: 15
 
+# Offense count: 10
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/components/marty/main_auth_app.rb'
+    - 'lib/marty/content_handler.rb'
+    - 'lib/marty/data_change.rb'
+    - 'lib/marty/data_importer.rb'
+    - 'lib/marty/xl.rb'
+
 # Offense count: 42
 # Cop supports --auto-correct.
 Style/ParallelAssignment:

data/Dockerfile.dummy

@@ -24,9 +24,6 @@ RUN curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrom
     && sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome \
     && rm google-chrome.deb
 
-# Install additional tools
-RUN apt-get install -qq -y --no-install-recommends netcat-openbsd vim
-
 RUN gem install bundler
 
 ENV BUNDLE_PATH /bundle_box/bundle

data/Gemfile

@@ -5,39 +5,33 @@ source 'http://rubygems.org'
 # development dependencies will be added by default to the :development group.
 gemspec
 
-group :default do
-  gem 'daemons'
-  gem 'delayed_job_active_record'
-  gem 'pg'
-  gem 'rails'
-end
-
-group :default, :cmit do
-  gem 'delorean_lang'
-  gem 'marty_rspec'
-  gem 'mcfly'
-  # gem 'delorean_lang', path: File.expand_path('../../delorean', __FILE__)
-  # gem 'marty_rspec', path: File.expand_path('../../marty_rspec', __FILE__)
-  # gem 'mcfly', path: File.expand_path('../../mcfly', __FILE__)
-end
+gem 'daemons'
+gem 'delayed_job_active_record'
+gem 'pg'
+gem 'rails', '~> 5.1.4'
+gem 'sqlite3'
 
 group :development, :test do
-  gem 'capybara'
+  gem 'capybara', '~> 2.18.0'
   gem 'connection_pool'
   gem 'database_cleaner'
-  gem 'fuubar', require: false
-  gem 'netzke', '6.5.0.0'
   gem 'pry-byebug'
   gem 'pry-rails'
-  gem 'puma'
   gem 'rails-controller-testing'
   gem 'rspec-instafail', require: false
   gem 'rspec-rails'
   gem 'rspec-retry'
   gem 'rubocop', require: false
-  gem 'rubocop-performance', require: false
-  gem 'rubocop-rails', require: false
   gem 'selenium-webdriver'
   gem 'timecop'
   gem 'webdrivers'
+
+  # gem 'mcfly', path: File.expand_path('../../mcfly', __FILE__)
+  gem 'mcfly'
+  gem 'netzke', '6.5.0.0'
+
+  # gem 'delorean_lang', path: File.expand_path('../../delorean', __FILE__)
+
+  # gem 'marty_rspec', path: File.expand_path('../../marty_rspec', __FILE__)
+  gem 'marty_rspec'
 end

data/Gemfile.lock

@@ -0,0 +1,289 @@
+PATH
+  remote: .
+  specs:
+    marty (2.10.0)
+      aws-sigv4 (~> 1.0, >= 1.0.2)
+      axlsx (= 3.0.0pre)
+      coderay
+      daemons (~> 1.3.1)
+      delayed_cron_job
+      delayed_job_active_record
+      delorean_lang (~> 1.0)
+      json-schema
+      mcfly (~> 0.0.20)
+      net-ldap (~> 0.16.1)
+      netzke (= 6.5.0.0)
+      pg (~> 0.21)
+      rubyzip
+      sqlite3
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actioncable (5.1.6.1)
+      actionpack (= 5.1.6.1)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.6.1)
+      actionpack (= 5.1.6.1)
+      actionview (= 5.1.6.1)
+      activejob (= 5.1.6.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.6.1)
+      actionview (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.6.1)
+      activesupport (= 5.1.6.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.6.1)
+      activesupport (= 5.1.6.1)
+      globalid (>= 0.3.6)
+    activemodel (5.1.6.1)
+      activesupport (= 5.1.6.1)
+    activerecord (5.1.6.1)
+      activemodel (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
+      arel (~> 8.0)
+    activesupport (5.1.6.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (8.0.0)
+    ast (2.4.0)
+    aws-eventstream (1.0.3)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+    axlsx (3.0.0.pre)
+      htmlentities (~> 4.3, >= 4.3.4)
+      mimemagic (~> 0.3)
+      nokogiri (~> 1.8, >= 1.8.2)
+      rubyzip (~> 1.2, >= 1.2.1)
+    builder (3.2.3)
+    byebug (11.0.0)
+    capybara (2.18.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (>= 2.0, < 4.0)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.2)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.1.5)
+    connection_pool (2.2.2)
+    crass (1.0.4)
+    daemons (1.3.1)
+    database_cleaner (1.7.0)
+    delayed_cron_job (0.7.2)
+      delayed_job (>= 4.1)
+    delayed_job (4.1.5)
+      activesupport (>= 3.0, < 5.3)
+    delayed_job_active_record (4.1.3)
+      activerecord (>= 3.0, < 5.3)
+      delayed_job (>= 3.0, < 5)
+    delorean_lang (1.0.0)
+      activerecord
+      treetop
+    diff-lcs (1.3)
+    erubi (1.8.0)
+    execjs (2.7.0)
+    ffi (1.10.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    htmlentities (4.3.4)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.2)
+    json-schema (2.8.1)
+      addressable (>= 2.4)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marty_rspec (0.1)
+      rspec-by
+    mcfly (0.0.22)
+      delorean_lang
+      pg (~> 0.17)
+    method_source (0.9.2)
+    mime-types (2.99.3)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    net-ldap (0.16.1)
+    netzke (6.5.0.0)
+      netzke-basepack (= 6.5.0.0)
+      netzke-core (= 6.5.0.0)
+      netzke-testing (= 6.5.0.0)
+    netzke-basepack (6.5.0.0)
+    netzke-core (6.5.0.0)
+      execjs
+      mime-types (< 3)
+      uglifier
+    netzke-testing (6.5.0.0)
+      coffee-script
+    nio4r (2.3.1)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.13.0)
+    parser (2.6.0.0)
+      ast (~> 2.4.0)
+    pg (0.21.0)
+    polyglot (0.3.5)
+    powerpack (0.1.2)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    pry-rails (0.3.9)
+      pry (>= 0.10.4)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.6.1)
+      actioncable (= 5.1.6.1)
+      actionmailer (= 5.1.6.1)
+      actionpack (= 5.1.6.1)
+      actionview (= 5.1.6.1)
+      activejob (= 5.1.6.1)
+      activemodel (= 5.1.6.1)
+      activerecord (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
+      bundler (>= 1.3.0)
+      railties (= 5.1.6.1)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.1.6.1)
+      actionpack (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rainbow (3.0.0)
+    rake (12.3.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-by (0.0.7)
+      rspec-core (>= 3)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-instafail (1.0.0)
+      rspec
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-retry (0.6.1)
+      rspec-core (> 3.3)
+    rspec-support (3.8.0)
+    rubocop (0.64.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.0)
+    rubyzip (1.2.2)
+    selenium-webdriver (3.141.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2, >= 1.2.2)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    treetop (1.6.10)
+      polyglot (~> 0.3)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uglifier (4.1.20)
+      execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.4.1)
+    webdrivers (3.9.4)
+      nokogiri (~> 1.6)
+      rubyzip (~> 1.0)
+      selenium-webdriver (~> 3.0)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara (~> 2.18.0)
+  connection_pool
+  daemons
+  database_cleaner
+  delayed_job_active_record
+  marty!
+  marty_rspec
+  mcfly
+  netzke (= 6.5.0.0)
+  pg
+  pry-byebug
+  pry-rails
+  rails (~> 5.1.4)
+  rails-controller-testing
+  rspec-instafail
+  rspec-rails
+  rspec-retry
+  rubocop
+  selenium-webdriver
+  sqlite3
+  timecop
+  webdrivers
+
+BUNDLED WITH
+   2.0.1

data/app/components/marty/data_grid_view.rb

@@ -98,9 +98,6 @@ module Marty; class DataGridView < McflyGridPanel
         :lenient,
         :data_type,
         :constraint,
-        :perm_view,
-        :perm_edit_data,
-        :perm_edit_all,
         :created_dt,
       ]
 
@@ -110,19 +107,6 @@ module Marty; class DataGridView < McflyGridPanel
     c.multi_select = false
   end
 
-  def set_perms(dg, data)
-    permstrs = %w[perm_view perm_edit_data perm_edit_all]
-    view, edit_data, edit_all = data.values_at(*permstrs).map do |plist|
-      Marty::RoleType.from_nice_names(plist)
-    end
-    dg.permissions = {
-      view: view.present? ? view : [],
-      edit_data: edit_data.present? ? edit_data : [],
-      edit_all: edit_all.present? ? edit_all : [],
-    }
-    dg.save!
-  end
-
   endpoint :add_window__add_form__submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
 
@@ -130,12 +114,11 @@ module Marty; class DataGridView < McflyGridPanel
       !config[:permissions][:create]
 
     begin
-      dg = DataGrid.create_from_import(data['name'], data['export'])
-      set_perms(dg, data)
+      DataGrid.create_from_import(data['name'], data['export'])
       client.success = true
       client.netzke_on_submit_success
-    rescue StandardError => e
-      client.netzke_notify(e.to_s)
+    rescue StandardError => exc
+      client.netzke_notify(exc.to_s)
     end
   end
 
@@ -146,11 +129,10 @@ module Marty; class DataGridView < McflyGridPanel
 
     begin
       dg.update_from_import(data['name'], data['export'])
-      set_perms(dg, data)
       client.success = true
       client.netzke_on_submit_success
-    rescue StandardError => e
-      client.netzke_notify(e.to_s)
+    rescue StandardError => exc
+      client.netzke_notify(exc.to_s)
     end
   end
 
@@ -186,8 +168,14 @@ module Marty; class DataGridView < McflyGridPanel
     client.netzke_client_show_grid maxcount, res, 'Data Grid'
   end
 
-  def self.get_edit_permission(_permissions)
-    'edit_all'
+  # placeholders for grid editing permission logic.
+  # for now, this allows the rspec to control the permission
+  def self.get_edit_edit_permission
+    Marty::Config['grid_edit_edit_perm'] || 'edit_all'
+  end
+
+  def self.get_edit_save_permission
+    Marty::Config['grid_edit_save_perm'] || 'edit_all'
   end
 
   endpoint :edit_grid do |params|
@@ -205,21 +193,9 @@ module Marty; class DataGridView < McflyGridPanel
     vdim = md.map { |m| m['dir'] == 'v' && m['attr'] }.select { |v| v }
     hdim_en = hdim.map { |d| I18n.t('attributes.' + d, default: d) }
     vdim_en = vdim.map { |d| I18n.t('attributes.' + d, default: d) }
-    perm = self.class.get_edit_permission(dg.permissions)
-    # should never happen
-    return client.netzke_notify('No permission to edit/view grid.') unless perm
-
-    doing = case perm
-            when 'view'
-              'Viewing'
-            when 'edit_all'
-              'Editing (all)'
-            when 'edit_data'
-              'Editing (data only)'
-            end
-    name = "#{doing} Data Grid '#{dg.name}'"
-
-    client.edit_grid(record_id, hdim_en, vdim_en, res, name, perm)
+    name = "Editing Data Grid '#{dg.name}'"
+    permission = Marty::DataGridView.get_edit_edit_permission
+    client.edit_grid(record_id, hdim_en, vdim_en, res, name, permission)
   end
 
   endpoint :save_grid do |params|
@@ -237,36 +213,10 @@ module Marty; class DataGridView < McflyGridPanel
   def default_form_items
     [
       :name,
-      :perm_view, :perm_edit_data, :perm_edit_all,
       textarea_field(:export, height: 300, hide_label: true),
     ]
   end
 
-  ['view', 'edit_data', 'edit_all'].each do |p|
-    s = ('perm_' + p).to_s
-    attribute s do |c|
-      c.width   = 100
-      c.flex    = 1
-      c.label   = I18n.t("data_grid_view_perms.#{s}")
-      c.type    = :string
-      c.getter = lambda do |r|
-        Marty::RoleType.to_nice_names(r.permissions[p].sort)
-      end
-      store = Marty::RoleType.to_nice_names(::Marty::RoleType.get_all.sort.map)
-
-      # edit does not work without this dummy setter
-      c.setter = ->(r, v) {}
-
-      c.editor_config = {
-        multi_select: true,
-        empty_text:   I18n.t('user_grid.select_roles'),
-        store:        store,
-        type:         :string,
-        xtype:        :combo,
-      }
-    end
-  end
-
   component :edit_window do |c|
     super(c)
     c.width = 700
@@ -278,11 +228,11 @@ module Marty; class DataGridView < McflyGridPanel
   end
 
   attribute :name do |c|
-    c.width = 400
+    c.width = 120
   end
 
   attribute :constraint do |c|
-    c.width = 150
+    c.width = 100
   end
 
   attribute :hcols do |c|