marty 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f65bd901e74662263479f7acb3c2f616e41be2a
-  data.tar.gz: 6ef39fe48e763f6758e93d0f75aae5266bb3ab64
+  metadata.gz: 617dd635afba9c6d1b56fc1c2db3be5f713f312f
+  data.tar.gz: 1d6f98bf730650667a75a6fe91bb928a8717bba3
 SHA512:
-  metadata.gz: bf459ac2132cd88ce789485e564c1885b2433a8bf2fed54239249d660038db911dfec94345e8166ee279c8b1955aa7a93812fed51e16013084679e8235c2fd5d
-  data.tar.gz: 5c89ea1896bfed735b88a6cf3e0d8e507d7ef329d35c53cf1e933d1183826861fa411378f3dbf36dc6de6882a5bfc399b3e12803754b602aa0440b4e3c4c37c5
+  metadata.gz: 79f5da757ad9b8873fa4fbe78f4e7bc1dba68c5fd940d0d446ecda38aa08837c587cac13d2e2023b8e461290c7605f98468653df818ee3cf54870d554ed68cc1
+  data.tar.gz: e0bdc4190a5e0ffb17924b36c03bf34455a189a79835242dc1a7c93aa9fb3add286caa13af377f206458be647182caaaac881c5595ef9b85f04b2502ad10e39c

data/Gemfile

@@ -7,9 +7,8 @@ gemspec
 
 gem 'delayed_job_active_record'
 gem 'daemons', '~> 1.1.9'
-gem 'mime-types', '< 3.0', platforms: :ruby_19
-gem 'rails', '~> 4.2.1'
-gem 'pg', '~> 0.18.4'
+gem 'rails', '~> 4.2.10'
+gem 'pg'
 gem 'sqlite3'
 # for signing of aws ec2 requests
 gem 'aws-sigv4', '~> 1.0', '>= 1.0.2'
@@ -29,6 +28,4 @@ group :development, :test do
   gem 'rspec-instafail', require: false
 
   gem 'marty_rspec'
-
-  # gem 'delorean_lang', path: File.expand_path('../../delorean', __FILE__)
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (1.1.0)
+    marty (1.1.2)
       axlsx (= 2.1.0pre)
       coderay
       delorean_lang (~> 0.3.24)
@@ -17,36 +17,36 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
+    actionmailer (4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.9)
-      actionview (= 4.2.9)
-      activesupport (= 4.2.9)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.9)
-      activesupport (= 4.2.9)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.9)
-      activesupport (= 4.2.9)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
       globalid (>= 0.3.0)
-    activemodel (4.2.9)
-      activesupport (= 4.2.9)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activerecord (4.2.9)
-      activemodel (= 4.2.9)
-      activesupport (= 4.2.9)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
       arel (~> 6.0)
-    activesupport (4.2.9)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -60,14 +60,14 @@ GEM
       nokogiri (>= 1.4.1)
       rubyzip (~> 1.1.7)
     builder (3.2.3)
-    capybara (2.15.1)
+    capybara (2.16.1)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.7.1)
+    childprocess (0.8.0)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.2)
     coffee-script (2.4.1)
@@ -75,8 +75,9 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
+    crass (1.0.3)
     daemons (1.1.9)
-    database_cleaner (1.6.1)
+    database_cleaner (1.6.2)
     delayed_job (4.1.3)
       activesupport (>= 3.0, < 5.2)
     delayed_job_active_record (4.1.2)
@@ -89,25 +90,27 @@ GEM
     erubis (2.7.0)
     execjs (2.7.0)
     ffi (1.9.18)
-    globalid (0.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
-    i18n (0.8.6)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
     json-schema (2.8.0)
       addressable (>= 2.4)
-    loofah (2.0.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     marty_rspec (0.1)
       rspec-by
     mcfly (0.0.19)
       delorean_lang (~> 0.1)
       pg (~> 0.17)
-    method_source (0.8.2)
+    method_source (0.9.0)
     mime-types (2.99.3)
-    mini_mime (0.1.4)
-    mini_portile2 (2.2.0)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
     minitest (5.10.3)
     net-ldap (0.12.1)
     netzke-basepack (1.0.1.0)
@@ -115,32 +118,31 @@ GEM
       execjs
       mime-types (< 3)
       uglifier
-    netzke-testing (1.0.1.0)
+    netzke-testing (6.5.0.0)
       coffee-script
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pg (0.18.4)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    pg (0.21.0)
     polyglot (0.3.5)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+      method_source (~> 0.9.0)
     pry-rails (0.3.6)
       pry (>= 0.10.4)
-    public_suffix (3.0.0)
+    public_suffix (3.0.1)
     rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.9)
-      actionmailer (= 4.2.9)
-      actionpack (= 4.2.9)
-      actionview (= 4.2.9)
-      activejob (= 4.2.9)
-      activemodel (= 4.2.9)
-      activerecord (= 4.2.9)
-      activesupport (= 4.2.9)
+    rails (4.2.10)
+      actionmailer (= 4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      activemodel (= 4.2.10)
+      activerecord (= 4.2.10)
+      activesupport (= 4.2.10)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.9)
+      railties (= 4.2.10)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -150,43 +152,41 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.9)
-      actionpack (= 4.2.9)
-      activesupport (= 4.2.9)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.1.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
+    rake (12.3.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
     rspec-by (0.0.7)
       rspec-core (>= 3)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.7.0)
     rspec-instafail (1.0.0)
       rspec
-    rspec-mocks (3.6.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.1)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     rubyzip (1.1.7)
-    selenium-webdriver (2.53.4)
+    selenium-webdriver (3.7.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
-      websocket (~> 1.0)
-    slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -198,13 +198,12 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    treetop (1.6.8)
+    treetop (1.6.9)
       polyglot (~> 0.3)
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
-    websocket (1.2.4)
     xpath (2.1.0)
       nokogiri (~> 1.3)
 
@@ -219,13 +218,12 @@ DEPENDENCIES
   delayed_job_active_record
   marty!
   marty_rspec
-  mime-types (< 3.0)
   netzke-basepack
   netzke-core
   netzke-testing
-  pg (~> 0.18.4)
+  pg
   pry-rails
-  rails (~> 4.2.1)
+  rails (~> 4.2.10)
   rspec-instafail
   rspec-rails (~> 3.0)
   selenium-webdriver

data/app/models/marty/data_grid.rb

@@ -160,7 +160,9 @@ class Marty::DataGrid < Marty::Base
       attr = m["attr"]
       inc = h_passed.fetch(attr, :__nf__)
       next if inc == :__nf__
-      h[attr] = (defined? inc.name) ? inc.name : inc
+      val = (defined? inc.name) ? inc.name : inc
+      h[attr] = val.is_a?(String) ?
+                  ActiveRecord::Base.connection.quote(val)[1..-2] : val
     end
 
     fn     = "lookup_grid_distinct"

data/lib/marty/rpc_call.rb

@@ -23,11 +23,12 @@ class Marty::RpcCall
     res
   end
 
-  def self.marty_download(host, port, path, job_id)
+  def self.marty_download(host, port, path, job_id, ssl=false)
     params = {job_id: job_id}
     url = path + '?' + URI.encode(URI.encode_www_form(params))
 
     http = Net::HTTP.new(host, port)
+    http.use_ssl = ssl
     request = Net::HTTP::Get.new(url)
 
     begin

data/lib/marty/version.rb

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

data/spec/models/data_grid_spec.rb

@@ -697,6 +697,39 @@ EOS
         expect(res["data"]).to eq (expected_data)
         expect(res["metadata"]).to eq (expected_metadata)
       end
+
+      it "should handle all characters in grid inputs" do
+        dg = Marty::DataGrid.lookup(pt, 'G1')
+        5000.times do
+          st = 30.times.map{rand(224)+32}.pack('U*')
+          res = dg.lookup_grid_distinct_entry(pt, { "ltv" => 10,
+                                                    "fico" => 690,
+                                                    "state" => st }, nil,
+                                              false, true)
+        end
+      end
+      it "should handle all quote chars in grid inputs" do
+        dg = Marty::DataGrid.lookup(pt, 'G1')
+        # single, double, backslash, grave, acute, unicode quotes: left single,
+        # right single, left double, right double
+        quotes = ["'", '"', '\\', '`', "\u00b4", "\u2018", "\u2019",
+                  "\u201C", "\u201D"]
+        100.times do
+          st = 30.times.map{quotes[rand(9)]}.join
+          res = dg.lookup_grid_distinct_entry(pt, { "ltv" => 10,
+                                                    "fico" => 690,
+                                                    "state" => st }, nil,
+                                              false, true)
+        end
+      end
+      it "should handle quote chars in object name" do
+        dg = Marty::DataGrid.lookup(pt, 'G1')
+        st = Gemini::State.new(name: "'\\")
+        res = dg.lookup_grid_distinct_entry(pt, { "ltv" => 10,
+                                                  "fico" => 690,
+                                                  "state" => st }, nil,
+                                            false, true)
+      end
     end
 
     describe "exports" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Arman Bostani