ruby_native 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7e336fc49236887320d23ecfc7718229370029d7a2b7981df2e888fd427e853
-  data.tar.gz: 16ca5ee3894370636c36193591a135c3829c3a9bb1449065994e04fc09be6b47
+  metadata.gz: c31d1051712c237ce11a48f7ab2681ac6083c81f8fc1bb155c918f7283390d79
+  data.tar.gz: 7f3f059d502a92a389b5110cd3e8f0028adfece442dee9e44f29f2d6d5629bff
 SHA512:
-  metadata.gz: 8039052ae6fe99f9a429564c534b9b78b1df59c5cfa9a4b0157dd3b606244d609666b360242ff25b2a9931511262bb933f0e1b668c6570ade89413dd4c058009
-  data.tar.gz: 5b3b966610654c7f0625b2ffdb4aa42f4cb0ecccf773f06a2795faea962b6e54db0324d246959a3436083c907e1cc6b8f208275718fb598ceef74f4d42e04afd
+  metadata.gz: 15d77625c818cd4a63f82b1e03490a7365b3a91cd1c75e41ca893f64d9813c197683f27198e9aaa7fc96a2eb25f702f042e55cd8e333fa9812749cea9d16839c
+  data.tar.gz: b7cca8fcc74f7151a6eabfe2706f5644cb6e51ccf7cb9f375c60a029c036565005a9d9d1dd698dd517f08529ba98ad8126006f39e6540b2e43b2df68957c3b46

data/README.md

@@ -72,6 +72,8 @@ This starts a Cloudflare tunnel and shows a QR code for the Ruby Native app to s
 brew install cloudflare/cloudflare/cloudflared
 ```
 
+The tunnel points at port 3000, or at `PORT` when it is set, the same way `rails server` picks its port. Pass `--port 4000` to override, or `--url` for an upstream that isn't on localhost.
+
 See [rubynative.com/docs/cli](https://rubynative.com/docs/cli) for `deploy`, `login`, and auto-deploying from CI.
 
 ## React and Vue

data/app/assets/stylesheets/ruby_native.css

@@ -2,22 +2,50 @@
   display: none !important;
 }
 
-/* Android's WebView doesn't populate env(safe-area-inset-*) from system bars
-   (only display cutouts), so the native shell pushes the real top/bottom
-   system bar heights into these CSS variables. iOS leaves the variables
-   undefined and falls back to env(), which works there. */
+/* Public API for app CSS. Android's WebView doesn't populate
+   env(safe-area-inset-*) from system bars (only display cutouts), so the
+   native shell pushes the real heights into the internal -inset- variables;
+   iOS leaves them undefined and falls back to env(). */
+:root {
+  --ruby-native-safe-area-top: var(--ruby-native-safe-area-inset-top, env(safe-area-inset-top, 0px));
+  --ruby-native-safe-area-bottom: var(--ruby-native-safe-area-inset-bottom, env(safe-area-inset-bottom, 0px));
+}
+
 .native-inset-top::before,
 .native-inset::before {
   content: "";
   display: block;
-  height: var(--ruby-native-safe-area-inset-top, env(safe-area-inset-top));
+  height: var(--ruby-native-safe-area-top);
 }
 
 .native-inset-bottom::after,
 .native-inset::after {
   content: "";
   display: block;
-  height: var(--ruby-native-safe-area-inset-bottom, env(safe-area-inset-bottom));
+  height: var(--ruby-native-safe-area-bottom);
+}
+
+/* In-app defaults so pages feel native without any setup: no gray tap flash,
+   no selecting button labels on long-press, no double-tap zoom on controls.
+   Pair with :active styles for pressed feedback; the bridge makes them apply
+   instantly on touch. */
+[data-native-app] * {
+  -webkit-tap-highlight-color: transparent;
+}
+
+[data-native-app] button,
+[data-native-app] [role="button"] {
+  -webkit-user-select: none;
+  user-select: none;
+  -webkit-touch-callout: none;
+}
+
+[data-native-app] a,
+[data-native-app] button,
+[data-native-app] input,
+[data-native-app] label,
+[data-native-app] [role="button"] {
+  touch-action: manipulation;
 }
 
 .native-back-button {

data/app/controllers/ruby_native/aasa_controller.rb

@@ -12,7 +12,7 @@ module RubyNative
       render json: {
         applinks: {
           details: [
-            { appIDs: [ app_id ], components: oauth_exclusions + [ { "/": "*" } ] }
+            { appIDs: [ app_id ], components: oauth_exclusions + linked_components }
           ]
         },
         webcredentials: {
@@ -37,5 +37,15 @@ module RubyNative
         { "/": "#{path}*", exclude: true }
       end
     end
+
+    # `linked_paths` scopes Universal Links to those prefixes; without it every
+    # URL on the domain is linked. Password sharing (webcredentials) stays
+    # domain-wide either way; there is no path concept for it.
+    def linked_components
+      paths = Array(RubyNative.config&.dig(:linked_paths))
+      return [ { "/": "*" } ] if paths.empty?
+
+      paths.map { |path| { "/": "#{path}*" } }
+    end
   end
 end

data/app/controllers/ruby_native/assetlinks_controller.rb

@@ -0,0 +1,30 @@
+module RubyNative
+  class AssetlinksController < ::ActionController::Base
+    def show
+      RubyNative.load_config if Rails.env.development?
+
+      package = RubyNative.config&.dig(:android, :package)
+      # The Digital Asset Links spec wants uppercase colon-separated hex, so a
+      # lowercase paste from keytool still verifies.
+      fingerprints = Array(RubyNative.config&.dig(:android, :cert_fingerprint))
+        .map { |fingerprint| fingerprint.to_s.strip.upcase }
+        .reject(&:empty?)
+      return head :not_found unless package.present? && fingerprints.present?
+
+      response.set_header("Cache-Control", "no-cache")
+      render json: [
+        {
+          relation: [
+            "delegate_permission/common.handle_all_urls",
+            "delegate_permission/common.get_login_creds"
+          ],
+          target: {
+            namespace: "android_app",
+            package_name: package,
+            sha256_cert_fingerprints: fingerprints
+          }
+        }
+      ]
+    end
+  end
+end

data/lib/generators/ruby_native/install_generator.rb

@@ -10,14 +10,24 @@ module RubyNative
       end
 
       def add_allowed_host
-        host_line = '  config.hosts << ".trycloudflare.com"'
+        host_line = %(  config.hosts << ".trycloudflare.com" if config.hosts.is_a?(Array)\n)
         dev_config = "config/environments/development.rb"
 
         return unless File.exist?(File.join(destination_root, dev_config))
-        return if File.read(File.join(destination_root, dev_config)).include?("trycloudflare")
+        contents = File.read(File.join(destination_root, dev_config))
+        return if contents.include?("trycloudflare")
 
-        environment(host_line, env: "development")
-        say "  Added .trycloudflare.com to allowed hosts in development.rb", :green
+        # Match any configure block, not just Rails.application.configure; some
+        # apps use MyApp::Application.configure and Thor's environment helper
+        # silently skips those.
+        configure_block = /^[\w:.]+\.configure do\s*\n/
+        if contents.match?(configure_block)
+          inject_into_file dev_config, host_line, after: configure_block, verbose: false
+          say "  Added .trycloudflare.com to allowed hosts in development.rb", :green
+        else
+          say "  Couldn't find a configure block in development.rb. Add this line inside it:", :yellow
+          say "  #{host_line.strip}", :yellow
+        end
       end
 
       def add_gitignore

data/lib/generators/ruby_native/templates/ruby_native.yml

@@ -109,6 +109,16 @@ tabs:
 # ios:
 #   bundle_id: com.example.myapp
 #   team_id: ABCD123456
+# android:
+#   package: com.example.myapp
+#   # Play Console -> Setup -> App integrity -> App signing key certificate.
+#   cert_fingerprint: "AA:BB:CC:..."
+
+# Link only these path prefixes instead of the whole domain. Links outside
+# them keep opening in the browser. Applies to iOS on your next deploy and
+# to Android on your next build.
+# linked_paths:
+#   - /pair/
 
 # Enable OAuth. Each path triggers a native ASWebAuthenticationSession
 # on iOS instead of an in-app web view. List only the authorize path for each

data/lib/ruby_native/cli/preview.rb

@@ -11,10 +11,12 @@ module RubyNative
       TUNNEL_READY_TIMEOUT = 60
       TUNNEL_POLL_INTERVAL = 1
       PUBLIC_NAMESERVERS = ["1.1.1.1", "8.8.8.8"].freeze
+      DEFAULT_PORT = 3000
+      PORT_RANGE = (1..65_535)
 
       def initialize(argv)
         @url = parse_option(argv, "--url")
-        @port = parse_port(argv)
+        @port, @port_from_env = resolve_port(argv)
         @upstream = @url || "http://localhost:#{@port}"
       end
 
@@ -32,7 +34,7 @@ module RubyNative
 
         return if response.is_a?(Net::HTTPSuccess)
 
-        puts "Rails server is reachable at #{@upstream}, but #{CONFIG_PATH} returned #{response.code}."
+        puts "Rails server is reachable at #{upstream_description}, but #{CONFIG_PATH} returned #{response.code}."
         puts ""
 
         # 404 is what an unmounted engine returns; any other code means the app
@@ -57,7 +59,7 @@ module RubyNative
           puts ""
           puts "Make sure your Rails server is reachable at that URL."
         else
-          puts "Nothing is running on port #{@port}."
+          puts "Nothing is running on port #{port_description}."
           puts ""
           puts "Start your Rails server in another terminal:"
           puts "  bin/rails server -p #{@port}"
@@ -121,9 +123,36 @@ module RubyNative
         Process.clock_gettime(Process::CLOCK_MONOTONIC)
       end
 
-      def parse_port(argv)
-        value = parse_option(argv, "--port")
-        value ? value.to_i : 3000
+      # --port, then PORT, then 3000 is the precedence rails server itself uses,
+      # so a preview lands on the port the app is already serving. Anything
+      # unusable in PORT falls back rather than failing: the variable gets set
+      # for plenty of reasons that have nothing to do with a local Rails server.
+      def resolve_port(argv)
+        flag = parse_option(argv, "--port")
+        return [flag.to_i, false] if flag
+
+        env = env_port
+        env ? [env, true] : [DEFAULT_PORT, false]
+      end
+
+      def env_port
+        value = ENV["PORT"].to_s.strip
+        return unless value.match?(/\A\d+\z/)
+
+        port = value.to_i
+        port if PORT_RANGE.cover?(port)
+      end
+
+      # Naming the source keeps a port nobody typed from reading as a bug.
+      def port_description
+        @port_from_env ? "#{@port} (from PORT)" : @port.to_s
+      end
+
+      # @port_from_env can be true alongside --url, which ignores the port.
+      def upstream_description
+        return @upstream if @url || !@port_from_env
+
+        "#{@upstream} (port from PORT)"
       end
 
       def parse_option(argv, flag)
@@ -148,7 +177,7 @@ module RubyNative
         if @url
           puts "Make sure your Rails server is reachable at #{@url}."
         else
-          puts "Make sure your Rails server is running on port #{@port} in another terminal."
+          puts "Make sure your Rails server is running on port #{port_description} in another terminal."
         end
         puts ""
 
@@ -201,7 +230,7 @@ module RubyNative
         if @url
           puts "Keep this running and your Rails server reachable at #{@url}."
         else
-          puts "Keep this running and your Rails server on port #{@port} in another terminal."
+          puts "Keep this running and your Rails server on port #{port_description} in another terminal."
         end
         puts "Press Ctrl+C to stop."
       end

data/lib/ruby_native/engine.rb

@@ -51,6 +51,7 @@ module RubyNative
     initializer "ruby_native.routes" do |app|
       app.routes.prepend do
         get "/.well-known/apple-app-site-association", to: "ruby_native/aasa#show"
+        get "/.well-known/assetlinks.json", to: "ruby_native/assetlinks#show"
         mount RubyNative::Engine, at: "/native"
       end
     end

data/lib/ruby_native/native_detection.rb

@@ -2,8 +2,17 @@ module RubyNative
   module NativeDetection
     extend ActiveSupport::Concern
 
+    # Matches "Ruby Native iOS/5.2/35 iOS/26.5.2 RubyNative/0.12.5". The build and
+    # OS groups are optional: apps built before the UA carried them send only
+    # "Ruby Native iOS/5.2", and the optional group keeps the OS capture from
+    # swallowing that app version.
+    SIGNATURE = %r{Ruby Native (?:iOS|Android)/([\d.]+)(?:/([\d.]+) (?:iOS|Android)/([\d.]+))?}
+
     included do
-      helper_method :native_app?, :native_version, :native_platform if respond_to?(:helper_method)
+      if respond_to?(:helper_method)
+        helper_method :native_app?, :native_version, :native_platform,
+          :native_app_version, :native_app_build, :native_os_version
+      end
     end
 
     def native_app?
@@ -23,5 +32,22 @@ module RubyNative
       return "android" if ua.include?("Ruby Native Android")
       nil
     end
+
+    # The app's marketing version, like "5.2". Nil for web browsers.
+    def native_app_version
+      request.user_agent.to_s[SIGNATURE, 1]
+    end
+
+    # The app's build number (CFBundleVersion / versionCode), like "35". Nil for
+    # web browsers and apps built before the User-Agent carried it.
+    def native_app_build
+      request.user_agent.to_s[SIGNATURE, 2]
+    end
+
+    # The device's OS version, like "26.5.2". Nil for web browsers and apps built
+    # before the User-Agent carried it.
+    def native_os_version
+      request.user_agent.to_s[SIGNATURE, 3]
+    end
   end
 end

data/lib/ruby_native/version.rb

@@ -1,3 +1,3 @@
 module RubyNative
-  VERSION = "0.12.1"
+  VERSION = "0.13.0"
 end

data/lib/ruby_native.rb

@@ -49,6 +49,7 @@ module RubyNative
     self.config[:app][:entry_path] ||= self.config.dig(:tabs, 0, :path) || "/"
     self.config[:auth] ||= {}
     normalize_oauth_paths
+    normalize_linked_paths
     backfill_tab_icons
     backfill_error_icons
   end
@@ -183,4 +184,17 @@ module RubyNative
     )
     self.config[:auth][:oauth_paths] = paths - callbacks
   end
+
+  # Entries are path prefixes: "/pair/" links every URL under it. A leading
+  # slash is added when missing, and a trailing "*" (an easy slip, since the
+  # AASA file uses one) is stripped so both platforms receive a plain prefix.
+  # Left absent when unconfigured so config.json doesn't grow an empty key.
+  def self.normalize_linked_paths
+    return unless self.config.key?(:linked_paths)
+
+    self.config[:linked_paths] = Array(self.config[:linked_paths])
+      .map { |path| path.to_s.strip.sub(/\*+\z/, "") }
+      .reject(&:empty?)
+      .map { |path| path.start_with?("/") ? path : "/#{path}" }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_native
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Joe Masilotti
@@ -70,6 +70,7 @@ files:
 - README.md
 - app/assets/stylesheets/ruby_native.css
 - app/controllers/ruby_native/aasa_controller.rb
+- app/controllers/ruby_native/assetlinks_controller.rb
 - app/controllers/ruby_native/auth/sessions_controller.rb
 - app/controllers/ruby_native/auth/start_controller.rb
 - app/controllers/ruby_native/config_controller.rb