marty 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f1288f6cc23a26347fad541903d5f7df4c62c2e
-  data.tar.gz: b70b8b6df1ce3eab6720bddeed11f622b17421d7
+  metadata.gz: c0cfa3fa0d78f474f6e7c1bc44ba2070fcc094b0
+  data.tar.gz: c28a5fa19dafea07a63416931c1087b7da37795d
 SHA512:
-  metadata.gz: fb4e5bf0e6dea87587dd93ae9d0a7bc78e65a425d64b3b8ba41a408df519d3ccb4d036f3d74570ba8d674d8514a74e4bb88c1569309a7e41a6756e8482882cb9
-  data.tar.gz: 762ca965e66e6f65d15a9ad713a2614c75dd7cee37669a94851be394260d0f40425da78462cd326fc36107ffaadd371845e92bae0c9124635828b44f84446702
+  metadata.gz: 89d5443037bee0c5938b27a02426c974a062714355e037c1a91d80d619a1ab1f29c432ab1c5a335592ccd01110d7c9a95643a110dea238b1764b41081fab111a
+  data.tar.gz: 6f4fc68bdd7e32aa4928a04ab2a3024fac47a8eb8fc3c904d64b992a22c50ee6a731533b422306a4618ac7855bead871b1c53df11e61aaab068949bbde4475de

data/Gemfile

@@ -5,7 +5,6 @@ source "http://rubygems.org"
 # development dependencies will be added by default to the :development group.
 gemspec
 
-gem 'responders'
 gem 'delayed_job_active_record'
 gem 'daemons', '~> 1.1.9'
 gem 'mime-types', '< 3.0', platforms: :ruby_19

data/app/controllers/marty/rpc_controller.rb

@@ -1,6 +1,4 @@
 class Marty::RpcController < ActionController::Base
-  respond_to :json, :csv
-
   def evaluate
     res = do_eval(params["script"],
                   params["tag"],

data/lib/marty/migrations.rb

@@ -83,8 +83,8 @@ module Marty::Migrations
       if jsons[c]
         jsons[c].each do |subc|
           if subc.class == Array
-            subcol, type = subc
-            columns.push "f_fixfalse(main.#{c} ->> '#{subcol}')::#{type} " +
+            subcol, type, fn = subc
+            columns.push "#{fn || ''}(main.#{c} ->> '#{subcol}')::#{type} " +
                          "as \"#{c}_#{subcol}\""
           else
             columns.push "main.#{c} ->> '#{subc}' as \"#{c}_#{subc}\""

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/spec/features/auth_app_spec.rb

@@ -8,8 +8,6 @@ feature 'Posting workflows', js: true do
 
     populate_test_users
 
-    custom_selectors
-
     monkey_patch_new_posting_form
   end
 
@@ -27,6 +25,7 @@ feature 'Posting workflows', js: true do
     log_in_as('admin1')
 
     posting_grid = netzke_find('posting_grid')
+    posting_type_combo = netzke_find('Posting Type', 'combobox')
 
     by 'bring up new posting form' do
       wait_for_ajax
@@ -35,8 +34,8 @@ feature 'Posting workflows', js: true do
     end
 
     and_by 'make posting TEST-A' do
-      click_combobox('Posting Type')
-      select_combobox('BASE', 'Posting Type')
+      posting_type_combo.click
+      posting_type_combo.select_values('BASE')
       fill_in('Comment', with: 'TEST-A')
       press('Create')
     end
@@ -70,8 +69,9 @@ feature 'Posting workflows', js: true do
     end
 
     and_by 'no posting available for adding' do
-      click_combobox('Posting Type')
-      expect(combobox_values('Posting Type')).not_to include 'BASE'
+      posting_type_combo = netzke_find('Posting Type', 'combobox')
+      posting_type_combo.click
+      expect(posting_type_combo.get_values).not_to include 'BASE'
     end
   end
 end

data/spec/features/data_import_spec.rb

@@ -13,8 +13,6 @@ feature 'under Applications menu, Reports using  Data Import', js: true do
     populate_import_type
     populate_bud_category_fannie_bup
     populate_test_users
-
-    custom_selectors
   end
 
   after(:all) do
@@ -82,7 +80,8 @@ feature 'under Applications menu, Reports using  Data Import', js: true do
         wait_for_ajax
 
         within(:gridpanel, 'report_form', match: :first) do
-          select_combobox('FB', 'Import Type')
+          import_type_combo = netzke_find('Import Type', 'combobox')
+          import_type_combo.select_values('FB')
           bud_id = Gemini::BudCategory.first.id
           paste("bud_category_id\tnote_rate\tsettlement_mm\tsettlement_yy\tbuy_up\tbuy_down\n#{bud_id}\t9.500\t9\t2014\t0\t0\n#{bud_id}\t9.750\t9\t2014\t0\t0\n",
                 'data_import_field')
@@ -148,7 +147,8 @@ feature 'under Applications menu, Reports using  Data Import', js: true do
         wait_for_ajax
 
         within(:gridpanel, 'report_form', match: :first) do
-          select_combobox('BC', 'Import Type')
+          import_type_combo = netzke_find('Import Type', 'combobox')
+          import_type_combo.select_values('BC')
           paste("name\nConv Fixed 40\n", 'data_import_field')
         end
       end

data/spec/features/reporting_spec.rb

@@ -10,7 +10,6 @@ feature 'under Applications menu, Reports workflows', js: true do
 
     populate_test_users
     populate_sample_reports
-    custom_selectors
   end
 
   after(:all) do
@@ -107,6 +106,8 @@ DELOREAN
 
     tag_grid = netzke_find('tag_grid')
     script_grid = netzke_find('script_grid')
+    posting_combo = netzke_find('Posting', 'combobox')
+    script_combo = netzke_find('', 'combobox')
 
     by 'select 2nd tag' do
       wait_for_ajax
@@ -140,7 +141,7 @@ DELOREAN
 
     and_by 'validate posting combobox' do
       wait_for_ajax
-      expect(combobox_values('Posting')).to include('BASE-20130520-1200')
+      expect(posting_combo.get_values).to include('BASE-20130520-1200')
     end
 
     and_by 'select 3rd tag' do
@@ -152,18 +153,18 @@ DELOREAN
     end
 
     and_by 'validate script combobox' do
-      expect(combobox_values('')).to include('AA (csv)',
-                                             'DD [role: dev] (csv)',
-                                             '---')
+      expect(script_combo.get_values).to include('AA (csv)',
+                                                 'DD [role: dev] (csv)',
+                                                 '---')
     end
 
     and_by 'select AA node' do
       select_node('AA (csv)')
     end
 
-    and_by 'validate posting comobox' do
+    and_by 'validate posting combobox' do
       wait_for_ajax
-      expect(combobox_values('Posting')).to include('BASE-20130520-1200')
+      expect(posting_combo.get_values).to include('BASE-20130520-1200')
     end
   end
 
@@ -230,6 +231,7 @@ DELOREAN
 
     tag_grid = netzke_find('tag_grid')
     script_grid = netzke_find('script_grid')
+    script_combo = netzke_find('', 'combobox')
 
     by 'select 2nd tag' do
       wait_for_ajax
@@ -242,7 +244,7 @@ DELOREAN
     end
 
     and_by 'no DD [role: dev] (csv)' do
-      expect(combobox_values('')).to include('AA (csv)',
+      expect(script_combo.get_values).to include('AA (csv)',
                                              'CC (csv)',
                                              '---')
     end

data/spec/features/scripting_spec.rb

@@ -7,8 +7,6 @@ feature 'under Applications menu, Scripting workflows', js: true do
 
     @clean_file = "/tmp/clean_#{Process.pid}.psql"
     save_clean_db(@clean_file)
-
-    custom_selectors
   end
 
   before(:each) do
@@ -89,7 +87,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
     and_by 'select the new script' do
       wait_for_ajax
       within(:gridpanel, 'script_grid', match: :first) do
-        script_grid.validate_row_values(6, name: 'Xyz', tag: 'DEV')
+        expect(script_grid.get_row_vals(6)).to netzke_include({:name=>"Xyz", :tag=>"DEV"})
         script_grid.select_row(6)
       end
     end
@@ -294,7 +292,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
       wait_for_ajax
       script_grid.select_row(5)
       expect(page).to have_content "#123\n#456\n"
-      tag_grid.validate_row_values(2, comment: 'ABCD')
+      expect(tag_grid.get_row_vals(2)).to netzke_include({:comment=>"ABCD"})
     end
   end
 

data/spec/features/scripting_test_spec.rb

@@ -8,7 +8,6 @@ feature 'under Applications menu, Scripting (debug) workflows', js: true do
     populate_test_users
     populate_sample_scripts1
     populate_sample_scripts2
-    custom_selectors
   end
 
   after(:all) do

data/spec/features/user_view_spec.rb

@@ -2,10 +2,6 @@ require 'spec_helper'
 
 feature 'under Sytem menu, User Management worflows', js: true do
 
-  before(:all) do
-    custom_selectors
-  end
-
   def go_to_user_view
     press('System')
     press('User Management')
@@ -40,6 +36,7 @@ feature 'under Sytem menu, User Management worflows', js: true do
     go_to_user_view
 
     user_view = netzke_find('user_view')
+    roles_combo = netzke_find('Roles', 'combobox')
 
     by 'add new user' do
       wait_for_ajax
@@ -56,8 +53,8 @@ feature 'under Sytem menu, User Management worflows', js: true do
         fill_in('First Name', with: 'test_fname')
         fill_in('Last Name', with: 'test_lname')
         check 'Active'
-        click_combobox 'Roles'
-        select_combobox('Admin, Developer, User Manager, Viewer', 'Roles')
+        roles_combo.click
+        roles_combo.select_values('Admin, Developer, User Manager, Viewer')
         press 'OK'
       end
     end
@@ -72,20 +69,21 @@ feature 'under Sytem menu, User Management worflows', js: true do
         fill_in('Login', with: 'new_login')
         fill_in('First Name', with: 'new_fname')
         fill_in('Last Name', with: 'new_lname')
-        click_combobox 'Roles'
-        select_combobox('User Manager, Viewer', 'Roles')
+        roles_combo.click
+        roles_combo.select_values('User Manager, Viewer')
         press 'OK'
       end
     end
 
     and_by 'check row got edited' do
       wait_for_ajax
-      user_view.validate_row_values(2,
-                                    :login => 'new_login',
-                                    :firstname => 'new_fname',
-                                    :lastname => 'new_lname',
-                                    :active => true,
-                                    :roles => 'User Manager,Viewer')
+      expect(user_view.get_row_vals(2)).to netzke_include({
+        :login=>"new_login", 
+        :firstname=>"new_fname", 
+        :lastname=>"new_lname", 
+        :active=>true, 
+        :roles=>"User Manager,Viewer",
+        })
     end
 
     and_by 'delete user fails' do

data/spec/models/data_grid_spec.rb

@@ -160,6 +160,15 @@ fico\tnumrange\th\t\t
 1|2\t90.5\t4.4\t5.5\t6.6
 3|4\t100.5\t1.2\t2.3\t3.4
 3|4\t105.5\t4.5\t5.6\t6.7
+EOS
+
+Gj =<<EOS
+lenient
+client_id\tinteger\tv
+property_state\tstring\tv
+
+\tCA\t0.25
+700127\tCA\t0.35
 EOS
 
     before(:each) do
@@ -279,7 +288,7 @@ EOS
 
       before(:each) do
         ["G1", "G2", "G3", "G4", "G5", "G6", "G7", "G8", "Ga", "Gb",
-         "Gc", "Gd", "Ge", "Gf", "Gg", "Gh"].each { |g|
+         "Gc", "Gd", "Ge", "Gf", "Gg", "Gh", "Gj"].each { |g|
           dg_from_import(g, "Marty::DataGridSpec::#{g}".constantize)
         }
       end
@@ -362,6 +371,22 @@ EOS
         }.to raise_error(RuntimeError)
       end
 
+      it "should handle non-distinct lookups (2)" do
+        params = {
+          "client_id" => 700127,
+          "property_state" => "CA",
+        }
+        dg = Marty::DataGrid.lookup(pt, "Gj")
+        res = Marty::DataGrid.lookup_grid(pt, dg, params, false)
+
+        # should return the upper left corner match
+        expect(res).to eq(0.25)
+
+        expect {
+          Marty::DataGrid.lookup_grid(pt, dg, params, true)
+        }.to raise_error(RuntimeError)
+      end
+
       it "should handle boolean lookups" do
         res = [true, false].map { |hb_indicator|
           lookup_grid_helper('infinity',

data/spec/spec_helper.rb

@@ -46,7 +46,6 @@ RSpec.configure do |config|
   config.include SpecSetup
   config.include Marty::IntegrationHelpers
   config.include MartyRSpec::Util
-  config.include MartyRSpec::NetzkeGrid
 
   Capybara.default_max_wait_time = 3
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg