marty 2.3.13 → 2.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f430fb3de709a8defa184dd6713f26f4241eb00
-  data.tar.gz: 7c4b7968a63650d1c64ebe92ad078afe73a2de0d
+SHA256:
+  metadata.gz: da67a7b3a76528a69a24aa349d488d0675a0d9b3de9733c3b67abd5bd04428f8
+  data.tar.gz: 915575d95227cd4c01a7d1b2b5ffb77b9846789a0d303462c8590a708aa0f83d
 SHA512:
-  metadata.gz: c34932a807c4104371feb55c3f60c55e142a1c0da653f5db0d9fbd6cc407fdc53e6680b5271ad58fa8551a862b0ee6012d5409641406ad285c733675bf7425ed
-  data.tar.gz: de51f0373c9f1b368f89baffd59982cb14a426cd38dfccc4350e5ab14f98366ea0fc6634814a490868ba7d7ba6c225288ad6e03473c6f70253e58c60d55fc38f
+  metadata.gz: ecba775e4ad650d2ef22a0d79ae33d7743864e3ebef3ab7597513c122048441226db7a44f3b55f5a0aa606d626836561f118c9db5f49df1e44adb9013620e6ae
+  data.tar.gz: 13ce94510034f486dcff99496d7cba902b53f1ddc0d56ebcc99a2b639c5a040c084c2a45b3d83e2b187cc3ada48e9977c1fe92dbeccea003b5c46a13f847f7a4

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

@@ -73,7 +73,8 @@ module Layout
   ######################################################################
   # PG ENUM field handling
 
-  def enum_column(c, class_or_array)
+  def enum_column(c, class_or_array, col=nil)
+    col ||= c.name.demodulize.tableize.singularize
     vals = class_or_array.is_a?(Array) ? class_or_array : class_or_array::VALUES
     editor_config = {
       trigger_action: :all,
@@ -91,6 +92,7 @@ module Layout
       field_config:  editor_config,
       type:          :string,
       setter:        enum_setter(c.name),
+      sorting_scope: get_sorter(col)
     )
   end
 
@@ -112,6 +114,10 @@ module Layout
     lambda {|r, v| r.send("#{name}=", v.blank? || v == '---' ? nil : v)}
   end
 
+  def get_sorter(col)
+    lambda {|rel, dir| rel.order("#{col}::text #{dir.to_s}")}
+  end
+
   ######################################################################
   # employ lots of hakery to implement NULLable boolean field in
   # Netzke 8.x.

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.3.13"
+  VERSION = "2.3.14"
 end

data/spec/features/enum_spec.rb

@@ -14,6 +14,27 @@ feature 'test netzke + pg_enum compatibility', js: true do
   end
 
   it 'shows netzke grid combobox works w pg_enums' do
+
+    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')
+
+    def setup_enum_form(stateVal)
+      @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(stateVal)
+    end
+
     log_in_as('dev1')
 
     by 'navigating to loan program screen' do
@@ -21,11 +42,6 @@ feature 'test netzke + pg_enum compatibility', js: true do
       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')
@@ -35,14 +51,14 @@ feature 'test netzke + pg_enum compatibility', js: true do
       within(:gridpanel, 'add_window', match: :first) do
         fill_in("Name", with: 'a_l_p')
 
-        amort_combo.click
-        amort_combo.select_values('Fixed')
+        @amort_combo.click
+        @amort_combo.select_values('Fixed')
 
-        mortgage_combo.click
-        mortgage_combo.select_values('FHA')
+        @mortgage_combo.click
+        @mortgage_combo.select_values('FHA')
 
-        streamline_combo.click
-        streamline_combo.select_values('DURP')
+        @streamline_combo.click
+        @streamline_combo.select_values('DURP')
 
         press('OK')
       end
@@ -58,18 +74,7 @@ feature 'test netzke + pg_enum compatibility', js: true do
     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')
-
+        setup_enum_form("CA")
         press('OK')
 
         expect(find(:msg)).to have_content 'Name - record must be unique'
@@ -100,18 +105,7 @@ feature 'test netzke + pg_enum compatibility', js: true do
     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('---')
-
+        setup_enum_form("---")
         press('OK')
       end
 
@@ -121,5 +115,76 @@ feature 'test netzke + pg_enum compatibility', js: true do
         expect(lp_grid.get_row_vals(1)).to netzke_include({enum_state: nil})
       end
     end
+
+    and_by 'delete leftover rows' do
+      lp_grid.select_row(1)
+      press('Delete')
+      press('Yes')
+      wait_for_ajax
+      lp_grid.select_row(1)
+      press('Delete')
+      press('Yes')
+      wait_for_ajax
+      expect(lp_grid.row_count).to eq(0)
+    end
+
+    and_by "bring up new window" do
+      press("Add")
+    end
+
+    and_by "fill form with state_enum DC" do
+      within(:gridpanel, "add_window", match: :first) do
+        fill_in("Name", with: "DC Row")
+        setup_enum_form("DC")
+        press("OK")
+      end
+    end
+
+    and_by "bring up new window" do
+      press("Add")
+    end
+
+    and_by "fill form with state_enum AS" do
+      within(:gridpanel, "add_window", match: :first) do
+        fill_in("Name", with: "AS Row")
+        setup_enum_form("AS")
+        press("OK")
+      end
+    end
+
+    and_by "bring up new window" do
+      press("Add")
+    end
+
+    and_by "fill form with state_enum WA" do
+      within(:gridpanel, "add_window", match: :first) do
+        fill_in("Name", with: "WA Row")
+        setup_enum_form("WA")
+        press("OK")
+      end
+    end
+
+    and_by "bring up new window" do
+      press("Add")
+    end
+
+    and_by "fill form with state_enum AZ" do
+      within(:gridpanel, "add_window", match: :first) do
+        fill_in("Name", with: "AZ Row")
+        setup_enum_form("AZ")
+        press("OK")
+      end
+    end
+
+    and_by "filter form by state_enum ASCENDING" do
+      press("Enum state")
+      expect(lp_grid.col_values(:enum_state)).to eq(["AS","AZ","DC","WA"])
+    end
+
+    and_by "filter form by state_enum DESCENDING" do
+      press("Enum state")
+      expect(lp_grid.col_values(:enum_state)).to eq(["WA","DC","AZ","AS"])
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.3.13
+  version: 2.3.14
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1706,7 +1706,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A framework for working with versioned data