zuora_connect 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbcfd76feb0ad0d0f46d8e159460c5ce1660a0cb
-  data.tar.gz: c8c36a2de376fb0898560340d0c54006755ec496
+  metadata.gz: ad24fe3dc010f81a0303453a4b056c06edd88a28
+  data.tar.gz: f4c0c821aedf29b10d282cb81dc2e09d772ceced
 SHA512:
-  metadata.gz: 716bbb8e21dc24a1740d427b3ff51519fc900bce7176f0f9cafe1fea81aff7bc03d58ec74bb1e43147a4bc770f21da45797f2803129242edd856a05f33e3b0f2
-  data.tar.gz: 5f8bd3b1486cfe2d906b3588df1020e1dcec4adbfeb891caa92818c1fea50053c6c51be5ee330dbb57c526e978af169ca9964c2a212654c7c395fb3c21964ad6
+  metadata.gz: acac89e89d90174546e7e275cfb792f99d96fc1b00676948a8ebe86196cd120142fece1b29437dbab989d35e16c0c9c5b88fc1f341aec61da9bf5f01c48b25f6
+  data.tar.gz: 90dd37a8c6c3f52e0a710617ce39f3f72ed3dbd3bb13ec408386e2db013ae2e7d9bd9f3c5234d5eb5d3acdce54ff11fbd66dfc5c749dffb536ffe51115fa5041

data/app/models/zuora_connect/app_instance.rb

@@ -1,153 +1,5 @@
 module ZuoraConnect
-  class AppInstance < ActiveRecord::Base
-    after_initialize :init
-    before_create :generate_access_token
-    attr_accessor :options, :mode, :logins, :valid, :task_data, :last_refresh, :username, :password, :s3_client
-
-    def init
-      @options = Hash.new
-      @logins = Hash.new
-      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
-      @valid = false
-      self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
-      self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
-      Apartment::Tenant.switch!(self.id)
-      if( ActiveRecord::Migration.check_pending! != nil)
-        Apartment::Migrator.migrate(self.id)
-      end
-      Thread.current[:appinstance] = self
-    end
-
-    def new_session(session: {}, username: self.access_token, password: self.refresh_token)
-      @username = username
-      @password = password
-      @last_refresh = session["#{self.id}::last_refresh"]
-
-      ## DEV MODE TASK DATA MOCKUP
-      if ZuoraConnect.configuration.mode != "Production"
-        self.options = ZuoraConnect.configuration.dev_mode_options
-        ZuoraConnect.configuration.dev_mode_logins.each do |k,v|
-          tmp = ZuoraConnect::Login.new(v)
-          self.logins[k] = tmp
-          self.attr_builder(k, tmp)
-        end
-        self.mode = ZuoraConnect.configuration.dev_mode_mode
-      else
-        if session.nil? || (!session.nil? && self.id != session["appInstance"].to_i) || session["#{self.id}::task_data"].blank? || ( session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
-          Rails.logger.debug("REFRESHING - Session Nil") if session.nil?
-          Rails.logger.debug("REFRESHING - AppInstance ID does not match session id") if  (!session.nil? && self.id != session["appInstance"].to_i)
-          Rails.logger.debug("REFRESHING - Task Data Blank") if session["#{self.id}::task_data"].blank?
-          Rails.logger.debug("REFRESHING - No Time on Cookie") if session["#{self.id}::last_refresh"].blank?
-          Rails.logger.debug("REFRESHING - Session Old") if (session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
-          self.refresh(session)
-        else
-          Rails.logger.debug("REBUILDING")
-          build_task(session["#{self.id}::task_data"], session)
-        end
-      end
-      I18n.locale = self.locale
-      Time.zone = self.timezone
-      @valid = true
-    end
-
-    def save_data(session = Hash.new)
-      self.logins.each do |key, login|
-        if login.tenant_type == "Zuora"
-          if login.available_entities.size > 1 && Rails.application.config.session_store != ActionDispatch::Session::CookieStore
-            login.available_entities.each do |entity_key|
-              session["#{self.id}::#{key}::#{entity_key}:session"] = login.client(entity_key).current_session
-            end
-          else
-            session["#{self.id}::#{key}:session"] = login.client.current_session
-          end
-        end
-      end
-      session["#{self.id}::task_data"] = self.task_data
-      session["#{self.id}::last_refresh"] = self.last_refresh
-      session["appInstance"] = self.id
-      return session
-    end
-
-    def updateOption(optionId, value)
-      if self.access_token && self.refresh_token
-        return HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/application_options/#{optionId}/edit?value=#{value}",:basic_auth => auth = {:username => self.username, :password => self.password})
-      else
-        return false
-      end
-    end
-
-    def refresh(session = nil)
-      response = HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/tasks/#{self.id}.json",:basic_auth => auth = {:username => self.username, :password => self.password})
-      if response.code == 200
-        @last_refresh = Time.now.to_i
-        build_task(JSON.parse(response.body), session)
-      else
-        raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
-      end
-    end
-
-    def build_task(task_data, session)
-      @task_data = task_data
-      @mode = @task_data["mode"]
-      @task_data.each do |k,v|
-        if k.match(/^(.*)_login$/)
-          tmp = ZuoraConnect::Login.new(v)
-          if !session.nil? && v["tenant_type"] == "Zuora"
-            if tmp.entities.size > 0
-              tmp.entities.each do |value|
-                entity_id = value["id"]
-                tmp.client(entity_id).current_session = session["#{self.id}::#{k}::#{entity_id}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}::#{entity_id}:session"]
-              end
-            else
-              tmp.client.current_session = session["#{self.id}::#{k}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}:session"]
-            end
-          end
-          @logins[k] = tmp
-          self.attr_builder(k, @logins[k])
-        elsif k == "options"
-          v.each do |opt|
-            @options[opt["config_name"]] = opt
-          end
-        elsif k == "user_settings"
-          self.timezone =  v["timezone"]
-          self.locale = v["local"]
-        end
-      end
-    end
-
-    def send_email
-
-    end
-
-    def upload_to_s3(local_file,s3_path = nil)
-      s3_path = local_file.split("/").last if s3_path.nil?
-      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: @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)
-      OpenSSL::PKey::RSA.new(ZuoraConnect.configuration.private_key).private_decrypt(resp)
-    end
-
-    def attr_builder(field,val)
-      singleton_class.class_eval { attr_accessor "#{field}" }
-      send("#{field}=", val)
-    end
-
-    def generate_access_token
-      begin
-        self.token = SecureRandom.hex
-      end while self.class.exists?(token: token)
-    end
+  class AppInstance < ZuoraConnect::AppInstanceBase
 
   end
 end

data/app/models/zuora_connect/app_instance_base.rb

@@ -0,0 +1,154 @@
+module ZuoraConnect
+  class AppInstanceBase < ActiveRecord::Base
+    after_initialize :init
+     self.table_name = "zuora_connect_app_instances"
+    before_create :generate_access_token
+    attr_accessor :options, :mode, :logins, :valid, :task_data, :last_refresh, :username, :password, :s3_client
+
+    def init
+      @options = Hash.new
+      @logins = Hash.new
+      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
+      @valid = false
+      self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
+      self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
+      Apartment::Tenant.switch!(self.id)
+      if( ActiveRecord::Migration.check_pending! != nil)
+        Apartment::Migrator.migrate(self.id)
+      end
+      Thread.current[:appinstance] = self
+    end
+
+    def new_session(session: {}, username: self.access_token, password: self.refresh_token)
+      @username = username
+      @password = password
+      @last_refresh = session["#{self.id}::last_refresh"]
+
+      ## DEV MODE TASK DATA MOCKUP
+      if ZuoraConnect.configuration.mode != "Production"
+        self.options = ZuoraConnect.configuration.dev_mode_options
+        ZuoraConnect.configuration.dev_mode_logins.each do |k,v|
+          tmp = ZuoraConnect::Login.new(v)
+          self.logins[k] = tmp
+          self.attr_builder(k, tmp)
+        end
+        self.mode = ZuoraConnect.configuration.dev_mode_mode
+      else
+        if session.nil? || (!session.nil? && self.id != session["appInstance"].to_i) || session["#{self.id}::task_data"].blank? || ( session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
+          Rails.logger.debug("REFRESHING - Session Nil") if session.nil?
+          Rails.logger.debug("REFRESHING - AppInstance ID does not match session id") if  (!session.nil? && self.id != session["appInstance"].to_i)
+          Rails.logger.debug("REFRESHING - Task Data Blank") if session["#{self.id}::task_data"].blank?
+          Rails.logger.debug("REFRESHING - No Time on Cookie") if session["#{self.id}::last_refresh"].blank?
+          Rails.logger.debug("REFRESHING - Session Old") if (session["#{self.id}::last_refresh"].blank? || session["#{self.id}::last_refresh"].to_i < ZuoraConnect.configuration.timeout.ago.to_i )
+          self.refresh(session)
+        else
+          Rails.logger.debug("REBUILDING")
+          build_task(session["#{self.id}::task_data"], session)
+        end
+      end
+      I18n.locale = self.locale
+      Time.zone = self.timezone
+      @valid = true
+    end
+
+    def save_data(session = Hash.new)
+      self.logins.each do |key, login|
+        if login.tenant_type == "Zuora"
+          if login.available_entities.size > 1 && Rails.application.config.session_store != ActionDispatch::Session::CookieStore
+            login.available_entities.each do |entity_key|
+              session["#{self.id}::#{key}::#{entity_key}:session"] = login.client(entity_key).current_session
+            end
+          else
+            session["#{self.id}::#{key}:session"] = login.client.current_session
+          end
+        end
+      end
+      session["#{self.id}::task_data"] = self.task_data
+      session["#{self.id}::last_refresh"] = self.last_refresh
+      session["appInstance"] = self.id
+      return session
+    end
+
+    def updateOption(optionId, value)
+      if self.access_token && self.refresh_token
+        return HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/application_options/#{optionId}/edit?value=#{value}",:basic_auth => auth = {:username => self.username, :password => self.password})
+      else
+        return false
+      end
+    end
+
+    def refresh(session = nil)
+      response = HTTParty.get(ZuoraConnect.configuration.url + "/api/v1/tools/tasks/#{self.id}.json",:basic_auth => auth = {:username => self.username, :password => self.password})
+      if response.code == 200
+        @last_refresh = Time.now.to_i
+        build_task(JSON.parse(response.body), session)
+      else
+        raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
+      end
+    end
+
+    def build_task(task_data, session)
+      @task_data = task_data
+      @mode = @task_data["mode"]
+      @task_data.each do |k,v|
+        if k.match(/^(.*)_login$/)
+          tmp = ZuoraConnect::Login.new(v)
+          if !session.nil? && v["tenant_type"] == "Zuora"
+            if tmp.entities.size > 0
+              tmp.entities.each do |value|
+                entity_id = value["id"]
+                tmp.client(entity_id).current_session = session["#{self.id}::#{k}::#{entity_id}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}::#{entity_id}:session"]
+              end
+            else
+              tmp.client.current_session = session["#{self.id}::#{k}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}:session"]
+            end
+          end
+          @logins[k] = tmp
+          self.attr_builder(k, @logins[k])
+        elsif k == "options"
+          v.each do |opt|
+            @options[opt["config_name"]] = opt
+          end
+        elsif k == "user_settings"
+          self.timezone =  v["timezone"]
+          self.locale = v["local"]
+        end
+      end
+    end
+
+    def send_email
+
+    end
+
+    def upload_to_s3(local_file,s3_path = nil)
+      s3_path = local_file.split("/").last if s3_path.nil?
+      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: @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)
+      OpenSSL::PKey::RSA.new(ZuoraConnect.configuration.private_key).private_decrypt(resp)
+    end
+
+    def attr_builder(field,val)
+      singleton_class.class_eval { attr_accessor "#{field}" }
+      send("#{field}=", val)
+    end
+
+    def generate_access_token
+      begin
+        self.token = SecureRandom.hex
+      end while self.class.exists?(token: token)
+    end
+
+  end
+end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store
@@ -148,6 +148,7 @@ files:
 - app/helpers/zuora_connect/api/v1/app_instance_helper.rb
 - app/helpers/zuora_connect/application_helper.rb
 - app/models/zuora_connect/app_instance.rb
+- app/models/zuora_connect/app_instance_base.rb
 - app/models/zuora_connect/login.rb
 - app/views/layouts/zuora_connect/application.html.erb
 - app/views/zuora_connect/static/invalid_app_instance_error.html.erb
@@ -226,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Summary of Connect.