roda 2.2.0 → 2.3.0

data/spec/plugin/hooks_spec.rb

@@ -29,19 +29,19 @@ describe "hooks plugin" do
 
   it "adds before and after hooks for running code before and after requests" do
     s, h, b = req
-    s.should == 201
-    h['foo'].should == 'baz'
-    b.join.should == 'bar'
-    @a.should == [[200, 'baz', ['bar']]]
+    s.must_equal 201
+    h['foo'].must_equal 'baz'
+    b.join.must_equal 'bar'
+    @a.must_equal [[200, 'baz', ['bar']]]
   end
 
   it "multiple plugin calls do not override existing hooks" do
     app.plugin :hooks
     s, h, b = req
-    s.should == 201
-    h['foo'].should == 'baz'
-    b.join.should == 'bar'
-    @a.should == [[200, 'baz', ['bar']]]
+    s.must_equal 201
+    h['foo'].must_equal 'baz'
+    b.join.must_equal 'bar'
+    @a.must_equal [[200, 'baz', ['bar']]]
   end
 
   it "after hooks are still called if an exception is raised" do
@@ -55,9 +55,9 @@ describe "hooks plugin" do
       a << $!
     end
 
-    proc{req}.should raise_error(Roda::RodaError)
-    a.pop.should be_a_kind_of(Roda::RodaError)
-    a.pop.should == nil
+    proc{req}.must_raise(Roda::RodaError)
+    a.pop.must_be_kind_of(Roda::RodaError)
+    a.pop.must_equal nil
   end
 
   it "handles multiple before and after blocks correctly" do
@@ -72,11 +72,11 @@ describe "hooks plugin" do
     end
 
     s, h, b = req
-    s.should == 402
-    h['foo'].should == 'baz'
-    h['bar'].should == 'foo'
-    b.join.should == 'bar'
-    a.should == [[200, 'baz', ['bar']], 'foo']
+    s.must_equal 402
+    h['foo'].must_equal 'baz'
+    h['bar'].must_equal 'foo'
+    b.join.must_equal 'bar'
+    a.must_equal [[200, 'baz', ['bar']], 'foo']
   end
 
   it "copies before and after blocks when subclassing" do
@@ -87,9 +87,9 @@ describe "hooks plugin" do
       end
     end
     s, h, b = req
-    s.should == 201
-    h['foo'].should == 'bar'
-    b.join.should == 'foo'
-    @a.should == [[200, 'bar', ['foo']]]
+    s.must_equal 201
+    h['foo'].must_equal 'bar'
+    b.join.must_equal 'foo'
+    @a.must_equal [[200, 'bar', ['foo']]]
   end
 end

data/spec/plugin/indifferent_params_spec.rb

@@ -8,6 +8,6 @@ describe "indifferent_params plugin" do
       end
     end
 
-    body('QUERY_STRING'=>'a=2&b[][c]=3', 'rack.input'=>StringIO.new).should == '2/3'
+    body('QUERY_STRING'=>'a=2&b[][c]=3', 'rack.input'=>StringIO.new).must_equal '2/3'
   end
 end

data/spec/plugin/json_parser_spec.rb

@@ -0,0 +1,72 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "json_parser plugin" do 
+  before do
+    app(:json_parser) do |r|
+      r.params['a']['b'].to_s
+    end
+  end
+
+  it "parses incoming json if content type specifies json" do
+    body('rack.input'=>StringIO.new('{"a":{"b":1}}'), 'CONTENT_TYPE'=>'text/json', 'REQUEST_METHOD'=>'POST').must_equal '1'
+  end
+
+  it "doesn't affect parsing of non-json content type" do
+    body('rack.input'=>StringIO.new('a[b]=1'), 'REQUEST_METHOD'=>'POST').must_equal '1'
+  end
+
+  it "returns 400 for invalid json" do
+    req('rack.input'=>StringIO.new('{"a":{"b":1}'), 'CONTENT_TYPE'=>'text/json', 'REQUEST_METHOD'=>'POST').must_equal [400, {}, []]
+  end
+end
+
+describe "json_parser plugin" do 
+  it "handles empty request bodies" do
+    app(:json_parser) do |r|
+      r.params.length.to_s
+    end
+    body('rack.input'=>StringIO.new(''), 'CONTENT_TYPE'=>'text/json', 'REQUEST_METHOD'=>'POST').must_equal '0'
+  end
+
+  it "supports :error_handler option" do
+    app(:bare) do
+      plugin(:json_parser, :error_handler=>proc{|r| r.halt [401, {}, ['bad']]})
+      route do |r|
+        r.params['a']['b'].to_s
+      end
+    end
+    req('rack.input'=>StringIO.new('{"a":{"b":1}'), 'CONTENT_TYPE'=>'text/json', 'REQUEST_METHOD'=>'POST').must_equal [401, {}, ['bad']]
+  end
+
+  it "works with bare POST" do
+    app(:bare) do
+      plugin(:json_parser, :error_handler=>proc{|r| r.halt [401, {}, ['bad']]})
+      route do |r|
+        (r.POST['a']['b'] + r.POST['a']['c']).to_s
+      end
+    end
+    body('rack.input'=>StringIO.new('{"a":{"b":1,"c":2}}'), 'CONTENT_TYPE'=>'text/json', 'REQUEST_METHOD'=>'POST').must_equal '3'
+  end
+
+  it "supports :parser option" do
+    app(:bare) do
+      plugin(:json_parser, :parser=>method(:eval))
+      route do |r|
+        r.params['a']['b'].to_s
+      end
+    end
+    body('rack.input'=>StringIO.new("{'a'=>{'b'=>1}}"), 'CONTENT_TYPE'=>'text/json', 'REQUEST_METHOD'=>'POST').must_equal '1'
+  end
+
+  it "supports :include_request option" do
+    app(:bare) do
+      plugin(:json_parser,
+        :include_request => true,
+        :parser => lambda{|s,r| {'a'=>s, 'b'=>r.path_info}})
+      route do |r|
+        "#{r.params['a']}:#{r.params['b']}"
+      end
+    end
+    body('rack.input'=>StringIO.new('{}'), 'CONTENT_TYPE'=>'text/json', 'REQUEST_METHOD'=>'POST').must_equal '{}:/'
+  end
+end

data/spec/plugin/json_spec.rb

@@ -28,22 +28,35 @@ describe "json plugin" do
   end
 
   it "should use a json content type for a json response" do
-    header('Content-Type', "/array").should == 'application/json'
-    header('Content-Type', "/hash").should == 'application/json'
-    header('Content-Type', "/c").should == 'application/json'
-    header('Content-Type').should == 'text/html'
+    header('Content-Type', "/array").must_equal 'application/json'
+    header('Content-Type', "/hash").must_equal 'application/json'
+    header('Content-Type', "/c").must_equal 'application/json'
+    header('Content-Type').must_equal 'text/html'
   end
 
   it "should convert objects to json" do
-    body('/array').gsub(/\s/, '').should == '[1,2,3]'
-    body('/hash').gsub(/\s/, '').should == '{"a":"b"}'
-    body('/c').should == '[1]'
-    body.should == ''
+    body('/array').gsub(/\s/, '').must_equal '[1,2,3]'
+    body('/hash').gsub(/\s/, '').must_equal '{"a":"b"}'
+    body('/c').must_equal '[1]'
+    body.must_equal ''
   end
 
   it "should work when subclassing" do
     @app = Class.new(app)
     app.route{[1]}
-    body.should == '[1]'
+    body.must_equal '[1]'
+  end
+
+  it "should accept custom serializers" do
+    app.plugin :json, :serializer => proc{|o| o.inspect}
+    body("/hash").must_equal '{"a"=>"b"}'
+  end
+
+  it "should give serializer the request if :include_request is set" do
+    app.plugin :json,
+      :include_request => true,
+      :serializer => lambda{|o,r| "#{o['a']}:#{r.path_info}"}
+
+    body("/hash").must_equal 'b:/hash'
   end
 end

data/spec/plugin/mailer_spec.rb

@@ -36,28 +36,28 @@ describe "mailer plugin" do
     end
 
     m = app.mail('/foo')
-    deliveries.should == []
-    m.from.should == ['f@example.com']
-    m.to.should == ['t@example.com']
-    m.cc.should == ['c@example.com']
-    m.bcc.should == ['b@example.com']
-    m.subject.should == 's'
-    m.body.should == 'b'
-    m.header['X-Foo'].to_s.should == 'Bar'
+    deliveries.must_equal []
+    m.from.must_equal ['f@example.com']
+    m.to.must_equal ['t@example.com']
+    m.cc.must_equal ['c@example.com']
+    m.bcc.must_equal ['b@example.com']
+    m.subject.must_equal 's'
+    m.body.must_be :==, 'b'
+    m.header['X-Foo'].to_s.must_equal 'Bar'
 
     m.deliver!
-    deliveries.should == [m]
+    deliveries.must_equal [m]
 
     deliveries.clear
     m = app.sendmail('/foo')
-    deliveries.should == [m]
-    m.from.should == ['f@example.com']
-    m.to.should == ['t@example.com']
-    m.cc.should == ['c@example.com']
-    m.bcc.should == ['b@example.com']
-    m.subject.should == 's'
-    m.body.should == 'b'
-    m.header['X-Foo'].to_s.should == 'Bar'
+    deliveries.must_equal [m]
+    m.from.must_equal ['f@example.com']
+    m.to.must_equal ['t@example.com']
+    m.cc.must_equal ['c@example.com']
+    m.bcc.must_equal ['b@example.com']
+    m.subject.must_equal 's'
+    m.body.must_be :==, 'b'
+    m.header['X-Foo'].to_s.must_equal 'Bar'
   end
 
   it "supports arguments to mail/sendmail methods, yielding them to the route blocks" do
@@ -71,8 +71,22 @@ describe "mailer plugin" do
       end
     end
 
-    app.mail('/foo', 1, 2).body.should == 'foo[1, 2]'
-    app.sendmail('/bar', 1, 2).body.should == '["bar", 1, 2]'
+    app.mail('/foo', 1, 2).body.must_be :==, 'foo[1, 2]'
+    app.sendmail('/bar', 1, 2).body.must_be :==, '["bar", 1, 2]'
+  end
+
+  it "supports no_mail! method for skipping mailing" do
+    app(:mailer) do |r|
+      instance_exec(&setup_email)
+      r.mail "foo" do |*args|
+        no_mail!
+        raise
+      end
+    end
+
+    app.mail('/foo', 1, 2).must_equal nil
+    app.sendmail('/foo', 1, 2).must_equal nil
+    deliveries.must_equal []
   end
 
   it "supports attachments" do
@@ -84,11 +98,11 @@ describe "mailer plugin" do
     end
 
     m = app.mail('foo')
-    m.attachments.length.should == 1
-    m.attachments.first.content_type.should =~ /mailer_spec\.rb/
-    m.content_type.should =~ /\Amultipart\/mixed/
-    m.parts.length.should == 1
-    m.parts.first.body.should == File.read(__FILE__)
+    m.attachments.length.must_equal 1
+    m.attachments.first.content_type.must_match(/mailer_spec\.rb/)
+    m.content_type.must_match(/\Amultipart\/mixed/)
+    m.parts.length.must_equal 1
+    m.parts.first.body.must_be :==, File.read(__FILE__)
   end
 
   it "supports attachments with blocks" do
@@ -102,11 +116,11 @@ describe "mailer plugin" do
     end
 
     m = app.mail('foo')
-    m.attachments.length.should == 1
-    m.attachments.first.content_type.should == 'text/foo'
-    m.content_type.should =~ /\Amultipart\/mixed/
-    m.parts.length.should == 1
-    m.parts.first.body.should == File.read(__FILE__)
+    m.attachments.length.must_equal 1
+    m.attachments.first.content_type.must_equal 'text/foo'
+    m.content_type.must_match(/\Amultipart\/mixed/)
+    m.parts.length.must_equal 1
+    m.parts.first.body.must_be :==, File.read(__FILE__)
   end
 
   it "supports plain-text attachments with an email body" do
@@ -119,14 +133,14 @@ describe "mailer plugin" do
     end
 
     m = app.mail('foo')
-    m.parts.length.should == 2
-    m.parts.first.content_type.should =~ /text\/plain/
-    m.parts.first.body.should == 'c'
-    m.parts.last.content_type.should =~ /text\/plain/
-    m.parts.last.body.should == 'b'
-    m.attachments.length.should == 1
-    m.attachments.first.content_type.should =~ /a\.txt/
-    m.content_type.should =~ /\Amultipart\/mixed/
+    m.parts.length.must_equal 2
+    m.parts.first.content_type.must_match(/text\/plain/)
+    m.parts.first.body.must_be :==, 'c'
+    m.parts.last.content_type.must_match(/text\/plain/)
+    m.parts.last.body.must_be :==, 'b'
+    m.attachments.length.must_equal 1
+    m.attachments.first.content_type.must_match(/a\.txt/)
+    m.content_type.must_match(/\Amultipart\/mixed/)
   end
 
   it "supports regular web requests in same application" do
@@ -140,8 +154,8 @@ describe "mailer plugin" do
       end
     end
 
-    body("/foo/baz", 'rack.input'=>StringIO.new).should == 'foobaz'
-    app.mail('/bar').body.should == 'b'
+    body("/foo/baz", 'rack.input'=>StringIO.new).must_equal 'foobaz'
+    app.mail('/bar').body.must_be :==, 'b'
   end
 
   it "supports multipart email using text_part/html_pat" do
@@ -154,9 +168,9 @@ describe "mailer plugin" do
     end
 
     m = app.mail('/foo')
-    m.text_part.body.should == 't'
-    m.html_part.body.should == 'h'
-    m.content_type.should =~ /\Amultipart\/alternative/
+    m.text_part.body.must_be :==, 't'
+    m.html_part.body.must_be :==, 'h'
+    m.content_type.must_match(/\Amultipart\/alternative/)
   end
 
   it "supports setting arbitrary email headers for multipart emails" do
@@ -169,21 +183,21 @@ describe "mailer plugin" do
     end
 
     m = app.mail('/foo')
-    m.text_part.body.should == 't'
-    m.text_part.header['X-Text'].to_s.should == 'T'
-    m.html_part.body.should == 'h'
-    m.html_part.header['X-HTML'].to_s.should == 'H'
-    m.content_type.should =~ /\Amultipart\/alternative/
+    m.text_part.body.must_be :==, 't'
+    m.text_part.header['X-Text'].to_s.must_equal 'T'
+    m.html_part.body.must_be :==, 'h'
+    m.html_part.header['X-HTML'].to_s.must_equal 'H'
+    m.content_type.must_match(/\Amultipart\/alternative/)
   end
 
   it "raises error if mail object is not returned" do
     app(:mailer){}
-    proc{app.mail('/')}.should raise_error(Roda::RodaPlugins::Mailer::Error)
+    proc{app.mail('/')}.must_raise(Roda::RodaPlugins::Mailer::Error)
   end
 
   it "does not raise an error when using an explicitly empty body" do
     app(:mailer){""}
-    proc{app.mail('/')}.should_not raise_error
+    app.mail('/')
   end
 
   it "supports setting the default content-type for emails when loading the plugin" do
@@ -191,7 +205,7 @@ describe "mailer plugin" do
       plugin :mailer, :content_type=>'text/html'
       route{""}
     end
-    app.mail('/').content_type.should =~ /\Atext\/html/
+    app.mail('/').content_type.must_match(/\Atext\/html/)
   end
 
   it "supports loading the plugin multiple times" do
@@ -200,7 +214,7 @@ describe "mailer plugin" do
       plugin :mailer
       route{""}
     end
-    app.mail('/').content_type.should =~ /\Atext\/html/
+    app.mail('/').content_type.must_match(/\Atext\/html/)
   end
 
   it "supports manually overridding the default content-type for emails" do
@@ -211,7 +225,7 @@ describe "mailer plugin" do
         ""
       end
     end
-    app.mail('/').content_type.should =~ /\Atext\/foo/
+    app.mail('/').content_type.must_match(/\Atext\/foo/)
   end
 
   it "supports setting the default content type when attachments are used" do
@@ -223,12 +237,12 @@ describe "mailer plugin" do
       end
     end
     m = app.mail('/')
-    m.content_type.should =~ /\Amultipart\/mixed/
-    m.parts.length.should == 2
-    m.parts.first.content_type.should =~ /\Atext\/html/
-    m.parts.first.body.should == "a"
-    m.parts.last.content_type.should =~ /\Atext\/css/
-    m.parts.last.body.should == File.read('spec/assets/css/raw.css')
+    m.content_type.must_match(/\Amultipart\/mixed/)
+    m.parts.length.must_equal 2
+    m.parts.first.content_type.must_match(/\Atext\/html/)
+    m.parts.first.body.must_be :==, "a"
+    m.parts.last.content_type.must_match(/\Atext\/css/)
+    m.parts.last.body.must_be :==, File.read('spec/assets/css/raw.css')
   end
 end
 end

data/spec/plugin/match_affix_spec.rb

@@ -16,7 +16,7 @@ describe "match_affix plugin" do
       end
     end
 
-    body("/albums/a/1").should == 'albums-/'
-    body("/albums/b/1").should == 'b-/-1-""'
+    body("/albums/a/1").must_equal 'albums-/'
+    body("/albums/b/1").must_equal 'b-/-1-""'
   end
 end

data/spec/plugin/middleware_spec.rb

@@ -42,18 +42,18 @@ describe "middleware plugin" do
       end
     end
 
-    body('/a').should == 'a3'
-    body('/b').should == 'b3'
-    body('/a', 'REQUEST_METHOD'=>'POST').should == 'a2'
-    body('/b', 'REQUEST_METHOD'=>'POST').should == 'b2'
-    body('/a', 'REQUEST_METHOD'=>'PATCH').should == 'a2'
-    body('/b', 'REQUEST_METHOD'=>'PATCH').should == 'b1'
+    body('/a').must_equal 'a3'
+    body('/b').must_equal 'b3'
+    body('/a', 'REQUEST_METHOD'=>'POST').must_equal 'a2'
+    body('/b', 'REQUEST_METHOD'=>'POST').must_equal 'b2'
+    body('/a', 'REQUEST_METHOD'=>'PATCH').must_equal 'a2'
+    body('/b', 'REQUEST_METHOD'=>'PATCH').must_equal 'b1'
   end
 
   it "makes it still possible to use the Roda app normally" do
     app(:middleware) do
       "a"
     end
-    body.should == 'a'
+    body.must_equal 'a'
   end
 end