app_manager 1.2.4 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c547a5aa3260006c06faf84cd242801459dc0d6557139d94797558b2e960cf3
-  data.tar.gz: bb52538ee806521616ca899b526db05d5dfa606921c0a49874584af7d5960ed2
+  metadata.gz: 559b2673d956bf393a0182e6bce25468802af17e39d6f3144a4ffdc6b78c8746
+  data.tar.gz: 698af4708cb8956733e8c6430fd4a280547411263ffac2f92dadd3e6fc3be8a1
 SHA512:
-  metadata.gz: 0cf9d50efcfd4a72bc88a842d1ba7508a56cfe0a4eb29c3226ed526cda19a095125382292093fd2f296ea71c8cdca562039af5dda5b2ba2df34fe4ca05070f8c
-  data.tar.gz: 6b4db1ea27b42898de5549a5fa528a3df9c759071e228d9a373075766b91086658d632b8427e5d9761382d16c3f46cb2685b5dcb8f33898f4590e3f7dd50f3f9
+  metadata.gz: bc4d093387cbf91f43cc6e303b5829f9aa30e8f4e80299419edcc324a9902a34cf26e39f6a1bfc8770da596efd34fa746be692f5ca9d7d9f0b688f1e41a96e17
+  data.tar.gz: cb61ff896ea8f84cd97305a711befc02dfd2ebd56da8d0d652b251d0ff9c55a20ab8992ada75854e7fb8f81e58b22314e8af8ac198064a4d66f0add031b19ca5

data/.gitignore

@@ -6,4 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-/.env
+/.env
+.idea/
+.rakeTasks

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    app_manager (1.2.4)
+    app_manager (1.2.7)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)
-      sqlite3 (~> 1.3.0)
+      sqlite3 (~> 1.4.4)
 
 GEM
   remote: https://rubygems.org/
@@ -93,7 +93,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.10.0)
+    i18n (1.11.0)
       concurrent-ruby (~> 1.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -118,7 +118,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)
@@ -136,9 +135,6 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
     nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
     pry (0.14.1)
@@ -192,7 +188,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.4)
     strscan (3.0.3)
     thor (1.2.1)
     timeout (0.3.0)

data/app/controllers/app_manager/plans_controller.rb

@@ -16,6 +16,7 @@ module AppManager
 	    	active_charge = nil
 			default_plan_id = nil
 			choose_later = false
+			trial_activated_at = nil
 			plan_obj = AppManager::Client.new
 			plans = []
 			if params[:shop_domain].present? && !AppManager.configuration.plan_features.nil?
@@ -31,7 +32,7 @@ module AppManager
 				    @trial_activated_field = AppManager.configuration.field_names['trial_activated_at'] 
 					trial_activated_at = @shop[@trial_activated_field] rescue nil
 					active_charge = plan_obj.get_charge(params[:shop_domain])
-					if active_charge && active_charge.any? && active_charge['active_charge'].nil? && active_charge['cancelled_charge'].nil? && !trial_activated_at 
+					if active_charge && active_charge.any? && active_charge['active_charge'].nil? && active_charge['cancelled_charge'].nil? && !trial_activated_at && !plan 
 					choose_later = true
 					end
 
@@ -66,7 +67,7 @@ module AppManager
 				'plan' => plan,
 				'default_plan_id' => default_plan_id,
                 'choose_later' => choose_later,
-                'has_active_charge' => (!active_charge['active_charge'].nil? ? true : false) 
+                'has_active_charge' => (((active_charge && active_charge.any? && !active_charge['active_charge'].nil?) or !trial_activated_at) ? true : false) 
 			}
 			render json: response
 	    end

data/app_manager.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "httparty"
   spec.add_dependency "rails",   '>= 5.2.0'
   spec.add_dependency "kaminari",   '>= 0.16.3'
-  spec.add_dependency "sqlite3", '~> 1.3.0'
+  spec.add_dependency "sqlite3", '~> 1.4.4'
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

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/client/plans.rb

@@ -38,6 +38,10 @@ module AppManager
 				  get("/get-status", options)
 			  end
 
+			  def has_plan(shop_domain,plan_id,trial_activated_at,grandfathered)
+			  	  get("/has-plan?shop_domain=#{shop_domain}&plan_id=#{plan_id}&trial_activated_at=#{trial_activated_at}&grandfathered=#{grandfathered}")
+			  end
+
 
 			end
 	end

data/lib/app_manager/graphql_helper.rb

@@ -61,10 +61,8 @@ module AppManager
       trial_days = plan['trial_days'] || 0
 
       if shop && shop.shopify_domain && trial_days
-        trial_activated_at_field = AppManager.configuration.field_names['trial_activated_at'] rescue nil
-        trial_activated_at = shop[trial_activated_at] rescue nil
-        plan_field = AppManager.configuration.plan_id_or_name_field rescue nil
-        plan_id_field = shop[@plan_field] rescue nil
+        trial_activated_at = shop[AppManager.configuration.field_names['trial_activated_at']] rescue nil
+        plan_id_field = shop[AppManager.configuration.plan_id_or_name_field] rescue nil
         remaining_obj = AppManager::Client.new
         remaining = remaining_obj.get_remaining_days(shop.shopify_domain,trial_activated_at,plan_id_field)
         trial_days = !remaining.nil? ? remaining : trial_days

data/lib/app_manager/model.rb

@@ -5,7 +5,7 @@ module AppManager
      @@remaining_cache_key = "get_remaining_days_key"
      @@get_charge_key = "get_charge_key"
 
-    def has_plan
+    def has_plan_old
         if !self[AppManager.configuration.plan_id_or_name_field]
             return false;
         end 
@@ -28,6 +28,20 @@ module AppManager
         return active_charge && active_charge['active_charge'].present? && !active_charge['active_charge'].nil? ? true : false
     end
 
+    def has_plan
+        plan_id = self[AppManager.configuration.plan_id_or_name_field]
+        if !plan_id
+            return false;
+        end
+        grandfathered = self[AppManager.configuration.field_names['grandfathered']] 
+        grandfathered = grandfathered ? 1 : 0
+        shop_domain = self[AppManager.configuration.shopify_domain_field]
+        trial_activated_at_field = AppManager.configuration.field_names['trial_activated_at']
+        trial_activated_at_val = self[trial_activated_at_field]
+        plan_obj = AppManager::Client.new
+        response = plan_obj.has_plan(shop_domain,plan_id,trial_activated_at_val,grandfathered)
+        return (response && response['has_plan']) || false
+    end
 
 
     def plan_features
@@ -51,7 +65,7 @@ module AppManager
 
 
     def has_feature(slug)
-    	self.plan_features.select{|x| x['slug'].to_s == slug }.size > 0
+    	self.plan_features.any? && self.plan_features.select{|x| x['slug'].to_s == slug }.size > 0 ? true : false
     end
 
 
@@ -67,17 +81,14 @@ module AppManager
     end
 
     def get_remaining_days
-        begin
             shop_domain = self[AppManager.configuration.shopify_domain_field]
             trial_activated_at_field = AppManager.configuration.field_names['trial_activated_at']
             trial_activated_at_val = self[trial_activated_at_field]
             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
-        rescue Exception => e
-            return "#{e.inspect}" 
-        end
+            res = plan_obj.get_remaining_days(shop_domain,trial_activated_at_val,plan_id)
+            return (res && !res.nil?) ? res : 0
     end
 
 

data/lib/app_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppManager
-  VERSION = "1.2.4"
+  VERSION = "1.2.7"
 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.4
+  version: 1.2.7
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.4
 description: Provides helper function to access AppManager API
 email: rahul.t@hulkapps.com
 executables: []