zuora_connect 2.0.5 → 2.0.8

data/lib/zuora_connect/engine.rb

@@ -12,7 +12,7 @@ module ZuoraConnect
       Rails.application.routes.prepend do
         mount ZuoraConnect::Engine, at: "/connect"
         match '/api/connect/health', via: :all, to: 'zuora_connect/static#health'
-        match '/api/connect/internal/data', via: :all, to: 'zuora_connect/static#metrics'       
+        match '/api/connect/internal/data', via: :all, to: 'zuora_connect/static#metrics'
       end
     end
 
@@ -27,6 +27,7 @@ module ZuoraConnect
     initializer "connect.helpers" do
       ActiveSupport.on_load(:action_controller) do
         include ZuoraConnect::Controllers::Helpers
+        helper ZuoraConnect::ApplicationHelper
       end
     end
   end

data/lib/zuora_connect/railtie.rb

@@ -1,5 +1,6 @@
 require 'middleware/metrics_middleware'
 require 'middleware/request_id_middleware'
+require 'middleware/json_parse_errors'
 
 module ZuoraConnect
   class Railtie < Rails::Railtie
@@ -25,19 +26,22 @@ module ZuoraConnect
     initializer "zuora_connect.configure_rails_initialization" do |app|
       app.middleware.insert_after Rack::Sendfile, ZuoraConnect::MetricsMiddleware
       app.middleware.insert_after ActionDispatch::RequestId, ZuoraConnect::RequestIdMiddleware
+      app.config.middleware.use ZuoraConnect::JsonParseErrors
     end
 
     # hook to process_action
     ActiveSupport::Notifications.subscribe('process_action.action_controller', ZuoraConnect::PageRequest.new)
 
     initializer(:rails_stdout_logging, before: :initialize_logger) do
-      if Rails.env != 'development' && !ENV['DEIS_APP'].blank?
-        require 'lograge'
-  
-        Rails.configuration.logger = ZuoraConnect.custom_logger(name: "Rails") 
-
+      require 'lograge'
+      
+      Rails.configuration.logger = ZuoraConnect.custom_logger(name: "Rails") 
+      if Rails.env != 'development'
         Rails.configuration.lograge.enabled = true
         Rails.configuration.colorize_logging = false
+      end
+
+      if Rails.configuration.lograge.enabled
         if Rails.configuration.logger.class.to_s == 'Ougai::Logger'
           Rails.configuration.lograge.formatter = Class.new do |fmt|
             def fmt.call(data)
@@ -50,7 +54,7 @@ module ZuoraConnect
           exceptions = %w(controller action format id)
           items = {
             #time: event.time.strftime('%FT%T.%6N'),  
-            params: event.payload[:params].except(*exceptions).to_json.to_s
+            params: event.payload[:params].as_json(except: exceptions).to_json.to_s
           }
           items.merge!({exception_object: event.payload[:exception_object]}) if event.payload[:exception_object].present?
           items.merge!({exception: event.payload[:exception]}) if event.payload[:exception].present?

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "2.0.5"
+  VERSION = "2.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.8
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-01 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -39,59 +39,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: zuora_api
+  name: ougai-formatters-customizable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.43
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.43
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.43
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.43
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: zuora_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.4
+        version: 1.7.00
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.4
+        version: 1.7.00
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.4
+        version: 1.7.00
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.4
+        version: 1.7.00
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.4
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 0.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.4
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 0.16.4
 - !ruby/object:Gem::Dependency
   name: lograge
   requirement: !ruby/object:Gem::Requirement
@@ -308,14 +308,13 @@ files:
 - app/models/zuora_connect/zuora_user.rb
 - app/views/layouts/zuora_connect/application.html.erb
 - app/views/sql/refresh_aggregate_table.txt
-- app/views/zuora_connect/static/invalid_app_instance_error.html.erb
-- app/views/zuora_connect/static/invalid_launch_request.html.erb
+- app/views/zuora_connect/static/error_handled.html.erb
+- app/views/zuora_connect/static/error_unhandled.erb
 - app/views/zuora_connect/static/launch.html.erb
-- app/views/zuora_connect/static/permission_error.html.erb
-- app/views/zuora_connect/static/session_error.html.erb
 - config/initializers/apartment.rb
 - config/initializers/aws.rb
 - config/initializers/object_method_hooks.rb
+- config/initializers/patches.rb
 - config/initializers/postgresql_adapter.rb
 - config/initializers/prometheus.rb
 - config/initializers/redis.rb
@@ -335,9 +334,11 @@ files:
 - db/migrate/20180301052853_add_catalog_attempted_at.rb
 - db/migrate/20181206162339_add_fields_to_instance.rb
 - db/migrate/20190520232221_add_zuora_user_table_and_alter_app_instance_id_table.rb
+- db/migrate/20190520232222_add_unique_index.rb
 - lib/logging/connect_formatter.rb
 - lib/metrics/influx/point_value.rb
 - lib/metrics/net.rb
+- lib/middleware/json_parse_errors.rb
 - lib/middleware/metrics_middleware.rb
 - lib/middleware/request_id_middleware.rb
 - lib/resque/additions.rb
@@ -353,7 +354,6 @@ files:
 - lib/zuora_connect/exceptions.rb
 - lib/zuora_connect/railtie.rb
 - lib/zuora_connect/version.rb
-- lib/zuora_connect/views/helpers.rb
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
@@ -418,44 +418,44 @@ signing_key:
 specification_version: 4
 summary: Summary of Connect.
 test_files:
-- test/lib/generators/zuora_connect/datatable_generator_test.rb
 - test/integration/navigation_test.rb
-- test/test_helper.rb
-- test/models/zuora_connect/app_instance_test.rb
-- test/fixtures/zuora_connect/app_instances.yml
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
-- test/zuora_connect_test.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
+- test/fixtures/zuora_connect/app_instances.yml
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/environments/test.rb
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
+- test/dummy/bin/rake
+- test/dummy/bin/rails
+- test/dummy/config/routes.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb
-- test/dummy/config/database.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/secrets.yml
+- test/dummy/config/locales/en.yml
+- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/secrets.yml
-- test/dummy/bin/setup
-- test/dummy/bin/rails
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
-- test/dummy/config.ru
-- test/dummy/public/422.html
-- test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy/public/500.html
 - test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/Rakefile
+- test/dummy/README.rdoc
+- test/dummy/config.ru
+- test/lib/generators/zuora_connect/datatable_generator_test.rb
+- test/test_helper.rb
+- test/zuora_connect_test.rb
+- test/models/zuora_connect/app_instance_test.rb

data/app/views/zuora_connect/static/invalid_app_instance_error.html.erb

@@ -1,65 +0,0 @@
-<html><head>
-  <title>We're sorry, but something went wrong</title>
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <style>
-  body {
-    background-color: #EFEFEF;
-    color: #2E2F30;
-    text-align: center;
-    font-family: arial, sans-serif;
-    margin: 0;
-  }
-
-  div.dialog {
-    width: 95%;
-    max-width: 33em;
-    margin: 4em auto 0;
-  }
-
-  div.dialog > div {
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #BBB;
-    border-top: #B00100 solid 4px;
-    border-top-left-radius: 9px;
-    border-top-right-radius: 9px;
-    background-color: white;
-    padding: 7px 12% 0;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-
-  h1 {
-    font-size: 100%;
-    color: #730E15;
-    line-height: 1.5em;
-  }
-
-  div.dialog > p {
-    margin: 0 0 1em;
-    padding: 1em;
-    background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #999;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-top-color: #DADADA;
-    color: #666;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-  </style>
-</head>
-
-<body>
-  <!-- This file lives in public/500.html -->
-  <div class="dialog">
-    <div>
-      <h1>We're sorry, but this request could not be verified.</h1>
-    </div>
-    <p>Please try relaunching this application at connect.zuora.com</p>
-  </div>
-
-
-</body></html>

data/app/views/zuora_connect/static/invalid_launch_request.html.erb

@@ -1,81 +0,0 @@
-<html><head>
-  <title>We're sorry, but something went wrong</title>
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <style>
-  body {
-    background-color: #EFEFEF;
-    color: #2E2F30;
-    text-align: center;
-    font-family: arial, sans-serif;
-    margin: 0;
-  }
-
-  div.dialog {
-    width: 95%;
-    max-width: 33em;
-    margin: 4em auto 0;
-  }
-
-  div.dialog > div {
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #BBB;
-    border-top: #B00100 solid 4px;
-    border-top-left-radius: 9px;
-    border-top-right-radius: 9px;
-    background-color: white;
-    padding: 7px 12% 0;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-
-  h1 {
-    font-size: 100%;
-    color: #730E15;
-    line-height: 1.5em;
-  }
-
-  div.dialog > p {
-    margin: 0 0 1em;
-    padding: 1em;
-    background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #999;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-top-color: #DADADA;
-    color: #666;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-  div#main{
-    background: white;
-  }
-  </style>
-</head>
-
-<body >
-  <div style='background: white;'>
-    <!-- This file lives in public/500.html -->
-    <% if defined?(exception) %>
-      <div class="dialog" style='max-width: 74em;'>
-        <div>
-          <h1><%= exception.class %> - '<%= exception.message %>'</h1>
-        </div>
-        <p style='text-align: left;'>
-        <% exception.backtrace.each do |line| %>
-          <%= line %><br>
-        <% end %>
-      </p>
-      </div>
-    <% else %>
-      <div class="dialog">
-        <div>
-          <h1>The launch url was invalid.</h1>
-        </div>
-        <p>Please try relaunching this application</p>
-      </div>
-    <% end %>
-  </div>
-</body></html>

data/app/views/zuora_connect/static/permission_error.html.erb

@@ -1,80 +0,0 @@
-<html><head>
-  <title>Select Task ID</title>
-  <meta name="viewport" content="width=device-width,initial-scale=1">
-  <style>
-  body {
-    background-color: #EFEFEF;
-    color: #2E2F30;
-    text-align: center;
-    font-family: arial, sans-serif;
-    margin: 0;
-  }
-
-  div.dialog {
-    width: 95%;
-    max-width: 33em;
-    margin: 4em auto 0;
-  }
-
-  div.dialog > div {
-    margin: 0 0 1em;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #BBB;
-    border-top: #3D4B5A solid 4px;
-    border-top-left-radius: 9px;
-    border-top-right-radius: 9px;
-    border-bottom-left-radius: 9px;
-    border-bottom-right-radius: 9px;
-    background-color: white;
-    padding: 7px 12% 0;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-
-  h1 {
-    font-size: 100%;
-    color: #3D4B5A;
-    line-height: 1.5em;
-  }
-
-    
-  div.launch_button {
-    margin: 1em 0 1em;
-    margin-right: auto;
-    margin-left: auto;
-    padding: 1em;
-    width: 300px;
-    font-size: 12pt;
-    font-weight: bold;
-    background-color: #F7F7F7;
-    border: 1px solid #CCC;
-    border-right-color: #999;
-    border-left-color: #999;
-    border-bottom-color: #999;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-top-color: #999;
-    color: #666;
-    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
-  }
-  </style>
-</head>
-
-<body style='background: white;'>
-  <div class="dialog">
-    <div>
-      <h1>You currently don't have access to the deployed workflow instance.</h1>
-      <p style='text-align:left'>Please contact one of the below system administrators and have them give you access.</p>
-      <ul style='text-align:left'>
-        <% admins.each do |admin| %>
-        <li><%= admin.username %></li>
-        <% end %>
-      </ul>
-    </div>
-  </div>
-
-
-</body></html>