marty 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74cf23a65bfc74eca6990825fc5cd0e3498ce1ee
-  data.tar.gz: bbe239541fa78e0520ba9556ce2e54a6bdcd316d
+  metadata.gz: 7ad4a69b32113f2cc635319cdf01b1fbaf5e75da
+  data.tar.gz: 9f949b565d227a2f3bfcd4f06be08f8b080b3800
 SHA512:
-  metadata.gz: 7b83dbaa63058e3cb97bf2075b41630737fe3caed36b5f006b70c34e2dc743dc57333064b5952cd3e933b1b67a81309001e688944d0f0de4eb5a558d5ce27db6
-  data.tar.gz: a8a857fcf340d133ecf3a9248aad919630f8f11c480b3301abf7df896a70e7bb4811fddef838b4787bfe6c08d95863a33eb88045fe50b29c14e158ede8484b6c
+  metadata.gz: f2e598681727dc3a4035a605c69c805d8f91f69699ca862797a1bd88f6bd81eeaf628134d694b447be752b16d56b37b75d0c6599fd9aac2600dc4f2ece5c2152
+  data.tar.gz: e255658aa7a7fbb18c055147aef9d4c3ce385914c37648c6a1df9706484d722f4b8d0f8dc1f9e725fe106ed00c125c669e892d23cdb5a44835edc927fa913bf7

data/Gemfile

@@ -10,8 +10,6 @@ gem 'daemons', '~> 1.1.9'
 gem 'rails', '~> 5.1.4'
 gem 'pg'
 gem 'sqlite3'
-# for signing of aws ec2 requests
-gem 'aws-sigv4', '~> 1.0', '>= 1.0.2'
 
 
 group :development, :test do

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    marty (2.1.0)
+    marty (2.1.1)
+      aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay
       delorean_lang (~> 0.3.37)
@@ -233,7 +234,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-sigv4 (~> 1.0, >= 1.0.2)
   capybara
   chromedriver-helper
   connection_pool

data/app/models/marty/data_grid.rb

@@ -188,14 +188,11 @@ class Marty::DataGrid < Marty::Base
     h = dgh["metadata"].each_with_object({}) do |m, h|
       attr = m["attr"]
       inc = h_passed.fetch(attr, :__nf__)
-      next if inc == :__nf__
+      next if inc == :__nf__ || inc.nil?
       val = (defined? inc.name) ? inc.name : inc
       h[attr] = val.is_a?(String) ?
                   ActiveRecord::Base.connection.quote(val)[1..-2] : val
     end
-    nilparams =  h.select{|k, v| v==nil}
-    raise "Data Grid #{dgh['name']} lookup with nil attrs #{nilparams}" if
-      nilparams.present?
 
     fn     = "lookup_grid_distinct"
     hjson  = "'#{h.to_json}'::JSONB"

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/marty.gemspec

@@ -41,4 +41,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rubyzip'
   s.add_dependency 'sqlite3'
   s.add_dependency 'json-schema'
+
+  # used for signing aws ec2 requests
+  s.add_dependency 'aws-sigv4', '~> 1.0', '>= 1.0.2'
 end

data/other/marty/diagnostic/aws/ec2_instance.rb

@@ -53,7 +53,7 @@ class Marty::Diagnostic::Aws::Ec2Instance
   def self.get url
     uri = URI.parse(url)
     request = Net::HTTP.new(uri.host, uri.port)
-    request.read_timeout = request.open_timeout = ENV['DIAG_TIMEOUT'] || 5
+    request.read_timeout = request.open_timeout = ENV['DIAG_TIMEOUT'] || 0.25
     request.start {|http|
       http.get(uri.to_s)
     }.body

data/other/marty/diagnostic/connections.rb

@@ -2,7 +2,10 @@ module Marty::Diagnostic; class Connections < Base
   self.aggregatable = false
   diagnostic_fn do
     conns = Node.get_postgres_connections[Database.db_name].
-              sort_by{|h| [h['application_name'], h['pid'], h['client_addr']]}
+              sort_by{|h| [h['application_name'],
+                           h['pid'],
+                           h['client_addr'],
+                           h['state']]}
 
     counts = Hash.new(0)
     conns.each_with_object({}) do |c, h|

data/other/marty/diagnostic/environment_variables.rb

@@ -6,14 +6,19 @@ module Marty::Diagnostic; class EnvironmentVariables < Base
   def self.env filter=''
     env = ENV.clone
 
-    # obfuscate SECRET_KEY_BASE for comparison
-    env['SECRET_KEY_BASE'] = env['SECRET_KEY_BASE'][0,4] if
-      env['SECRET_KEY_BASE']
+    to_delete = (Marty::Config['DIAG_ENV_BLOCK'] || []).map(&:upcase) + [
+      'SCRIPT_URI', 'SCRIPT_URL']
 
-    # remove SCRIPT_URI, SCRIPT_URL as calling node differs
-    ['SCRIPT_URI', 'SCRIPT_URL'].each{|k| env.delete(k)}
+    to_obfus = (Marty::Config['DIAG_ENV_OBFUSCATE'] || []).map(&:upcase) + [
+      'SECRET_KEY_BASE']
+
+    to_block = (Marty::Config['DIAG_ENV_BLOCK_IF_INCL'] || []).map(&:upcase) + [
+      'PASSWORD', 'DEBUG']
+
+    to_delete.each{|k| env.delete(k)}
+
+    to_obfus.each{|k| env[k] = env[k][0,4] if env[k]}
 
-    to_block = ['PASSWORD', 'DEBUG']
     env.sort.each_with_object({}){|(k,v),h|
       h[k] = v if to_block.all?{|b| !k.include?(b)} && k.include?(filter)}
   end

data/spec/dummy/db/migrate/20160923183516_add_bulk_pricing_event_ops.rb

@@ -1,9 +1,8 @@
 class AddBulkPricingEventOps < ActiveRecord::Migration[4.2]
+  disable_ddl_transaction!
   def change
-    execute("COMMIT;")
     execute "ALTER TYPE enum_event_operations ADD VALUE 'PRICING';"
     execute "ALTER TYPE enum_event_operations ADD VALUE 'CRA';"
     execute "ALTER TYPE enum_event_operations ADD VALUE 'AVM';"
-    execute("BEGIN;")
   end
 end

data/spec/models/data_grid_spec.rb

@@ -185,9 +185,10 @@ EOS
       marty_whodunnit
     end
 
-    def lookup_grid_helper(pt, gridname, params, follow=false)
+    def lookup_grid_helper(pt, gridname, params, follow=false, distinct=true)
       dgh=Marty::DataGrid.lookup_h(pt, gridname)
-      res=Marty::DataGrid.lookup_grid_distinct_entry_h(pt, params, dgh, nil, follow)
+      res=Marty::DataGrid.lookup_grid_distinct_entry_h(pt, params, dgh, nil, follow,
+                                                       false, distinct)
       [res["result"], res["name"]]
     end
 
@@ -489,21 +490,20 @@ EOS
         expect(res).to eq [456,"G9"]
       end
 
-      it "should handle nil attr values to match wildcard" do
+      it "should raise on nil attr values" do
         dg_from_import("G9", G9)
 
-        res = lookup_grid_helper('infinity',
+        expect{lookup_grid_helper('infinity',
                                "G9",
                                {"state" => nil, "ltv" => 81},
-                               )
-        expect(res).to eq [456,"G9"]
+                               )}.to raise_error(/matches > 1/)
+
+        res = lookup_grid_helper('infinity',
+                                 "G9",
+                                 {"state" => "CA", "ltv" => nil},
+                                 false, false)
+        expect(res).to eq [123,"G9"]
 
-        expect {
-          res = lookup_grid_helper('infinity',
-                                     "G9",
-                                     {"state" => "CA", "ltv" => nil},
-                                    )
-        }.to raise_error(RuntimeError)
       end
 
       it "should handle boolean keys" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -156,6 +156,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sigv4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 description: Marty is a framework for viewing and reporting on versioned data.
 email:
 - arman.bostani@pnmac.com