merb-gen 0.9.13 → 1.0

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

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

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

@@ -15,7 +15,10 @@ class Autotest::Merb < Autotest
     initialize_test_layout
     
     # Ignore any happenings in these directories
-    add_exception %r%^\./(?:doc|log|public|tmp)%
+    add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3)% 
+    # Ignore SCM directories and custom Autotest mappings
+    %w[.svn .hg .git .autotest].each { |exception| add_exception(exception) }
+    
     
     # Ignore any mappings that Autotest may have already set up
     clear_mappings
@@ -36,7 +39,7 @@ class Autotest::Merb < Autotest
       ]
     end
     
-    # Any change to a test or test will cause it to be run
+    # Any change to a test will cause it to be run
     add_mapping %r%^test/(unit|models|integration|controllers|views|functional)/.*rb$% do |filename, _|
       filename
     end

data/lib/generators/templates/application/merb_stack/autotest/merb_rspec.rb

@@ -14,7 +14,7 @@ class Autotest::MerbRspec < Autotest
     super
 
     # Ignore any happenings in these directories
-    add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3)% 
+    add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3|.*\.thor)% 
     # Ignore SCM directories and custom Autotest mappings
     %w[.svn .hg .git .autotest].each { |exception| add_exception(exception) }
 
@@ -44,7 +44,7 @@ class Autotest::MerbRspec < Autotest
     # Any change to global_helpers will result in all view and controller
     # tests being run
     add_mapping %r%^app/helpers/global_helpers\.rb% do
-      files_matching %r%^spec/(views|controllers|helpers)/.*_spec\.rb$%
+      files_matching %r%^spec/(views|controllers|helpers|requests)/.*_spec\.rb$%
     end
 
     # Any change to a helper will cause its spec to be run

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

@@ -0,0 +1,7 @@
+require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb')
+
+describe "/<%= full_class_name.to_s.to_const_path %>" do
+  before(:each) do
+    @response = request("/<%= full_class_name.to_s.to_const_path %>")
+  end
+end

data/lib/generators/templates/component/controller/test/{controllers → requests}/%file_name%_test.rb

@@ -6,8 +6,7 @@ class <%= full_class_name %>; def rescue_action(e) raise e end; end
 class <%= full_class_name %>Test < Test::Unit::TestCase
 
   def setup
-    @controller = <%= full_class_name %>.build(fake_request)
-    @controller.dispatch('index')
+    @resonse = request("/<%= full_class_name.to_s.to_const_path %>")
   end
 
   # Replace this with your real tests.

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

@@ -1,4 +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>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>
+<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></p>

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

@@ -1,4 +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>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>
+<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></p>

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

@@ -1,4 +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>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>
+<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></p>

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

@@ -1,4 +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>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>
+<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></p>

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

@@ -110,7 +110,7 @@ describe "resource(@<%= singular_model %>)", :given => "a <%= singular_model %>
     before(:each) do
       @<%= singular_model %> = <%= model_class_name %>.first
       @response = request(resource(@<%= singular_model %>), :method => "PUT", 
-        :params => { :article => {:id => @<%= singular_model %>.id} })
+        :params => { :<%= singular_model %> => {:id => @<%= singular_model %>.id} })
     end
   
     it "redirect to the article show action" do

data/spec/controller_spec.rb

@@ -19,7 +19,7 @@ describe Merb::Generators::ControllerGenerator do
   describe "with rspec" do
     
     it "should create a controller spec" do
-      @generator.should create('/tmp/spec/controllers/stuff_spec.rb')
+      @generator.should create('/tmp/spec/requests/stuff_spec.rb')
     end
     
     it "should render templates successfully" do
@@ -35,7 +35,7 @@ describe Merb::Generators::ControllerGenerator do
     end
     
     it "should create a controller test" do
-      @generator.should create('/tmp/test/controllers/stuff_test.rb')
+      @generator.should create('/tmp/test/requests/stuff_test.rb')
     end
     
     it "should render templates successfully" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 0.9.13
+  version: "1.0"
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-03 00:00:00 -08:00
+date: 2008-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.13
+        version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater
@@ -231,11 +231,11 @@ files:
 - lib/generators/templates/component/controller/app/views/%file_name%
 - lib/generators/templates/component/controller/app/views/%file_name%/index.html.erb
 - lib/generators/templates/component/controller/spec
-- lib/generators/templates/component/controller/spec/controllers
-- lib/generators/templates/component/controller/spec/controllers/%file_name%_spec.rb
+- lib/generators/templates/component/controller/spec/requests
+- lib/generators/templates/component/controller/spec/requests/%file_name%_spec.rb
 - lib/generators/templates/component/controller/test
-- lib/generators/templates/component/controller/test/controllers
-- lib/generators/templates/component/controller/test/controllers/%file_name%_test.rb
+- lib/generators/templates/component/controller/test/requests
+- lib/generators/templates/component/controller/test/requests/%file_name%_test.rb
 - lib/generators/templates/component/helper
 - lib/generators/templates/component/helper/app
 - lib/generators/templates/component/helper/app/helpers

data/lib/generators/templates/component/controller/spec/controllers/%file_name%_spec.rb

@@ -1,7 +0,0 @@
-require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb')
-
-describe <%= full_class_name %>, "index action" do
-  before(:each) do
-    dispatch_to(<%= full_class_name %>, :index)
-  end
-end