marty 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 617dd635afba9c6d1b56fc1c2db3be5f713f312f
-  data.tar.gz: 1d6f98bf730650667a75a6fe91bb928a8717bba3
+  metadata.gz: df53e49739260b578673a704246805ddfdfe299a
+  data.tar.gz: 192942a02df9fd61b9062311a55d5a3fecb72bc0
 SHA512:
-  metadata.gz: 79f5da757ad9b8873fa4fbe78f4e7bc1dba68c5fd940d0d446ecda38aa08837c587cac13d2e2023b8e461290c7605f98468653df818ee3cf54870d554ed68cc1
-  data.tar.gz: e0bdc4190a5e0ffb17924b36c03bf34455a189a79835242dc1a7c93aa9fb3add286caa13af377f206458be647182caaaac881c5595ef9b85f04b2502ad10e39c
+  metadata.gz: b4ca86582715a4d856d5aecceda3c85d30be2adafdd586bf0bdda524d35cbbc668cb797bbfe7e5b4bb3c2e4bf4c7b621aaf54be533b958a2315169525dc3ecf7
+  data.tar.gz: 5e720b5bc6a02a55bf2e3db22a07ecfe0167f42f7710df2fcbb5e4cef216c357f4b5dba2e3df429082b89b5056a5c9569dca01253cc893cc0502cc733196f3cc

data/Gemfile

@@ -18,7 +18,7 @@ group :development, :test do
   gem 'pry-rails'
   gem 'rspec-rails', '~>3.0'
   gem 'capybara'
-  gem 'selenium-webdriver'
+  gem "selenium-webdriver", '~> 2.53.4'
   gem 'timecop'
   gem 'database_cleaner'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (1.1.2)
+    marty (1.1.3)
       axlsx (= 2.1.0pre)
       coderay
       delorean_lang (~> 0.3.24)
@@ -184,9 +184,10 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
     rubyzip (1.1.7)
-    selenium-webdriver (3.7.0)
+    selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
+      websocket (~> 1.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -204,6 +205,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
+    websocket (1.2.5)
     xpath (2.1.0)
       nokogiri (~> 1.3)
 
@@ -226,7 +228,7 @@ DEPENDENCIES
   rails (~> 4.2.10)
   rspec-instafail
   rspec-rails (~> 3.0)
-  selenium-webdriver
+  selenium-webdriver (~> 2.53.4)
   sqlite3
   timecop
 

data/app/models/marty/event.rb

@@ -269,17 +269,24 @@ SQL
     upd_count = update_start_and_end
     if upd_count > 0 ||
        time_now_i - @all_finished[:timestamp] > @poll_secs
-      raw = get_data(
-        "SELECT * FROM
-            (SELECT ROW_NUMBER() OVER (PARTITION BY klass,
-                                                    subject_id,
-                                                    enum_event_operation
-                                       ORDER BY end_dt DESC) rownum, *
-             FROM (#{BASE_QUERY}) sub2
-             WHERE end_dt IS NOT NULL and end_dt > '#{cutoff}') sub1
-         WHERE rownum = 1
-         ORDER BY end_dt"
-      )
+      raw = get_data("
+        SELECT * FROM (SELECT  id
+                             , klass
+                             , subject_id
+                             , enum_event_operation
+                             , start_dt
+                             , end_dt
+                             , expire_secs
+                             , comment
+                             , error
+                             , ROW_NUMBER() OVER (PARTITION BY
+                                                            klass
+                                                          , subject_id
+                                                          , enum_event_operation
+                                                  ORDER BY  end_dt DESC) row_num
+                       FROM marty_events
+                       WHERE end_dt > '#{cutoff}') sub
+        WHERE row_num = 1")
       @all_finished[:timestamp] = time_now_i
       raw.each_with_object(@all_finished[:data]) do |ev, hash|
         if ev["end_dt"] && ev["error"].nil?

data/lib/marty/data_conversion.rb

@@ -46,8 +46,6 @@ class Marty::DataConversion
       end
     when :string, :text, :enum
       v
-    when :enum_array, :string_array, :integer_array
-      "'{#{v}}'"
     when :integer
       v.to_i
     when :float
@@ -71,7 +69,7 @@ class Marty::DataConversion
       end
     when :numrange, :int4range, :int8range
       v.to_s
-    when :float_array, :json, :jsonb
+    when :float_array, :json, :jsonb, :enum_array, :string_array, :integer_array
       # v might be base64 or might be a readable string
       JSON.parse Marty::DataExporter.decode_json(v) rescue JSON.parse(v)
     else

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/spec/lib/data_importer_spec.rb

@@ -54,16 +54,24 @@ EOF
 
 loan_programs =<<EOF
 name	amortization_type	mortgage_type	streamline_type	high_balance_indicator	state_array	test_int_array	test_string_array
-Conv Fixed 30 Year	Fixed	Conventional	Not Streamlined	false		1	foo
-Conv Fixed 30 Year HB	Fixed	Conventional	Not Streamlined	true	TN	"1,2"	foo,bar
-Conv Fixed 30 Year DURP <=80	Fixed	Conventional	DURP	false	TN,CT	1,2,3	"foo,bar"
-Conv Fixed 30 Year DURP <=80 HB	Fixed	Conventional	DURP	true	"CA,NY"		foo,hi mom
+Conv Fixed 30 Year	Fixed	Conventional	Not Streamlined	false		[1]	"[""foo""]"
+Conv Fixed 30 Year HB	Fixed	Conventional	Not Streamlined	true	"[""TN""]"	[1,2]	"[""foo"",""bar""]"
+Conv Fixed 30 Year DURP <=80	Fixed	Conventional	DURP	false	"[""TN"",""CT""]"	[1,2,3]	"[""foo"",""bar""]"
+Conv Fixed 30 Year DURP <=80 HB	Fixed	Conventional	DURP	true	"[""CA"",""NY""]"		"[""foo"",""hi mom""]"
 EOF
 
 loan_programs_comma =<<EOF
 name,amortization_type,mortgage_type,state_array,test_string_array,streamline_type,high_balance_indicator
-FHA Fixed 15 Year,Fixed,FHA,"FL,NV,ME","ABC,DEF",Not Streamlined,false
-FHA Fixed 100 Year,Fixed,FHA,"FL,NV,ME","XYZ,""hi mom""",Not Streamlined,false
+FHA Fixed 15 Year,Fixed,FHA,"[""FL"",""NV"",""ME""]","[""ABC"",""DEF""]",Not Streamlined,false
+FHA Fixed 100 Year,Fixed,FHA,"[""FL"",""NV"",""ME""]","[""XYZ,"",""hi mom""]",Not Streamlined,false
+EOF
+
+loan_programs_encoded =<<EOF
+name,amortization_type,mortgage_type,conforming,ltv_ratio_percent_range,high_balance_indicator,loan_amortization_period_count,streamline_type,extra_feature_type_id,arm_initial_reset_period_count,arm_initial_cap_percent,arm_periodic_cap_percent,arm_lifetime_cap_percent,arm_index_type_id,arm_margin_rate_percent,enum_state,state_array,test_int_array,test_string_array
+VA Fixed 30 Year,Fixed,VA,true,,false,360,Not Streamlined,,,,,,,,,,eJyLNowFAAHTAOo=,eJyLVkrLz1eKBQAI+AJB
+VA Fixed 30 Year HB,Fixed,VA,true,,true,360,Not Streamlined,,,,,,,,,eJyLVgrxU4oFAAWtAZ8=,eJyLNtQxigUAA9UBSA==,eJyLVkrLz1fSUUpKLFKKBQAbWAPm
+VA Fixed 30 Year DURP <=80,Fixed,VA,true,,false,360,DURP,,,,,,,,,eJyLVgrxU9JRcg5RigUAD/UCpg==,eJyLNtQx0jGOBQAGlQGn,eJyLVkrLz1fSUUpKLFKKBQAbWAPm
+VA Fixed 30 Year DURP <=80 HB,Fixed,VA,true,,true,360,DURP,,,,,,,,,eJyLVnJ2VNJR8otUigUADy8CmA==,,eJyLVkrLz1fSUcrIVMjNz1WKBQApLQTr
 EOF
 
 fannie_bup4 =<<EOF
@@ -348,10 +356,12 @@ EOF
       end
     end
 
-    it "should load array types" do
+    it "should load array types (incl encoded)" do
       Marty::DataImporter.do_import(Gemini::LoanProgram, loan_programs)
       Marty::DataImporter.do_import(Gemini::LoanProgram, loan_programs_comma,
                                     'infinity', nil, nil, ',')
+      Marty::DataImporter.do_import(Gemini::LoanProgram, loan_programs_encoded,
+                                    'infinity', nil, nil, ',')
       lpset = Gemini::LoanProgram.all.pluck(:name, :state_array,
                                             :test_int_array,
                                             :test_string_array).to_set
@@ -365,7 +375,14 @@ EOF
                            ["FHA Fixed 15 Year", ["FL","NV","ME"], nil,
                             ['ABC', 'DEF']],
                            ["FHA Fixed 100 Year", ["FL","NV","ME"], nil,
-                            ['XYZ', 'hi mom']]
+                            ['XYZ,', 'hi mom']],
+                           ["VA Fixed 30 Year", nil, [1], ['foo']],
+                           ["VA Fixed 30 Year HB", ["TN"], [1, 2],
+                            ['foo', 'bar']],
+                           ["VA Fixed 30 Year DURP <=80", ["TN", "CT"],
+                            [1, 2, 3], ['foo', 'bar']],
+                           ["VA Fixed 30 Year DURP <=80 HB", ["CA", "NY"],
+                            nil, ['foo', 'hi mom']],
                           ].to_set)
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg