roda 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 325e660f0581837d20d346159eea1be6a7363c9c
-  data.tar.gz: eb99e9f1843f9959ae80a7b44900476b749f734f
+  metadata.gz: 7a139a3dab3d487524df22c5c49bb8a197bfa007
+  data.tar.gz: cc37453529b96bceb43bae2228175cfcd5249195
 SHA512:
-  metadata.gz: 5bb3a46ed33cf4086c2d911be08817d60ba7ae522c23ad773824d6938fb6b2ab5bca7c15ce3dfa47a14d6364b37a65b96e29e23fc24b312b8c17d070e39241ac
-  data.tar.gz: 705cbd16aeae28277012f7597f926156b8c825988d167c1cfaf36f2f8c263f6f81c2fe644587dede273cf5e4b9197897eb58a12b6027fadf832198f46b18d083
+  metadata.gz: 465573ac1586a9f64028c73d922593c5e631818e3b82ec6e0e916290ed52d4a90de69418d57ab536e3714882dacfb7a6a66499649744b3c752cfdb44caa05a82
+  data.tar.gz: 32e20c99866c50db2010091e785569e3aa68bb303ce6471be3e2057d37b80d6114bb3d5f889859554f96d3a18b53e24c77e83297301c529083acee2093dec581

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 2.5.1 (2015-08-13)
+
+* Allow multi_route and middleware plugins to work together (janko-m) (#36)
+
 = 2.5.0 (2015-07-14)
 
 * Make :by_name option to path plugin default to true in development (jeremyevans)

data/doc/release_notes/2.5.1.txt

@@ -0,0 +1,4 @@
+= Improvements
+
+* The multi_route plugin now works correctly if the middleware plugin
+  is loaded after it.

data/lib/roda.rb

@@ -166,7 +166,7 @@ class Roda
         #   Roda.plugin PluginModule
         #   Roda.plugin :csrf
         def plugin(plugin, *args, &block)
-          raise RodaError, "Cannot subclass a frozen Roda class" if frozen?
+          raise RodaError, "Cannot add a plugin to a frozen Roda class" if frozen?
           plugin = RodaPlugins.load_plugin(plugin) if plugin.is_a?(Symbol)
           plugin.load_dependencies(self, *args, &block) if plugin.respond_to?(:load_dependencies)
           include(plugin::InstanceMethods) if defined?(plugin::InstanceMethods)

data/lib/roda/plugins/middleware.rb

@@ -74,7 +74,7 @@ class Roda
 
         # Override the route block so that if no route matches, we throw so
         # that the next middleware is called.
-        def route(&block)
+        def route(*args, &block)
           super do |r|
             res = instance_exec(r, &block)
             throw :next, true if r.forward_next

data/lib/roda/plugins/path.rb

@@ -19,7 +19,7 @@ class Roda
     #   path Baz do |baz, *paths|
     #     "/baz/#{baz.id}/#{paths.join('/')}"
     #   end
-    #   path Quux |quux, path|
+    #   path Quux do |quux, path|
     #     "/quux/#{quux.id}/#{path}"
     #   end
     #

data/lib/roda/version.rb

@@ -8,7 +8,7 @@ class Roda
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.
-  RodaPatchVersion = 0
+  RodaPatchVersion = 1
 
   # The full version of Roda as a string.
   RodaVersion = "#{RodaMajorVersion}.#{RodaMinorVersion}.#{RodaPatchVersion}".freeze

data/spec/plugin/middleware_spec.rb

@@ -56,4 +56,23 @@ describe "middleware plugin" do
     end
     body.must_equal 'a'
   end
+
+  it "is compatible with the multi_route plugin" do
+    app(:bare) do
+      plugin :multi_route
+      plugin :middleware
+
+      route("a") do |r|
+        r.is "b" do
+          "ab"
+        end
+      end
+
+      route do |r|
+        r.multi_route
+      end
+    end
+
+    body('/a/b').must_equal 'ab'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -142,6 +142,7 @@ extra_rdoc_files:
 - doc/release_notes/2.3.0.txt
 - doc/release_notes/2.4.0.txt
 - doc/release_notes/2.5.0.txt
+- doc/release_notes/2.5.1.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -158,6 +159,7 @@ files:
 - doc/release_notes/2.3.0.txt
 - doc/release_notes/2.4.0.txt
 - doc/release_notes/2.5.0.txt
+- doc/release_notes/2.5.1.txt
 - lib/roda.rb
 - lib/roda/plugins/_erubis_escaping.rb
 - lib/roda/plugins/all_verbs.rb