zuora_connect 1.4.13a → 1.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e57dbd41b6b3061db0b57e211bf1b53deee71d6
-  data.tar.gz: 2a18c93ae7ab502bd165fa6dda57a21ff70b4db5
+  metadata.gz: e73c25e9febca6028ce9eea3567c32f5581657a9
+  data.tar.gz: 6f1da4f69f89c488ab5dbb552dc18e2b774143d2
 SHA512:
-  metadata.gz: 9b739b5d69418ddc0dcac8d70e454a932a9c829090685eae8d75d011ad3bdc12894f238b57ea5cb37dfd7e459bf10b2792413a7bf1e0d4bfc78074ff496f3c76
-  data.tar.gz: d57d581cd02e8c52b24d204e31edfac7af8ae7a96563cbde43255d19b39f95da6bad91b012b287ff6a3337eb24f7a9093fdf1ac5c06784cdb0879087f2243fa5
+  metadata.gz: 88081b7081819c38d4017b4429938d728a0e0422cc9d745f1be1ad7c72798143c7b61e88fd59c99c43db8a09cde3468bc4aa6cefa157d0fea376d9cc37474151
+  data.tar.gz: cdfe231a983d87f0f91baa038315cecf79e069ed53df50493800fbf2950dee5151863a2b59d1729648cf24500f202c5cb0592ceb8b31fd7c0bf70e5520186ff4

data/app/models/zuora_connect/app_instance_base.rb

@@ -23,20 +23,16 @@ module ZuoraConnect
     end
 
     def cache_app_instance
-      if defined?(Redis)
-        Redis.current.set("AppInstance:#{self.id}", encrypt_data(self.save_data.to_json))
-        Redis.current.expire("AppInstance:#{self.id}", 60.minutes.to_i)
-        Redis.current.del("Deleted:#{self.id}")
-      end
+      $redis.set("AppInstance:#{self.id}", encrypt_data(self.save_data.to_json))
+      $redis.expire("AppInstance:#{self.id}", 60.minutes.to_i)
+      $redis.del("Deleted:#{self.id}")
     end
 
     def decrypt_data(data)
-      return data if data.blank?
       return Rails.env == 'development' ? JSON.parse(data) : JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
     end
 
     def encrypt_data(data)
-      return data if data.blank?
       return Rails.env == 'development' ? data : encryptor.encrypt_and_sign(data)
     end
 
@@ -55,18 +51,13 @@ module ZuoraConnect
     def catalog_lookup(entity_id: nil, object: :product, object_id: nil, map_lower_objects: true)
       entity_reference = entity_id.blank? ? 'Default' : entity_id
       object_hierarchy = (JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog_mapping #> \'{%s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s LIMIT 1' % [entity_reference, self.id]).first["item"] || "{}") [object_id] || {"productId" => "SAFTEY", "productRatePlanId" => "SAFTEY", "productRatePlanChargeId" => "SAFTEY"})
-      
-      if defined?(Redis) && !object_id.blank?
-        stub_catalog = decrypt_data(Redis.current.get("Catalog:#{self.id}:#{object_id}"))
-      end
 
       case object
       when :product
         if object_id.blank?
-          stub_catalog ||= JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, self.id]).first["item"] || "{}")
-          Redis.current.set("Catalog:#{self.id}:#{object_id}", encrypt_data(stub_catalog))
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, self.id]).first["item"] || "{}")
         else
-          stub_catalog ||= JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s, %s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, object_id,  self.id]).first["item"] || "{}")
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s, %s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, object_id,  self.id]).first["item"] || "{}")
         end
 
         if !map_lower_objects
@@ -74,10 +65,9 @@ module ZuoraConnect
         end
       when :rateplan
         if object_id.blank?
-          stub_catalog ||= JSON.parse(ActiveRecord::Base.connection.execute('SELECT json_object_agg(rateplan_id, rateplan) AS item FROM "public"."zuora_connect_app_instances", jsonb_each(("public"."zuora_connect_app_instances"."catalog" #> \'{%s}\' )) AS e(product_id, product), jsonb_each(product #> \'{productRatePlans}\') AS ee(rateplan_id, rateplan) WHERE "id" = %s' % [entity_reference, self.id]).first["item"] || "{}")
-          Redis.current.set("Catalog:#{self.id}:#{object_id}", encrypt_data(stub_catalog))
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT json_object_agg(rateplan_id, rateplan) AS item FROM "public"."zuora_connect_app_instances", jsonb_each(("public"."zuora_connect_app_instances"."catalog" #> \'{%s}\' )) AS e(product_id, product), jsonb_each(product #> \'{productRatePlans}\') AS ee(rateplan_id, rateplan) WHERE "id" = %s' % [entity_reference, self.id]).first["item"] || "{}")
         else
-          stub_catalog ||= JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s, %s, productRatePlans, %s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, object_hierarchy['productId'], object_id,  self.id]).first["item"] || "{}")
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s, %s, productRatePlans, %s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, object_hierarchy['productId'], object_id,  self.id]).first["item"] || "{}")
         end
 
         if !map_lower_objects
@@ -85,10 +75,9 @@ module ZuoraConnect
         end
       when :charge
         if object_id.blank?
-          stub_catalog ||= JSON.parse(ActiveRecord::Base.connection.execute('SELECT json_object_agg(charge_id, charge) as item FROM "public"."zuora_connect_app_instances", jsonb_each(("public"."zuora_connect_app_instances"."catalog" #> \'{%s}\' )) AS e(product_id, product), jsonb_each(product #> \'{productRatePlans}\') AS ee(rateplan_id, rateplan), jsonb_each(rateplan #> \'{productRatePlanCharges}\') AS eee(charge_id, charge) WHERE "id" = %s' % [entity_reference, self.id]).first["item"] || "{}")
-          Redis.current.set("Catalog:#{self.id}:#{object_id}", encrypt_data(stub_catalog))
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT json_object_agg(charge_id, charge) as item FROM "public"."zuora_connect_app_instances", jsonb_each(("public"."zuora_connect_app_instances"."catalog" #> \'{%s}\' )) AS e(product_id, product), jsonb_each(product #> \'{productRatePlans}\') AS ee(rateplan_id, rateplan), jsonb_each(rateplan #> \'{productRatePlanCharges}\') AS eee(charge_id, charge) WHERE "id" = %s' % [entity_reference, self.id]).first["item"] || "{}")
         else
-          stub_catalog ||= JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s, %s, productRatePlans, %s, productRatePlanCharges, %s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, object_hierarchy['productId'], object_hierarchy['productRatePlanId'], object_id, self.id]).first["item"] || "{}")
+          stub_catalog = JSON.parse(ActiveRecord::Base.connection.execute('SELECT catalog #> \'{%s, %s, productRatePlans, %s, productRatePlanCharges, %s}\' AS item FROM "public"."zuora_connect_app_instances" WHERE "id" = %s' % [entity_reference, object_hierarchy['productId'], object_hierarchy['productRatePlanId'], object_id, self.id]).first["item"] || "{}")
         end
       end
    

data/lib/zuora_connect/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.4.13a
+  version: 1.4.13
 platform: ruby
 authors:
 - Connect Team
@@ -297,9 +297,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8