mkuklis-webrat 0.5.1 → 0.6.rc1

data/spec/integration/merb/app/views/exceptions/not_acceptable.html.erb

@@ -1,63 +1,63 @@
-<div id="container">
-  <div id="header-container">
-    <img src="/images/merb.jpg" />
-    <!-- <h1>Mongrel + Erb</h1> -->
-    <h2>pocket rocket web framework</h2>
-    <hr />
-  </div>
-
-  <div id="left-container">
-    <h3>Exception:</h3>
-    <p><%= request.exceptions.first.message %></p>
-  </div>
-
-  <div id="main-container">
-    <h3>Why am I seeing this page?</h3>
-    <p>Merb couldn't find an appropriate content_type to return,
-      based on what you said was available via provides() and
-      what the client requested.</p>
-
-    <h3>How to add a mime-type</h3>
-    <pre><code>
-      Merb.add_mime_type :pdf, :to_pdf, %w[application/pdf], &quot;Content-Encoding&quot; =&gt; &quot;gzip&quot;
-    </code></pre>
-    <h3>What this means is:</h3>
-    <ul>
-      <li>Add a mime-type for :pdf</li>
-      <li>Register the method for converting objects to PDF as <code>#to_pdf</code>.</li>
-      <li>Register the incoming mime-type "Accept" header as <code>application/pdf</code>.</li>
-      <li>Specify a new header for PDF types so it will set <code>Content-Encoding</code> to gzip.</li>
-    </ul>
-
-    <h3>You can then do:</h3>
-    <pre><code>
-      class Foo &lt; Application
-        provides :pdf
-      end
-    </code></pre>
-
-    <h3>Where can I find help?</h3>
-    <p>If you have any questions or if you can't figure something out, please take a
-      look at our <a href="http://merbivore.com/"> project page</a>,
-      feel free to come chat at irc.freenode.net, channel #merb,
-      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
-      on Google Groups.</p>
-      
-    <h3>What if I've found a bug?</h3>
-    <p>If you want to file a bug or make your own contribution to Merb,
-      feel free to register and create a ticket at our
-      <a href="http://merb.lighthouseapp.com/">project development page</a>
-      on Lighthouse.</p>
-
-    <h3>How do I edit this page?</h3>
-    <p>You can change what people see when this happens by editing <tt>app/views/exceptions/not_acceptable.html.erb</tt>.</p> 
-
-  </div>
-
-  <div id="footer-container">
-    <hr />
-    <div class="left"></div>
-    <div class="right">&copy; 2008 the merb dev team</div>
-    <p>&nbsp;</p>
-  </div>
-</div>
+<div id="container">
+  <div id="header-container">
+    <img src="/images/merb.jpg" />
+    <!-- <h1>Mongrel + Erb</h1> -->
+    <h2>pocket rocket web framework</h2>
+    <hr />
+  </div>
+
+  <div id="left-container">
+    <h3>Exception:</h3>
+    <p><%= request.exceptions.first.message %></p>
+  </div>
+
+  <div id="main-container">
+    <h3>Why am I seeing this page?</h3>
+    <p>Merb couldn't find an appropriate content_type to return,
+      based on what you said was available via provides() and
+      what the client requested.</p>
+
+    <h3>How to add a mime-type</h3>
+    <pre><code>
+      Merb.add_mime_type :pdf, :to_pdf, %w[application/pdf], &quot;Content-Encoding&quot; =&gt; &quot;gzip&quot;
+    </code></pre>
+    <h3>What this means is:</h3>
+    <ul>
+      <li>Add a mime-type for :pdf</li>
+      <li>Register the method for converting objects to PDF as <code>#to_pdf</code>.</li>
+      <li>Register the incoming mime-type "Accept" header as <code>application/pdf</code>.</li>
+      <li>Specify a new header for PDF types so it will set <code>Content-Encoding</code> to gzip.</li>
+    </ul>
+
+    <h3>You can then do:</h3>
+    <pre><code>
+      class Foo &lt; Application
+        provides :pdf
+      end
+    </code></pre>
+
+    <h3>Where can I find help?</h3>
+    <p>If you have any questions or if you can't figure something out, please take a
+      look at our <a href="http://merbivore.com/"> project page</a>,
+      feel free to come chat at irc.freenode.net, channel #merb,
+      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
+      on Google Groups.</p>
+      
+    <h3>What if I've found a bug?</h3>
+    <p>If you want to file a bug or make your own contribution to Merb,
+      feel free to register and create a ticket at our
+      <a href="http://merb.lighthouseapp.com/">project development page</a>
+      on Lighthouse.</p>
+
+    <h3>How do I edit this page?</h3>
+    <p>You can change what people see when this happens by editing <tt>app/views/exceptions/not_acceptable.html.erb</tt>.</p> 
+
+  </div>
+
+  <div id="footer-container">
+    <hr />
+    <div class="left"></div>
+    <div class="right">&copy; 2008 the merb dev team</div>
+    <p>&nbsp;</p>
+  </div>
+</div>

data/spec/integration/merb/app/views/exceptions/not_found.html.erb

@@ -1,47 +1,47 @@
-<div id="container">
-  <div id="header-container">
-    <img src="/images/merb.jpg" />
-    <!-- <h1>Mongrel + Erb</h1> -->
-    <h2>pocket rocket web framework</h2>
-    <hr />
-  </div>
-
-  <div id="left-container">
-    <h3>Exception:</h3>
-    <p><%= request.exceptions.first.message %></p>
-  </div>
-
-  <div id="main-container">
-    <h3>Welcome to Merb!</h3>
-    <p>Merb is a light-weight MVC framework written in Ruby.  We hope you enjoy it.</p>
-    
-    <h3>Where can I find help?</h3>
-    <p>If you have any questions or if you can't figure something out, please take a
-      look at our <a href="http://merbivore.com/"> project page</a>,
-      feel free to come chat at irc.freenode.net, channel #merb,
-      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
-      on Google Groups.</p>
-      
-    <h3>What if I've found a bug?</h3>
-    <p>If you want to file a bug or make your own contribution to Merb,
-      feel free to register and create a ticket at our
-      <a href="http://merb.lighthouseapp.com/">project development page</a>
-      on Lighthouse.</p>
-
-    <h3>How do I edit this page?</h3>
-    <p>You're seeing this page because you need to edit the following files:
-      <ul>
-        <li>config/router.rb <strong><em>(recommended)</em></strong></li>
-        <li>app/views/exceptions/not_found.html.erb <strong><em>(recommended)</em></strong></li>
-        <li>app/views/layout/application.html.erb <strong><em>(change this layout)</em></strong></li>
-      </ul>
-    </p>
-  </div>
-
-  <div id="footer-container">
-    <hr />
-    <div class="left"></div>
-    <div class="right">&copy; 2008 the merb dev team</div>
-    <p>&nbsp;</p>
-  </div>
-</div>
+<div id="container">
+  <div id="header-container">
+    <img src="/images/merb.jpg" />
+    <!-- <h1>Mongrel + Erb</h1> -->
+    <h2>pocket rocket web framework</h2>
+    <hr />
+  </div>
+
+  <div id="left-container">
+    <h3>Exception:</h3>
+    <p><%= request.exceptions.first.message %></p>
+  </div>
+
+  <div id="main-container">
+    <h3>Welcome to Merb!</h3>
+    <p>Merb is a light-weight MVC framework written in Ruby.  We hope you enjoy it.</p>
+    
+    <h3>Where can I find help?</h3>
+    <p>If you have any questions or if you can't figure something out, please take a
+      look at our <a href="http://merbivore.com/"> project page</a>,
+      feel free to come chat at irc.freenode.net, channel #merb,
+      or post to <a href="http://groups.google.com/group/merb">merb mailing list</a>
+      on Google Groups.</p>
+      
+    <h3>What if I've found a bug?</h3>
+    <p>If you want to file a bug or make your own contribution to Merb,
+      feel free to register and create a ticket at our
+      <a href="http://merb.lighthouseapp.com/">project development page</a>
+      on Lighthouse.</p>
+
+    <h3>How do I edit this page?</h3>
+    <p>You're seeing this page because you need to edit the following files:
+      <ul>
+        <li>config/router.rb <strong><em>(recommended)</em></strong></li>
+        <li>app/views/exceptions/not_found.html.erb <strong><em>(recommended)</em></strong></li>
+        <li>app/views/layout/application.html.erb <strong><em>(change this layout)</em></strong></li>
+      </ul>
+    </p>
+  </div>
+
+  <div id="footer-container">
+    <hr />
+    <div class="left"></div>
+    <div class="right">&copy; 2008 the merb dev team</div>
+    <p>&nbsp;</p>
+  </div>
+</div>

data/spec/integration/merb/app/views/layout/application.html.erb

@@ -1,12 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
-  <head>
-    <title>Fresh Merb App</title>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" href="/stylesheets/master.css" type="text/css" media="screen" charset="utf-8" />
-  </head>
-  <body>
-    <%#= message[:notice] %>
-    <%= catch_content :for_layout %>
-  </body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
+  <head>
+    <title>Fresh Merb App</title>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" href="/stylesheets/master.css" type="text/css" media="screen" charset="utf-8" />
+  </head>
+  <body>
+    <%#= message[:notice] %>
+    <%= catch_content :for_layout %>
+  </body>
 </html>

data/spec/integration/merb/app/views/testing/show_form.html.erb

@@ -1,27 +1,27 @@
-<h1>Webrat Form</h1>
-
-<form action="/testing/submit_form" method="post">
-  <label>
-    Text field
-    <input type="text" name="text_field" />
-  </label>
-  
-  <label>
-    TOS <input type="checkbox" name="tos" />
-  </label>
-  
-  <label>
-    Prefilled
-    <input type="text" name="prefilled" value="text" />
-  </label>
-  
-  <label>
-    Month
-    <select name="month">
-      <option>None</option>
-      <option>January</option>
-    </select>
-  </label>
-  
-  <input type="submit" value="Test">
+<h1>Webrat Form</h1>
+
+<form action="/testing/submit_form" method="post">
+  <label>
+    Text field
+    <input type="text" name="text_field" />
+  </label>
+  
+  <label>
+    TOS <input type="checkbox" name="tos" />
+  </label>
+  
+  <label>
+    Prefilled
+    <input type="text" name="prefilled" value="text" />
+  </label>
+  
+  <label>
+    Month
+    <select name="month">
+      <option>None</option>
+      <option>January</option>
+    </select>
+  </label>
+  
+  <input type="submit" value="Test">
 </form>

data/spec/integration/merb/app/views/testing/upload.html.erb

@@ -1,9 +1,9 @@
-<h1>Webrat Form</h1>
-
-<form action="/upload" method="post">
-  <label>
-    File
-    <input type="file" name="uploaded_file" />
-  </label>
-  <input type="submit" value="Upload">
+<h1>Webrat Form</h1>
+
+<form action="/upload" method="post">
+  <label>
+    File
+    <input type="file" name="uploaded_file" />
+  </label>
+  <input type="submit" value="Upload">
 </form>

data/spec/integration/merb/config/environments/development.rb

@@ -1,15 +1,15 @@
-Merb.logger.info("Loaded DEVELOPMENT Environment...")
-Merb::Config.use { |c|
-  c[:exception_details] = true
-  c[:reload_templates] = true
-  c[:reload_classes] = true
-  c[:reload_time] = 0.5
-  c[:ignore_tampered_cookies] = true
-  c[:log_auto_flush ] = true
-  c[:log_level] = :debug
-
-  c[:log_stream] = STDOUT
-  c[:log_file]   = nil
-  # Or redirect logging into a file:
-  # c[:log_file]  = Merb.root / "log" / "development.log"
-}
+Merb.logger.info("Loaded DEVELOPMENT Environment...")
+Merb::Config.use { |c|
+  c[:exception_details] = true
+  c[:reload_templates] = true
+  c[:reload_classes] = true
+  c[:reload_time] = 0.5
+  c[:ignore_tampered_cookies] = true
+  c[:log_auto_flush ] = true
+  c[:log_level] = :debug
+
+  c[:log_stream] = STDOUT
+  c[:log_file]   = nil
+  # Or redirect logging into a file:
+  # c[:log_file]  = Merb.root / "log" / "development.log"
+}

data/spec/integration/merb/config/environments/rake.rb

@@ -1,11 +1,11 @@
-Merb.logger.info("Loaded RAKE Environment...")
-Merb::Config.use { |c|
-  c[:exception_details] = true
-  c[:reload_classes]  = false
-  c[:log_auto_flush ] = true
-
-  c[:log_stream] = STDOUT
-  c[:log_file]   = nil
-  # Or redirect logging into a file:
-  # c[:log_file]  = Merb.root / "log" / "development.log"
-}
+Merb.logger.info("Loaded RAKE Environment...")
+Merb::Config.use { |c|
+  c[:exception_details] = true
+  c[:reload_classes]  = false
+  c[:log_auto_flush ] = true
+
+  c[:log_stream] = STDOUT
+  c[:log_file]   = nil
+  # Or redirect logging into a file:
+  # c[:log_file]  = Merb.root / "log" / "development.log"
+}

data/spec/integration/merb/config/environments/test.rb

@@ -1,14 +1,14 @@
-require File.dirname(__FILE__) + "/../../../../../lib/webrat"
-
-Merb.logger.info("Loaded TEST Environment...")
-Merb::Config.use { |c|
-  c[:testing]           = true
-  c[:exception_details] = true
-  c[:log_auto_flush ]   = true
-  # log less in testing environment
-  c[:log_level]         = :error
-
-  #c[:log_file]  = Merb.root / "log" / "test.log"
-  # or redirect logger using IO handle
-  c[:log_stream] = STDOUT
-}
+require File.dirname(__FILE__) + "/../../../../../lib/webrat"
+
+Merb.logger.info("Loaded TEST Environment...")
+Merb::Config.use { |c|
+  c[:testing]           = true
+  c[:exception_details] = true
+  c[:log_auto_flush ]   = true
+  # log less in testing environment
+  c[:log_level]         = :error
+
+  #c[:log_file]  = Merb.root / "log" / "test.log"
+  # or redirect logger using IO handle
+  c[:log_stream] = STDOUT
+}

data/spec/integration/merb/config/init.rb

@@ -1,25 +1,25 @@
-# Go to http://wiki.merbivore.com/pages/init-rb
-
-# Specify a specific version of a dependency
-# dependency "RedCloth", "> 3.0"
-
-#  use_orm :none
-use_test :rspec
-use_template_engine :erb
-
-Merb::Config.use do |c|
-  c[:use_mutex] = false
-  c[:session_store] = 'cookie'  # can also be 'memory', 'memcache', 'container', 'datamapper
-
-  # cookie session store configuration
-  c[:session_secret_key]  = 'adb9ea7a0e94b5513503f58623a393c5efe18851'  # required for cookie session store
-  c[:session_id_key] = '_merb_session_id' # cookie session id key, defaults to "_session_id"
-end
-
-Merb::BootLoader.before_app_loads do
-  # This will get executed after dependencies have been loaded but before your app's classes have loaded.
-end
-
-Merb::BootLoader.after_app_loads do
-  # This will get executed after your app's classes have been loaded.
-end
+# Go to http://wiki.merbivore.com/pages/init-rb
+
+# Specify a specific version of a dependency
+# dependency "RedCloth", "> 3.0"
+
+#  use_orm :none
+use_test :rspec
+use_template_engine :erb
+
+Merb::Config.use do |c|
+  c[:use_mutex] = false
+  c[:session_store] = 'cookie'  # can also be 'memory', 'memcache', 'container', 'datamapper
+
+  # cookie session store configuration
+  c[:session_secret_key]  = 'adb9ea7a0e94b5513503f58623a393c5efe18851'  # required for cookie session store
+  c[:session_id_key] = '_merb_session_id' # cookie session id key, defaults to "_session_id"
+end
+
+Merb::BootLoader.before_app_loads do
+  # This will get executed after dependencies have been loaded but before your app's classes have loaded.
+end
+
+Merb::BootLoader.after_app_loads do
+  # This will get executed after your app's classes have been loaded.
+end

data/spec/integration/merb/config/rack.rb

@@ -1,11 +1,11 @@
-# use PathPrefix Middleware if :path_prefix is set in Merb::Config
-if prefix = ::Merb::Config[:path_prefix]
-  use Merb::Rack::PathPrefix, prefix
-end
-
-# comment this out if you are running merb behind a load balancer
-# that serves static files
-use Merb::Rack::Static, Merb.dir_for(:public)
-
-# this is our main merb application
-run Merb::Rack::Application.new
+# use PathPrefix Middleware if :path_prefix is set in Merb::Config
+if prefix = ::Merb::Config[:path_prefix]
+  use Merb::Rack::PathPrefix, prefix
+end
+
+# comment this out if you are running merb behind a load balancer
+# that serves static files
+use Merb::Rack::Static, Merb.dir_for(:public)
+
+# this is our main merb application
+run Merb::Rack::Application.new

data/spec/integration/merb/config/router.rb

@@ -1,34 +1,34 @@
-# Merb::Router is the request routing mapper for the merb framework.
-#
-# You can route a specific URL to a controller / action pair:
-#
-#   match("/contact").
-#     to(:controller => "info", :action => "contact")
-#
-# You can define placeholder parts of the url with the :symbol notation. These
-# placeholders will be available in the params hash of your controllers. For example:
-#
-#   match("/books/:book_id/:action").
-#     to(:controller => "books")
-#
-# Or, use placeholders in the "to" results for more complicated routing, e.g.:
-#
-#   match("/admin/:module/:controller/:action/:id").
-#     to(:controller => ":module/:controller")
-#
-# You can specify conditions on the placeholder by passing a hash as the second
-# argument of "match"
-#
-#   match("/registration/:course_name", :course_name => /^[a-z]{3,5}-\d{5}$/).
-#     to(:controller => "registration")
-#
-# You can also use regular expressions, deferred routes, and many other options.
-# See merb/specs/merb/router.rb for a fairly complete usage sample.
-
-Merb.logger.info("Compiling routes...")
-Merb::Router.prepare do
-  match("/").to(:controller => "testing", :action => "show_form")
-  match("/upload").to(:controller => "testing", :action => "upload")
-  match("/internal_redirect").to(:controller => "testing", :action => "internal_redirect")
-  match("/external_redirect").to(:controller => "testing", :action => "external_redirect")
-end
+# Merb::Router is the request routing mapper for the merb framework.
+#
+# You can route a specific URL to a controller / action pair:
+#
+#   match("/contact").
+#     to(:controller => "info", :action => "contact")
+#
+# You can define placeholder parts of the url with the :symbol notation. These
+# placeholders will be available in the params hash of your controllers. For example:
+#
+#   match("/books/:book_id/:action").
+#     to(:controller => "books")
+#
+# Or, use placeholders in the "to" results for more complicated routing, e.g.:
+#
+#   match("/admin/:module/:controller/:action/:id").
+#     to(:controller => ":module/:controller")
+#
+# You can specify conditions on the placeholder by passing a hash as the second
+# argument of "match"
+#
+#   match("/registration/:course_name", :course_name => /^[a-z]{3,5}-\d{5}$/).
+#     to(:controller => "registration")
+#
+# You can also use regular expressions, deferred routes, and many other options.
+# See merb/specs/merb/router.rb for a fairly complete usage sample.
+
+Merb.logger.info("Compiling routes...")
+Merb::Router.prepare do
+  match("/").to(:controller => "testing", :action => "show_form")
+  match("/upload").to(:controller => "testing", :action => "upload")
+  match("/internal_redirect").to(:controller => "testing", :action => "internal_redirect")
+  match("/external_redirect").to(:controller => "testing", :action => "external_redirect")
+end

data/spec/integration/merb/spec/spec.opts

@@ -1 +1 @@
---color
+--color

data/spec/integration/merb/spec/spec_helper.rb

@@ -1,26 +1,26 @@
-require "rubygems"
-
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
-
-# Add the local gems dir if found within the app root; any dependencies loaded
-# hereafter will try to load from the local gems before loading system gems.
-if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
-  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
-end
-
-require "merb-core"
-require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
-
-# this loads all plugins required in your init file so don't add them
-# here again, Merb will do it for you
-Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
-
-Spec::Runner.configure do |config|
-  config.include(Merb::Test::ViewHelper)
-  config.include(Merb::Test::RouteHelper)
-  config.include(Merb::Test::ControllerHelper)
-end
-
-Webrat.configure do |config|
-  config.mode = :merb
-end
+require "rubygems"
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../../../lib"
+
+# Add the local gems dir if found within the app root; any dependencies loaded
+# hereafter will try to load from the local gems before loading system gems.
+if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
+  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
+end
+
+require "merb-core"
+require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
+
+# this loads all plugins required in your init file so don't add them
+# here again, Merb will do it for you
+Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
+
+Spec::Runner.configure do |config|
+  config.include(Merb::Test::ViewHelper)
+  config.include(Merb::Test::RouteHelper)
+  config.include(Merb::Test::ControllerHelper)
+end
+
+Webrat.configure do |config|
+  config.mode = :merb
+end