RubyGems - merb-gen - Versions diffs - 0.9.8 → 0.9.9 - Mend

@@ -5,7 +5,7 @@ class <%= class_name %> < Merb::Controller
   end
   def index
-    "Hello"
+    "Hello, I am flat Merb application. I only have one single file for the application, single file for configs and routes, and a directory for views."
   end
   def foo

data/lib/generators/templates/application/merb_flat/config/init.rb CHANGED Viewed

@@ -118,20 +118,25 @@ end
 # Move this to application.rb if you want it to be reloadable in dev mode.
-Merb::Router.prepare do |r|
-  r.match('/').to(:controller => 'foo', :action =>'index')
-  r.default_routes
+Merb::Router.prepare do
+  match('/').to(:controller => "<%= self.name.gsub("-", "_") %>", :action =>'index')
+  default_routes
 end
 Merb::Config.use { |c|
   c[:environment]         = 'production',
   c[:framework]           = {},
   c[:log_level]           = :debug,
+  c[:log_stream]          = STDOUT,
+  # or use file for loggine:
+  # c[:log_file]          = Merb.root / "log" / "merb.log",
   c[:use_mutex]           = false,
   c[:session_store]       = 'cookie',
   c[:session_id_key]      = '_session_id',
   c[:session_secret_key]  = '<%= SHA1.new(rand(100000000000).to_s).to_s %>',
   c[:exception_details]   = true,
   c[:reload_classes]      = true,
+  c[:reload_templates]    = true,
   c[:reload_time]         = 0.5
 }

data/lib/generators/templates/application/merb_plugin/LICENSE CHANGED Viewed

@@ -1,4 +1,4 @@
-Copyright (c) <%= Time.now.year %> YOUR NAME
+Copyright (c) <%= Time.now.year %> Engine Yard
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/generators/templates/application/merb_stack/app/controllers/application.rb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ class Application < Merb::Controller
2	+ end

data/lib/generators/templates/application/merb_stack/app/controllers/exceptions.rb ADDED Viewed

@@ -0,0 +1,13 @@
+class Exceptions < Application
+  # handle NotFound exceptions (404)
+  def not_found
+    render :format => :html
+  end
+  # handle NotAcceptable exceptions (406)
+  def not_acceptable
+    render :format => :html
+  end
+end

data/lib/generators/templates/application/merb_stack/app/helpers/global_helpers.rb ADDED Viewed

@@ -0,0 +1,5 @@
+module Merb
+  module GlobalHelpers
+    # helpers defined here available to all views.
+  end
+end

data/lib/generators/templates/application/merb_stack/app/models/user.rb ADDED Viewed

@@ -0,0 +1,17 @@
+# This is a default user class used to activate merb-auth.  Feel free to change from a User to
+# Some other class, or to remove it altogether.  If removed, merb-auth may not work by default.
+#
+# Don't forget that by default the salted_user mixin is used from merb-more
+# You'll need to setup your db as per the salted_user mixin, and you'll need
+# To use :password, and :password_confirmation when creating a user
+#
+# see config/merb-auth/setup.rb to see how to disable the salted_user mixin
+#
+# You will need to setup your database and create a user.
+class User
+  include DataMapper::Resource
+  property :id,     Serial
+  property :login,  String
+end

data/lib/generators/templates/application/merb_stack/app/views/exceptions/internal_server_error.html.erb ADDED Viewed

@@ -0,0 +1,216 @@
+<html>
+<head>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+	<title><%%= @exception_name %></title>
+	<style type="text/css" media="screen">
+		body {
+			font-family:arial;
+			font-size:11px;
+		}
+		h1 {
+			font-size:48px;
+			letter-spacing:-4px;
+			margin:0;
+			line-height:36px;
+			color:#333;
+		}
+			h1 sup {
+				font-size: 0.5em;
+			}
+			h1 sup.error_500, h1 sup.error_400 {
+				color:#990E05;
+			}
+			h1 sup.error_100, h1 sup.error_200 {
+				color:#00BF10;
+			}
+			h1 sup.error_300 {
+				/* pretty sure you cant 'see' status 300
+				errors but if you could I think they
+				would be blue */
+				color:#1B2099;
+			}
+		h2 {
+			font-size:36px;
+			letter-spacing:-3px;
+			margin:0;
+			line-height:28px;
+			color:#444;
+		}
+		a, a:visited {
+			color:#00BF10;
+		}
+		.internalError {
+			width:800px;
+			margin:50px auto;
+		}
+		.header {
+			border-bottom:10px solid #333;
+			margin-bottom:1px;
+			background-image: url("data:image/gif;base64,R0lGODlhAwADAIAAAP///8zMzCH5BAAAAAAALAAAAAADAAMAAAIEBHIJBQA7");
+			padding:20px;
+		}
+		table.trace {
+			width:100%;
+			font-family:courier, monospace;
+			letter-spacing:-1px;
+			border-collapse: collapse;
+			border-spacing:0;
+		}
+		table.trace tr td{
+			padding:0;
+			height:26px;
+			font-size:13px;
+			vertical-align:middle;
+		}
+		table.trace tr.file{
+			border-top:2px solid #fff;
+			background-color:#F3F3F3;
+		}
+		table.trace tr.source {
+			background-color:#F8F8F8;
+			display:none;
+		}
+		table.trace .open tr.source {
+			display:table-row;
+		}
+			table.trace tr.file td.expand {
+				width:23px;
+				background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAXCAIAAABvSEP3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAdVJREFUeNqMVL+TwUAYxaRIOlEhlZHGDAUzzOQ61+AqXMV1lJSU7q/QRqm8KFUcJTNn5qJkaPyoKKVz7y4mF8na5Kt29tt9+/Z97/u81+vVQ4r9frdarS6Xi7ETDIZisRjxMGPfmk4niNPpZE+xLAugbPaZ53nzvtfMBe/3+/3dbuehBrAKhZdUKkVAWa9Xsiybv0CPZDJZLr/qa5/BwgwRjYqOKIvFYjQa/aNommZh0Ww2K5UqzwfoQOPxaLPZ3FAmk0+7lplMpt1u53J5OpBOR0eZEE9wHJfP5zud93g88QhluwWbjW+5VOmKBgKBer3eaDTDYeGBQF8+x7rqIYoiPgixWJazpA6HA+MSxRArkUgMh0M409g8Ho8+9wYxxCqVSq1W26EDHGM2m4HOHQrEc38f/Yn7cLmlIRhBENzcx8cVRZnPZ/YUep2BWkjTIfA+PKVpZAXR5QxsjiqCKvGEqqp443w+0dvy17swqD0HB3S73V5PpkNg1qBqt8kwGCjmPkinM0QJbIoEa7U6UG6ToVgs4V9G2g0ESoP5Aoi7KYX5oCgf8IKbkvn9/mr1LRQKESamzgJy0g0tSZIuB3nuGqRU9Vv9C4sKkUhEkp4soxvxI8AAhWrrtXa3X8EAAAAASUVORK5CYII=);
+				background-position:top left;
+				background-repeat:no-repeat;
+			}
+			table.trace .open tr.file td.expand {
+				width:19px;
+				background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAB1CAIAAAAqdO2mAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAXZJREFUeNrslK1ywkAUhcMOBomEOiSdqLxEBJX0NaijOsjyHGGmCGyQQYaiiiw4gktkcOmZbpsuuzQ/M5XnqJ2d3S/n3nM3rTzPLUP7/Tt0+pLcGQwG3W53OLyHzPMtjYL7q9UqSRLrD4E1Gj1orCvKYuFHUWTVkOM44/HjDcp8/lL4r6NerzeZPMm1KFw0QkDn83m5fP2lHA4fNQvRtNvtjsfDd0WzmSfb2e/fdTqdOvdh/HLJZLOn0+d2HJ+KRGzbdl23EpFlmed5cp2maRzHQq1lvQ5KMi6EUZBGfup6E1pTfd+vrGW7jbQ2C9hTt9BpqNyIWaAwAy6xg2eBz5iRC/NomiZhGN5sqmnkauo0BUGgVQoBjQ80oCACgNQdZHfTYBkF2mxCtWWAqunWpahxIDUt3QYUxIFQpJHyIWpXjinabKbbwItMHT+NyjchrP8QKaSQQgoppJBCCimkkEIKKaSQQgoppJBCCimkkEIKKaSo+hRgAEFD17X08O2NAAAAAElFTkSuQmCC);
+				background-position:top left;
+				background-repeat:no-repeat;
+			}
+			table.trace tr.source td.collapse {
+				width:19px;
+				background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAB1CAIAAAAqdO2mAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVxJREFUeNrs0zFygkAUBmBlUkgJHdABlQwVkVJKKUxBYWbkALTxMJwhltyDFkss03IF8pudIcwaDaDl/6pd2P327b7d+eHwMXs4lNkzggoVKlSoUKFChQoVKlSoUKFChQoVKlSoUKFChQqVEYqm6ft9+qiSJEkYho7jTlcw2fd9NOI4nq4gEdFwXXe1Cqco63VkWVbXRTqLhTpOwQRpF7quR1E0TgGhqvLKUFCyoQqG/rks3O6kZKW/eRFpevOCoGTXVTcMQ5EyxyDEkML1c5RzuZOICIyXqn7JBVez6282MWrx731HOv2qB8Hri2lamNk0DfpVVdV1Peodappmmua8bdvzuc7zfNprzrLMth1FnGh/X8MjCAIQv/cFz/+65PcDh7rbvYv2ZUfdj+PxsyzLgVl0hKwgTqeqKApx2LeOc7t98zyv/1FWOgvx9RPii23bmL9cetJ8Ed8CDAC6aFW8bCzFhwAAAABJRU5ErkJggg==);
+				background-position:bottom left;
+				background-repeat:no-repeat;
+				background-color:#6F706F;
+			}
+			table.trace tr td.path {
+				padding-left:10px;
+			}
+			table.trace tr td.code {
+				padding-left:35px;
+				white-space: pre;
+				line-height:9px;
+				padding-bottom:10px;
+			}
+				table.trace tr td.code em {
+					font-weight:bold;
+					color:#00BF10;
+				}
+				table.trace tr td.code a {
+				  width: 20px;
+				  float: left;
+				}
+				table.trace tr td.code .more {
+					color:#666;
+				}
+			table.trace tr td.line {
+				width:30px;
+				text-align:right;
+				padding-right:4px;
+			}
+		.footer {
+			margin-top:5px;
+			font-size:11px;
+			color:#444;
+			text-align:right;
+		}
+	</style>
+</head>
+<body>
+	<div class="internalError">
+		<div class="header">
+			<h1><%%= @exception_name %> <sup class="error_<%%= @exception.class::STATUS %>"><%%= @exception.class::STATUS %></sup></h1>
+			<%% if show_details = ::Merb::Config[:exception_details] -%>
+				<h2><%%=h @exception.message %></h2>
+			<%% else -%>
+				<h2>Sorry about that...</h2>
+			<%% end -%>
+			<h3>Parameters</h3>
+			<ul>
+			<%% params[:original_params].each do |param, value| %>
+				<li><strong><%%= param %>:</strong> <%%= value.inspect %></li>
+			<%% end %>
+			<%%= "<li>None</li>" if params[:original_params].empty? %>
+			</ul>
+			<h3>Session</h3>
+			<ul>
+			<%% params[:original_session].each do |param, value| %>
+				<li><strong><%%= param %>:</strong> <%%= value.inspect %></li>
+			<%% end %>
+			<%%= "<li>None</li>" if params[:original_session].empty? %>
+			</ul>
+			<h3>Cookies</h3>
+			<ul>
+			<%% params[:original_cookies].each do |param, value| %>
+				<li><strong><%%= param %>:</strong> <%%= value.inspect %></li>
+			<%% end %>
+			<%%= "<li>None</li>" if params[:original_cookies].empty? %>
+			</ul>
+		</div>
+	<%% if show_details %>
+		<table class="trace">
+			<%% @exception.backtrace.each_with_index do |line, index| %>
+				<tbody class="close">
+					<tr class="file">
+						<td class="expand">
+						</td>
+						<td class="path">
+							<%%= (line.match(/^([^:]+)/)[1] rescue 'unknown').sub(/\/((opt|usr)\/local\/lib\/(ruby\/)?(gems\/)?(1.8\/)?(gems\/)?|.+\/app\/)/, '') %>
+							<%% unless line.match(/\.erb:/) %>
+                in "<strong><%%= line.match(/:in `(.+)'$/)[1] rescue '?' %></strong>"
+              <%% else %>
+                (<strong>ERB Template</strong>)
+              <%% end %>
+						</td>
+						<td class="line">
+							<a href="txmt://open?url=file://<%%=file = (line.match(/^([^:]+)/)[1] rescue 'unknown')%>&amp;line=<%%= lineno = line.match(/:([0-9]+):/)[1] rescue '?' %>"><%%=lineno%></a>&nbsp;
+						</td>
+					</tr>
+					<tr class="source">
+						<td class="collapse">
+						</td>
+						<td class="code" colspan="2"><%% (__caller_lines__(file, lineno, 5) rescue []).each do |llineno, lcode, lcurrent| %>
+<a href="txmt://open?url=file://<%%=file%>&amp;line=<%%=llineno%>"><%%= llineno %></a><%%='<em>' if llineno==lineno.to_i %><%%= lcode.size > 90 ? CGI.escapeHTML(lcode[0..90])+'<span class="more">......</span>' : CGI.escapeHTML(lcode) %><%%='</em>' if llineno==lineno.to_i %>
+<%% end %>
+</td>
+					</tr>
+				</tbody>
+			<%% end %>
+		</table>
+		<script type="text/javascript" charset="utf-8">
+			// swop the open & closed classes
+			els = document.getElementsByTagName('td');
+			for(i=0; i<els.length; i++){
+				if(els[i].className=='expand' || els[i].className=='collapse'){
+					els[i].onclick = function(e){
+						tbody = this.parentNode.parentNode;
+						if(tbody.className=='open'){
+							tbody.className='closed';
+						}else{
+							tbody.className='open';
+						}
+					}
+				}
+			}
+		</script>
+	<%% end %>
+	<div class="footer">
+		lots of love, from <a href="#">merb</a>
+	</div>
+	</div>
+</body>
+</html>

data/lib/generators/templates/application/merb_stack/app/views/exceptions/not_acceptable.html.erb ADDED Viewed

@@ -0,0 +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>

data/lib/generators/templates/application/merb_stack/app/views/exceptions/not_found.html.erb ADDED Viewed

@@ -0,0 +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>

data/lib/generators/templates/application/merb_stack/autotest/discover.rb ADDED Viewed

	@@ -0,0 +1 @@
1	+ Autotest.add_discovery { "merb" }

data/lib/generators/templates/application/merb_stack/autotest/merb.rb ADDED Viewed

@@ -0,0 +1,149 @@
+# Adapted from Autotest::Rails
+require 'autotest'
+class Autotest::Merb < Autotest
+  # +model_tests_dir+::      the directory to find model-centric tests
+  # +controller_tests_dir+:: the directory to find controller-centric tests
+  # +view_tests_dir+::       the directory to find view-centric tests
+  # +fixtures_dir+::         the directory to find fixtures in
+  attr_accessor :model_tests_dir, :controller_tests_dir, :view_tests_dir, :fixtures_dir
+  def initialize
+    super
+    initialize_test_layout
+    # Ignore any happenings in these directories
+    add_exception %r%^\./(?:doc|log|public|tmp)%
+    # Ignore any mappings that Autotest may have already set up
+    clear_mappings
+    # Any changes to a file in the root of the 'lib' directory will run any
+    # model test with a corresponding name.
+    add_mapping %r%^lib\/.*\.rb% do |filename, _|
+      files_matching Regexp.new(["^#{model_test_for(filename)}$"])
+    end
+    # Any changes to a fixture will run corresponding view, controller and
+    # model tests
+    add_mapping %r%^#{fixtures_dir}/(.*)s.yml% do |_, m|
+      [
+        model_test_for(m[1]),
+        controller_test_for(m[1]),
+        view_test_for(m[1])
+      ]
+    end
+    # Any change to a test or test will cause it to be run
+    add_mapping %r%^test/(unit|models|integration|controllers|views|functional)/.*rb$% do |filename, _|
+      filename
+    end
+    # Any change to a model will cause it's corresponding test to be run
+    add_mapping %r%^app/models/(.*)\.rb$% do |_, m|
+      model_test_for(m[1])
+    end
+    # Any change to the global helper will result in all view and controller
+    # tests being run
+    add_mapping %r%^app/helpers/global_helpers.rb% do
+      files_matching %r%^test/(views|functional|controllers)/.*_test\.rb$%
+    end
+    # Any change to a helper will run it's corresponding view and controller
+    # tests, unless the helper is the global helper. Changes to the global
+    # helper run all view and controller tests.
+    add_mapping %r%^app/helpers/(.*)_helper(s)?.rb% do |_, m|
+      if m[1] == "global" then
+        files_matching %r%^test/(views|functional|controllers)/.*_test\.rb$%
+      else
+        [
+          view_test_for(m[1]),
+          controller_test_for(m[1])
+        ]
+      end
+    end
+    # Changes to views result in their corresponding view and controller test
+    # being run
+    add_mapping %r%^app/views/(.*)/% do |_, m|
+      [
+        view_test_for(m[1]),
+        controller_test_for(m[1])
+      ]
+    end
+    # Changes to a controller result in its corresponding test being run. If
+    # the controller is the exception or application controller, all
+    # controller tests are run.
+    add_mapping %r%^app/controllers/(.*)\.rb$% do |_, m|
+      if ["application", "exception"].include?(m[1])
+        files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$%
+      else
+        controller_test_for(m[1])
+      end
+    end
+    # If a change is made to the router, run all controller and view tests
+    add_mapping %r%^config/router.rb$% do # FIX
+      files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$%
+    end
+    # If any of the major files governing the environment are altered, run
+    # everything
+    add_mapping %r%^test/test_helper.rb|config/(init|rack|environments/test.rb|database.yml)% do # FIX
+      files_matching %r%^test/(unit|models|controllers|views|functional)/.*_test\.rb$%
+    end
+  end
+private
+  # Determines the paths we can expect tests or specs to reside, as well as
+  # corresponding fixtures.
+  def initialize_test_layout
+    self.model_tests_dir      = "test/unit"
+    self.controller_tests_dir = "test/functional"
+    self.view_tests_dir       = "test/views"
+    self.fixtures_dir         = "test/fixtures"
+  end
+  # Given a filename and the test type, this method will return the
+  # corresponding test's or spec's name.
+  #
+  # ==== Arguments
+  # +filename+<String>:: the file name of the model, view, or controller
+  # +kind_of_test+<Symbol>:: the type of test we that we should run
+  #
+  # ==== Returns
+  # String:: the name of the corresponding test or spec
+  #
+  # ==== Example
+  #
+  #   > test_for("user", :model)
+  #   => "user_test.rb"
+  #   > test_for("login", :controller)
+  #   => "login_controller_test.rb"
+  #   > test_for("form", :view)
+  #   => "form_view_spec.rb" # If you're running a RSpec-like suite
+  def test_for(filename, kind_of_test)
+    name  = [filename]
+    name << kind_of_test.to_s if kind_of_test == :view
+    name << "test"
+    return name.join("_") + ".rb"
+  end
+  def model_test_for(filename)
+    [model_tests_dir, test_for(filename, :model)].join("/")
+  end
+  def controller_test_for(filename)
+    [controller_tests_dir, test_for(filename, :controller)].join("/")
+  end
+  def view_test_for(filename)
+    [view_tests_dir, test_for(filename, :view)].join("/")
+  end
+end