roda 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a139a3dab3d487524df22c5c49bb8a197bfa007
-  data.tar.gz: cc37453529b96bceb43bae2228175cfcd5249195
+  metadata.gz: 81b5d148505b95423a029a85acb7ab453ad50518
+  data.tar.gz: 825e0915b23389bb468b335fcadd2c102362f6ab
 SHA512:
-  metadata.gz: 465573ac1586a9f64028c73d922593c5e631818e3b82ec6e0e916290ed52d4a90de69418d57ab536e3714882dacfb7a6a66499649744b3c752cfdb44caa05a82
-  data.tar.gz: 32e20c99866c50db2010091e785569e3aa68bb303ce6471be3e2057d37b80d6114bb3d5f889859554f96d3a18b53e24c77e83297301c529083acee2093dec581
+  metadata.gz: c2c7ba330521161433166bd7ca685619366459800a28fa06b4a2328232cfced10a796ddd67aa16927a1be44ee3b31c1c8848847b987dd87d506ae501e3acf78c
+  data.tar.gz: c35370d775528f676f4ad1be2c9cc277f4d0d1082a7750a62418c28ebadc85b6e01056ad4699ea866e55941a8747323f8d3c666faa2b58c265027343685f6ae8

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 2.6.0 (2015-09-14)
+
+* Add :params and :params! matchers to param_matchers plugin (jeremyevans)
+
+* Merge options when loading csrf plugin multiple times (jeremyevans)
+
+* Allow request.halt to work in before hooks in the hooks plugin (celsworth) (#38)
+
 = 2.5.1 (2015-08-13)
 
 * Allow multi_route and middleware plugins to work together (janko-m) (#36)

data/doc/release_notes/2.6.0.txt

@@ -0,0 +1,21 @@
+= New Features
+
+* :params and :params! matchers have been added to the param_matchers
+  plugin, allowing you to match multiple params at the same time:
+
+    r.on :params=>%w'foo bar' do |foo, bar| end
+    # instead of
+    r.on({:param=>'foo'}, :param=>'bar') do |foo, bar| end
+
+= Other Improvements
+
+* When loading the csrf plugin multiple times, instead of loading the
+  middleware multiple times with different settings, merge options
+  in later plugin calls into a single middleware option hash, and
+  only load the middleware once.
+
+  This allows plugins to depend on the csrf plugin, while also
+  allowing the application to use the csrf plugin with options.
+
+* request.halt now works correctly when used inside a before hook when
+  using the hooks plugin.

data/lib/roda/plugins/caching.rb

@@ -5,7 +5,7 @@ class Roda
     # For proper caching, you should use either the +last_modified+ or
     # +etag+ request methods.  
     #
-    #   r.get '/albums/:d' do |album_id|
+    #   r.get 'albums/:d' do |album_id|
     #     @album = Album[album_id]
     #     r.last_modified @album.updated_at
     #     view('album')
@@ -13,7 +13,7 @@ class Roda
     #
     #   # or
     #
-    #   r.get '/albums/:d' do |album_id|
+    #   r.get 'albums/:d' do |album_id|
     #     @album = Album[album_id]
     #     r.etag @album.sha1
     #     view('album')

data/lib/roda/plugins/csrf.rb

@@ -24,7 +24,16 @@ class Roda
 
       # Load the Rack::Csrf middleware into the app with the given options.
       def self.configure(app, opts={})
-        app.use CSRF, opts
+        app.instance_exec do
+          @middleware.each do |(mid, *rest), _|
+            if mid.equal?(CSRF)
+              rest[0].merge!(opts)
+              build_rack_app
+              return
+            end
+          end
+          use CSRF, opts
+        end
       end
 
       module InstanceMethods

data/lib/roda/plugins/hooks.rb

@@ -69,12 +69,14 @@ class Roda
       module InstanceMethods
         # Before routing, execute the before hooks, and
         # execute the after hooks before returning.
-        def call
-          if b = opts[:before_hook]
-            instance_exec(&b)
-          end
+        def call(&block)
+          res = super do |r|
+            if b = opts[:before_hook]
+              instance_exec(&b)
+            end
 
-          res = super
+            instance_exec(r, &block)
+          end
         ensure
           if b = opts[:after_hook]
             instance_exec(res, &b)

data/lib/roda/plugins/param_matchers.rb

@@ -4,7 +4,7 @@ class Roda
     # on the request's params.
     #
     # It adds a :param matcher for matching on any param with the
-    # same name, yielding the value of the param.
+    # same name, yielding the value of the param:
     #
     #   r.on :param => 'foo' do |value|
     #     # Matches '?foo=bar', '?foo='
@@ -12,16 +12,30 @@ class Roda
     #   end
     #
     # It adds a :param! matcher for matching on any non-empty param
-    # with the same name, yielding the value of the param.
+    # with the same name, yielding the value of the param:
     #
     #   r.on(:param! => 'foo') do |value|
     #     # Matches '?foo=bar'
     #     # Doesn't match '?foo=', '?bar=foo'
     #   end
+    #
+    # It also adds :params and :params! matchers, for matching multiple
+    # params at the same time:
+    #
+    #   r.on :params => ['foo', 'baz'] do |value|
+    #     # Matches '?foo=bar&baz=quuz', '?foo=&baz='
+    #     # Doesn't match '?foo=bar', '?baz='
+    #   end
+    #
+    #   r.on :params! => ['foo', 'baz'] do |value|
+    #     # Matches '?foo=bar&baz=quuz'
+    #     # Doesn't match '?foo=bar', '?baz=', '?foo=&baz=', '?foo=bar&baz='
+    #   end
+    #
     module ParamMatchers
       module RequestMethods
         # Match the given parameter if present, even if the parameter is empty.
-        # Adds any match to the captures.
+        # Adds match to the captures.
         def match_param(key)
           if v = self[key]
             @captures << v
@@ -29,12 +43,28 @@ class Roda
         end
 
         # Match the given parameter if present and not empty.
-        # Adds any match to the captures.
+        # Adds match to the captures.
         def match_param!(key)
           if (v = self[key]) && !v.empty?
             @captures << v
           end
         end
+
+        # Match all given parameters if present, even if any/all parameters is empty.
+        # Adds all matches to the captures.
+        def match_params(keys)
+          keys.each do |key|
+            return false unless match_param(key)
+          end
+        end
+
+        # Match all given parameters if present and not empty.
+        # Adds all matches to the captures.
+        def match_params!(keys)
+          keys.each do |key|
+            return false unless match_param!(key)
+          end
+        end
       end
     end
 

data/lib/roda/plugins/render.rb

@@ -36,7 +36,7 @@ class Roda
     #            <tt><%== %></tt> not escape output, and handles postfix conditions inside
     #            <tt><%= %></tt> tags.
     # :escape_safe_classes :: String subclasses that should not be HTML escaped when used in
-    #            <tt><%= %></tt> tags, when :escape is used. Can be an array for multiple classes.
+    #                         <tt><%= %></tt> tags, when :escape is used. Can be an array for multiple classes.
     # :escaper :: Object used for escaping output of <tt><%= %></tt>, when :escape is used,
     #             overriding the default.  If given, object should respond to +escape_xml+ with
     #             a single argument and return an output string.
@@ -44,7 +44,7 @@ class Roda
     # :layout_opts :: The options to use when rendering the layout, if different
     #                 from the default options.
     # :template_opts :: The tilt options used when rendering all templates. defaults to:
-    #                 <tt>{:outvar=>'@_out_buf', :default_encoding=>Encoding.default_external}</tt>.
+    #                   <tt>{:outvar=>'@_out_buf', :default_encoding=>Encoding.default_external}</tt>.
     # :engine_opts :: The tilt options to use per template engine.  Keys are
     #                 engine strings, values are hashes of template options.
     # :views :: The directory holding the view files, defaults to the 'views' subdirectory of the

data/lib/roda/version.rb

@@ -4,11 +4,11 @@ class Roda
   RodaMajorVersion = 2
 
   # The minor version of Roda, updated for new feature releases of Roda.
-  RodaMinorVersion = 5
+  RodaMinorVersion = 6
 
   # The patch version of Roda, updated only for bug fixes from the last
   # feature release.
-  RodaPatchVersion = 1
+  RodaPatchVersion = 0
 
   # The full version of Roda as a string.
   RodaVersion = "#{RodaMajorVersion}.#{RodaMinorVersion}.#{RodaPatchVersion}".freeze

data/spec/plugin/csrf_spec.rb

@@ -44,6 +44,9 @@ describe "csrf plugin" do
     s, _, b = req('/', env[h].merge('REQUEST_METHOD'=>'POST', 'rack.input'=>io, "HTTP_#{h['HEADER']}"=>h['TOKEN']))
     s.must_equal 200
     b.must_equal ['p']
+
+    app.plugin :csrf
+    body('/foo', 'REQUEST_METHOD'=>'POST', 'rack.input'=>io).must_equal 'bar'
   end
 end
 end

data/spec/plugin/hooks_spec.rb

@@ -92,4 +92,12 @@ describe "hooks plugin" do
     b.join.must_equal 'foo'
     @a.must_equal [[200, 'bar', ['foo']]]
   end
+
+  it "handles halt in before blocks" do
+    app.before do
+      response.status = 200
+      request.halt
+    end
+    status.must_equal 201
+  end
 end

data/spec/plugin/param_matchers_spec.rb

@@ -7,9 +7,7 @@ describe "param_matchers plugin" do
         email
       end
 
-      r.on do
-        "No email"
-      end
+      "No email"
     end
 
     io = StringIO.new
@@ -18,15 +16,13 @@ describe "param_matchers plugin" do
     body("/signup", "rack.input" => io, "QUERY_STRING" => "email=").must_equal 'No email'
   end
 
-  it "param matcheshould yield a param only if given" do
+  it "param matcher should yield a param only if given" do
     app(:param_matchers) do |r|
       r.get "signup", :param=>"email" do |email|
         email
       end
 
-      r.on do
-        "No email"
-      end
+      "No email"
     end
 
     io = StringIO.new
@@ -34,4 +30,40 @@ describe "param_matchers plugin" do
     body("/signup", "rack.input" => io, "QUERY_STRING" => "").must_equal 'No email'
     body("/signup", "rack.input" => io, "QUERY_STRING" => "email=").must_equal ''
   end
+
+  it "params! matcher should yield the params only if all are given and not empty" do
+    app(:param_matchers) do |r|
+      r.get "signup", :params! => %w"em ail" do |em, ail|
+        em + ail
+      end
+
+      "No email"
+    end
+
+    io = StringIO.new
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo&ail=john@doe.com").must_equal 'foojohn@doe.com'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=&ail=john@doe.com").must_equal 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo&ail=").must_equal 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=&ail=").must_equal 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo").must_equal 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "ail=john@doe.com").must_equal 'No email'
+  end
+
+  it "params matcher should yield the params only if all are given" do
+    app(:param_matchers) do |r|
+      r.get "signup", :params=>%w"em ail" do |em, ail|
+        em + ail
+      end
+
+      "No email"
+    end
+
+    io = StringIO.new
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo&ail=john@doe.com").must_equal 'foojohn@doe.com'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=&ail=john@doe.com").must_equal 'john@doe.com'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo&ail=").must_equal 'foo'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=&ail=").must_equal ''
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "em=foo").must_equal 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "ail=john@doe.com").must_equal 'No email'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -143,6 +143,7 @@ extra_rdoc_files:
 - doc/release_notes/2.4.0.txt
 - doc/release_notes/2.5.0.txt
 - doc/release_notes/2.5.1.txt
+- doc/release_notes/2.6.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -160,6 +161,7 @@ files:
 - doc/release_notes/2.4.0.txt
 - doc/release_notes/2.5.0.txt
 - doc/release_notes/2.5.1.txt
+- doc/release_notes/2.6.0.txt
 - lib/roda.rb
 - lib/roda/plugins/_erubis_escaping.rb
 - lib/roda/plugins/all_verbs.rb
@@ -334,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Routing tree web framework toolkit