hotwire_native_version_gate 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a28510bb2899f691c79be862996ac02742b107db5bc52d22ee719a7a20f10fe
-  data.tar.gz: 55475a89e88294e1e26432c8cdc16cb0db8c9eba448e5359c8218d837f23ed75
+  metadata.gz: 76b2d43b870dbf0099ed5a0c6e465a1853cc2ae96b2ab16f06570aa6397d71af
+  data.tar.gz: '08393f721a6e48fc5193c5a34c6b4c76936a1aa923c1b04c209c0666a66e7ad7'
 SHA512:
-  metadata.gz: 7ca0c3871d000b4d5f42c3ebcfa77b888b036d5159739be890f9c98a2b725d2a67883d49e8379def5708db5916453191f120082be6231484c6d69619685d0cf3
-  data.tar.gz: 88a94760a3c596121ca665951f20444a69e4e66791f29414abeeaa41fc94de848aea8e6e0c4c5a4ef660c6299598e61559e96a5e69c328567a2c542c95399409
+  metadata.gz: ea6c7456e14d5cdc4336c9ea872741087b203b01dd00b45ae36961182b589c83c260195d05b131445ba873c89b2423d31b79ff327ba2ce56ec535802734688e0
+  data.tar.gz: a4345f8b1044668538d643242c8fc8fb67aa43291365794cf60c041ef7f1371570de93f25c4d23fb812011d477414cfefe7d119ccde86183396fb11ef5990ac7

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.3.0

data/lib/hotwire_native_version_gate/concern.rb

@@ -9,25 +9,34 @@ module HotwireNativeVersionGate
         VersionGate.native_feature(feature, ios: ios, android: android)
       end
 
-      def native_version_regex=(regex)
-        VersionGate.native_version_regex = regex
+      def native_version_regexes
+        VersionGate.native_version_regexes
+      end
+
+      def native_version_regexes=(regexes)
+        VersionGate.native_version_regexes = regexes
       end
     end
 
     included do
       if respond_to?(:helper_method)
-        helper_method :native_feature_enabled?
+        helper_method :native_feature_enabled?, :hotwire_native_ios?, :hotwire_native_android?
       end
     end
 
     def native_feature_enabled?(feature)
-      user_agent = if respond_to?(:request) && request.respond_to?(:user_agent)
-        request.user_agent
-      else
-        nil
-      end
-
+      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?
+      user_agent = respond_to?(:request) && request.respond_to?(:user_agent) ? request.user_agent : nil
+      VersionGate.ios?(user_agent)
+    end
+
+    def hotwire_native_android?
+      user_agent = respond_to?(:request) && request.respond_to?(:user_agent) ? request.user_agent : nil
+      VersionGate.android?(user_agent)
+    end
   end
 end

data/lib/hotwire_native_version_gate/version_gate.rb

@@ -5,18 +5,18 @@ module HotwireNativeVersionGate
     # Default regex example: Hotwire Native App iOS/1.0.0;
     # Expected capture groups: platform = (iOS|Android), version = semantic version
     DEFAULT_NATIVE_VERSION_REGEX = /\bHotwire Native App (?<platform>iOS|Android)\/(?<version>\d+(?:\.\d+)*)\b/
+    # Default fallback for apps that don't have the version in the User Agent ex: Hotwire Native iOS;
+    FALLBACK_NATIVE_VERSION_REGEX = /\b(Turbo|Hotwire) Native (?<platform>iOS|Android)\b/
 
     @native_features = {}
-    @native_version_regex = DEFAULT_NATIVE_VERSION_REGEX
+    @native_version_regexes = [ DEFAULT_NATIVE_VERSION_REGEX, FALLBACK_NATIVE_VERSION_REGEX ]
 
     class << self
-      attr_reader :native_features, :native_version_regex
+      attr_reader :native_features, :native_version_regexes
 
-      def native_version_regex=(regex)
-        unless regex.is_a?(Regexp)
-          raise ArgumentError, "native_version_regex must be a Regexp"
-        end
-        @native_version_regex = regex
+      def native_version_regexes=(regexes)
+        regexes_array = validate_regexes(regexes)
+        @native_version_regexes = regexes_array
       end
 
       def native_feature(feature, ios: false, android: false)
@@ -36,14 +36,43 @@ module HotwireNativeVersionGate
         handle_feature(feature_config, user_agent, context: context)
       end
 
+      def ios?(user_agent)
+        platform = match_platform(user_agent)
+        platform&.downcase == 'ios'
+      end
+
+      def android?(user_agent)
+        platform = match_platform(user_agent)
+        platform&.downcase == 'android'
+      end
+
       private
 
-      def match_platform(user_agent)
-        match = user_agent.to_s.match(@native_version_regex)
-        return match[:platform] if match
+      def validate_regexes(regexes)
+        # Support both single regex and array of regexes
+        regexes_array = Array(regexes)
+
+        regexes_array.each do |regex|
+          unless regex.is_a?(Regexp)
+            raise ArgumentError, "native_version_regexes must be an array of Regexp objects, got: #{regex.class}"
+          end
+        end
+
+        regexes_array
+      end
+
+      def match_key(user_agent, key)
+        @native_version_regexes.each do |regex|
+          match = user_agent.to_s.match(regex)
+          return match[key] if match&.names&.include?(key.to_s) && match[key]
+        end
         nil
       end
 
+      def match_platform(user_agent)
+        match_key(user_agent, :platform)
+      end
+
       def handle_feature(feature_config, user_agent, context: nil)
         # if false or nil, return false
         return false unless feature_config
@@ -51,9 +80,9 @@ module HotwireNativeVersionGate
         return true if feature_config == true
         # if a string, compare the version
         if feature_config.is_a?(String)
-          match = user_agent.to_s.match(@native_version_regex)
-          return false unless match
-          return Gem::Version.new(feature_config) <= Gem::Version.new(match[:version])
+          version = match_key(user_agent, :version)
+          return false unless version
+          return Gem::Version.new(feature_config) <= Gem::Version.new(version)
         end
         # if a symbol, call the method on the context (if provided) or self
         if feature_config.is_a?(Symbol)

metadata

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