zuora_connect 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23c46b24f33368a80465464a3502caae7dfa3aed
-  data.tar.gz: 35fde6ce89acdd31c8dd828c3a72f277dd1e1635
+  metadata.gz: be69eb7cb40f40b7b394b3ebd60758eec3ed55c8
+  data.tar.gz: c1713b5e4f7b6f28f5a8db0cfe9e3d206782790a
 SHA512:
-  metadata.gz: 5ea1686e5ec6aeeb3e2d999c9c26f2d481299fbf889330ad313de00236be2d1683221119578983e1f14e87845c38670e3207a247b2a910815452d53c444d4706
-  data.tar.gz: 2d95e2d5447fb38a8b3505c07014e3ca673cde8379534aed7472c4a4c1b178772de0229c7b065e7c61e460ce84ffb4dbc08d10b2e74e5de9c57afcf740c525c5
+  metadata.gz: 9c0f3b856c22f385f212a7e2e402945fc2ed83b018e2236f0f8d66897ef55563f27324e8a3fcd06a55e0d0f8523be9232b71f9bab55003f898c245e08ce644bd
+  data.tar.gz: 0663805cede5a63f7c445c24d5b1f3a665c40edc844c56939b95bb1a8d8988348ed93b47cfd8eba49b4006bfc61192deda55b60af832e4e29d1ae670e437a9fd

data/app/models/zuora_connect/app_instance_base.rb

@@ -7,6 +7,13 @@ module ZuoraConnect
     def init
       @options = Hash.new
       @logins = Hash.new
+      if ZuoraConnect.configuration.use_s3
+        if ZuoraConnect.configuration.mode == "Development"
+          @s3_client = Aws::S3::Resource.new(region: ZuoraConnect.configuration.aws_region,access_key_id: ZuoraConnect.configuration.dev_mode_access_key_id,secret_access_key: ZuoraConnect.configuration.dev_mode_secret_access_key)
+        else
+          @s3_client = Aws::S3::Resource.new(region: ZuoraConnect.configuration.aws_region)
+        end
+      end
       @valid = false
       self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
       self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
@@ -138,21 +145,13 @@ module ZuoraConnect
 
     def upload_to_s3(local_file,s3_path = nil)
       s3_path = local_file.split("/").last if s3_path.nil?
-      obj = self.s3_client.bucket(ZuoraConnect.configuration.s3_bucket_name).object("#{ZuoraConnect.configuration.s3_folder_name}/#{self.id.to_s}/#{s3_path}}")
+      obj = @s3_client.bucket(ZuoraConnect.configuration.s3_bucket_name).object("#{ZuoraConnect.configuration.s3_folder_name}/#{self.id.to_s}/#{s3_path}}")
       obj.upload_file(local_file)
     end
 
     def get_s3_file_url(key)
-      signer = Aws::S3::Presigner.new(client: self.s3_client)
-      url = signer.presigned_url(:get_object, bucket: ZuoraConnect.configuration.s3_bucket_name, key: "#{ZuoraConnect.configuration.s3_folder_name}/#{self.id.to_s}/#{key}")
-    end
-
-    def s3_client
-      if ZuoraConnect.configuration.mode == "Development"
-        @s3_client ||= Aws::S3::Resource.new(region: ZuoraConnect.configuration.aws_region,access_key_id: ZuoraConnect.configuration.dev_mode_access_key_id,secret_access_key: ZuoraConnect.configuration.dev_mode_secret_access_key)
-      else
-        @s3_client ||= Aws::S3::Resource.new(region: ZuoraConnect.configuration.aws_region)
-      end
+      signer = Aws::S3::Presigner.new(client: @s3_client)
+      url = signer.presigned_url(:get_object, bucket: ZuoraConnect.configuration.s3_bucket_name, key: "#{ZuoraConnect.configuration.s3_folder_name}/#{key}")
     end
 
     def self.decrypt_response(resp)

data/config/initializers/apartment.rb

@@ -68,7 +68,7 @@ Apartment.configure do |config|
   # e.g when using a PostgreSQL extension like hstore.
   # Any schemas added here will be available along with your selected Tenant.
   #
-  config.persistent_schemas = %w{ shared_extensions }
+  # config.persistent_schemas = %w{ hstore }
 
   # <== PostgreSQL only options
   #

data/lib/zuora_connect/controllers/helpers.rb

@@ -4,7 +4,7 @@ module ZuoraConnect
     module Helpers
       extend ActiveSupport::Concern
 
-      def instance_data_lookup(id = nil)
+      def instance_data_lookup(appinstance = nil)
         return session.blank? ? {} : session
       end
 
@@ -34,7 +34,7 @@ module ZuoraConnect
         else
           setup_instance_via_dev_mode
         end
-        @appinstance.new_session(:session =>instance_data_lookup(@appinstance.id))
+        @appinstance.new_session(:session =>instance_data_lookup(@appinstance))
         I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : @appinstance.locale
         Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
         Rails.logger.debug("[#{@appinstance.blank? ? "N/A" : @appinstance.id}] Authenticate App Request Completed In - #{(Time.now - start_time).round(2)}s")
@@ -112,14 +112,17 @@ module ZuoraConnect
         session["#{@appinstance.id}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
       end
 
-      def check_instance
-        if !@appinstance.blank?
-          @appinstance.new_session(:session => instance_data_lookup(@appinstance.id))
-          Thread.current[:appinstance] = @appinstance
-          return  @appinstance.valid
-        else
-          render text: "Access Denied", status: :unauthorized
-        end
+    end
+
+    private
+
+    def check_instance
+      if !@appinstance.blank?
+        @appinstance.new_session(:session => instance_data_lookup(@appinstance))
+        Thread.current[:appinstance] = @appinstance
+        return  @appinstance.valid
+      else
+        render text: "Access Denied", status: :unauthorized
       end
     end
   end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store
@@ -87,69 +87,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  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: rspec-expectations
-  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: factory_girl
-  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
-    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: aws-sdk-rails
   requirement: !ruby/object:Gem::Requirement
@@ -211,12 +155,12 @@ files:
 - app/views/zuora_connect/static/session_error.html.erb
 - config/initializers/apartment.rb
 - config/routes.rb
-- db/migrate/20100718151733_create_connect_app_instances.rb
-- db/migrate/20101024162319_add_tokens_to_app_instance.rb
-- db/migrate/20101024220705_add_token_to_app_instance.rb
-- db/migrate/20110131211919_add_sessions_table.rb
-- db/migrate/20110411200303_add_expiration_to_app_instance.rb
-- db/migrate/20110413191512_add_new_api_token.rb
+- db/migrate/20160718151733_create_connect_app_instances.rb
+- db/migrate/20161024162319_add_tokens_to_app_instance.rb
+- db/migrate/20161024220705_add_token_to_app_instance.rb
+- db/migrate/20170131211919_add_sessions_table.rb
+- db/migrate/20170411200303_add_expiration_to_app_instance.rb
+- db/migrate/20170413191512_add_new_api_token.rb
 - lib/tasks/zuora_connect_tasks.rake
 - lib/zuora_connect.rb
 - lib/zuora_connect/configuration.rb