roda-unpoly 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5df7078e07d240b65ffbb5381e68546a884ee6b
-  data.tar.gz: bed8ccfde1acb5f461898117d2844e0d652d93f0
+  metadata.gz: a6aa4aa5d22dd462b8af5b7141c607554853ea0b
+  data.tar.gz: eb7a5ec8bd812bf877cd6b77bcf099a1cd55dfdc
 SHA512:
-  metadata.gz: af2aca067de6df3eb85e80c066b99a645dadfa85af173e1197957c8223f55eeeab57fcd26300d6c02068bb86769834311c0ce808b272a9a9f802cfe53470ad31
-  data.tar.gz: e5bfadde3b72ade0784dad68b54f2fa56dcd7292510cc3467513c6b6e0439e39104cb3fb7c3a8f328a8ed00dc602f3f0c80c8c7ad0360bf4dee85ebb11992e1a
+  metadata.gz: 1bf9e69fbbb78e3255af81e9cc2bc442b412c79d617e3cf4f26e29f3734eb52788f0a356a1e867f6e248eaf2ee29d1f901b49d05620b7ebda55e68f96d74cf7e
+  data.tar.gz: 8bb5ccebfe90e8a48800164fc6b9f9ea2ee36e8220df4cb3331e97840bd683a57a5d2369c38faa69a8b0dfc348ec317b0c6df5f57e6a2568d3d9ebf7c1ee7261

data/README.md

@@ -20,18 +20,14 @@ Or install it yourself as:
 
 ## Usage
 
-In order for roda-unpoly to satisfy the server protocol expected by Unpoly, the
-`r.unpoly` method will need to be called once during your routing tree. Preferably
-near the top.
+Simply enable the plugin through the `plugin` mechanism.
 
 ```ruby
 class App < Roda
   plugin :unpoly
 
   route do |r|
-    r.unpoly
-
-    # Rest of routing tree
+    # Routing tree
   end
 end
 ```

data/lib/roda/plugins/unpoly.rb

@@ -1,67 +1,35 @@
 # frozen-string-literal: true
-
 require "forwardable"
+require "rack/unpoly/middleware"
 
 class Roda
   module RodaPlugins
     # The unpoly plugin provides the necessary sugar to make Unpoly work seamlessly
     # with Roda.
     #
+    # = Example
+    #
     #   plugin :unpoly
+    #
+    #   route do |r|
+    #     if r.up?
+    #       "Unpoly request! :)"
+    #     else
+    #       "Not an Unpoly request :("
+    #     end
+    #   end
     module Unpoly
-      class Inspector
-        extend Forwardable
-
-        def_delegators :@context, :get_header, :response
+      class RodaInspector < DelegateClass(Rack::Unpoly::Inspector)
+        attr_accessor :response # :nodoc:
 
-        def initialize(context) # :nodoc:
-          @context = context
-        end
-
-        # Determine if this is an Unpoly request.
-        def unpoly?
-          target.to_s.strip != ""
-        end
-        alias up? unpoly?
-
-        # Identify if the +tested_target+ will match the actual target requested.
-        def target?(tested_target)
-          if up?
-            actual_target = target
-
-            if actual_target == tested_target
-              true
-            elsif actual_target == "html"
-              true
-            elsif actual_target == "body"
-              !%w(head title meta).include?(tested_target)
-            else
-              false
-            end
-          else
-            true
-          end
-        end
-
-        # The actual target as requested by Unpoly.
-        def target
-          get_header("HTTP_X_UP_TARGET")
+        def initialize(obj, response) # :nodoc:
+          super(obj)
+          @response = response
         end
 
         # Set the page title.
-        def title=(new_title)
-          response.headers["X-Up-Title"] = new_title
-        end
-
-        # Determine if this is a validate request.
-        def validate?
-          validate_name.to_s.strip != ""
-        end
-
-        # The name attribute of the form field that triggered
-        # the validation.
-        def validate_name
-          get_header("HTTP_X_UP_VALIDATE")
+        def title=(value)
+          set_title(response, value)
         end
       end
 
@@ -70,25 +38,15 @@ class Roda
 
         def_delegators :up, :unpoly?, :up?
 
-        # Send the appropriate headers and cookies back to the client in order
-        # to satisfy the contract of the Unpoly library. Called early in your
-        # routing tree.
-        def unpoly
-          response.headers["X-Up-Location"] = url
-          response.headers["X-Up-Method"] = request_method
-
-          if !get? && !unpoly?
-            Rack::Utils.set_cookie_header!(response.headers, "_up_method", { value: request_method, path: "/" })
-          else
-            Rack::Utils.delete_cookie_header!(response.headers, "_up_method", { path: "/" })
-          end
-        end
-
         # An instance of the +Inspector+.
         def up
-          Inspector.new(self)
+          RodaInspector.new(env["rack.unpoly"], response)
         end
       end
+
+      def self.configure(app, _opts={}) # :nodoc:
+        app.use Rack::Unpoly::Middleware
+      end
     end
 
     register_plugin :unpoly, Unpoly

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: roda-unpoly
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Adam Daniels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack-unpoly
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement