merb-gen 0.9.9 → 0.9.10

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

@@ -5,7 +5,7 @@
 # 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
+# see merb/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

data/lib/generators/templates/application/merb_stack/config/dependencies.rb

@@ -1,15 +1,23 @@
-dependency "merb-action-args", "0.9.9"   # Provides support for querystring arguments to be passed in to controller actions
-dependency "merb-assets", "0.9.9"        # Provides link_to, asset_path, auto_link, image_tag methods (and lots more)
-dependency "merb-cache", "0.9.9"         # Provides your application with caching functions 
-dependency "merb-helpers", "0.9.9"       # Provides the form, date/time, and other helpers
-dependency "merb-mailer", "0.9.9"        # Integrates mail support via Merb Mailer
-dependency "merb-slices", "0.9.9"        # Provides a mechanism for letting plugins provide controllers, views, etc. to your app
-dependency "merb-auth", "0.9.9"          # An authentication slice (Merb's equivalent to Rails' restful authentication)
-dependency "merb-param-protection", "0.9.9"
+# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
+merb_gems_version = "<%= merb_gems_version %>"
+dm_gems_version   = "<%= dm_gems_version %>"
+
+# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
+dependency "merb-action-args", merb_gems_version
+dependency "merb-assets", merb_gems_version  
+dependency "merb-cache", merb_gems_version   
+dependency "merb-helpers", merb_gems_version 
+dependency "merb-mailer", merb_gems_version  
+dependency "merb-slices", merb_gems_version  
+dependency "merb-auth-core", merb_gems_version
+dependency "merb-auth-more", merb_gems_version
+dependency "merb-auth-slice-password", merb_gems_version
+dependency "merb-param-protection", merb_gems_version
+dependency "merb-exceptions", merb_gems_version
  
-dependency "dm-core", "0.9.6"         # The datamapper ORM
-dependency "dm-aggregates", "0.9.6"   # Provides your DM models with count, sum, avg, min, max, etc.
-dependency "dm-migrations", "0.9.6"   # Make incremental changes to your database.
-dependency "dm-timestamps", "0.9.6"   # Automatically populate created_at, created_on, etc. when those properties are present.
-dependency "dm-types", "0.9.6"        # Provides additional types, including csv, json, yaml.
-dependency "dm-validations", "0.9.6"  # Validation framework
+dependency "dm-core", dm_gems_version         
+dependency "dm-aggregates", dm_gems_version   
+dependency "dm-migrations", dm_gems_version   
+dependency "dm-timestamps", dm_gems_version   
+dependency "dm-types", dm_gems_version        
+dependency "dm-validations", dm_gems_version  

data/lib/generators/templates/application/merb_stack/config/init.rb

@@ -3,15 +3,15 @@
 require 'config/dependencies.rb'
  
 use_orm :datamapper
-use_test :rspec
-use_template_engine :erb
+use_test :<%= testing_framework %>
+use_template_engine :<%= template_engine %>
  
 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]  = '1205346b9baa87cf8e49f78124c8d17a31ac0971'  # required for cookie session store
+  c[:session_secret_key]  = '<%= SHA1.new(rand(100000000000).to_s).to_s %>'  # required for cookie session store
   # c[:session_id_key] = '_session_id' # cookie session id key, defaults to "_session_id"
 end
  

data/lib/generators/templates/application/merb_stack/merb/merb-auth/setup.rb

@@ -37,7 +37,7 @@ rescue
     
     If you want to fully customize your authentication you should use merb-core directly.  
     
-    See lib/authentication/setup.rb and strategies.rb to customize your setup
+    See merb/merb-auth/setup.rb and strategies.rb to customize your setup
 
     TEXT
 end

data/lib/generators/templates/component/resource_controller/app/views/%file_name%/edit.html.erb

@@ -1,3 +1,4 @@
 <h1><%= class_name %> controller, edit action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/edit.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/edit.html.erb</tt></p>
+<p>For more information and examples of CRUD views read <a href="http://wiki.merbivore.com/howto/crud_view_example_with_merb_using_erb"> this wiki page</a>

data/lib/generators/templates/component/resource_controller/app/views/%file_name%/index.html.erb

@@ -1,3 +1,4 @@
 <h1><%= class_name %> controller, index action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/index.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/index.html.erb</tt></p>
+<p>For more information and examples of CRUD views read <a href="http://wiki.merbivore.com/howto/crud_view_example_with_merb_using_erb"> this wiki page</a>

data/lib/generators/templates/component/resource_controller/app/views/%file_name%/new.html.erb

@@ -1,3 +1,4 @@
 <h1><%= class_name %> controller, new action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/new.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/new.html.erb</tt></p>
+<p>For more information and examples of CRUD views read <a href="http://wiki.merbivore.com/howto/crud_view_example_with_merb_using_erb"> this wiki page</a>

data/lib/generators/templates/component/resource_controller/app/views/%file_name%/show.html.erb

@@ -1,3 +1,4 @@
 <h1><%= class_name %> controller, show action</h1>
 
-<p>Edit this file in <tt>app/views/<%= file_name %>/show.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= file_name %>/show.html.erb</tt></p>
+<p>For more information and examples of CRUD views read <a href="http://wiki.merbivore.com/howto/crud_view_example_with_merb_using_erb"> this wiki page</a>

data/lib/generators/templates/component/resource_controller/spec/requests/%file_name%_spec.rb

@@ -1,22 +1,27 @@
 require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb')
 
 given "a <%= singular_model %> exists" do
+<%- if orm.to_sym == :datamapper -%>
+  <%= model_class_name %>.all.destroy!
+<%-elsif orm.to_sym == :activerecord -%>
+  <%= model_class_name %>.delete_all
+<% end -%>
   request(resource(:<%= plural_model %>), :method => "POST", 
-    :params => { :<%= singular_model %> => {  }})
+    :params => { :<%= singular_model %> => { :id => nil }})
 end
 
 describe "resource(:<%= plural_model %>)" do
   describe "GET" do
     
     before(:each) do
-      @response = request(resource(:<%= singular_model %>s))
+      @response = request(resource(:<%= plural_model %>))
     end
     
     it "responds successfully" do
       @response.should be_successful
     end
 
-    it "contains a list of speakers" do
+    it "contains a list of <%= plural_model %>" do
       pending
       @response.should have_xpath("//ul")
     end
@@ -36,8 +41,13 @@ describe "resource(:<%= plural_model %>)" do
   
   describe "a successful POST" do
     before(:each) do
+    <%- if orm.to_sym == :datamapper -%>
+      <%= model_class_name %>.all.destroy!
+    <%-elsif orm.to_sym == :activerecord -%>
+      <%= model_class_name %>.delete_all
+    <% end -%>
       @response = request(resource(:<%= plural_model %>), :method => "POST", 
-        :params => { :<%= singular_model %> => {  }})
+        :params => { :<%= singular_model %> => { :id => nil }})
     end
     
     it "redirects to resource(:<%= plural_model %>)" do
@@ -51,3 +61,62 @@ describe "resource(:<%= plural_model %>)" do
   end
 end
 
+describe "resource(@<%= singular_model %>)" do 
+  describe "a successful DELETE", :given => "a <%= singular_model %> exists" do
+     before(:each) do
+       @response = request(resource(<%= model_class_name %>.first), :method => "DELETE")
+     end
+
+     it "should redirect to the index action" do
+       @response.should redirect_to(resource(:<%= plural_model %>))
+     end
+
+   end
+end
+
+describe "resource(:<%= plural_model %>, :new)" do
+  before(:each) do
+    @response = request(resource(:<%= plural_model %>, :new))
+  end
+  
+  it "responds successfully" do
+    @response.should be_successful
+  end
+end
+
+describe "resource(@<%= singular_model %>, :edit)", :given => "a <%= singular_model %> exists" do
+  before(:each) do
+    @response = request(resource(<%= model_class_name %>.first, :edit))
+  end
+  
+  it "responds successfully" do
+    @response.should be_successful
+  end
+end
+
+describe "resource(@<%= singular_model %>)", :given => "a <%= singular_model %> exists" do
+  
+  describe "GET" do
+    before(:each) do
+      @response = request(resource(<%= model_class_name %>.first))
+    end
+  
+    it "responds successfully" do
+      @response.should be_successful
+    end
+  end
+  
+  describe "PUT" do
+    before(:each) do
+      @<%= singular_model %> = <%= model_class_name %>.first
+      @response = request(resource(@<%= singular_model %>), :method => "PUT", 
+        :params => { :article => {:id => @<%= singular_model %>.id} })
+    end
+  
+    it "redirect to the article show action" do
+      @response.should redirect_to(resource(@<%= singular_model %>))
+    end
+  end
+  
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-13 00:00:00 +03:00
+date: 2008-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater
@@ -81,7 +81,6 @@ files:
 - lib/generators/templates/application/merb_core/app/helpers/global_helpers.rb
 - lib/generators/templates/application/merb_core/app/views
 - lib/generators/templates/application/merb_core/app/views/exceptions
-- lib/generators/templates/application/merb_core/app/views/exceptions/internal_server_error.html.erb
 - lib/generators/templates/application/merb_core/app/views/exceptions/not_acceptable.html.erb
 - lib/generators/templates/application/merb_core/app/views/exceptions/not_found.html.erb
 - lib/generators/templates/application/merb_core/autotest
@@ -166,7 +165,6 @@ files:
 - lib/generators/templates/application/merb_stack/app/models/user.rb
 - lib/generators/templates/application/merb_stack/app/views
 - lib/generators/templates/application/merb_stack/app/views/exceptions
-- lib/generators/templates/application/merb_stack/app/views/exceptions/internal_server_error.html.erb
 - lib/generators/templates/application/merb_stack/app/views/exceptions/not_acceptable.html.erb
 - lib/generators/templates/application/merb_stack/app/views/exceptions/not_found.html.erb
 - lib/generators/templates/application/merb_stack/autotest
@@ -337,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Generators suite for Merb.

data/lib/generators/templates/application/merb_core/app/views/exceptions/internal_server_error.html.erb

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