ruby_native 0.10.12 → 0.10.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0c3d95e45afd32971cc8dc042ae37411aae04748b7b49cde8e9b94c9bc60a15
-  data.tar.gz: 047153c52db88fca1315f83ee8447509cc5ff28cb11abd802d9ad368a5864dff
+  metadata.gz: 7b83fa869135734b170e4b23a8ca46984c54ea5b830326af54003f1a9006830a
+  data.tar.gz: 84e8db6d56e06beb29933463939dfa970d90bc652f52e68bd0b5ad8f41dc273f
 SHA512:
-  metadata.gz: 1fe808f45eeff4c420ce915bb53b1267f39e5139c0b9626e0e0d1ac2829e169136b8248f1665de5bfb88251617949c570b293475324b4b254582e535bef51b79
-  data.tar.gz: 9ae961899223792d3936309e098dbd3caa3e4bc6f09b0877fa88029973a5d582807cab250bedc10577b8790f8b7e2a80c23e2601ea7207c76e2c2a68704a1c39
+  metadata.gz: c555bdb8ff38ae5a851b81a733aed0554949b1d15352de103f7c90415a56a2b8ce8a21acd5f1724e8b6ebd648ba1a875a9b03f86b1d150f451b53369c2fb23f5
+  data.tar.gz: 7de2e7778924c227c6501201af4a5d233c4b1000a99edc93f5074c824526ce248c7cd8d98fa3f963a9935deae69c92fa8f74cf920c3f1e731415545ff80f329a

data/app/controllers/ruby_native/push/devices_controller.rb

@@ -4,10 +4,20 @@ module RubyNative
       skip_forgery_protection
 
       def create
-        device = current_user.push_devices.find_or_initialize_by(token: params[:token])
+        device = ruby_native_user.push_devices.find_or_initialize_by(token: params[:token])
         device.update!(platform: params[:platform], name: params[:name])
         head :ok
       end
+
+      private
+
+      # Resolves the signed-in user via RubyNative.current_user_resolver, which is
+      # either a controller method name (Symbol) or a callable run in the
+      # controller. Defaults to `current_user`.
+      def ruby_native_user
+        resolver = RubyNative.current_user_resolver
+        resolver.respond_to?(:call) ? instance_exec(&resolver) : send(resolver)
+      end
     end
   end
 end

data/lib/ruby_native/cli/preview.rb

@@ -187,7 +187,8 @@ module RubyNative
         puts ""
         puts url
         puts ""
-        puts "Scan the QR code or paste the URL into the Ruby Native Preview app."
+        puts "Scan the QR code or paste the URL into the Ruby Native app."
+        puts "Don't have it yet? Download it at https://rubynative.com/try/download"
         if @url
           puts "Keep this running and your Rails server reachable at #{@url}."
         else

data/lib/ruby_native/helper.rb

@@ -120,9 +120,9 @@ module RubyNative
         if block
           menu = NavbarMenuBuilder.new(@context)
           @context.capture(menu, &block)
-          @items << @context.tag.div(data: data) { menu.to_html }
+          add(@context.tag.div(data: data) { menu.to_html })
         else
-          @items << @context.tag.div(data: data)
+          add(@context.tag.div(data: data))
         end
       end
 
@@ -136,7 +136,7 @@ module RubyNative
         data[:native_href] = href if href
         data[:native_click] = click if click
         data[:native_selected] = "" if selected
-        @items << @context.tag.div(data: data)
+        add(@context.tag.div(data: data))
       end
 
       # Adds a native share button to the nav bar. Tapping it opens the
@@ -152,20 +152,32 @@ module RubyNative
         data[:native_icon] = resolved if resolved
         data[:native_position] = position.to_s
         data[:native_share_url] = url if url
-        @items << @context.tag.div(data: data)
+        add(@context.tag.div(data: data))
       end
 
       def submit_button(title: "Save", click: "[type='submit']")
-        @items << @context.tag.div(data: {
+        add(@context.tag.div(data: {
           native_submit_button: "",
           native_title: title,
           native_click: click
-        })
+        }))
       end
 
       def to_html
         @context.safe_join(@items)
       end
+
+      private
+
+      # Collects a signal element and returns a blank, html-safe string. That
+      # lets the builder read naturally with `<%=` in ERB (`<%= navbar.button %>`)
+      # without emitting anything, since the nav bar renders from the collected
+      # items in `to_html`, not from these return values. Silent `<% %>` tags
+      # keep working too.
+      def add(item)
+        @items << item
+        ActiveSupport::SafeBuffer.new
+      end
     end
 
     class NavbarMenuBuilder
@@ -181,7 +193,7 @@ module RubyNative
         data[:native_click] = click if click
         data[:native_icon] = resolved if resolved
         data[:native_selected] = "" if selected
-        @items << @context.tag.div(data: data)
+        add(@context.tag.div(data: data))
       end
 
       # Adds a share entry to a navbar button's dropdown menu. Selecting it
@@ -194,12 +206,21 @@ module RubyNative
         data[:native_share_url] = url if url
         data[:native_icon] = resolved if resolved
         data[:native_selected] = "" if selected
-        @items << @context.tag.div(data: data)
+        add(@context.tag.div(data: data))
       end
 
       def to_html
         @context.safe_join(@items)
       end
+
+      private
+
+      # See NavbarBuilder#add: collects the item and returns a blank, html-safe
+      # string so menu items read naturally with `<%= menu.item %>` in ERB.
+      def add(item)
+        @items << item
+        ActiveSupport::SafeBuffer.new
+      end
     end
   end
 end

data/lib/ruby_native/version.rb

@@ -1,3 +1,3 @@
 module RubyNative
-  VERSION = "0.10.12"
+  VERSION = "0.10.14"
 end

data/lib/ruby_native.rb

@@ -22,6 +22,12 @@ module RubyNative
   mattr_accessor :screenshot_key
   mattr_accessor :screenshot_sign_in
 
+  # How the push endpoint finds the signed-in user to attach a device token to.
+  # Accepts a controller method name (Symbol) or a callable evaluated in the
+  # controller, e.g. `-> { Current.person }`. Defaults to `current_user`, so
+  # Devise apps need no configuration. Set via `RubyNative.configure`.
+  mattr_accessor :current_user_resolver, default: :current_user
+
   def self.configure
     yield self
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_native
 version: !ruby/object:Gem::Version
-  version: 0.10.12
+  version: 0.10.14
 platform: ruby
 authors:
 - Joe Masilotti