marty 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1ea4f6bcc7d2dc454f65ba38f7cc922e7778354
-  data.tar.gz: efa8f6b874e09398b171995daeb4cc898833bed5
+  metadata.gz: 9f7ab7a282240ba4ee18dc965f93bdb5dc90dda4
+  data.tar.gz: 59917c67864d40e9d849695798b11fc650c2b060
 SHA512:
-  metadata.gz: 2df7d3c0f2dd6f1146d65320ba6e6386895d52e7542144e489896193f86f545777d2eecb7ae951f4b70cef9f62ae2f791a8f2ff489f2159f48f97c7646d449b3
-  data.tar.gz: cbf82d6f70c0e1546a17b4c3d8be986c7f95a81f52bbe7c09ffde36aa71b7a1c5a1264525c5864520233925502a058756888d6440ed380a1152a04f653f1adae
+  metadata.gz: 56e52e10fad378a499de7debcc9528dcc1127f16a8802e907333d9d65ea7aab3320a8b53042e99ac16f1a354cc9359d8d14c99d690693fa5d4d67a2ef8609ef1
+  data.tar.gz: 5e38cb0f66dcdec946da7ca79ff44de3f0c60bc68a6982a81e1e8961b0c396a3d92a480fac9e96f51df10c24e0ab01e842c52390b7341859db921e455caff06a

data/app/components/marty/extras/layout.rb

@@ -63,14 +63,22 @@ module Marty
         editor_config = {
           trigger_action: :all,
           xtype:          :combo,
-          store:          klass::VALUES,
+
+          # hacky: extjs has issues with forceSelection true and clearing combos
+          store:          klass::VALUES + ['---'],
+          forceSelection: true,
         }
         c.merge!(
           column_config: { editor: editor_config },
           field_config:  editor_config,
           type:          :string,
+          setter:        enum_setter(c.name),
         )
       end
+
+      def enum_setter(name)
+        lambda {|r, v| r.send("#{name}=", v == '---' || v.empty? ? nil : v)}
+      end
     end
   end
 end

data/app/components/marty/main_auth_app.rb

@@ -56,6 +56,7 @@ class Marty::MainAuthApp < Marty::AuthApp
               :config_view,
               :api_auth_view,
               :reload_scripts,
+              :load_seed,
              ],
     }
   end
@@ -173,6 +174,13 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.disabled = !self.class.has_admin_perm?
   end
 
+  action :load_seed do |a|
+    a.text     = 'Load Seeds'
+    a.tooltip  = 'Load Seeds'
+    a.icon     = :arrow_rotate_clockwise
+    a.disabled = !self.class.has_admin_perm?
+  end
+
   ######################################################################
   # Postings
 
@@ -206,6 +214,12 @@ class Marty::MainAuthApp < Marty::AuthApp
     }
     JS
 
+    c.netzke_on_load_seed = l(<<-JS)
+    function(params) {
+      this.server.loadSeed({});
+    }
+    JS
+
     c.netzke_on_select_now = l(<<-JS)
     function(params) {
       this.server.selectPosting({});
@@ -272,6 +286,11 @@ class Marty::MainAuthApp < Marty::AuthApp
     Marty::Script.load_scripts
     client.netzke_notify 'Scripts have been reloaded'
   end
+
+  endpoint :load_seed do |params|
+    Rails.application.load_seed
+    client.netzke_notify 'Seeds have been loaded'
+  end
 end
 
 MainAuthApp = Marty::MainAuthApp

data/app/models/marty/pg_enum.rb

@@ -7,4 +7,6 @@ module Marty::PgEnum
 
     index
   end
+
+  alias_method :find_by_name, :[]
 end

data/lib/marty/monkey.rb

@@ -149,6 +149,51 @@ module Netzke::Basepack::DataAdapters
         relation.count
     end
 
+    ######################################################################
+    # The following is a hack to get around Netzke's broken handling
+    # of filtering on PostgreSQL enums columns.
+    def predicates_for_and_conditions(conditions)
+      return nil if conditions.empty?
+
+      predicates = conditions.map do |q|
+        q = HashWithIndifferentAccess.new(q)
+
+        attr = q[:attr]
+        method, assoc = method_and_assoc(attr)
+
+        arel_table = assoc ? Arel::Table.new(assoc.klass.table_name.to_sym) :
+                       @model.arel_table
+
+        value = q["value"]
+        op = q["operator"]
+
+        attr_type = attr_type(attr)
+
+        case attr_type
+        when :datetime
+          update_predecate_for_datetime(arel_table[method], op, value.to_date)
+        when :string, :text
+          update_predecate_for_string(arel_table[method], op, value)
+        when :boolean
+          update_predecate_for_boolean(arel_table[method], op, value)
+        when :date
+          update_predecate_for_rest(arel_table[method], op, value.to_date)
+        when :enum
+          # HACKY! monkey patching happens here...
+          update_predecate_for_enum(arel_table[method], op, value)
+        else
+          update_predecate_for_rest(arel_table[method], op, value)
+        end
+      end
+
+      # join them by AND
+      predicates[1..-1].inject(predicates.first){ |r,p| r.and(p)  }
+    end
+
+    def update_predecate_for_enum(table, op, value)
+      col = Arel::Nodes::NamedFunction.new("CAST", [table.as("TEXT")])
+      col.matches "%#{value}%"
+    end
   end
 end
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

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

@@ -0,0 +1,27 @@
+class Gemini::CmAuthApp < Marty::MainAuthApp
+
+  CATEGORY_COMPONENTS = [
+    :loan_program_view,
+  ]
+
+  def data_menus
+    basic = [
+      {
+        text: 'Pricing Config.',
+        icon: icon_hack(:database_key),
+        menu: [
+          :loan_program_view,
+        ],
+      }
+    ]
+  end
+
+  action :loan_program_view do |a|
+    a.text    = a.tooltip = 'Loan Programs'
+    a.handler = :netzke_load_component_by_action
+  end
+
+  component :loan_program_view do |c|
+    c.klass = Gemini::LoanProgramView
+  end
+end

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

@@ -0,0 +1,28 @@
+class Gemini::LoanProgramView < Marty::GridAppendOnly
+  include Marty::Extras::Layout
+
+  has_marty_permissions create: :dev,
+                        read:   :any,
+                        update: :dev,
+                        delete: :dev
+
+  def configure(c)
+    super
+
+    c.title = "Loan Programs"
+    c.model = "Gemini::LoanProgram"
+    c.attributes = [
+      :name,
+      :amortization_type__name,
+      :mortgage_type__name,
+      :streamline_type__name,
+      :enum_state,
+    ]
+
+    c.store_config.merge!({sorters:  [{property: :name, direction: 'ASC'}]})
+  end
+
+  attribute :enum_state do |c|
+    enum_column(c, Gemini::EnumState)
+  end
+end

data/spec/dummy/app/controllers/components_controller.rb

@@ -1,7 +1,5 @@
-require 'marty/main_auth_app'
-
 class ComponentsController < Marty::ApplicationController
   def home
-    render inline: "<%= netzke :'main_auth_app' %>", layout: true
+    render inline: "<%= netzke :'cm_auth_app', klass: Gemini::CmAuthApp %>", layout: true
   end
-end
+end

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

@@ -0,0 +1,63 @@
+class Gemini::EnumState < ActiveRecord::Base
+  extend Marty::PgEnum
+
+  VALUES = Set[
+    "AL",
+    "AK",
+    "AZ",
+    "AR",
+    "CA",
+    "CO",
+    "CT",
+    "DE",
+    "DC",
+    "FL",
+    "GA",
+    "HI",
+    "ID",
+    "IL",
+    "IN",
+    "IA",
+    "KS",
+    "KY",
+    "LA",
+    "ME",
+    "MD",
+    "MA",
+    "MI",
+    "MN",
+    "MS",
+    "MO",
+    "MT",
+    "NE",
+    "NV",
+    "NH",
+    "NJ",
+    "NM",
+    "NY",
+    "NC",
+    "ND",
+    "OH",
+    "OK",
+    "OR",
+    "PA",
+    "RI",
+    "SC",
+    "SD",
+    "TN",
+    "TX",
+    "UT",
+    "VT",
+    "VA",
+    "WA",
+    "WV",
+    "WI",
+    "WY",
+
+    # US Territories (FIXME: incomplete)
+    "AS",
+    "GU",
+    "PR",
+    "VI",
+  ]
+end

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

@@ -5,6 +5,8 @@ class Gemini::LoanProgram < ActiveRecord::Base
   has_mcfly
   mcfly_validates_uniqueness_of :name
 
+  validates_presence_of :name, :amortization_type, :mortgage_type, :streamline_type
+
   belongs_to :amortization_type
   belongs_to :mortgage_type
   belongs_to :streamline_type

data/spec/dummy/db/migrate/20140000000000_create_enums.rb

@@ -0,0 +1,16 @@
+class CreateEnums < ActiveRecord::Migration
+  def change
+    values = Gemini::EnumState::VALUES
+      str_values =
+        values.map {|v| ActiveRecord::Base.connection.quote v}.join ','
+
+      ActiveRecord::Base.schema_migrations_table_name
+
+      # FIXME: very crude
+      name = 'enum_states'
+
+      execute <<-SQL
+         CREATE TYPE #{name} AS ENUM (#{str_values});
+      SQL
+  end
+end

data/spec/dummy/db/migrate/20150408200916_create_loan_programs.rb

@@ -16,6 +16,7 @@ class CreateLoanPrograms < ActiveRecord::Migration
       t.decimal  "arm_lifetime_cap_percent",       precision: 7, scale: 4
       t.integer  "arm_index_type_id"
       t.decimal  "arm_margin_rate_percent",        precision: 7, scale: 4
+      t.pg_enum  :enum_state, null: true
     end
     McflyMigration.new.add_sql 'gemini_loan_programs', false
   end

data/spec/features/enum_spec.rb

@@ -0,0 +1,125 @@
+require 'spec_helper'
+
+feature 'test netzke + pg_enum compatibility', js: true do
+
+  before(:all) do
+    @clean_file = "/tmp/clean_#{Process.pid}.psql"
+    save_clean_db(@clean_file)
+
+    populate_test_users
+  end
+
+  after(:all) do
+    restore_clean_db(@clean_file)
+  end
+
+  it 'shows netzke grid combobox works w pg_enums' do
+    log_in_as('dev1')
+
+    by 'navigating to loan program screen' do
+      press('Pricing Config.')
+      press('Loan Programs')
+    end
+
+    lp_grid = netzke_find('loan_program_view')
+    amort_combo = netzke_find('amortization_type__name', 'combobox')
+    mortgage_combo = netzke_find('mortgage_type__name', 'combobox')
+    streamline_combo = netzke_find('streamline_type__name', 'combobox')
+    state_combo = netzke_find('enum_state', 'combobox')
+
+    and_by 'bring up new window' do
+      press('Add')
+    end
+
+    and_by 'fill form minus enum value' do
+      within(:gridpanel, 'add_window', match: :first) do
+        fill_in("Name", with: 'a_l_p')
+
+        amort_combo.click
+        amort_combo.select_values('Fixed')
+
+        mortgage_combo.click
+        mortgage_combo.select_values('FHA')
+
+        streamline_combo.click
+        streamline_combo.select_values('DURP')
+
+        press('OK')
+      end
+
+      wait_for_ajax
+      expect(lp_grid.row_count).to eq(1)
+    end
+
+    and_by 'bring up new window' do
+      press('Add')
+    end
+
+    and_by 'fill form w enum value & duplicated name (error), then fix' do
+      within(:gridpanel, 'add_window', match: :first) do
+        fill_in("Name", with: 'a_l_p')
+        amort_combo.click
+        amort_combo.select_values('Fixed')
+
+        mortgage_combo.click
+        mortgage_combo.select_values('FHA')
+
+        streamline_combo.click
+        streamline_combo.select_values('DURP')
+
+        state_combo.click
+        state_combo.select_values('CA')
+
+        press('OK')
+
+        expect(find(:msg)).to have_content 'Name - record must be unique'
+
+        fill_in("Name", with: 'a_l_p_2')
+        press('OK')
+      end
+
+      wait_for_ajax
+      aggregate_failures do
+        expect(lp_grid.row_count).to eq(2)
+        expect(lp_grid.get_row_vals(2)).to netzke_include({enum_state: 'CA'})
+      end
+    end
+
+    and_by 'delete a row' do
+      lp_grid.select_row(1)
+      press('Delete')
+      press('Yes')
+      wait_for_ajax
+      expect(lp_grid.row_count).to eq(1)
+    end
+
+    and_by 'bring up new window' do
+      press('Add')
+    end
+
+    and_by 'fill form w --- for enum value' do
+      within(:gridpanel, 'add_window', match: :first) do
+        fill_in("Name", with: 'a_l_p')
+        amort_combo.click
+        amort_combo.select_values('Fixed')
+
+        mortgage_combo.click
+        mortgage_combo.select_values('FHA')
+
+        streamline_combo.click
+        streamline_combo.select_values('DURP')
+
+        state_combo.click
+        state_combo.select_values('---')
+
+        press('OK')
+      end
+
+      wait_for_ajax
+      aggregate_failures do
+        expect(lp_grid.row_count).to eq(2)
+        expect(lp_grid.get_row_vals(1)).to netzke_include({enum_state: nil})
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -469,6 +469,8 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/client/application.css
 - spec/dummy/app/assets/client/application.js
+- spec/dummy/app/components/gemini/cm_auth_app.rb
+- spec/dummy/app/components/gemini/loan_program_view.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/components_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -477,6 +479,7 @@ files:
 - spec/dummy/app/models/gemini/amortization_type.rb
 - spec/dummy/app/models/gemini/bud_category.rb
 - spec/dummy/app/models/gemini/entity.rb
+- spec/dummy/app/models/gemini/enum_state.rb
 - spec/dummy/app/models/gemini/extras/data_import.rb
 - spec/dummy/app/models/gemini/extras/settlement_import.rb
 - spec/dummy/app/models/gemini/fannie_bup.rb
@@ -508,6 +511,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/migrate/20140000000000_create_enums.rb
 - spec/dummy/db/migrate/20140801000000_create_groupings.rb
 - spec/dummy/db/migrate/20150406171536_create_categories.rb
 - spec/dummy/db/migrate/20150408200916_create_loan_programs.rb
@@ -1537,6 +1541,7 @@ files:
 - spec/dummy/tmp/.gitkeep
 - spec/features/auth_app_spec.rb
 - spec/features/data_import_spec.rb
+- spec/features/enum_spec.rb
 - spec/features/javascripts/job_dashboard_live_search.js.coffee
 - spec/features/javascripts/login.js.coffee
 - spec/features/jobs_dashboard_spec.rb