This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Lorem ipsum sdfdsfsdfsdfsdf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mlangenberg-mbp:merb-core mlangenberg$ git diff | |
diff --git a/spec/public/request/request_spec.rb b/spec/public/request/request_spec.rb | |
index 0486a07..4bd3053 100644 | |
--- a/spec/public/request/request_spec.rb | |
+++ b/spec/public/request/request_spec.rb | |
@@ -76,6 +76,11 @@ describe Merb::Request, " query and body params" do | |
request.params[:inflated_object].should eql(["foo", "bar"]) | |
end | |
+ it "should not try to parse the request body as JSON on GET" do |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From ee6bf8c0144a5d2d3958ea280ba0154f3bee05ee Mon Sep 17 00:00:00 2001 | |
From: Matthijs Langenberg <[email protected]> | |
Date: Thu, 31 Jul 2008 23:27:50 +0200 | |
Subject: [PATCH] Rewrote the spec for unparsable JSON and added a spec for unparsable XML. | |
--- | |
spec/public/request/request_spec.rb | 19 +++++++++++++------ | |
1 files changed, 13 insertions(+), 6 deletions(-) | |
diff --git a/spec/public/request/request_spec.rb b/spec/public/request/request_spec.rb |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
require 'rubygems' | |
require 'spec' | |
## implementatie | |
class Calculator | |
attr_reader :result | |
def initialize(a = 0) | |
@result = a | |
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
proxy_set_header Host $http_host; | |
proxy_set_header X-Real-IP $remote_addr; | |
proxy_set_header X-Forwarded-For $remote_addr; | |
proxy_redirect http://localhost/ $scheme://$http_host/; | |
server { | |
listen 80; | |
server_name sandbox.phusion.nl; | |
root /u/apps/sandbox/current/public; | |
location / { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
require 'rubygems' | |
require 'merb-core' | |
module Merb | |
class Mailer | |
class_inheritable_accessor :config | |
def initialize(opts = {}) | |
self.config = {:sendmail_path => '/usr/sbin/sendmail'} if config.nil? | |
end | |
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
class Test < Application | |
# ...and remember, everything returned from an action | |
# goes to the client... | |
def index | |
body = render(:format => :html) | |
render(:template => 'test/mail', :format => :text, :layout => false) | |
body | |
end | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
~ undefined method `new' for nil:NilClass - (NoMethodError) | |
/Library/Ruby/Gems/1.8/gems/merb_helpers-0.9.5/lib/merb_helpers/form/helpers.rb:10:in `_singleton_form_context' | |
/Library/Ruby/Gems/1.8/gems/merb_helpers-0.9.5/lib/merb_helpers/form/helpers.rb:18:in `current_form_context' | |
/Library/Ruby/Gems/1.8/gems/merb_helpers-0.9.5/lib/merb_helpers/form/helpers.rb:397:in `error_messages_for' | |
/Users/mlangenberg/dev/idscms/app/views/admin/sites/new.html.erb:3:in `__Users__mlangenberg__dev__idscms__app__views__admin__sites__new_html_erb' | |
/Library/Ruby/Gems/1.8/gems/merb-core-0.9.5/lib/merb-core/controller/mixins/render.rb:120:in `send' | |
/Library/Ruby/Gems/1.8/gems/merb-core-0.9.5/lib/merb-core/controller/mixins/render.rb:120:in `render' | |
/Users/mlangenberg/dev/idscms/app/controllers/admin/sites.rb:23:in `new' | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
~ Started request handling: Wed Aug 27 16:07:57 +0200 2008 | |
~ Params: {"action"=>"new", "namespace"=>"admin", "controller"=>"sites"} | |
~ undefined method `new' for nil:NilClass - (NoMethodError) | |
/Library/Ruby/Gems/1.8/gems/merb_helpers-0.9.5/lib/merb_helpers/form/helpers.rb:10:in `_singleton_form_context' | |
/Library/Ruby/Gems/1.8/gems/merb_helpers-0.9.5/lib/merb_helpers/form/helpers.rb:18:in `current_form_context' | |
/Library/Ruby/Gems/1.8/gems/merb_helpers-0.9.5/lib/merb_helpers/form/helpers.rb:397:in `error_messages_for' | |
/Users/mlangenberg/dev/idscms/app/views/admin/sites/new.html.erb:3:in `__Users__mlangenberg__dev__idscms__app__views__admin__sites__new_html_erb' | |
/Library/Ruby/Gems/1.8/gems/merb-core-0.9.5/lib/merb-core/controller/mixins/render.rb:120:in `send' | |
/Library/Ruby/Gems/1.8/gems/merb-core-0.9.5/lib/merb-core/controller/mixins/render.rb:120:in `render' | |
/Users/mlangenberg/dev/idscms/app/controllers/admin/sites.rb:23:in `new' |
OlderNewer