app_manager 1.3.0 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccc14af26b2bc149bba059ef2c7d45e58bc0d8460f02141d26edce1ba465aaeb
-  data.tar.gz: 51da1f98e7d8bb114e3adbf80cfe510fd66caa7965525adf0cb98c8ad4fa5ca0
+  metadata.gz: 9b43df1c21cb67c078b9a24c4152573750ffcaf7e13e9748380c642ebe62a7f1
+  data.tar.gz: 1d0e8f8dff11ff42024d85999189384408b663b6d196798d415ba6eed1ff606f
 SHA512:
-  metadata.gz: 13238860ae46955c3c6fa71e304d0be8e29b30c2940d29ff07e8b31e724bf887349f4148c452e137b4b5d0f551e1e047f9ca16a413cb09788795dacc304dbc75
-  data.tar.gz: 18d9de82d48bcaa9dd9dff5a4cc8473d704c06096228e3a2148a26d2022ef6b8c71a6bb45cf877f9296ed391e33508fa7368ecc0b77eac8ed77c2dc25d100129
+  metadata.gz: 15cb229b021268ad6a36ac708cdb50a5305db6e654ec34317b0685c91cbde3515789ab84d57f13118313b7355be7d1084c43b2ae60dbc84098d5e72f04d47ae3
+  data.tar.gz: 126d03e0ce67248128236fde8cbd4c98d246f012358965b5b8fd000df7bb396e5e75125b42e3d0552b7cd8177e49ffdd0cd73d931af769a6606400953b657afc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.3.0)
+    app_manager (1.3.3)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)
@@ -117,7 +117,6 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
     minitest (5.16.2)
     multi_xml (0.6.0)
     net-imap (0.2.3)
@@ -135,8 +134,7 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)

data/app/controllers/app_manager/plans_controller.rb

@@ -160,18 +160,18 @@ module AppManager
       params_permit
       Thread.new do
         @fs = AppManager::FailSafe.new
-        # begin
-        #   @fs.sync_app_manager
-        # rescue Exception => e
-        #   Rails.logger.info "APP MANAGER >>>> LOCAL DB couldn't sync with POTAL DB #{e.inspect}"
-        # end
+        begin
+          @fs.sync_app_manager
+        rescue Exception => e
+          Rails.logger.info "APP MANAGER >>>> LOCAL DB couldn't sync with POTAL DB #{e.inspect}"
+        end
 
-        # begin
+        begin
         @fs.save_api_data(params)
-          # rescue Exception => e
-          # Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
-          # end
-          # AppManager.clear_cache
+          rescue Exception => e
+          Rails.logger.info "APP MANAGER >>>> #{e.inspect}"
+          end
+          AppManager.clear_cache
       end
       head :ok
     end

data/lib/app_manager/client/connection.rb

@@ -23,8 +23,10 @@ module AppManager
       private
 
       def request(http_method, path, options)
-          if http_method.to_s == 'get'
+          failsafe_or_caching_done = false
+          if http_method.to_s == 'get' && !path.include?("/get-status") && !path.include?("/sync-charge")
           response = response_from_cache_for_api(http_method, path, options)
+          failsafe_or_caching_done = true
           else
           response = self.class.send(http_method, path, { body: options, timeout: 10 })
           end
@@ -34,12 +36,19 @@ module AppManager
             data = response.parsed_response
             data = parse_data(response.parsed_response)
           else
-            if response.code.to_s.start_with?('2') or response.code.to_s.start_with?('4')
+            if response.class.to_s == "HTTParty::Response" && (response.code.to_s.start_with?('2') or response.code.to_s.start_with?('4')) && (response.code.to_s != '429')
               data = response.parsed_response
               data = parse_data(response.parsed_response)
-              data = response_from_failsafe(path,options)
+              # data = response_from_failsafe(path,options) #uncomment to test failsafe
+              return data
             else
-              data = response_from_failsafe(path,options) 
+              if failsafe_or_caching_done == true
+                data = response
+                return data
+              else
+                data = response_from_failsafe(path,options)
+                return data
+              end
             end
           end
        end
@@ -50,7 +59,11 @@ module AppManager
           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)
+        if response.class.to_s == "HTTParty::Response" && (response.code.to_s.start_with?('2') or response.code.to_s.start_with?('4')) && (response.code.to_s != '429')
+           Rails.cache.write(cache_key, response, expires_in: AppManager.configuration.expires_in)
+        else
+          response = response_from_failsafe(path,options)
+        end
         return response
       end
 

data/lib/app_manager/fail_safe.rb

@@ -399,23 +399,22 @@ module AppManager
 
     def get_local_has_plan(params, options)
       if params["grandfathered"].present? && params["grandfathered"] == 1
-        return {:has_plan => true}
+        return {"has_plan" => true}
       end
       plans = AppManager::Plan.where(id: params["plan_id"])
       if plans.any? && plans.first.price == 0
-        return {:has_plan => true}
+        return {"has_plan" => true}
       end
       @remaining_days = get_local_remaining_days(params, options)
-      puts @remaining_days.inspect
       if (@remaining_days && @remaining_days > 0)
-        return {:has_plan => true}
+        return {"has_plan" => true}
       end
       active_charge = AppManager::Charge.where(status: 'active', shop_domain: params["shop_domain"])
       if active_charge.any?
-        return {:has_plan => true}
+        return {"has_plan" => true}
       end
 
-      return {:has_plan => false}
+      return {"has_plan" => false}
 
     end
 

data/lib/app_manager/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.3
 platform: ruby
 authors:
 - Hulkapps