marty 8.0.0 → 8.2.0

data/lib/marty/engine.rb

@@ -14,7 +14,13 @@ module Marty
 
     config.assets.precompile += [
       'marty/application.js',
-      'marty/application.css'
+      'marty/cable.js',
+      'marty/application.css',
+      'marty/dark_mode.css'
     ]
+
+    config.action_cable.disable_request_forgery_protection = true
+    # Can be overriden by config/cable.yml in Rails app
+    ActionCable.server.config.cable ||= { 'adapter' => 'postgresql' }
   end
 end

data/lib/marty/mcfly_model.rb

@@ -6,10 +6,16 @@ module Mcfly::Model
   end
 
   module ClassMethods
-    def hash_if_necessary(q, private)
+    def openstruct_if_necessary(q, private)
       !private && q.is_a?(ActiveRecord::Base) ? make_openstruct(q) : q
     end
 
+    def hash_if_necessary(q, to_hash)
+      return make_hash(q) if to_hash && q.is_a?(ActiveRecord::Base)
+
+      q
+    end
+
     def base_mcfly_lookup(name, options = {}, &block)
       delorean_options = {
         # private: options.fetch(:private, false),
@@ -41,7 +47,14 @@ module Mcfly::Model
 
         q = q.first if q.respond_to?(:first) && options[:mode] == :first
 
-        hash_if_necessary(q, options[:private])
+        if options[:to_hash]
+          next hash_if_necessary(
+            q,
+            options.fetch(:to_hash, false)
+          )
+        end
+
+        openstruct_if_necessary(q, options[:private])
       end
     end
 
@@ -55,7 +68,7 @@ module Mcfly::Model
 
     def gen_mcfly_lookup(name, attrs, options = {})
       raise "bad options #{options.keys}" unless
-        (options.keys - [:mode, :cache, :private]).empty?
+      (options.keys - [:mode, :cache, :private, :to_hash]).empty?
 
       mode = options.fetch(:mode, :first)
 
@@ -134,7 +147,7 @@ module Mcfly::Model
 
       pc_name = "pc_#{name}".to_sym
 
-      gen_mcfly_lookup(pc_name, pc_attrs, options + { private: true })
+      gen_mcfly_lookup(pc_name, pc_attrs, options + { private: true, to_hash: false })
 
       lpi = attrs.keys.index rel_attr
 
@@ -142,7 +155,7 @@ module Mcfly::Model
       raise "need #{rel_attr} argument" unless lpi
 
       # cache if mode is not nil
-      priv = options[:private]
+      to_hash = options.fetch(:to_hash, false)
 
       # cache if mode is not explicitly set to nil or cache is true
       cache = options.fetch(:cache) { options.fetch(:mode, :first) }
@@ -165,7 +178,15 @@ module Mcfly::Model
                       send(cat_attr_id)
 
         q = send(pc_name, ts, *args)
-        hash_if_necessary(q, priv)
+
+        if to_hash
+          next hash_if_necessary(
+            q,
+            options.fetch(:to_hash, false)
+          )
+        end
+
+        openstruct_if_necessary(q, options[:private])
       end
     end
   end

data/lib/marty/railtie.rb

@@ -5,5 +5,6 @@ module Marty
     config.marty.extjs_theme = 'classic'
     config.marty.promise_job_enqueue_hooks = []
     config.marty.redis_url = nil
+    config.marty.enable_action_cable = true
   end
 end

data/lib/marty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Marty
-  VERSION = '8.0.0'
+  VERSION = '8.2.0'
 end

data/marty.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split($\)
   s.licenses    = ['MIT']
   # used for signing aws ec2 requests
+  s.add_dependency 'actioncable'
   s.add_dependency 'aws-sigv4'
   # Only pinning this because there's no other way around it for Axlsx.
   # DO NOT unpin this.
@@ -43,5 +44,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'pg'
   s.add_dependency 'redis'
   s.add_dependency 'rubyzip'
+  s.add_dependency 'state_machines'
+  s.add_dependency 'state_machines-activerecord'
   s.add_dependency 'zip-zip'
 end

data/spec/controllers/diagnostic/controller_spec.rb

@@ -67,7 +67,7 @@ module Marty::Diagnostic
                   'status'      => true,
                   'consistent'  => true
                 },
-                'Git' => {
+                'Root Git' => {
                   'description' => git,
                   'status'      => true,
                   'consistent'  => true

data/spec/dummy/app/models/gemini/fannie_bup.rb

@@ -29,63 +29,77 @@ module Gemini
     gen_mcfly_lookup :lookup, {
                        entity: true,
                        note_rate: false
-                     }
+                     }, to_hash: true
+
     gen_mcfly_lookup :lookup_p, {
                        entity: true,
                        note_rate: false
-                     }, private: true
+                     }, to_hash: false
+
     gen_mcfly_lookup :clookup, {
                        entity: true,
                        note_rate: false
-                     }, cache: true
+                     }, cache: true, to_hash: true
+
     gen_mcfly_lookup :clookup_p, {
                        entity: true,
                        note_rate: false
-                     }, cache: true, private: true
+                     }, cache: true, to_hash: false
+
     gen_mcfly_lookup :lookupn, {
                        entity: true,
                        note_rate: false
-                     }, mode: nil
+                     }, mode: nil, to_hash: true
+
     gen_mcfly_lookup :lookupn_p, {
                        entity: true,
                        note_rate: false
-                     }, private: true, mode: nil
+                     }, to_hash: false, mode: nil
+
     gen_mcfly_lookup :clookupn, {
                        entity: true,
                        note_rate: false
-                     }, cache: true, mode: nil
+                     }, cache: true, mode: nil, to_hash: true
+
     gen_mcfly_lookup :clookupn_p, {
                        entity: true,
                        note_rate: false
-                     }, cache: true, private: true, mode: nil
+                     }, cache: true, to_hash: false, mode: nil
 
-    mcfly_lookup :a_func, sig: 3 do
+    mcfly_lookup :a_func, sig: 3, to_hash: true do
       |pt, e_id, bc_id|
       where(entity_id: e_id, bud_category_id: bc_id).
         order(:settlement_mm)
     end
 
-    mcfly_lookup :b_func, sig: [3, 4] do
+    mcfly_lookup :b_func, sig: [3, 4], to_hash: true do
+      |pt, e_id, bc_id, mm = nil|
+      q = where(entity_id: e_id, bud_category_id: bc_id)
+      q = q.where(settlement_mm: mm) if mm
+      q.order(:settlement_mm).first
+    end
+
+    mcfly_lookup :c_func, sig: [3, 4], to_hash: false do
       |pt, e_id, bc_id, mm = nil|
       q = where(entity_id: e_id, bud_category_id: bc_id)
       q = q.where(settlement_mm: mm) if mm
       q.order(:settlement_mm).first
     end
 
-    mcfly_lookup :a_func_p, sig: 3, private: true do
+    mcfly_lookup :a_func_p, sig: 3, to_hash: false do
       |pt, e_id, bc_id|
       where(entity_id: e_id, bud_category_id: bc_id).
         order(:settlement_mm)
     end
 
-    mcfly_lookup :b_func_p, sig: [3, 4], private: true do
+    mcfly_lookup :b_func_p, sig: [3, 4], to_hash: false do
       |pt, e_id, bc_id, mm = nil|
       q = where(entity_id: e_id, bud_category_id: bc_id)
       q = q.where(settlement_mm: mm) if mm
       q.order(:settlement_mm)
     end
 
-    cached_mcfly_lookup :ca_func, sig: 3 do
+    cached_mcfly_lookup :ca_func, sig: 3, to_hash: true do
       |pt, e_id, bc_id|
       where(entity_id: e_id, bud_category_id: bc_id).
         order(:settlement_mm)

data/spec/dummy/app/models/gemini/helper.rb

@@ -34,6 +34,68 @@ class Gemini::Helper
     idh.values.map { |h| h['result'] }
   end
 
+  def self.pr_wait(ids)
+    idh = ids.each_with_object({}) do |id, h|
+      h[id] = false
+    end
+    timeout = 60
+    all_done = false
+    loop do
+      idh.each do |id, v|
+        next if v
+        p = Marty::Promise.uncached { Marty::Promise.find_by(id: id) }
+        idh[id] = p.result if p.status
+      end
+      all_done = idh.values.all? { |v| v }
+      break if all_done || timeout == 0
+      timeout -= 1
+      sleep 1
+    end
+    raise "DID NOT FINISH" unless all_done
+    idh.values.map { |h| h['result'] }
+  end
+
+  def self.promise_test(job_title)
+    sleep 5
+    pps = [1, 2, 3].map do |id|
+      new_title = job_title + ' ' + id.to_s
+      Marty::Promises::Ruby::Create.call(
+        module_name: 'Gemini::Helper',
+        method_name: 'promise_test_1',
+        method_args: [new_title],
+        params: {
+          p_title: new_title,
+          _user_id: 1,
+          _parent_id: ENV['__promise_id']&.to_i
+        }.compact
+      ).as_json.values.first.first
+    end
+    pr_wait(pps)
+  end
+
+  def self.promise_test_1(job_title)
+    pps = [1, 2, 3].map do |id|
+      new_title = job_title + ' ' + id.to_s
+      sleep 2
+      Marty::Promises::Ruby::Create.call(
+        module_name: 'Gemini::Helper',
+        method_name: 'promise_test_2',
+        method_args: [new_title],
+        params: {
+          p_title: new_title,
+          _user_id: 1,
+          _parent_id: ENV['__promise_id']&.to_i
+        }.compact
+      ).as_json.values.first.first
+    end
+    pr_wait(pps)
+  end
+
+  def self.promise_test_2(job_title)
+    sleep(5, job_title)
+    job_title
+  end
+
   # Just for testing
   delorean_fn :to_csv, sig: [1, 2] do
     |*args|

data/spec/features/notifications_spec.rb

@@ -0,0 +1,224 @@
+require 'spec_helper'
+
+feature 'Notifications spec', js: true do
+  before do
+    populate_test_users
+
+    ::Marty::Notifications::Config.create!(
+      event_type: event_type,
+      recipient: user1,
+      delivery_type: :web,
+      state: :on,
+      text: 'Please contact the customer'
+    )
+
+    Marty::Notifications::Create.call(
+      event_type: event_type,
+      text: 'Test limit is 1000'
+    )
+  end
+
+  let(:user1) do
+    Marty::User.find_by(login: :marty)
+  end
+
+  let(:user2) do
+    Marty::User.find_by(login: :viewer1)
+  end
+
+  let(:event_type) do
+    'API reached the limit'
+  end
+
+  let(:notification_grid) do
+    netzke_find 'grid_view'
+  end
+
+  context 'as admin' do
+    before do
+      log_in_as('marty')
+    end
+
+    describe 'Notifications pop-up' do
+      it 'shows notifications' do
+        notification_link = find 'a[data-qtip="Show notifications"]'
+        expect(notification_link.text).to eq '1'
+
+        notification_link.click
+
+        wait_for_ajax
+
+        expect(notification_grid.row_count).to eq 1
+        values = notification_grid.get_row_vals 1
+
+        expect(values['notification__event_type']).to eq 'API reached the limit'
+
+        expect(values['text']).to eq(
+          'Test limit is 1000, Please contact the customer'
+        )
+
+        expect(values['error_text']).to eq ''
+
+        close_btn = find 'div[data-qtip="Close dialog"]'
+        close_btn.click
+
+        # Check that no unread notifications left
+        notification_link = find 'a[data-qtip="Show notifications"]'
+        expect(notification_link.text).to eq ''
+      end
+    end
+
+    describe 'Configuration grid' do
+      before do
+        press('System')
+        press('Notifications')
+        press('User Notification Rules')
+
+        wait_for_ajax
+      end
+
+      let(:grid) do
+        netzke_find 'notifications_config_view'
+      end
+
+      let(:state_select) do
+        netzke_find('state', 'combobox')
+      end
+
+      let(:event_type_select) do
+        netzke_find('event_type', 'combobox')
+      end
+
+      let(:recipient_select) do
+        netzke_find('recipient__name', 'combobox')
+      end
+
+      let(:delivery_type_select) do
+        netzke_find('delivery_type', 'combobox')
+      end
+
+      it 'allows to view and edit configuration' do
+        expect(grid.row_count).to eq 1
+
+        by 'turns the rule off' do
+          values = grid.get_row_vals 1
+          expect(values['state']).to eq 'on'
+
+          grid.select_row 1
+          press 'Edit'
+
+          state_select.select_values 'off'
+
+          press 'OK'
+
+          wait_for_ajax
+
+          values = grid.get_row_vals 1
+          expect(values['state']).to eq 'off'
+        end
+
+        and_by 'adds new rule' do
+          press 'Add'
+
+          event_type_select.select_values 'API reached the limit'
+
+          recipient_select.click
+          recipient_select.select_values 'admin1 admin1'
+
+          delivery_type_select.select_values 'web'
+
+          fill_in :text, with: 'example text'
+
+          press 'OK'
+
+          wait_for_ajax
+
+          expect(grid.row_count).to eq 2
+
+          values = grid.get_row_vals 1
+          expect(values['state']).to eq 'on'
+          expect(values['text']).to eq 'example text'
+          expect(values['recipient__name']).to eq 'admin1 admin1'
+        end
+
+        and_by "doesn't allow to duplicate the rule with the same delivery_type" do
+          press 'Add'
+
+          event_type_select.select_values 'API reached the limit'
+
+          recipient_select.click
+          recipient_select.select_values 'admin1 admin1'
+
+          delivery_type_select.select_values 'web'
+
+          fill_in :text, with: 'example text'
+
+          press 'OK'
+
+          expect(page).to have_content 'Delivery type has already been taken'
+
+          press 'Cancel'
+        end
+
+        and_by 'deletes rule' do
+          row_count = grid.row_count
+
+          grid.select_row 1
+          press 'Delete'
+          press 'Yes'
+
+          wait_for_ajax
+
+          expect(grid.row_count).to eq(row_count - 1)
+        end
+      end
+    end
+  end
+
+  context 'as viewer' do
+    before do
+      ::Marty::Notifications::Config.create!(
+        event_type: event_type,
+        recipient: user2,
+        delivery_type: :web,
+        state: :on,
+        text: 'Please notify your manager'
+      )
+
+      Marty::Notifications::Create.call(
+        event_type: event_type,
+        text: 'Test limit is 1000'
+      )
+
+      log_in_as('viewer1')
+    end
+
+    it 'shows notifications' do
+      notification_link = find 'a[data-qtip="Show notifications"]'
+      expect(notification_link.text).to eq '1'
+
+      notification_link.click
+
+      wait_for_ajax
+
+      expect(notification_grid.row_count).to eq 1
+      values = notification_grid.get_row_vals 1
+
+      expect(values['notification__event_type']).to eq 'API reached the limit'
+
+      expect(values['text']).to eq(
+        'Test limit is 1000, Please notify your manager'
+      )
+    end
+
+    it "doesn't have access to notifications config" do
+      visit '#notifications_config_view'
+      expect(page).to have_content "You don't have permissions to read data"
+    end
+
+    it "doesn't have access to all notification messages" do
+      visit '#notifications_deliveries_view'
+      expect(page).to have_content "You don't have permissions to read data"
+    end
+  end
+end