zuora_connect 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60246e1ca36f66fba7eecb4903262715f37f190a
-  data.tar.gz: d2e9a02c090cd3dd20968d59c660395ab132bf9a
+  metadata.gz: 42044116d3463337d0e299acf27a87d61b2bf062
+  data.tar.gz: 49bf8ebf4242594ef406e2b9e9a29369150322f5
 SHA512:
-  metadata.gz: 8ffa066023e356a9339bec3a40bae4842bca29e2e0afaff267538862401ee8765f21e66cdef56bf6f73289353379afbbdb140846da70e851932018546efeb2b2
-  data.tar.gz: 50c4ccae0d41690143e42d92ed10bc57b32f66879417bbd2a8a6fb25670a68ceb2348dc4c72505dec03c59a5f93b41cea4df831c33a99ca40f25130a3fa9820a
+  metadata.gz: 0159a60522458ac5d4527420f51b0e0a9864a320cd541e4a46f0fb57e08c49f6fb4ae6e78de7d2c2e9ddc63611dd34e8480b2c42cbae6c7d01b248bdcb370c78
+  data.tar.gz: 1df1c2d11a03f1e26b9c551d371dce00a9eb66613a72f9a3acead6235c93e69cbb38cccd5487073077e4b36fde2c2c3f5ad05700e09877b4443ccb80e6e1ce97

data/app/models/zuora_connect/app_instance.rb

@@ -52,7 +52,13 @@ module ZuoraConnect
     def save_data(session = Hash.new)
       self.logins.each do |key, login|
         if login.tenant_type == "Zuora"
-          session["#{self.id}::#{key}:session"] = login.client.current_session
+          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
@@ -85,7 +91,16 @@ module ZuoraConnect
       @task_data.each do |k,v|
         if k.match(/^(.*)_login$/)
           tmp = ZuoraConnect::Login.new(v)
-          tmp.client.current_session = session["#{self.id}::#{k}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}:session"]
+          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"

data/app/models/zuora_connect/login.rb

@@ -2,7 +2,20 @@ module ZuoraConnect
   class Login
 
     def initialize (fields)
-      self.attr_builder("client",::ZuoraAPI::Login.new(fields.map{|k,v| [k.to_sym, v]}.to_h)) if fields["tenant_type"] == "Zuora"
+      @clients = {}
+      if fields["tenant_type"] == "Zuora" && fields["entities"] && fields["entities"].size > 0
+        @clients["none"] = ::ZuoraAPI::Login.new(fields.map{|k,v| [k.to_sym, v]}.to_h)
+        fields["entities"].each do |entity|
+          login_fields = fields.map{|k,v| [k.to_sym, v]}.to_h
+          login_fields[:entity_id] = entity["id"]
+          @clients[entity["id"]] = ::ZuoraAPI::Login.new(login_fields)
+        end
+      elsif fields["tenant_type"] == "Zuora"
+        @clients["none"] = ::ZuoraAPI::Login.new(fields.map{|k,v| [k.to_sym, v]}.to_h)
+      end
+
+      self.attr_builder("available_entities",@clients.keys) if fields["tenant_type"] == "Zuora"
+
       fields.each do |k,v|
         self.attr_builder(k,v)
       end
@@ -13,5 +26,11 @@ module ZuoraConnect
       send("#{field}=", val)
     end
 
+    def client(id = nil)
+      return id.nil? ? @clients["none"] : @clients[id]
+    end
+
   end
 end
+
+

data/config/initializers/apartment.rb

@@ -48,7 +48,7 @@ Apartment.configure do |config|
   # end
   #
   config.tenant_names = lambda { ZuoraConnect::AppInstance.pluck :id }
-  config.excluded_models = ["ZuoraConnect::AppInstance"]
+  config.excluded_models = ["ZuoraConnect::AppInstance", "ActiveRecord::SessionStore::Session"]
 
   #
   # ==> PostgreSQL only options

data/db/migrate/20170131211919_add_sessions_table.rb

@@ -0,0 +1,12 @@
+class AddSessionsTable < ActiveRecord::Migration
+  def change
+    create_table :sessions do |t|
+      t.string :session_id, :null => false
+      t.text :data
+      t.timestamps
+    end
+
+    add_index :sessions, :session_id, :unique => true
+    add_index :sessions, :updated_at
+  end
+end

data/lib/zuora_connect/engine.rb

@@ -3,6 +3,7 @@ require 'zuora_connect'
 require 'apartment'
 require 'httparty'
 require 'zuora_api'
+require 'activerecord/session_store'
 
 module ZuoraConnect
   class Engine < ::Rails::Engine

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord-session_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: apartment
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +143,7 @@ files:
 - 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
 - lib/tasks/zuora_connect_tasks.rake
 - lib/zuora_connect.rb
 - lib/zuora_connect/configuration.rb