marty 2.6.8 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4140696924d42a202fac12bd3814165524a9b7b879872901267653b16c0c45fa
-  data.tar.gz: 0d70e6ef96d88ecc298b9120a6e20e483458dda1b53bfffd6499686445e6180d
+  metadata.gz: e0e03798f9be33a5ac6995f9a6bf568b4b9928c6548d85b3070e77d509d0265d
+  data.tar.gz: c6d25161882530320f08258601a6a4fc41550de79e50d061b130c29d76b9ecbe
 SHA512:
-  metadata.gz: 4f0d0bc0f97b39eeb4c0ccfda90b0583a265518723c20b20fc3372df4c3aeb95f9931bf67a28cf621f9056ef8431a8e8d467e7b762d6b09401883800eab33f17
-  data.tar.gz: '088d9b8d457f1fd96d7a0481a356a4cac442ca309051ca5cfc46c2892c082e4842bc4902b4ed8eb62b2bfe0f870fd4e4dbcf76bac3c73e086ed05dc95221cdd1'
+  metadata.gz: 24595f41c2364b5c8594d12031700b4a25698a1a77a06091f268b11762154dd78090a3cd3f8390b77e321eed5e34e87fb274ce92f0dff7bc78a7b3f88970c3d3
+  data.tar.gz: 61bd8abc08224bfbebaf55623f045b894c0fb098522cf682d8bb4aea88dec138f1eddb55e6b898855ac317a9d0aaa39f81a1ce626af56015960c464d9231156a

data/.gitlab-ci.yml

@@ -28,11 +28,7 @@ rspec-features:
   extends: .base-test
   script:
     - ln -s /opt/support/extjs /cm_tech/marty/spec/dummy/public/extjs
-    - chromedriver-update 73.0.3683.68
-    # - bundle exec rspec --pattern "spec/features/**/*_spec.rb"
-    # FIXME: rule_spec is excluded, because chrome doesn't work with big window size in docker
-    # And test fails with 1400/1400 resolution
-    - bundle exec rspec --pattern "spec/features/**/*_spec.rb" --exclude-pattern "spec/features/rule_spec.rb"
+    - bundle exec rspec spec/features
 
 cache:
   key: 'marty_bundler_cache'

data/Gemfile

@@ -13,7 +13,6 @@ gem 'sqlite3'
 
 group :development, :test do
   gem 'capybara', '~> 2.18.0'
-  gem 'chromedriver-helper'
   gem 'connection_pool'
   gem 'database_cleaner'
   gem 'pry-byebug'
@@ -24,6 +23,7 @@ group :development, :test do
   gem 'rubocop', require: false
   gem 'selenium-webdriver'
   gem 'timecop'
+  gem 'webdrivers'
 
   # gem 'mcfly', path: File.expand_path('../../mcfly', __FILE__)
   gem 'mcfly'

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    marty (2.6.7)
+    marty (2.7.0)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay
       daemons (~> 1.3.1)
       delayed_job_active_record
-      delorean_lang (~> 0.5.2)
+      delorean_lang (~> 0.6.0)
       json-schema
       mcfly (~> 0.0.20)
       net-ldap (~> 0.16.1)
@@ -58,8 +58,6 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    archive-zip (0.11.0)
-      io-like (~> 0.3.0)
     arel (8.0.0)
     ast (2.4.0)
     aws-eventstream (1.0.3)
@@ -81,15 +79,12 @@ GEM
       xpath (>= 2.0, < 4.0)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    chromedriver-helper (2.1.0)
-      archive-zip (~> 0.10)
-      nokogiri (~> 1.8)
     coderay (1.1.2)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     connection_pool (2.2.2)
     crass (1.0.4)
     daemons (1.3.1)
@@ -99,7 +94,7 @@ GEM
     delayed_job_active_record (4.1.3)
       activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
-    delorean_lang (0.5.2)
+    delorean_lang (0.6.1)
       activerecord (>= 3.2)
       treetop (~> 1.5)
     diff-lcs (1.3)
@@ -109,9 +104,8 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    io-like (0.3.0)
     jaro_winkler (1.5.2)
     json-schema (2.8.1)
       addressable (>= 2.4)
@@ -249,6 +243,10 @@ GEM
     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)
@@ -260,7 +258,6 @@ PLATFORMS
 
 DEPENDENCIES
   capybara (~> 2.18.0)
-  chromedriver-helper
   connection_pool
   daemons
   database_cleaner
@@ -280,6 +277,7 @@ DEPENDENCIES
   selenium-webdriver
   sqlite3
   timecop
+  webdrivers
 
 BUNDLED WITH
    2.0.1

data/app/models/marty/pg_enum.rb

@@ -9,15 +9,25 @@ module Marty::PgEnum
     index
   end
 
-  def get_all(pt = nil)
-    self::VALUES.map(&:to_s)
-  end
-
   def self.extended(base)
     base.class_eval do
-      const_set :GET_ALL_SIG,      [0, 1]
-      const_set :LOOKUP_SIG,       [1, 2]
-      const_set :FIND_BY_NAME_SIG, [1, 2]
+      extend ::Delorean::Functions unless respond_to?(:delorean_fn)
+
+      delorean_fn :get_all do |pt = nil|
+        self::VALUES.map(&:to_s)
+      end
+
+      delorean_fn :[] do |i0, i1 = nil|
+        super(i0, i1)
+      end
+
+      delorean_fn :lookup do |i0, i1 = nil|
+        send(:[], i0, i1)
+      end
+
+      delorean_fn :find_by_name do |i0, i1 = nil|
+        send(:[], i0, i1)
+      end
     end
   end
 
@@ -27,7 +37,4 @@ module Marty::PgEnum
   def _pg_enum?
     true
   end
-
-  alias_method :find_by_name, :[]
-  alias_method :lookup, :[]
 end

data/lib/marty/mcfly_model.rb

@@ -16,6 +16,16 @@ module Mcfly::Model
       send(meth, name, options) do |ts, *args|
         raise 'time cannot be nil' if ts.nil?
 
+        # FIXME: sig is removed from delorean. We need to find a better way
+        # to control amount of arguments, instead of using *splat arguments.
+        max_args = Array(options[:sig]).max if options[:sig]
+        if max_args && (args.size + 1) > max_args
+          err = "Too many args to #{name}." \
+            "(given #{args.size + 1}, expected #{max_args})"
+
+          raise ArgumentError, err
+        end
+
         ts = Mcfly.normalize_infinity(ts)
         q = where("#{table_name}.obsoleted_dt >= ? AND " +
                    "#{table_name}.created_dt < ?", ts, ts).scoping do

data/lib/marty/monkey.rb

@@ -256,23 +256,6 @@ end
 require 'marty/cache_adapters'
 
 class ActiveRecord::Base
-  MCFLY_PT_SIG = [1, 1]
-
-  # FIXME: hacky signatures for AR queries on classes
-  COUNT_SIG    = [0, 0]
-  DISTINCT_SIG = [0, 100]
-  FIND_BY_SIG  = [0, 100]
-  FIRST_SIG    = [0, 1]
-  GROUP_SIG    = [1, 100]
-  JOINS_SIG    = [1, 100]
-  LAST_SIG     = [0, 1]
-  LIMIT_SIG    = [1, 1]
-  NOT_SIG      = [1, 100]
-  ORDER_SIG    = [1, 100]
-  PLUCK_SIG    = [1, 100]
-  SELECT_SIG   = [1, 100]
-  WHERE_SIG    = [0, 100]
-
   class << self
     alias_method :old_joins, :joins
 
@@ -290,19 +273,22 @@ end
 
 ar_instances = [ActiveRecord::Relation, ActiveRecord::QueryMethods::WhereChain]
 
-args_hack = [[Object, nil]] * 10
+args_hack = [[Object, nil]] * 30
 
 [
   [:distinct, args_hack],
+  [:count,    []],
   [:find_by,  args_hack],
+  [:first,    args_hack],
   [:group,    args_hack],
   [:joins,    args_hack],
   [:limit,    [Integer]],
+  [:last,     [[Integer, nil]]],
   [:not,      args_hack],
-  [:order,     args_hack],
-  [:pluck,     args_hack],
-  [:select,    args_hack],
-  [:where,     args_hack],
+  [:order,    args_hack],
+  [:pluck,    args_hack],
+  [:select,   args_hack],
+  [:where,    args_hack],
   [:mcfly_pt, [[Date, Time, ActiveSupport::TimeWithZone, String], [nil, Class]]]
 ].each do |meth, args|
   ::Delorean::Ruby.whitelist.add_method meth do |method|
@@ -310,12 +296,18 @@ args_hack = [[Object, nil]] * 10
       method.called_on ar, with: args
     end
   end
+
+  ::Delorean::Ruby.whitelist.add_class_method meth do |method|
+    method.called_on ActiveRecord::Base, with: args
+  end
 end
+
 ::Delorean::Ruby.whitelist.add_method :count do |method|
-    ar_instances.each do |ar|
-      method.called_on ar
-    end
+  ar_instances.each do |ar|
+    method.called_on ar
+  end
 end
+
 ::Delorean::Ruby.whitelist.add_method :lookup_grid_distinct_entry do |method|
   method.called_on OpenStruct, with: [[Date, Time,
                                        ActiveSupport::TimeWithZone, String],

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.6.8'
+  VERSION = '2.7.0'
 end

data/marty.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'axlsx', '3.0.0pre'
 
-  s.add_dependency 'delorean_lang', '~> 0.5.2'
+  s.add_dependency 'delorean_lang', '~> 0.6.0'
   s.add_dependency 'mcfly', '~> 0.0.20'
 
   s.add_dependency 'coderay'

data/spec/dummy/app/components/gemini/my_rule_view.rb

@@ -66,4 +66,23 @@ class Gemini::MyRuleView < Marty::DeloreanRuleView
     enum_column(c, Gemini::MyRuleType)
   end
 
+  # Override width, so it would fit in chrome window in tests
+  component :add_window do |c|
+    super(c)
+    c.width = 1200
+    c.height = 740
+  end
+
+  component :edit_window do |c|
+    super(c)
+    c.width = 1200
+    c.height = 740
+  end
+
+  component :view_window do |c|
+    super(c)
+    c.width = 1200
+    c.height = 740
+  end
+
 end

data/spec/dummy/app/components/gemini/xyz_rule_view.rb

@@ -15,6 +15,7 @@ class Gemini::XyzRuleView < Marty::DeloreanRuleView
   def default_form_items
     super
   end
+
   self.init_fields
 
   attribute :rule_type do |c|
@@ -22,4 +23,22 @@ class Gemini::XyzRuleView < Marty::DeloreanRuleView
     enum_column(c, Gemini::XyzRuleType)
   end
 
+  # Override width, so it would fit in chrome window in tests
+  component :add_window do |c|
+    super(c)
+    c.width = 1200
+    c.height = 740
+  end
+
+  component :edit_window do |c|
+    super(c)
+    c.width = 1200
+    c.height = 740
+  end
+
+  component :view_window do |c|
+    super(c)
+    c.width = 1200
+    c.height = 740
+  end
 end

data/spec/dummy/delorean/delorean_fn.dl

@@ -0,0 +1,33 @@
+DeloreanFnTest:
+    get_all = Gemini::GuardOne.get_all
+    lookup = Gemini::GuardOne.lookup('G1V1')
+    find_by_name = Gemini::GuardOne.find_by_name('G1V1')
+    brackets = Gemini::GuardOne['G1V1']
+    result = Gemini::GuardOne.get_all()
+
+ActiveRecord:
+    time =?
+
+    distinct = Marty::Script.distinct
+    distinct_select = Marty::Script.distinct().select('name')
+    count = Marty::Script.count
+    find_by = Marty::Script.find_by({ 'name' : 'DeloreanFn' })
+    first = Marty::Script.first
+    first2 = Marty::Script.first(2)
+
+    group_count = Marty::Script.group('created_dt').count
+    joins = Marty::Script.joins('user')
+    limit3 = Marty::Script.limit(3)
+
+    last = Marty::Script.last
+    last3 = Marty::Script.last(3)
+
+    order = Marty::Script.order('name')
+
+    pluck = Marty::Script.pluck('name')
+    pluck2 = Marty::Script.pluck('name', 'user_id')
+
+    select = Marty::Script.select('name')
+    select2 = Marty::Script.select('name', 'user_id')
+    where_not = Marty::Script.where.not({ 'user_id' : nil })
+    mcfly_pt = Marty::Script.mcfly_pt(time)

data/spec/features/enum_spec.rb

@@ -175,11 +175,13 @@ feature 'test netzke + pg_enum compatibility', js: true do
 
     and_by 'filter form by state_enum ASCENDING' do
       press('Enum state')
+      wait_for_ajax
       expect(lp_grid.get_col_vals(:enum_state)).to eq(['AS', 'AZ', 'DC', 'WA'])
     end
 
     and_by 'filter form by state_enum DESCENDING' do
       press('Enum state')
+      wait_for_ajax
       expect(lp_grid.get_col_vals(:enum_state)).to eq(['WA', 'DC', 'AZ', 'AS'])
     end
   end

data/spec/features/rule_spec.rb

@@ -9,14 +9,17 @@ feature 'rule view', js: true do
     Marty::Script.load_scripts
     dt = DateTime.parse('2017-1-1')
     p = File.expand_path('../../fixtures/csv/rule', __FILE__)
+
     [Marty::DataGrid, Gemini::XyzRule, Gemini::MyRule].each do |klass|
       f = '%s/%s.csv' % [p, klass.to_s.sub(/(Gemini|Marty)::/, '')]
       Marty::DataImporter.do_import(klass, File.read(f), dt, nil, nil, ',')
     end
   end
+
   after(:all) do
     restore_clean_db(@save_file)
   end
+
   def go_to_my_rules
     press('Pricing Config.')
     press('My Rules')
@@ -57,8 +60,17 @@ feature 'rule view', js: true do
   end
 
   def column_filter(rv, name, value)
-    cid = col_id(rv, name)
-    c = find('#' + cid)
+    begin
+      cid = col_id(rv, name)
+      c = find('#' + cid)
+    rescue Capybara::ElementNotFound
+      # Scroll to the element
+      page.execute_script <<-JS
+        var element = document.getElementById('#{cid}')
+        element.scrollIntoView(true);
+      JS
+      c = find('#' + cid)
+    end
     c.send_keys([:down, :down, :down, :down, :right, value, :return])
     sleep 1.0
   end
@@ -82,6 +94,7 @@ feature 'rule view', js: true do
     tm.native.clear()
     tm.native.send_keys(value)
   end
+
   it 'rule workflow' do
     log_in_as('marty')
     go_to_my_rules

data/spec/lib/mcfly_model_spec.rb

@@ -156,27 +156,48 @@ describe 'McflyModel' do
     expect(a1.to_a.count).to eq(4)
   end
 
-  it "private methods can't be called by delorean" do
+  it 'raises exception when too many arguments passed' do
     # generated methods
     aggregate_failures 'errors' do
       @errs.in_groups_of(2) do |name, fn|
         err = /Too many args to #{fn}/
 
         expect do
-          Marty::ScriptSet.new.get_engine(name)
-        end.to raise_error(Delorean::BadCallError, err)
+          Marty::ScriptSet.new.get_engine(name).evaluate(
+            'Err',
+            ['result'],
+            'pt' => Time.zone.now, 'entity' => nil, 'note_rate' => nil
+          )
+        end.to raise_error(ArgumentError, err)
       end
     end
   end
 
-  it "private methods can't be called by delorean (2)" do
+  it 'raises exception when too many arguments passed (2)' do
     # non-generated
     aggregate_failures 'errors' do
-      ['E5', 'a_func_p', 'E6', 'b_func_p'].in_groups_of(2) do |scr, fn|
-        err = /Too many args to #{fn}/
-        expect { Marty::ScriptSet.new.get_engine(scr) }.to raise_error(
-          Delorean::BadCallError, err)
-      end
+      expect do
+        Marty::ScriptSet.new.get_engine('E5').evaluate(
+          'Err',
+          ['result'],
+          'pt' => Time.zone.now, 'e_id' => nil, 'bc_id' => nil
+        )
+      end.to raise_error(
+        ArgumentError,
+        /Too many args to a_func_p/
+      )
+
+      expect do
+        Marty::ScriptSet.new.get_engine('E6').evaluate(
+          'Err',
+          ['result'],
+          'pt' => Time.zone.now, 'e_id' => nil,
+           'bc_id' => nil, 'mm' => nil
+        )
+      end.to raise_error(
+        ArgumentError,
+        /Too many args to b_func_p/
+      )
     end
   end
 

data/spec/models/script_spec.rb

@@ -11,9 +11,9 @@ NodeB:
 eof
 
 describe Marty::Script do
-  describe '.load_a_script' do
-    let(:now) { Time.zone.now - 1.minute }
+  let(:now) { Time.zone.now - 1.minute }
 
+  describe '.load_a_script' do
     it "creates a new script if it doesn't already exist" do
       expect { Marty::Script.load_a_script('TestNew', s1, now) }.
         to change(Marty::Script, :count).by(1)
@@ -54,8 +54,6 @@ describe Marty::Script do
       allow(Marty::Script).to receive(:load_a_script)
     end
 
-    let(:now) { Time.zone.now - 1.minute }
-
     it 'loads each script given a hash' do
       Marty::Script.load_script_bodies({ 'Test1' => s1, 'Test2' => s2 }, now)
       expect(Marty::Script).to have_received(:load_a_script).
@@ -119,7 +117,6 @@ describe Marty::Script do
     let(:scripts_path) do
       File.expand_path('../../fixtures/scripts/load_tests', __FILE__)
     end
-    let(:now) { Time.zone.now - 1.minute }
     let(:ls1) { File.read("#{scripts_path}/script1.dl") }
     let(:ls2) { File.read("#{scripts_path}/script2.dl") }
     let(:ls3) { File.read("#{scripts_path}/namespace/nested_namespace/script3.dl") }
@@ -208,4 +205,81 @@ describe Marty::Script do
       expect(Marty::Script.count).to eq(0)
     end
   end
+
+  describe '.evaluate' do
+    let(:scripts_path) do
+      Rails.root.join('delorean')
+    end
+
+    def call_test(attr)
+      Marty::Script.evaluate(
+        Time.zone.now,
+        'DeloreanFn',
+        'DeloreanFnTest',
+        [attr],
+        {}
+      )
+    end
+
+    def call_ar(attr)
+      Marty::Script.evaluate(
+        Time.zone.now,
+        'DeloreanFn',
+        'ActiveRecord',
+        [attr],
+        'time' => Time.zone.now
+      )
+    end
+
+    before do
+      Marty::Script.load_scripts(scripts_path, now)
+    end
+
+    it 'calls ruby code from delorean' do
+      res = call_test('result')
+      expect(res.first).to eq ['G1V1', 'G1V2', 'G1V3']
+
+      res = call_test('get_all')
+      expect(res.first).to eq ['G1V1', 'G1V2', 'G1V3']
+
+      res = call_test('lookup')
+      expect(res.first).to eq 'G1V1'
+
+      res = call_test('find_by_name')
+      expect(res.first).to eq 'G1V1'
+
+      res = call_test('brackets')
+      expect(res.first).to eq 'G1V1'
+    end
+
+    let(:ar_methods) do
+      [
+        :distinct,
+        :distinct_select,
+        :count,
+        :find_by,
+        :first,
+        :first2,
+        :group_count,
+        :joins,
+        :limit3,
+        :last,
+        :last3,
+        :order,
+        :pluck,
+        :pluck2,
+        :select,
+        :select2,
+        :where_not,
+        :mcfly_pt
+      ]
+    end
+
+    it 'calls AR code from delorean' do
+      ar_methods.each do |method_name|
+        res = call_ar(method_name)
+        expect(res).to be_present
+      end
+    end
+  end
 end

data/spec/support/chromedriver.rb

@@ -1,3 +1,4 @@
+require 'webdrivers/chromedriver'
 require 'selenium-webdriver'
 require Pathname.new(__FILE__).parent.to_s + '/download_helper'
 
@@ -40,4 +41,6 @@ module Marty; module RSpec; module Chromedriver
   Capybara.default_driver    = :chrome
   Capybara.javascript_driver = ENV['HEADLESS'] == 'true' ?
                                  :headless_chrome : :chrome
+
+  Webdrivers.cache_time = 86_400 # check new drivers once per day
 end end end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.7.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mcfly
   requirement: !ruby/object:Gem::Requirement
@@ -534,6 +534,7 @@ files:
 - spec/dummy/delorean/base_code.dl
 - spec/dummy/delorean/blame_report.dl
 - spec/dummy/delorean/data_report.dl
+- spec/dummy/delorean/delorean_fn.dl
 - spec/dummy/delorean/marty_fields.dl
 - spec/dummy/delorean/styles.dl
 - spec/dummy/delorean/table_report.dl