app_manager 1.3.2 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d929322090bfd34a68ef7e9049e2d7f5833a7f140da6ea524df5649de2d888d
-  data.tar.gz: 21a5fb7b13c4bdfd067e2504759be2f9cd8c2a39531afd21ebe279179c0fa516
+  metadata.gz: 19143ee5bb30c0d6f1dce901a195eb9fe021ee4755dd752e45ee364f6146687d
+  data.tar.gz: 99eecbe9df8a0263077579c308c8b1838c6bbbceec699ea7289dd806d0ce469d
 SHA512:
-  metadata.gz: d3d52ceb7551a5ace2076f10414b1624d43b69be4024f67eef5a79e043a307ee39e62d78399220ec084f641174f496359f7c6d99c031aed5f1b489251c4422c3
-  data.tar.gz: 5d3f77fc3febddf0effe43ada6ae02dbc07f9cc7f3073540e1004e49a9d4593fb5c8c00439cf6ffa20ef26f82af8050c886bb3523797b25430a82f2491c92a96
+  metadata.gz: 8c264bf7f5b5d4d1f207a1d79dfcf398a624d077f2a4543cdbfacb7e06b39f26420c92aa8d654392a39a7db22c144b1810000533390531840b43150b526de3eb
+  data.tar.gz: 044cf45961370e69beb87a761e74d7bb1a25e4674931195c2d0e49d786bfcb16aee1878a9e25e76bb0af1e3ece9034a24c7728ceabde5a991364560162d8c996

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.3.2)
+    app_manager (1.3.5)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)
@@ -9,67 +9,67 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.3)
-      actionpack (= 7.0.3)
-      activesupport (= 7.0.3)
+    actioncable (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.3)
-      actionpack (= 7.0.3)
-      activejob (= 7.0.3)
-      activerecord (= 7.0.3)
-      activestorage (= 7.0.3)
-      activesupport (= 7.0.3)
+    actionmailbox (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.3)
-      actionpack (= 7.0.3)
-      actionview (= 7.0.3)
-      activejob (= 7.0.3)
-      activesupport (= 7.0.3)
+    actionmailer (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.3)
-      actionview (= 7.0.3)
-      activesupport (= 7.0.3)
+    actionpack (7.0.3.1)
+      actionview (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.3)
-      actionpack (= 7.0.3)
-      activerecord (= 7.0.3)
-      activestorage (= 7.0.3)
-      activesupport (= 7.0.3)
+    actiontext (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.3)
-      activesupport (= 7.0.3)
+    actionview (7.0.3.1)
+      activesupport (= 7.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.3)
-      activesupport (= 7.0.3)
+    activejob (7.0.3.1)
+      activesupport (= 7.0.3.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.3)
-      activesupport (= 7.0.3)
-    activerecord (7.0.3)
-      activemodel (= 7.0.3)
-      activesupport (= 7.0.3)
-    activestorage (7.0.3)
-      actionpack (= 7.0.3)
-      activejob (= 7.0.3)
-      activerecord (= 7.0.3)
-      activesupport (= 7.0.3)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activestorage (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.3)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -135,7 +135,7 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.6)
+    nokogiri (1.13.7)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     pry (0.14.1)
@@ -146,28 +146,28 @@ GEM
     rack (2.2.4)
     rack-test (2.0.2)
       rack (>= 1.3)
-    rails (7.0.3)
-      actioncable (= 7.0.3)
-      actionmailbox (= 7.0.3)
-      actionmailer (= 7.0.3)
-      actionpack (= 7.0.3)
-      actiontext (= 7.0.3)
-      actionview (= 7.0.3)
-      activejob (= 7.0.3)
-      activemodel (= 7.0.3)
-      activerecord (= 7.0.3)
-      activestorage (= 7.0.3)
-      activesupport (= 7.0.3)
+    rails (7.0.3.1)
+      actioncable (= 7.0.3.1)
+      actionmailbox (= 7.0.3.1)
+      actionmailer (= 7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actiontext (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.3)
+      railties (= 7.0.3.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (7.0.3)
-      actionpack (= 7.0.3)
-      activesupport (= 7.0.3)
+    railties (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)

data/app/controllers/app_manager/plans_controller.rb

@@ -161,7 +161,7 @@ module AppManager
       Thread.new do
         @fs = AppManager::FailSafe.new
         begin
-          @fs.sync_app_manager
+            @fs.sync_app_manager
         rescue Exception => e
           Rails.logger.info "APP MANAGER >>>> LOCAL DB couldn't sync with POTAL DB #{e.inspect}"
         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.class.to_s == "HTTParty::Response" && (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
@@ -49,12 +58,16 @@ module AppManager
         if fetch_static_cached_response(cache_key).present?
           return fetch_static_cached_response(cache_key)
         end
+        begin
         response = self.class.send(http_method, path, { body: options, timeout: 10 })
-        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')
            Rails.cache.write(cache_key, response, expires_in: AppManager.configuration.expires_in)
         else
           response = response_from_failsafe(path,options)
         end
+        rescue Net::ReadTimeout => error
+          response = response_from_failsafe(path,options)
+        end
         return response
       end
 

data/lib/app_manager/fail_safe.rb

@@ -399,22 +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)
       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/model.rb

@@ -98,7 +98,6 @@ module AppManager
         if shop_plan_id && !shop_plan_id.nil?
           req_plan_id = shop_plan_id
         else
-          Rollbar.error("Invalid params, must have charge_id,shop && plan")
           return {}
         end
       end

data/lib/app_manager/version.rb

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

metadata

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