merb 0.3.7 → 0.4.0

data/rspec_generators/merb_controller_test/templates/controller_spec.rb

@@ -0,0 +1,8 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe "<%= class_name.pluralize %> Controller", "index action" do
+  before(:each) do
+    @controller = <%= class_name.pluralize %>.build(fake_request)
+    @controller.dispatch('index')
+  end
+end

data/rspec_generators/merb_controller_test/templates/edit_spec.rb

@@ -0,0 +1,12 @@
+require File.join(File.dirname(__FILE__),'..','..','spec_helper')
+
+describe "/<%= file_name %>/edit" do
+  before(:each) do
+    @controller,@action = get("/<%= file_name %>/edit")
+    @body = @controller.body
+  end
+
+  it "should mention <%= class_name %>" do
+    @body.should match(/<%= class_name %>/)
+  end
+end

data/rspec_generators/merb_controller_test/templates/helper_spec.rb

@@ -0,0 +1,5 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
+
+describe Merb::<%= class_name %>Helper do
+
+end

data/rspec_generators/merb_controller_test/templates/index_spec.rb

@@ -0,0 +1,12 @@
+require File.join(File.dirname(__FILE__),'..','..','spec_helper')
+
+describe "/<%= file_name %>" do
+  before(:each) do
+    @controller,@action = get("/<%= file_name %>")
+    @body = @controller.body
+  end
+
+  it "should mention <%= class_name %>" do
+    @body.should match(/<%= class_name %>/)
+  end
+end

data/rspec_generators/merb_controller_test/templates/new_spec.rb

@@ -0,0 +1,12 @@
+require File.join(File.dirname(__FILE__),'..','..','spec_helper')
+
+describe "/<%= file_name %>/new" do
+  before(:each) do
+    @controller,@action = get("/<%= file_name %>/new")
+    @body = @controller.body
+  end
+
+  it "should mention <%= class_name %>" do
+    @body.should match(/<%= class_name %>/)
+  end
+end

data/rspec_generators/merb_controller_test/templates/show_spec.rb

@@ -0,0 +1,5 @@
+require File.join(File.dirname(__FILE__),'..','..','spec_helper')
+
+describe "/<%= file_name %>/1" do
+  it "should spec the show view"
+end

data/rspec_generators/merb_model_test/merb_model_test_generator.rb

@@ -0,0 +1,26 @@
+require 'merb/generators/merb_generator_helpers'
+class MerbModelTestGenerator < Merb::GeneratorHelpers::MerbModelTestGenerator
+  
+  def initialize( *args )
+    super( *args )
+    @model_test_template_name = "model_spec_template.erb"
+    @model_test_path_name = File.join("spec", "models")
+    @model_test_file_suffix = "spec"
+  end
+  
+  def banner
+          <<-EOS
+Creates a model spec stub for use in Merb
+
+USAGE: #{$0} #{spec.name} NameOfModel
+Example:
+  #{$0} #{spec.name} project
+
+
+    EOS
+  end
+  
+  def self.superclass
+    RubiGen::Base
+  end
+end

data/rspec_generators/merb_model_test/templates/model_spec_template.erb

@@ -0,0 +1,7 @@
+require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+
+describe <%= class_name %> do
+
+  it "should have specs"
+
+end

data/script/destroy

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.join(File.dirname(__FILE__), '..')
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! :rubygems
+RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.join(File.dirname(__FILE__), '..')
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! :rubygems
+RubiGen::Scripts::Generate.new.run(ARGV)

data/test_unit_generators/merb_controller_test/merb_controller_test_generator.rb

@@ -0,0 +1,53 @@
+require 'merb'
+class MerbControllerTestGenerator < RubiGen::Base
+  
+  default_options :author => nil
+  
+  attr_reader :name, :class_name, :file_name
+  
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @name = args.shift
+    @class_name = @name.camel_case
+    @file_name = @name.snake_case
+    extract_options
+  end
+
+  def manifest
+    record do |m|
+      m.directory 'test/functional'
+      m.template "functional_test.rb", "test/functional/#{file_name}_test.rb"
+      
+      m.directory 'test/helpers'
+      m.template "helper_test.rb", "test/helpers/#{file_name}_helper_test.rb"
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a test unit stub for a resource controller
+
+USAGE: #{$0} #{spec.name} name"
+EOS
+    end
+
+    def add_options!(opts)
+      # opts.separator ''
+      # opts.separator 'Options:'
+      # For each option below, place the default
+      # at the top of the file next to "default_options"
+      # opts.on("-a", "--author=\"Your Name\"", String,
+      #         "Some comment about this option",
+      #         "Default: none") { |options[:author]| }
+      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    end
+    
+    def extract_options
+      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+      # Templates can access these value via the attr_reader-generated methods, but not the
+      # raw instance variable value.
+      # @author = options[:author]
+    end
+end

data/test_unit_generators/merb_controller_test/templates/functional_test.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+# Re-raise errors caught by the controller.
+class <%= class_name.pluralize %>; def rescue_action(e) raise e end; end
+
+class <%= class_name.pluralize %>Test < Test::Unit::TestCase
+
+  def setup
+    @controller = <%= class_name.pluralize %>.build(fake_request)
+    @controller.dispatch('index')
+  end
+
+  # Replace this with your real tests.
+  def test_should_be_setup
+    assert false
+  end
+end

data/test_unit_generators/merb_controller_test/templates/helper_test.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class <%= class_name.pluralize %>HelperTest < Test::Unit::TestCase
+  
+  def test_should_be_setup
+    assert false
+  end
+  
+end

data/test_unit_generators/merb_model_test/merb_model_test_generator.rb

@@ -0,0 +1,29 @@
+require 'merb/generators/merb_generator_helpers'
+class MerbModelTestGenerator < Merb::GeneratorHelpers::MerbModelTestGenerator
+  
+  def initialize( *args )
+    super( *args )
+    @model_test_template_name = "model_test_unit_template.erb"
+    @model_test_path_name = File.join( "test", "unit" )
+    @model_test_file_suffix = "test"
+  end
+  
+    def banner
+            <<-EOS
+Creates a model Test::Unit stub for use in Merb
+
+USAGE: #{$0} #{spec.name} NameOfModel
+Example:
+  #{$0} #{spec.name} project
+
+
+      EOS
+    end
+  
+  def self.superclass
+    RubiGen::Base
+  end
+end
+
+class MerbTesterThing
+end

data/test_unit_generators/merb_model_test/templates/model_test_unit_template.erb

@@ -0,0 +1,9 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper' )
+
+class <%= "#{class_name}Test" %> < Test::Unit::TestCase
+
+  def test_should_be_tested
+    assert 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.3.7
-date: 2007-08-04 00:00:00 -07:00
+  version: 0.4.0
+date: 2007-11-06 00:00:00 -08:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths: 
 - lib
@@ -34,7 +34,11 @@ files:
 - Rakefile
 - TODO
 - bin/merb
+- lib/autotest
+- lib/autotest/discover.rb
+- lib/autotest/merb_rspec.rb
 - lib/merb
+- lib/merb/abstract_controller.rb
 - lib/merb/caching
 - lib/merb/caching/action_cache.rb
 - lib/merb/caching/fragment_cache.rb
@@ -43,53 +47,56 @@ files:
 - 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/merb_array.rb
-- lib/merb/core_ext/merb_class.rb
-- lib/merb/core_ext/merb_enumerable.rb
-- lib/merb/core_ext/merb_hash.rb
-- lib/merb/core_ext/merb_inflections.rb
-- lib/merb/core_ext/merb_inflector.rb
-- lib/merb/core_ext/merb_kernel.rb
-- lib/merb/core_ext/merb_module.rb
-- lib/merb/core_ext/merb_numeric.rb
-- lib/merb/core_ext/merb_object.rb
-- lib/merb/core_ext/merb_string.rb
-- lib/merb/core_ext/merb_symbol.rb
+- lib/merb/core_ext/array.rb
+- lib/merb/core_ext/class.rb
+- lib/merb/core_ext/enumerable.rb
+- lib/merb/core_ext/get_args.rb
+- lib/merb/core_ext/hash.rb
+- lib/merb/core_ext/inflections.rb
+- lib/merb/core_ext/inflector.rb
+- lib/merb/core_ext/kernel.rb
+- lib/merb/core_ext/mash.rb
+- lib/merb/core_ext/module.rb
+- lib/merb/core_ext/numeric.rb
+- 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/merb_abstract_controller.rb
-- lib/merb/merb_constants.rb
-- lib/merb/merb_controller.rb
-- lib/merb/merb_dispatcher.rb
-- lib/merb/merb_drb_server.rb
-- lib/merb/merb_exceptions.rb
-- lib/merb/merb_handler.rb
-- lib/merb/merb_mail_controller.rb
-- lib/merb/merb_mailer.rb
-- lib/merb/merb_part_controller.rb
-- lib/merb/merb_plugins.rb
-- lib/merb/merb_request.rb
-- lib/merb/merb_router.rb
-- lib/merb/merb_server.rb
-- lib/merb/merb_upload_handler.rb
-- lib/merb/merb_upload_progress.rb
-- lib/merb/merb_view_context.rb
-- lib/merb/merb_yaml_store.rb
+- lib/merb/generators/merb_generator_helpers.rb
+- lib/merb/generators/merb_plugin.rb
+- lib/merb/logger.rb
+- lib/merb/mail_controller.rb
+- lib/merb/mailer.rb
 - lib/merb/mixins
-- lib/merb/mixins/basic_authentication_mixin.rb
-- lib/merb/mixins/controller_mixin.rb
-- lib/merb/mixins/erubis_capture_mixin.rb
-- lib/merb/mixins/form_control_mixin.rb
-- lib/merb/mixins/render_mixin.rb
-- lib/merb/mixins/responder_mixin.rb
-- lib/merb/mixins/view_context_mixin.rb
+- 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/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/merb_ar_session.rb
-- lib/merb/session/merb_mem_cache_session.rb
-- lib/merb/session/merb_memory_session.rb
+- 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
@@ -98,58 +105,129 @@ files:
 - lib/merb/template/xml_builder.rb
 - lib/merb/template.rb
 - lib/merb/test
-- lib/merb/test/merb_fake_request.rb
-- lib/merb/test/merb_multipart.rb
-- lib/merb/vendor
-- lib/merb/vendor/paginator
-- lib/merb/vendor/paginator/paginator.rb
-- lib/merb/vendor/paginator/README.txt
+- 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/view_context.rb
 - lib/merb.rb
-- lib/merb_tasks.rb
 - lib/tasks
-- lib/tasks/db.rake
 - lib/tasks/merb.rake
-- examples/README_EXAMPLES
-- examples/skeleton
-- examples/skeleton/dist
-- examples/skeleton/dist/app
-- examples/skeleton/dist/app/controllers
-- examples/skeleton/dist/app/controllers/application.rb
-- examples/skeleton/dist/app/helpers
-- examples/skeleton/dist/app/helpers/global_helper.rb
-- examples/skeleton/dist/app/mailers
-- examples/skeleton/dist/app/mailers/helpers
-- examples/skeleton/dist/app/mailers/layout
-- examples/skeleton/dist/app/mailers/layout/application.erb
-- examples/skeleton/dist/app/mailers/views
-- examples/skeleton/dist/app/models
-- examples/skeleton/dist/app/views
-- examples/skeleton/dist/app/views/layout
-- examples/skeleton/dist/app/views/layout/application.herb
-- examples/skeleton/dist/conf
-- examples/skeleton/dist/conf/database.yml
-- examples/skeleton/dist/conf/environments
-- examples/skeleton/dist/conf/environments/development.rb
-- examples/skeleton/dist/conf/environments/production.rb
-- examples/skeleton/dist/conf/environments/test.rb
-- examples/skeleton/dist/conf/merb.yml
-- examples/skeleton/dist/conf/merb_init.rb
-- examples/skeleton/dist/conf/router.rb
-- examples/skeleton/dist/conf/upload.conf
-- examples/skeleton/dist/plugins
-- examples/skeleton/dist/public
-- examples/skeleton/dist/public/images
-- examples/skeleton/dist/public/javascripts
-- examples/skeleton/dist/public/stylesheets
-- examples/skeleton/dist/schema
-- examples/skeleton/dist/schema/migrations
-- examples/skeleton/dist/schema/migrations/001_add_sessions_table.rb
-- examples/skeleton/plugins
-- examples/skeleton/Rakefile
-- examples/skeleton/script
-- examples/skeleton/script/new_migration
-- examples/skeleton/script/stop_merb
-- examples/skeleton/test
+- lib/tasks.rb
+- app_generators/merb
+- app_generators/merb/merb_generator.rb
+- app_generators/merb/templates
+- app_generators/merb/templates/app
+- app_generators/merb/templates/app/controllers
+- 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.erb
+- app_generators/merb/templates/app/views
+- app_generators/merb/templates/app/views/exceptions
+- 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/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/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/templates/LICENSE
+- app_generators/merb_plugin/templates/merbtasks.rb
+- app_generators/merb_plugin/templates/Rakefile
+- app_generators/merb_plugin/templates/README
+- app_generators/merb_plugin/templates/sampleplugin.rb
+- 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/controller/controller_generator.rb
+- merb_generators/controller/templates
+- 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/model/model_generator.rb
+- merb_default_generators/model/templates
+- 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/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_controller_test/merb_controller_test_generator.rb
+- rspec_generators/merb_controller_test/templates
+- rspec_generators/merb_controller_test/templates/controller_spec.rb
+- rspec_generators/merb_controller_test/templates/edit_spec.rb
+- rspec_generators/merb_controller_test/templates/helper_spec.rb
+- 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_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
+- script/destroy
+- script/generate
 test_files: []
 
 rdoc_options: []
@@ -184,7 +262,7 @@ dependencies:
         version: 0.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: mime-types
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
@@ -193,7 +271,7 @@ dependencies:
         version: 0.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: rubigen
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: