app_manager 1.2.2 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e3986aadebfd51cccf040bfd0a5ad36041de436ac3ab4c074fb0a2174a9da10
-  data.tar.gz: 83e772b1847481e9e91745f91569973d16e1809eb7732affe4f6f46ab3385c89
+  metadata.gz: b8b130ade59cce66eefb10134bca05802a6f7911e59123a1f8885789547a6c5f
+  data.tar.gz: d3fb70f8010e1d70dc1042c28322d5eeb7696cdecef9bd29fdd09e80a9a02e9d
 SHA512:
-  metadata.gz: 8793bb25fdfbff2ed36e2c0f4f24f63d6c40c1bc6df999ef101cfa6f6b66d2732729743f1ab2298d66debfbd6785ea47bddcdacf7fa3d21efcebdd17bcda5b3b
-  data.tar.gz: 1b040a0afaedeb15cf4892f9010105e4f1ea1e6f7a92b75c5d65dc5e1c3a5870fd3eb4a01f825738a5c8fbc722a8f3dd63fe3be8eb217bf19ac4859bc1d716bd
+  metadata.gz: 3fbef0b8ce7194394d942bbf2fd93d1aa52c7b9035be8a98a09ab080c33d047c8e8fe213f66d5cc1396aa326f7d4881d0db47077ffae42a01b1558f8a8c3febc
+  data.tar.gz: e2138c8801189e683ae7db8703dbe2703eedfdedca2a87c0a6f00528bb49bcd28436e457aeb77dca3113993599459b25632e190ee85e95521332d43fe018a4a1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.2.2)
+    app_manager (1.2.5)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)

data/app/controllers/app_manager/plans_controller.rb

@@ -172,6 +172,7 @@ module AppManager
 	    end
 
 
+
         private
 
         def params_permit

data/lib/app_manager/client/connection.rb

@@ -24,7 +24,11 @@ module AppManager
 
       def request(http_method, path, options)
         begin
+          if http_method.to_s == 'get'
+          response = response_from_cache_for_api(http_method, path, options)
+          else
           response = self.class.send(http_method, path, { body: options, timeout: 10 })
+          end
           if path.include? "/get-status"
             data = response
           elsif path.include? "/sync-charge" 
@@ -44,6 +48,22 @@ module AppManager
         end
       end
 
+      def response_from_cache_for_api(http_method, path, options)
+        cache_key = "app-manager-cache/#{path}"
+        if fetch_static_cached_response(cache_key).present?
+          return fetch_static_cached_response(cache_key)
+        end
+        response = self.class.send(http_method, path, { body: options, timeout: 10 })
+        Rails.cache.write(cache_key, response, expires_in: AppManager.configuration.expires_in)
+        return response
+      end
+
+      def fetch_static_cached_response(cache_key)
+        if Rails.cache.read(cache_key).present?
+          return Rails.cache.read(cache_key) 
+        end
+      end
+
       def parse_data(original_data)
         return unless original_data
         if (original_data.class == Hash) && original_data.key?("headers") && original_data.key?("footers") && original_data.key?("modal")

data/lib/app_manager/config.rb

@@ -35,7 +35,7 @@ module AppManager
         'email' => 'email'
     }
       @fs = AppManager::FailSafe.new
-      AppManager.clear_cache
+      # AppManager.clear_cache
     end
 
     def expires_in

data/lib/app_manager/fail_safe.rb

@@ -10,7 +10,7 @@ module AppManager
 		def initialize(db_name='app_manager_local')
 			@apm_db = SQLite3::Database.open "db/#{db_name}.db"
 			begin
-				FileUtils.chmod 0777, "db/#{db_name}.db"
+				FileUtils.chmod 0664, "db/#{db_name}.db"
 			rescue Exception => e
 				puts ">>>>>> #{e.inspect}"
 			end			

data/lib/app_manager/model.rb

@@ -2,7 +2,8 @@ module AppManager
   module Model
     extend ActiveSupport::Concern
 
-    
+     @@remaining_cache_key = "get_remaining_days_key"
+     @@get_charge_key = "get_charge_key"
 
     def has_plan
         if !self[AppManager.configuration.plan_id_or_name_field]
@@ -16,14 +17,15 @@ module AppManager
             Rails.logger.info "Plan id found nil or not set"
             return false;
         end
-        remaining_days = self.get_remaining_days
+        remaining_days = fetch_static_remaining_days
         if remaining_days > 0
             return true
         end
-        plan_obj = AppManager::Client.new
-        shop_domain = self[AppManager.configuration.shopify_domain_field]
-        active_charge = plan_obj.get_charge(shop_domain) rescue nil
-        return active_charge['active_charge'].present? && !active_charge['active_charge'].nil? ? true : false
+        # plan_obj = AppManager::Client.new
+        # shop_domain = self[AppManager.configuration.shopify_domain_field]
+        # active_charge = plan_obj.get_charge(shop_domain) rescue nil
+        active_charge = fetch_static_get_charge
+        return active_charge && active_charge['active_charge'].present? && !active_charge['active_charge'].nil? ? true : false
     end
 
 
@@ -72,7 +74,7 @@ module AppManager
             plan_field = AppManager.configuration.field_names['plan_id']
             plan_id = self[plan_field]
             plan_obj = AppManager::Client.new
-            shop_domain ? plan_obj.get_remaining_days(shop_domain,trial_activated_at_val,plan_id) : 0
+            return shop_domain ? plan_obj.get_remaining_days(shop_domain,trial_activated_at_val,plan_id) : 0
         rescue Exception => e
             return "#{e.inspect}" 
         end
@@ -195,6 +197,41 @@ module AppManager
 
 
 
+    def fetch_static_remaining_days
+        @remaining_cache_key = "app-manager-cache/#{self.shopify_domain}-remaining_days"
+        if fetch_cached_static_remaining_days(@remaining_cache_key).present?
+          return fetch_cached_static_remaining_days(@remaining_cache_key)
+        end
+        remaining_days = self.get_remaining_days
+        Rails.cache.write(@remaining_cache_key, remaining_days, expires_in: AppManager.configuration.expires_in)
+        return remaining_days
+      end
+
+      def fetch_cached_static_remaining_days(cache_key)
+        if Rails.cache.read(cache_key).present?
+          return Rails.cache.read(cache_key) 
+        end
+      end
+
+
+
+    def fetch_static_get_charge
+        @get_charge_key = "app-manager-cache/#{self.shopify_domain}-get_charge"
+        if fetch_cached_static_get_charge(@get_charge_key).present?
+          return fetch_cached_static_get_charge(@get_charge_key)
+        end
+        charge = self.get_charge
+        Rails.cache.write(@get_charge_key, charge, expires_in: AppManager.configuration.expires_in)
+        return charge
+    end
+
+    def fetch_cached_static_get_charge(cache_key)
+        if Rails.cache.read(cache_key).present?
+          return Rails.cache.read(cache_key) 
+        end
+    end
+
+
     private
     
     def casted_value(value,value_type)

data/lib/app_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppManager
-  VERSION = "1.2.2"
+  VERSION = "1.2.5"
 end

data/lib/app_manager.rb

@@ -27,7 +27,11 @@ module AppManager
   end
 
   def self.clear_cache
-     Rails.cache.delete_matched('app-manager-cache/*')
+  	begin
+  		Rails.cache.delete_matched('app-manager-cache/*')
+  	rescue Exception => e
+  		Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
+  	end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.5
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty