zuora_connect 1.3.9 → 1.4.0a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6d5f05b1b4f3c37602ba49c9745757106ccc1ef
-  data.tar.gz: 51a55dd0baf20f50417d3297c5e2c243c6e880d6
+  metadata.gz: 5a2bce9917263f9e79e86e7f92b0eb3e7b208aa3
+  data.tar.gz: cef13fbb624e9d6ee81295e352766f9b2d5f9115
 SHA512:
-  metadata.gz: c90ceda1f586db2589e88743584b2a9c264fdd360a4c902f86877cc31d18ebe05947ad2bd32a34a746d00095ba9946c3e7f7d05d724c922614af2f4fe6f7f13a
-  data.tar.gz: c654907409adbb582b22e3b52c0655dbcafb137772d172f02abd843c462e417c3c8d12342512aca4d62ad037bd51e7ddd3a1b7df042f4c49be74dc7a424c5f9b
+  metadata.gz: d68a9eefa6b7139ae3b6ede62ceeb027cf6957fe458ff29e05f9227c61e55d15deaf645dc76491111d869d1034c8b1adf562f952042a60d1899f162f2090184e
+  data.tar.gz: cb18a44be8d166f1ef9f0a2d06ace9a99800b26c83267265164ace509c4d63ec634da84277131527ed61d0a83faf7eb6df0f963c2d28aae7f3c3634a950449fc

data/app/models/zuora_connect/app_instance_base.rb

@@ -11,14 +11,14 @@ module ZuoraConnect
       self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
       self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
       Apartment::Tenant.switch!(self.id)
-      if( ActiveRecord::Migrator.needs_migration?)
+      if( ActiveRecord::Migration.check_pending! != nil)
         Apartment::Migrator.migrate(self.id)
       end
       Thread.current[:appinstance] = self
     end
 
-    def data_lookup(session: {})
-      return session
+    def data_lookup(session: nil)
+      return session.blank? ? {} : session
     end
 
     def cache_app_instance
@@ -27,12 +27,12 @@ module ZuoraConnect
       $redis.del("Deleted:#{self.id}")
     end
 
-    def decrypt_data(data)
+    def decrypt_data(data)  
       return Rails.env == 'development' ? JSON.parse(data) : JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
     end
 
-    def encrypt_data(data)
-      return Rails.env == 'development' ? data : encryptor.encrypt_and_sign(data)
+    def encrypt_data(data)  
+      return Rails.env == 'development' ? data : encryptor.encrypt_and_sign(data) 
     end
 
     def encryptor
@@ -43,59 +43,6 @@ module ZuoraConnect
       return ActiveSupport::MessageEncryptor.new(secret, sign_secret)
     end
 
-    def catalog_outdated?
-      return self.catalog_updated_at.blank? || (self.catalog_updated_at < Time.now - 12.hours)
-    end
-
-    def catalog_lookup(entity_id: nil, object: :product, map_lower_objects: true)
-      entity_reference = entity_id.blank? ? 'Default' : entity_id
-      stub_catalog = ((self.catalog || {})[entity_reference] || {})
-      case object
-      when :product
-        if !map_lower_objects
-          stub_catalog = stub_catalog.map{|k,v| [k,v.except("productRatePlans").merge({"productRatePlans" =>  v["productRatePlans"].map {|k,v| v.except("productRatePlanCharges").merge({"productRatePlanCharges" =>  v["productRatePlanCharges"].map {|k,v| v}})}})]}.to_h
-        end
-      when :rateplan
-        stub_catalog = stub_catalog.map {|k,x| x["productRatePlans"] }.reduce({}, :merge)
-
-        if !map_lower_objects
-          stub_catalog = stub_catalog.map {|k,v| [k,v.except("productRatePlanCharges").merge({"productRatePlanCharges" =>  v["productRatePlanCharges"].map {|k,v| v}})]}.to_h
-        end
-      when :charge
-        stub_catalog = stub_catalog.map {|k,x| x["productRatePlans"].map{|k,x| x["productRatePlanCharges"] }.reduce({}, :merge)}.reduce({}, :merge)
-      end
-
-      return stub_catalog
-    end
-
-    def instance_failure(failure)
-      raise failure
-    end
-
-    def login_lookup(type: "Zuora")
-      results = []
-      self.logins.each do |name, login|
-        results << login if login.tenant_type == type
-      end
-      return results
-    end
-
-    def get_catalog(zuora_login: self.login_lookup.first, force_update: false, entity_id: nil)
-      entity_reference = entity_id.blank? ? 'Default' : entity_id
-      Rails.logger.debug("Fetching catalog for default") if entity_id.blank?
-      Rails.logger.debug("Fetching catalog for entity #{entity_id}") if !entity_id.blank?
-      if catalog_outdated? || force_update
-        Rails.logger.debug("Fetch Catalog")
-        self.update_column(:catalog_updated_at, Time.now.utc)
-        products = zuora_login.client(entity_reference).get_catalog
-        self.catalog = {} if self.catalog.blank? || self.catalog.class == Array
-        self.catalog[entity_reference] = products.blank? ? {} : products
-        self.update_column(:catalog, self.catalog)
-        self.touch
-      end
-      return self.catalog[entity_reference]
-    end
-
     def new_session(session: self.data_lookup, username: self.access_token, password: self.refresh_token)
       @api_version = (username.include?("@") ? "v1" : "v2")
       @username = username

data/app/models/zuora_connect/login.rb

@@ -4,7 +4,7 @@ module ZuoraConnect
     def initialize (fields)
       @clients = {}
       if fields["tenant_type"] == "Zuora" && fields["entities"] && fields["entities"].size > 0
-        @clients["Default"] = ::ZuoraAPI::Login.new(fields.map{|k,v| [k.to_sym, v]}.to_h)
+        @clients["none"] = ::ZuoraAPI::Login.new(fields.map{|k,v| [k.to_sym, v]}.to_h)
         @default_entity = fields["entities"][0]["id"] if fields["entities"].size == 1
         fields["entities"].each do |entity|
           login_fields = fields.map{|k,v| [k.to_sym, v]}.to_h
@@ -12,7 +12,7 @@ module ZuoraConnect
           @clients[entity["id"]] = ::ZuoraAPI::Login.new(login_fields)
         end
       elsif fields["tenant_type"] == "Zuora"
-        @clients["Default"] = ::ZuoraAPI::Login.new(fields.map{|k,v| [k.to_sym, v]}.to_h)
+        @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"
@@ -20,7 +20,7 @@ module ZuoraConnect
       fields.each do |k,v|
         self.attr_builder(k,v)
       end
-      @default_entity ||= "Default"
+      @default_entity ||= "none"
     end
 
     def attr_builder(field,val)
@@ -34,3 +34,5 @@ module ZuoraConnect
 
   end
 end
+
+

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.3.9"
+  VERSION = "1.4.0a"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0a
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-session_store
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.0a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.0a
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +217,6 @@ files:
 - 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/20110503003602_add_catalog_data_to_app_instance.rb
 - lib/tasks/zuora_connect_tasks.rake
 - lib/zuora_connect.rb
 - lib/zuora_connect/configuration.rb
@@ -281,9 +280,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/db/migrate/20110503003602_add_catalog_data_to_app_instance.rb

@@ -1,6 +0,0 @@
-class AddCatalogDataToAppInstance < ActiveRecord::Migration
-  def change
-    add_column :zuora_connect_app_instances, :catalog_updated_at, :datetime  unless column_exists? :zuora_connect_app_instances, :catalog_updated_at
-    add_column :zuora_connect_app_instances, :catalog, :jsonb  unless column_exists? :zuora_connect_app_instances, :catalog
-  end
-end