hotwire_native_version_gate 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b2d43b870dbf0099ed5a0c6e465a1853cc2ae96b2ab16f06570aa6397d71af
-  data.tar.gz: '08393f721a6e48fc5193c5a34c6b4c76936a1aa923c1b04c209c0666a66e7ad7'
+  metadata.gz: ebc18b98c7d0f0ea4318e3b3d4fdcf49bbf8cf6b0fb2cc4eeaed8589e1fcb385
+  data.tar.gz: b182557f57ff23e9d27c210a81e1cf1a23150cc87b4e4ae4d16a9215f36531dc
 SHA512:
-  metadata.gz: ea6c7456e14d5cdc4336c9ea872741087b203b01dd00b45ae36961182b589c83c260195d05b131445ba873c89b2423d31b79ff327ba2ce56ec535802734688e0
-  data.tar.gz: a4345f8b1044668538d643242c8fc8fb67aa43291365794cf60c041ef7f1371570de93f25c4d23fb812011d477414cfefe7d119ccde86183396fb11ef5990ac7
+  metadata.gz: ada0778b182a271c578e9f9d6a7959e3361a4e5aa1691a156fb4dca2e851383e3a54aa193011b8be8495872f1ee5d617309f47c08f73ab9cc92ed5e742a55da4
+  data.tar.gz: 8b49531a19959472f9fa81ea2bea13675c811dc933a033eef56b3faea19ccb5a8aedf8dcd888906bf6c83edbfba674a5291808fd993b9524ae564bd62a7a7bbe

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/hotwire_native_version_gate/concern.rb

@@ -20,23 +20,23 @@ module HotwireNativeVersionGate
 
     included do
       if respond_to?(:helper_method)
-        helper_method :native_feature_enabled?, :hotwire_native_ios?, :hotwire_native_android?
+        helper_method :native_feature?, :native_ios?, :native_android?
       end
     end
 
-    def native_feature_enabled?(feature)
+    def native_feature?(feature)
       user_agent = respond_to?(:request) && request.respond_to?(:user_agent) ? request.user_agent : nil
       VersionGate.feature_enabled?(feature, user_agent, context: self)
     end
 
-    def hotwire_native_ios?
+    def native_ios?(min_version = nil)
       user_agent = respond_to?(:request) && request.respond_to?(:user_agent) ? request.user_agent : nil
-      VersionGate.ios?(user_agent)
+      VersionGate.ios?(user_agent, min_version)
     end
 
-    def hotwire_native_android?
+    def native_android?(min_version = nil)
       user_agent = respond_to?(:request) && request.respond_to?(:user_agent) ? request.user_agent : nil
-      VersionGate.android?(user_agent)
+      VersionGate.android?(user_agent, min_version)
     end
   end
 end

data/lib/hotwire_native_version_gate/version_gate.rb

@@ -36,14 +36,12 @@ module HotwireNativeVersionGate
         handle_feature(feature_config, user_agent, context: context)
       end
 
-      def ios?(user_agent)
-        platform = match_platform(user_agent)
-        platform&.downcase == 'ios'
+      def ios?(user_agent, min_version = nil)
+        platform_check?('ios', user_agent, min_version)
       end
 
-      def android?(user_agent)
-        platform = match_platform(user_agent)
-        platform&.downcase == 'android'
+      def android?(user_agent, min_version = nil)
+        platform_check?('android', user_agent, min_version)
       end
 
       private
@@ -69,29 +67,34 @@ module HotwireNativeVersionGate
         nil
       end
 
+      def platform_check?(platform, user_agent, min_version = nil)
+        return false unless match_platform(user_agent)&.downcase == platform
+        return true unless min_version
+        compare_version(user_agent, min_version)
+      end
+
       def match_platform(user_agent)
         match_key(user_agent, :platform)
       end
 
+      def compare_version(user_agent, min_version)
+        version = match_key(user_agent, :version)
+        return false unless version
+
+        Gem::Version.new(version) >= Gem::Version.new(min_version)
+      end
+
       def handle_feature(feature_config, user_agent, context: nil)
         # if false or nil, return false
         return false unless feature_config
         # if true, return true
         return true if feature_config == true
         # if a string, compare the version
-        if feature_config.is_a?(String)
-          version = match_key(user_agent, :version)
-          return false unless version
-          return Gem::Version.new(feature_config) <= Gem::Version.new(version)
-        end
+        return compare_version(user_agent, feature_config) if feature_config.is_a?(String)
         # if a symbol, call the method on the context (if provided) or self
-        if feature_config.is_a?(Symbol)
-          if context
-            return context.send(feature_config)
-          else
-            return send(feature_config)
-          end
-        end
+        return context.send(feature_config) if feature_config.is_a?(Symbol) && context
+        return send(feature_config) if feature_config.is_a?(Symbol)
+
         # else, raise an error
         raise InvalidVersionGateError, "Invalid version gate: #{feature_config}"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotwire_native_version_gate
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Stuart Yamartino