merb 0.4.1 → 0.4.2

data/spec/merb/server_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Merb::Server do
+  it "should apply environment from the command line option --environment" do
+    options = Merb::Server.merb_config(["--environment", "performance_testing"])
+    options[:environment].should == "performance_testing"
+  end
+
+  it "should apply environment from the command line option -e" do
+    options = Merb::Server.merb_config(["-e", "selenium"])
+    options[:environment].should == "selenium"
+  end
+  
+  it "should load the yaml file for the environment if it exists" do
+    options = Merb::Server.merb_config(["-e", "environment_config_test"])
+    options[:loaded_config_for_environment_config_test].should == true
+  end
+
+end

data/spec/merb/view_context_spec.rb

@@ -14,6 +14,12 @@ describe "View Context", "image tag" do
   it "should render local image" do
     image_tag('foo.gif').clean.should == %[<img src="/images/foo.gif"/>].clean
   end
+
+  it "should render a local image with a path_prefix" do
+    Merb::Server.config[:path_prefix] = '/inky'
+    image_tag('foo.gif').clean.should == %[<img src="/inky/images/foo.gif"/>].clean
+    Merb::Server.config.delete(:path_prefix)
+  end
   
   it "should render local image with class" do
     image_tag('foo.gif', :class => 'bar').clean.should == %[<img src="/images/foo.gif" class="bar" />].clean
@@ -47,9 +53,18 @@ describe "View Context", "css tag" do
     css_include_tag('foo') +
     css_include_tag('bar')
   end
+  
+  it "should render a link tag with a path_prefix" do
+    Merb::Server.config[:path_prefix] = '/inky'
+    css_include_tag('foo.css').clean.should ==
+      %[<link href="/inky/stylesheets/foo.css" media="all" rel="Stylesheet" type="text/css"/>].clean
+    Merb::Server.config.delete(:path_prefix)
+  end
+  
   it "should not generate a script tag with the include_required_css" do
     include_required_css.clean.should == ''
-end
+  end
+  
   it "should generate script tags with the include_required_css" do
     require_css('foo')
     require_css('bar')
@@ -71,9 +86,18 @@ describe "View Context", "script tag" do
     js_include_tag('foo') +
     js_include_tag('bar')
   end
+  
+  it "should render a script tag with a path_prefix" do
+    Merb::Server.config[:path_prefix] = '/inky'
+    js_include_tag('foo.js').clean.should ==
+      %[<script src="/inky/javascripts/foo.js" type="text/javascript">//</script>].clean
+    Merb::Server.config.delete(:path_prefix)
+  end
+  
   it "should not generate a script tag with the include_required_js" do
     include_required_js.clean.should == ''
-end
+  end
+  
   it "should generate script tags with the include_required_js" do
     require_js('foo')
     require_js('bar')
@@ -115,8 +139,12 @@ describe "View Context", "throw_content, catch_content" do
     content = c.render :template => "examples/template_catch_content", :layout => :none
     content.should match( /\A\s*START HEADER\s*CAUGHT CONTENT\s*END HEADER\s*START FOOTER\s*CAUGHT FOOTER\s*END FOOTER\s*\Z/m)
   end
-    
 
+  it "should throw content as an argument without a block" do
+    c = new_controller
+    content = c.render :template => "examples/template_throw_content_without_block", :layout => :none
+    content.should match(/Content Without Block/)
+  end
 end
 
 describe Merb::ViewContextMixin do

data/spec/spec_helper.rb

@@ -13,6 +13,13 @@ require 'merb/test/helper'
 
 FIXTURES = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
 
+require File.join(File.dirname(__FILE__), "spec_helpers", "url_shared_behaviour")
+
+Spec::Runner.configure do |config|
+  config.include(Merb::Test::Helper)
+  config.include(Merb::Test::RspecMatchers)
+  config.include(Merb::Test::MerbRspecControllerRedirect)  
+end
 
 # Creates a new controller, e.g.
 #   c = new_controller('index', Examples) do |request|
@@ -36,6 +43,7 @@ class Merb::Controller
   require "lib/merb/session/memory_session"
   Merb::MemorySessionContainer.setup
   include ::Merb::SessionMixin
+  self.session_secret_key = "footo the bar to the baz"
 end
 
 class String

data/spec/spec_helpers/url_shared_behaviour.rb

@@ -0,0 +1,112 @@
+describe "class with general url generation", :shared => true do
+  
+  before(:all) do
+    Merb::Router.prepare do |r|
+      @resource_routes = r.resources(:blogs)
+      r.resources(:gardens) do |gardens|
+        @nested_resource = gardens.resources :flowers
+      end
+      @test_route = r.match("/the/:place/:goes/here").to(:controller => "Test", :action => "show").name(:test)
+      @default_route = r.default_routes
+    end
+  end
+
+
+  it "should generate a url from a route using a hash" do
+    c = new_url_controller(@test_route, :place => "1")
+    c.url_from_route(@test_route, :goes => "g").should == "/the/1/g/here"
+  end
+  
+  it "should generate a url from a route using an object" do
+    c = new_url_controller(@test_route, :place => "2")
+    obj = OpenStruct.new(:goes => "elsewhere")
+    c.url_from_route(@test_route, obj).should == "/the/2/elsewhere/here"
+  end
+  
+  it "should generate a url and tack extra params on as a query string" do
+    c = new_url_controller(@test_route, :place => "1")
+    c.url_from_route(@test_route, :goes => "g", :page => 2).should == "/the/1/g/here?page=2"
+  end
+  
+  it "should generate a url directly from a hash using the current route as a default" do
+    c = new_url_controller(@test_route, :goes => "swimmingly")
+    c.url(:place => "provo").should == "/the/provo/swimmingly/here"
+  end
+  
+  it "should generate a default route url with just :controller" do
+    c = new_url_controller(@default_route)
+    c.url(:controller => "welcome").should == "/welcome"
+  end
+  
+  it 'should generate urls from nested resources' do
+    c = new_url_controller(@nested_resource, :garden => 5)
+    c.url(:flower, :garden_id => 1, :id => 3).should == "/gardens/1/flowers/3"
+  end
+  
+  # it "should generate a default route url with an extra param" do
+  #   c = new_url_controller(@default_route, :controller => "foo", :action => "bar")
+  #   c.url(:controller => :current, :monkey => "quux").should == "/foo/bar?monkey=quux"
+  # end
+  
+  it "should generate a default route url with all options" do
+    c = new_url_controller(@default_route, :controller => "foo", :action => "bar")
+    c.url(:controller => "foo", :action => "bar", :id => "baz", :format => :js, :monkey => "quux").should == "/foo/bar/baz.js?monkey=quux"
+  end
+  
+  it "should handle an object as the second arg" do
+    c = new_url_controller(@resource_routes, :controller => "blogs", :action => "show")
+    blog = mock("blog")
+    blog.should_receive(:id).once.and_return(7)
+    url = c.url(:blog, blog)
+    url.should == "/blogs/7"
+  end
+  
+  it "should point to /blogs/:blog_id if @blog is not new_record" do
+    c = new_url_controller(@resource_routes, :controller => "blogs", :action => "index")
+    blog = mock("blog")
+    blog.should_receive(:id).once.and_return(7)
+    blog.should_receive(:new_record?).once.and_return(false)
+    url = c.url(:blog, blog)
+    url.should == "/blogs/7"
+  end
+  
+  it "should point to /blogs/ if @blog is new_record" do
+    c = new_url_controller(@resource_routes, :controller => "blogs", :action => "index")
+    blog = mock("blog")
+    blog.should_receive(:new_record?).once.and_return(true)
+    url = c.url(:blog, blog)
+    url.should == "/blogs/"
+  end
+end
+
+describe "non routeable controller with url mixin", :shared => true do
+  
+  before(:all) do
+    Merb::Router.prepare do |r|
+      @resource_routes = r.resources(:blogs)
+      r.resources(:gardens) do |gardens|
+        @nested_resource = gardens.resources :flowers
+      end
+      @test_route = r.match("/the/:place/:goes/here").to(:controller => "Test", :action => "show").name(:test)
+      @default_route = r.default_routes
+    end
+  end
+  
+  it "should route when given a controller and an action" do
+    c = new_url_controller(@default_route, :controller => "blah")
+    the_url = c.url(:controller => "foo", :action => "bar")
+    the_url.should == "/foo/bar"
+  end
+  
+  it "should generate a route when only a controller is given" do
+    c = new_url_controller(@default_route, :controller => "blah")
+    the_url = c.url(:controller => "foo")
+    the_url.should == "/foo"
+  end
+  
+  it "should generate a route with controller action and extra options" do
+    c = new_url_controller(@default_route, :controller => "blah")
+    the_url = c.url(:controller => "foo", :action => "bar", :cool => "false")
+    the_url.should == "/foo/bar?cool=false"
+  end  
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2007-11-12 00:00:00 -06:00
+  version: 0.4.2
+date: 2007-12-14 00:00:00 -08:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths: 
 - lib
@@ -35,25 +35,20 @@ files:
 - TODO
 - bin/merb
 - spec/fixtures
-- spec/merb
-- spec/spec_generator_helper.rb
-- spec/spec_helper.rb
 - spec/fixtures/config
-- spec/fixtures/controllers
-- spec/fixtures/foo.rb
-- spec/fixtures/mailers
-- spec/fixtures/models
-- spec/fixtures/parts
-- spec/fixtures/sample.txt
-- spec/fixtures/views
+- spec/fixtures/config/environments
+- spec/fixtures/config/environments/environment_config_test.yml
 - spec/fixtures/config/merb.yml
+- spec/fixtures/controllers
 - spec/fixtures/controllers/dispatch_spec_controllers.rb
 - spec/fixtures/controllers/render_spec_controllers.rb
+- spec/fixtures/foo.rb
+- spec/fixtures/mailers
 - spec/fixtures/mailers/views
 - spec/fixtures/mailers/views/layout
-- spec/fixtures/mailers/views/test_mail_controller
 - spec/fixtures/mailers/views/layout/application.html.erb
 - spec/fixtures/mailers/views/layout/application.text.erb
+- spec/fixtures/mailers/views/test_mail_controller
 - spec/fixtures/mailers/views/test_mail_controller/eighth.html.erb
 - spec/fixtures/mailers/views/test_mail_controller/eighth.text.erb
 - spec/fixtures/mailers/views/test_mail_controller/first.html.erb
@@ -62,30 +57,23 @@ files:
 - spec/fixtures/mailers/views/test_mail_controller/ninth.text.erb
 - spec/fixtures/mailers/views/test_mail_controller/second.text.erb
 - spec/fixtures/mailers/views/test_mail_controller/third.html.erb
+- spec/fixtures/models
 - spec/fixtures/models/router_spec_models.rb
+- spec/fixtures/parts
 - spec/fixtures/parts/helpers
 - spec/fixtures/parts/views
 - spec/fixtures/parts/views/layout
-- spec/fixtures/parts/views/todo_part
 - spec/fixtures/parts/views/layout/todo_part.html.erb
 - spec/fixtures/parts/views/layout/todo_part.xml.erb
+- spec/fixtures/parts/views/todo_part
 - spec/fixtures/parts/views/todo_part/formatted_output.html.erb
 - spec/fixtures/parts/views/todo_part/formatted_output.js.erb
 - spec/fixtures/parts/views/todo_part/formatted_output.xml.erb
 - spec/fixtures/parts/views/todo_part/list.html.erb
+- spec/fixtures/sample.txt
+- spec/fixtures/views
 - spec/fixtures/views/erubis.html.erb
 - spec/fixtures/views/examples
-- spec/fixtures/views/exceptions
-- spec/fixtures/views/extension_template_controller
-- spec/fixtures/views/haml.html.haml
-- spec/fixtures/views/haml.xml.haml
-- spec/fixtures/views/layout
-- spec/fixtures/views/markaby.html.mab
-- spec/fixtures/views/nested
-- spec/fixtures/views/partials
-- spec/fixtures/views/render_object_controller
-- spec/fixtures/views/template_views
-- spec/fixtures/views/test.dir
 - spec/fixtures/views/examples/_erubis.html.erb
 - spec/fixtures/views/examples/_haml.html.haml
 - spec/fixtures/views/examples/_markaby.html.mab
@@ -95,7 +83,10 @@ files:
 - spec/fixtures/views/examples/template_catch_content.html.erb
 - spec/fixtures/views/examples/template_catch_content_from_partial.html.erb
 - spec/fixtures/views/examples/template_throw_content.html.erb
+- spec/fixtures/views/examples/template_throw_content_without_block.html.erb
+- spec/fixtures/views/exceptions
 - spec/fixtures/views/exceptions/admin_access_required.html.erb
+- spec/fixtures/views/extension_template_controller
 - spec/fixtures/views/extension_template_controller/_nested_js.js.erb
 - spec/fixtures/views/extension_template_controller/_nested_xml.xml.erb
 - spec/fixtures/views/extension_template_controller/_render_partial_multiple_times.html.erb
@@ -115,12 +106,18 @@ files:
 - spec/fixtures/views/extension_template_controller/render_multiple_partials.html.erb
 - spec/fixtures/views/extension_template_controller/render_nested_js.js.erb
 - spec/fixtures/views/extension_template_controller/render_nested_xml.xml.erb
+- spec/fixtures/views/haml.html.haml
+- spec/fixtures/views/haml.xml.haml
+- spec/fixtures/views/layout
 - spec/fixtures/views/layout/application.html.erb
 - spec/fixtures/views/layout/application.xml.erb
 - spec/fixtures/views/layout/nested
 - spec/fixtures/views/layout/nested/example.html.erb
+- spec/fixtures/views/markaby.html.mab
+- spec/fixtures/views/nested
 - spec/fixtures/views/nested/example
 - spec/fixtures/views/nested/example/test.html.erb
+- spec/fixtures/views/partials
 - spec/fixtures/views/partials/_erubis.html.erb
 - spec/fixtures/views/partials/_erubis_collection.html.erb
 - spec/fixtures/views/partials/_erubis_collection_with_locals.html.erb
@@ -133,9 +130,11 @@ files:
 - spec/fixtures/views/partials/_markaby_collection.html.mab
 - spec/fixtures/views/partials/_markaby_collection_with_locals.html.mab
 - spec/fixtures/views/partials/_markaby_new.html.mab
+- spec/fixtures/views/render_object_controller
 - spec/fixtures/views/render_object_controller/render_object_with_template.html.erb
 - spec/fixtures/views/render_object_controller/render_object_with_template.js.erb
 - spec/fixtures/views/render_object_controller/render_object_with_template.xml.erb
+- spec/fixtures/views/template_views
 - spec/fixtures/views/template_views/interface__buffer_erubis.html.erb
 - spec/fixtures/views/template_views/interface__buffer_haml.html.haml
 - spec/fixtures/views/template_views/interface__buffer_markaby.html.mab
@@ -145,7 +144,9 @@ files:
 - spec/fixtures/views/template_views/interface_concat_erubis.html.erb
 - spec/fixtures/views/template_views/interface_concat_haml.html.haml
 - spec/fixtures/views/template_views/interface_concat_markaby.html.mab
+- spec/fixtures/views/test.dir
 - spec/fixtures/views/test.dir/the_template.html.erb
+- spec/merb
 - spec/merb/abstract_controller_spec.rb
 - spec/merb/caching_spec.rb
 - spec/merb/config_spec.rb
@@ -167,52 +168,30 @@ files:
 - spec/merb/request_spec.rb
 - spec/merb/responder_spec.rb
 - spec/merb/router_spec.rb
+- spec/merb/server_spec.rb
 - spec/merb/template_spec.rb
 - spec/merb/upload_handler_spec.rb
 - spec/merb/view_context_spec.rb
+- spec/spec_generator_helper.rb
+- spec/spec_helper.rb
+- spec/spec_helpers
+- spec/spec_helpers/url_shared_behaviour.rb
 - lib/autotest
-- lib/merb
-- lib/merb.rb
-- lib/tasks
-- lib/tasks.rb
 - lib/autotest/discover.rb
 - lib/autotest/merb_rspec.rb
+- lib/merb
 - lib/merb/abstract_controller.rb
 - lib/merb/caching
-- lib/merb/caching.rb
-- lib/merb/constants.rb
-- lib/merb/controller.rb
-- lib/merb/core_ext
-- lib/merb/core_ext.rb
-- lib/merb/dispatcher.rb
-- lib/merb/drb_server.rb
-- lib/merb/erubis_ext.rb
-- lib/merb/exceptions.rb
-- lib/merb/generators
-- lib/merb/logger.rb
-- lib/merb/mail_controller.rb
-- lib/merb/mailer.rb
-- lib/merb/mixins
-- lib/merb/mongrel_handler.rb
-- lib/merb/part_controller.rb
-- lib/merb/plugins.rb
-- lib/merb/rack_adapter.rb
-- lib/merb/request.rb
-- lib/merb/router.rb
-- lib/merb/server.rb
-- lib/merb/session
-- lib/merb/session.rb
-- lib/merb/template
-- lib/merb/template.rb
-- lib/merb/test
-- lib/merb/upload_handler.rb
-- lib/merb/upload_progress.rb
-- lib/merb/view_context.rb
 - lib/merb/caching/action_cache.rb
 - lib/merb/caching/fragment_cache.rb
 - lib/merb/caching/store
 - lib/merb/caching/store/file_cache.rb
+- lib/merb/caching/store/memcache.rb
 - lib/merb/caching/store/memory_cache.rb
+- lib/merb/caching.rb
+- lib/merb/constants.rb
+- lib/merb/controller.rb
+- lib/merb/core_ext
 - lib/merb/core_ext/array.rb
 - lib/merb/core_ext/class.rb
 - lib/merb/core_ext/enumerable.rb
@@ -227,90 +206,120 @@ files:
 - lib/merb/core_ext/object.rb
 - lib/merb/core_ext/string.rb
 - lib/merb/core_ext/symbol.rb
+- lib/merb/core_ext.rb
+- lib/merb/dispatcher.rb
+- lib/merb/drb_server.rb
+- lib/merb/erubis_ext.rb
+- lib/merb/exceptions.rb
+- lib/merb/generators
 - lib/merb/generators/merb_app
+- lib/merb/generators/merb_app/merb_app.rb
 - lib/merb/generators/merb_generator_helpers.rb
 - lib/merb/generators/merb_plugin.rb
-- lib/merb/generators/merb_app/merb_app.rb
+- lib/merb/logger.rb
+- lib/merb/mail_controller.rb
+- lib/merb/mailer.rb
+- lib/merb/mixins
 - lib/merb/mixins/basic_authentication.rb
 - lib/merb/mixins/controller.rb
 - lib/merb/mixins/erubis_capture.rb
 - lib/merb/mixins/form_control.rb
+- lib/merb/mixins/general_controller.rb
 - lib/merb/mixins/render.rb
 - lib/merb/mixins/responder.rb
 - lib/merb/mixins/view_context.rb
 - lib/merb/mixins/web_controller.rb
+- lib/merb/mongrel_handler.rb
+- lib/merb/part_controller.rb
+- lib/merb/plugins.rb
+- lib/merb/rack_adapter.rb
+- lib/merb/request.rb
+- lib/merb/router.rb
+- lib/merb/server.rb
+- lib/merb/session
 - lib/merb/session/cookie_store.rb
 - lib/merb/session/mem_cache_session.rb
 - lib/merb/session/memory_session.rb
+- lib/merb/session.rb
+- lib/merb/template
 - lib/merb/template/erubis.rb
 - lib/merb/template/haml.rb
 - lib/merb/template/markaby.rb
 - lib/merb/template/xml_builder.rb
+- lib/merb/template.rb
+- lib/merb/test
 - lib/merb/test/fake_request.rb
 - lib/merb/test/helper.rb
 - lib/merb/test/hpricot.rb
 - lib/merb/test/multipart.rb
 - lib/merb/test/rspec.rb
+- lib/merb/upload_handler.rb
+- lib/merb/upload_progress.rb
+- lib/merb/version.rb
+- lib/merb/view_context.rb
+- lib/merb.rb
+- lib/patch
+- lib/tasks
 - lib/tasks/merb.rake
+- lib/tasks.rb
 - app_generators/merb
-- app_generators/merb_plugin
 - app_generators/merb/merb_generator.rb
 - app_generators/merb/templates
-- app_generators/merb/USAGE
 - app_generators/merb/templates/app
-- app_generators/merb/templates/config
-- app_generators/merb/templates/public
-- app_generators/merb/templates/Rakefile
-- app_generators/merb/templates/script
-- app_generators/merb/templates/spec
-- app_generators/merb/templates/test
 - app_generators/merb/templates/app/controllers
-- app_generators/merb/templates/app/helpers
-- app_generators/merb/templates/app/mailers
-- app_generators/merb/templates/app/parts
-- app_generators/merb/templates/app/views
 - app_generators/merb/templates/app/controllers/application.rb
 - app_generators/merb/templates/app/controllers/exceptions.rb
+- app_generators/merb/templates/app/helpers
 - app_generators/merb/templates/app/helpers/global_helper.rb
+- app_generators/merb/templates/app/mailers
 - app_generators/merb/templates/app/mailers/views
 - app_generators/merb/templates/app/mailers/views/layout
 - app_generators/merb/templates/app/mailers/views/layout/application.html.erb
 - app_generators/merb/templates/app/mailers/views/layout/application.text.erb
+- app_generators/merb/templates/app/parts
 - app_generators/merb/templates/app/parts/views
 - app_generators/merb/templates/app/parts/views/layout
 - app_generators/merb/templates/app/parts/views/layout/application.html.erb
+- app_generators/merb/templates/app/views
 - app_generators/merb/templates/app/views/exceptions
-- app_generators/merb/templates/app/views/layout
 - app_generators/merb/templates/app/views/exceptions/internal_server_error.html.erb
 - app_generators/merb/templates/app/views/exceptions/not_acceptable.html.erb
 - app_generators/merb/templates/app/views/exceptions/not_found.html.erb
+- app_generators/merb/templates/app/views/layout
 - app_generators/merb/templates/app/views/layout/application.html.erb
+- app_generators/merb/templates/config
 - app_generators/merb/templates/config/boot.rb
 - app_generators/merb/templates/config/dependencies.rb
 - app_generators/merb/templates/config/environments
+- app_generators/merb/templates/config/environments/development.rb
+- app_generators/merb/templates/config/environments/production.rb
+- app_generators/merb/templates/config/environments/test.rb
 - app_generators/merb/templates/config/merb.yml
 - app_generators/merb/templates/config/merb_init.rb
 - app_generators/merb/templates/config/plugins.yml
 - app_generators/merb/templates/config/router.rb
 - app_generators/merb/templates/config/upload.conf
-- app_generators/merb/templates/config/environments/development.rb
-- app_generators/merb/templates/config/environments/production.rb
-- app_generators/merb/templates/config/environments/test.rb
+- app_generators/merb/templates/public
 - app_generators/merb/templates/public/images
+- app_generators/merb/templates/public/images/merb.jpg
 - app_generators/merb/templates/public/merb.fcgi
 - app_generators/merb/templates/public/stylesheets
-- app_generators/merb/templates/public/images/merb.jpg
 - app_generators/merb/templates/public/stylesheets/master.css
+- app_generators/merb/templates/Rakefile
+- app_generators/merb/templates/script
 - app_generators/merb/templates/script/destroy
 - app_generators/merb/templates/script/generate
 - app_generators/merb/templates/script/stop_merb
 - app_generators/merb/templates/script/win_script.cmd
+- app_generators/merb/templates/spec
 - app_generators/merb/templates/spec/spec.opts
 - app_generators/merb/templates/spec/spec_helper.rb
+- app_generators/merb/templates/test
 - app_generators/merb/templates/test/test_helper.rb
+- app_generators/merb/USAGE
+- app_generators/merb_plugin
 - app_generators/merb_plugin/merb_plugin_generator.rb
 - app_generators/merb_plugin/templates
-- app_generators/merb_plugin/USAGE
 - app_generators/merb_plugin/templates/LICENSE
 - app_generators/merb_plugin/templates/merbtasks.rb
 - app_generators/merb_plugin/templates/Rakefile
@@ -319,33 +328,33 @@ files:
 - app_generators/merb_plugin/templates/sampleplugin_spec.rb
 - app_generators/merb_plugin/templates/spec_helper.rb
 - app_generators/merb_plugin/templates/TODO
+- app_generators/merb_plugin/USAGE
 - merb_generators/controller
-- merb_generators/resource
 - merb_generators/controller/controller_generator.rb
 - merb_generators/controller/templates
-- merb_generators/controller/USAGE
 - merb_generators/controller/templates/controller.rb
 - merb_generators/controller/templates/helper.rb
 - merb_generators/controller/templates/index.html.erb
+- merb_generators/controller/USAGE
+- merb_generators/resource
 - merb_generators/resource/resource_generator.rb
 - merb_generators/resource/USAGE
 - merb_default_generators/model
-- merb_default_generators/resource_controller
 - merb_default_generators/model/model_generator.rb
 - merb_default_generators/model/templates
-- merb_default_generators/model/USAGE
 - merb_default_generators/model/templates/new_model_template.erb
+- merb_default_generators/model/USAGE
+- merb_default_generators/resource_controller
 - merb_default_generators/resource_controller/resource_controller_generator.rb
 - merb_default_generators/resource_controller/templates
-- merb_default_generators/resource_controller/USAGE
 - merb_default_generators/resource_controller/templates/controller.rb
 - merb_default_generators/resource_controller/templates/edit.html.erb
 - merb_default_generators/resource_controller/templates/helper.rb
 - merb_default_generators/resource_controller/templates/index.html.erb
 - merb_default_generators/resource_controller/templates/new.html.erb
 - merb_default_generators/resource_controller/templates/show.html.erb
+- merb_default_generators/resource_controller/USAGE
 - rspec_generators/merb_controller_test
-- rspec_generators/merb_model_test
 - rspec_generators/merb_controller_test/merb_controller_test_generator.rb
 - rspec_generators/merb_controller_test/templates
 - rspec_generators/merb_controller_test/templates/controller_spec.rb
@@ -354,15 +363,16 @@ files:
 - rspec_generators/merb_controller_test/templates/index_spec.rb
 - rspec_generators/merb_controller_test/templates/new_spec.rb
 - rspec_generators/merb_controller_test/templates/show_spec.rb
+- rspec_generators/merb_model_test
 - rspec_generators/merb_model_test/merb_model_test_generator.rb
 - rspec_generators/merb_model_test/templates
 - rspec_generators/merb_model_test/templates/model_spec_template.erb
 - test_unit_generators/merb_controller_test
-- test_unit_generators/merb_model_test
 - test_unit_generators/merb_controller_test/merb_controller_test_generator.rb
 - test_unit_generators/merb_controller_test/templates
 - test_unit_generators/merb_controller_test/templates/functional_test.rb
 - test_unit_generators/merb_controller_test/templates/helper_test.rb
+- test_unit_generators/merb_model_test
 - test_unit_generators/merb_model_test/merb_model_test_generator.rb
 - test_unit_generators/merb_model_test/templates
 - test_unit_generators/merb_model_test/templates/model_test_unit_template.erb
@@ -378,8 +388,8 @@ executables:
 - merb
 extensions: []
 
-requirements: []
-
+requirements: 
+- install the json gem to get faster json parsing
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongrel
@@ -417,3 +427,30 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby2ruby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: