zuora_connect 2.0.5y → 2.0.5z

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee905da43d4b965a647b9149ec7988f032c76afcc37dbffc934ac70eed7a8e2f
-  data.tar.gz: fc34629d958f8330fdabe0894f8e9d6c7af82b8b578ca3e2136b187c47dc3e00
+  metadata.gz: a444e75e8b7dde543c7fd746f2077ea447b0e4bff7c45f459e6032c00d657a3f
+  data.tar.gz: b14e75d257b9cc63e0e70e2b17bb41be30d7e6da79fb82f0db8b242ceb169598
 SHA512:
-  metadata.gz: f686fd92b5118df058d1cfb25ab3c21496e6b31d0271de5173be08d7d4731b80a13f22d103af39e57f0ba2c24a84810bd2adc3df147ca6f02cce5ff1bfb0267b
-  data.tar.gz: 78744edba395438dbd76f94c68b1cdcacb5896e4f509e302267df5654ad5ef87356ef65cf17be9e0da594fed1d72dc7408c12428581ccc18fe7ec8870dfb6c57
+  metadata.gz: 9796c3c7bf607aafceda3ee497944ef7f76aec87dc8c98057096a61619b4896c6e0a0b09804eeec9cffe89c2cfd2832d604c5317f8e5220d49aa1c791006bc93
+  data.tar.gz: 06bf04ef362d45e7954722de4a26b96b547080e78549a6118a48232dfbcb89592b4c4add15eec367e9ac3d698a77081be68484d922320ffb4d0c1cc95a5f94e3

data/app/helpers/zuora_connect/application_helper.rb

@@ -1,5 +1,15 @@
 module ZuoraConnect
   module ApplicationHelper
+    def is_app_admin?
+      return @appinstance.blank? ? false : session["#{@appinstance.id}::admin"]
+    end
 
+    def zuora_user
+      return @zuora_user
+    end
+
+    def connect_meta_tags
+      "<meta name=\"z-hallway-prefix\" content=\"#{ Thread.current[:isHallway] }\">".html_safe
+    end
   end
 end

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/version.rb

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

data/lib/zuora_connect.rb

@@ -2,7 +2,6 @@ require 'zuora_connect/configuration'
 require "zuora_connect/engine"
 require 'zuora_connect/exceptions'
 require 'zuora_connect/controllers/helpers'
-require 'zuora_connect/views/helpers'
 require 'zuora_connect/railtie'
 require 'resque/additions'
 require 'resque/dynamic_queues'
@@ -25,7 +24,7 @@ module ZuoraConnect
       else
         @logger ||= custom_logger(name: "Connect", level: Rails.logger.level)
       end
-    end    
+    end
 
     def custom_logger(name: "", level: Rails.logger.present? ? Rails.logger.level : MonoLogger::INFO, type: :ougai)
       #puts name + ' - ' + {Logger::WARN => 'Logger::WARN', Logger::ERROR => 'Logger::ERROR', Logger::DEBUG => 'Logger::DEBUG', Logger::INFO => 'Logger::INFO' }[level] + ' - '
@@ -33,7 +32,7 @@ module ZuoraConnect
         require 'ougai'
         require "ougai/formatters/customizable"
         #logger = Ougai::Logger.new(MonoLogger.new(STDOUT))
-        logger = Ougai::Logger.new(STDOUT) 
+        logger = Ougai::Logger.new(STDOUT)
         logger.level = level
         if ZuoraConnect.configuration.json_logging
           logger.formatter = Ougai::Formatters::ConnectFormatter.new(name)
@@ -41,7 +40,7 @@ module ZuoraConnect
             data[:trace_id] = ZuoraConnect::RequestIdMiddleware.request_id if ZuoraConnect::RequestIdMiddleware.request_id.present?
             data[:zuora_trace_id] = ZuoraConnect::RequestIdMiddleware.zuora_request_id if ZuoraConnect::RequestIdMiddleware.zuora_request_id.present?
             #data[:traces] = {amazon_id: data[:trace_id], zuora_id: data[:zuora_trace_id]}
-            if !['ElasticAPM', 'ResqueScheduler', 'ResquePool', 'Resque', 'Makara'].include?(name) 
+            if !['ElasticAPM', 'ResqueScheduler', 'ResquePool', 'Resque', 'Makara'].include?(name)
               if Thread.current[:appinstance].present?
                 data[:app_instance_id] = Thread.current[:appinstance].id
                 logitems = Thread.current[:appinstance].logitems
@@ -86,8 +85,8 @@ module ZuoraConnect
               pid: Process.pid,
               message: name == "ActionMailer" ? msg.strip : msg
             }
-            if !['ElasticAPM', 'ResqueScheduler', 'ResquePool','Resque', 'Makara'].include?(name) 
-              if Thread.current[:appinstance].present? 
+            if !['ElasticAPM', 'ResqueScheduler', 'ResquePool','Resque', 'Makara'].include?(name)
+              if Thread.current[:appinstance].present?
                 store[:app_instance_id] = Thread.current[:appinstance].id
                 logitems = Thread.current[:appinstance].logitems
                 if logitems.present? && logitems.class == Hash
@@ -103,17 +102,13 @@ module ZuoraConnect
         end
       end
       return logger
-    end      
+    end
   end
 
   module Controllers
     autoload :Helpers,        'zuora_connect/controllers/helpers'
   end
 
-  module Views
-    ActionView::Base.send(:include, Helpers)
-  end
-
   def self.configuration
     @configuration ||= Configuration.new
   end
@@ -151,23 +146,23 @@ module ZuoraConnect
       }
     when 'test'
       defaults = {
-        active: false, 
+        active: false,
         disable_send: true
       }
     end
 
     defaults.merge!({
       disable_start_message: true,
-      pool_size: 1, 
-      transaction_max_spans: 500, 
-      ignore_url_patterns: ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*'], 
+      pool_size: 1,
+      transaction_max_spans: 500,
+      ignore_url_patterns: ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*'],
       verify_server_cert: false,
       log_level: Logger::INFO,
       service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : Rails.application.class.parent_name,
       logger: ZuoraConnect.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN)
     })
     defaults.merge!({disable_send: true}) if defined?(Rails::Console)
-    
+
     return defaults
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 2.0.5y
+  version: 2.0.5z
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -92,20 +92,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.4
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: lograge
   requirement: !ruby/object:Gem::Requirement
@@ -366,7 +352,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
@@ -431,44 +416,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/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/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/bin/rake
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/config/secrets.yml
+- test/dummy/config/routes.rb
+- test/dummy/config/locales/en.yml
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/application.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/boot.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/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/cookies_serializer.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/Rakefile
+- test/dummy/public/favicon.ico
 - test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/public/favicon.ico
 - test/dummy/public/404.html
+- test/dummy/README.rdoc
+- test/integration/navigation_test.rb
+- test/zuora_connect_test.rb
+- test/models/zuora_connect/app_instance_test.rb
+- test/lib/generators/zuora_connect/datatable_generator_test.rb
+- test/fixtures/zuora_connect/app_instances.yml
+- test/test_helper.rb
+- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb

data/lib/zuora_connect/views/helpers.rb

@@ -1,13 +0,0 @@
-module ZuoraConnect
-  module Views
-    module Helpers
-      def is_app_admin?
-        return @appinstance.blank? ? false : session["#{@appinstance.id}::admin"]
-      end
-
-      def zuora_user
-        return @zuora_user
-      end
-    end
-  end
-end