zuora_connect 1.5.30 → 1.5.32

data/config/initializers/object_method_hooks.rb

@@ -0,0 +1,27 @@
+class Object
+  def self.method_hook(*args)
+    options = args.extract_options!
+    return unless (options[:before].present? or options[:after].present?)
+    args.each do |method_name|      
+      old_method = instance_method(method_name) rescue next
+
+      define_method(method_name) do |*args|
+        # invoke before callback
+        if options[:before].present?
+          options[:before].is_a?(Proc) ? options[:before].call(method_name, self):
+            send(options[:before], method_name) 
+        end
+
+        # you can modify the code to call after callback 
+        # only when the old method returns true etc..
+        old_method.bind(self).call(*args)
+
+        # invoke after callback
+        if options[:after].present?
+          options[:after].is_a?(Proc) ? options[:after].call(method_name, self): 
+            send(options[:after], method_name) 
+        end
+      end
+    end
+  end
+end

data/config/initializers/redis.rb

@@ -1,6 +1,6 @@
-redis_url = ENV["REDIS_URL"].present? ?  ENV["REDIS_URL"] : 'redis://localhost:6379/1'
+redis_url = ENV["REDIS_URL"].present? ?  ENV["REDIS_URL"] : defined?(Rails.application.secrets.redis) ? Rails.application.secrets.redis : 'redis://localhost:6379/1'
 if defined?(Redis.current)
-  Redis.current = Redis.new(:url => redis_url, :timeout => 10)
+  Redis.current = Redis.new(:url => redis_url, :timeout => 10, :reconnect_attempts => 2)
   if defined?(Resque.redis)
     Resque.redis = Redis.current
   end

data/db/migrate/20180301052853_add_catalog_attempted_at.rb

@@ -0,0 +1,5 @@
+class AddCatalogAttemptedAt < ActiveRecord::Migration
+  def change
+    add_column :zuora_connect_app_instances, :catalog_update_attempt_at, :datetime  unless column_exists? :zuora_connect_app_instances, :catalog_update_attempt_at
+  end
+end

data/lib/zuora_connect/configuration.rb

@@ -3,7 +3,6 @@ module ZuoraConnect
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri,:use_s3, :default_locale,:dev_mode_appinstance ,:dev_mode_admin, :dev_mode_user, :dev_mode_pass, :default_time_zone,:delayed_job,:url, :private_key, :dev_mode_logins,:dev_mode_mode, :dev_mode_options, :mode, :timeout,:dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :additional_apartment_models
 
     def initialize
-      @timeout = 30.minutes
       @default_locale = :en
       @default_time_zone = Time.zone
       @url = "https://connect.zuora.com"

data/lib/zuora_connect/controllers/helpers.rb

@@ -8,7 +8,7 @@ module ZuoraConnect
         #Skip session for api requests
         request.session_options[:skip] = true
         start_time = Time.now
-        if !request.headers["API-Token"].blank?
+        if request.headers["API-Token"].present?
           @appinstance = ZuoraConnect::AppInstance.where(:api_token => request.headers["API-Token"]).first
           Rails.logger.debug("[#{@appinstance.id}] API REQUEST - API token") if @appinstance.present?
           check_instance
@@ -38,7 +38,9 @@ module ZuoraConnect
         #Call .data_lookup with the current session to retrieve session. In some cases session may be stored/cache in redis 
         #so data lookup provides a model method that can be overriden per app.
         if params[:controller] != 'zuora_connect/api/v1/app_instance' && params[:action] != 'drop'
-          @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
+          if @appinstance.new_session_for_ui_requests(:params => params)
+            @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
+          end
         end
         PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail) && session["#{@appinstance.id}::user::email"].present? 
         begin
@@ -52,7 +54,7 @@ module ZuoraConnect
 
       def persist_connect_app_session
         if @appinstance.present?
-          if defined?(Redis.current) && Rails.application.config.session_store.to_s == "RedisSessionStore"
+          if defined?(Redis.current)
             @appinstance.cache_app_instance
           else
             session.merge!(@appinstance.save_data)
@@ -138,8 +140,8 @@ module ZuoraConnect
           @appinstance = ZuoraConnect::AppInstance.new(:id => values[:appinstance].to_i, :access_token => values[:user], :refresh_token => values[:key], :token => "#{values[:key]}#{values[:key]}", :api_token => "#{values[:key]}#{values[:key]}")
           @appinstance.save(:validate => false)
         end
-        if @appinstance.access_token.blank? || @appinstance.refresh_token.blank?
-          @appinstance.update_attributes(:access_token =>  values["user"], :refresh_token =>  values["key"], :token => "#{values[:key]}#{values[:key]}", :api_token => "#{values[:key]}#{values[:key]}")
+        if @appinstance.access_token.blank? || @appinstance.refresh_token.blank? || @appinstance.token.blank? || @appinstance.api_token.blank?
+          @appinstance.update_attributes!(:access_token =>  values["user"], :refresh_token =>  values["key"], :token => "#{values[:key]}#{values[:key]}", :api_token => "#{values[:key]}#{values[:key]}")
         end
         session["#{@appinstance.id}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
       end
@@ -147,7 +149,9 @@ module ZuoraConnect
       #API ONLY
       def check_instance
         if @appinstance.present?
-          @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
+          if @appinstance.new_session_for_api_requests(:params => params)
+            @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
+          end
           Thread.current[:appinstance] = @appinstance
           PaperTrail.whodunnit = "API User" if defined?(PaperTrail)
           return true

data/lib/zuora_connect/exceptions.rb

@@ -1,5 +1,7 @@
 module ZuoraConnect
   module Exceptions
+
+    class HoldingPattern < StandardError; end
     class Error < StandardError; end
     class AuthorizationNotPerformed < Error; end
 

data/lib/zuora_connect/version.rb

@@ -1,4 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.5.30"
+  VERSION = "1.5.32"
 end
- 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.30
+  version: 1.5.32
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -170,6 +170,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: derailed
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +225,7 @@ files:
 - app/views/zuora_connect/static/invalid_app_instance_error.html.erb
 - app/views/zuora_connect/static/session_error.html.erb
 - config/initializers/apartment.rb
+- config/initializers/object_method_hooks.rb
 - config/initializers/redis.rb
 - config/initializers/resque.rb
 - config/initializers/to_bool.rb
@@ -224,6 +239,7 @@ files:
 - db/migrate/20110503003602_add_catalog_data_to_app_instance.rb
 - db/migrate/20110503003603_add_catalog_mappings_to_app_instance.rb
 - db/migrate/20110503003604_catalog_default.rb
+- db/migrate/20180301052853_add_catalog_attempted_at.rb
 - lib/resque/additions.rb
 - lib/resque/dynamic_queues.rb
 - lib/resque/self_lookup.rb
@@ -301,44 +317,44 @@ signing_key:
 specification_version: 4
 summary: Summary of Connect.
 test_files:
-- test/lib/generators/zuora_connect/datatable_generator_test.rb
 - test/models/zuora_connect/app_instance_test.rb
 - test/test_helper.rb
-- test/fixtures/zuora_connect/app_instances.yml
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
-- test/integration/navigation_test.rb
-- test/zuora_connect_test.rb
-- test/dummy/Rakefile
-- test/dummy/bin/rails
-- test/dummy/bin/bundle
-- test/dummy/bin/setup
-- test/dummy/bin/rake
-- test/dummy/README.rdoc
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config/database.yml
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/routes.rb
+- test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/public/404.html
+- test/dummy/Rakefile
+- test/dummy/README.rdoc
+- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/config/routes.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/application.rb
+- test/dummy/config/database.yml
+- test/dummy/config/secrets.yml
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
 - test/dummy/config.ru
+- test/integration/navigation_test.rb
+- test/zuora_connect_test.rb
+- test/fixtures/zuora_connect/app_instances.yml
+- test/lib/generators/zuora_connect/datatable_generator_test.rb