merb-gen 0.9.7 → 0.9.8

data/lib/generators/templates/application/merb/app/views/exceptions/not_acceptable.html.erb

@@ -8,7 +8,7 @@
 
   <div id="left-container">
     <h3>Exception:</h3>
-    <p><%%= params[:exception] %></p>
+    <p><%%= request.exceptions.first.message %></p>
   </div>
 
   <div id="main-container">

data/lib/generators/templates/application/merb/app/views/exceptions/not_found.html.erb

@@ -8,7 +8,7 @@
 
   <div id="left-container">
     <h3>Exception:</h3>
-    <p><%%= params[:exception] %></p>
+    <p><%%= request.exceptions.first.message %></p>
   </div>
 
   <div id="main-container">

data/lib/generators/templates/application/merb/config/environments/development.rb

@@ -1,6 +1,7 @@
 Merb.logger.info("Loaded DEVELOPMENT Environment...")
 Merb::Config.use { |c|
   c[:exception_details] = true
+  c[:reload_templates] = true
   c[:reload_classes] = true
   c[:reload_time] = 0.5
   c[:log_auto_flush ] = true

data/lib/generators/templates/application/merb/config/environments/staging.rb

@@ -0,0 +1,7 @@
+Merb.logger.info("Loaded STAGING Environment...")
+Merb::Config.use { |c|
+  c[:exception_details] = false
+  c[:reload_classes] = false
+  c[:log_level] = :error
+  c[:log_file] = Merb.log_path + "/staging.log"
+}

data/lib/generators/templates/application/merb/config/environments/test.rb

@@ -3,4 +3,5 @@ Merb::Config.use { |c|
   c[:testing] = true
   c[:exception_details] = true
   c[:log_auto_flush ] = true
-}
+  c[:log_level] = :fatal
+}

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

@@ -1,5 +1,3 @@
-$KCODE = 'UTF8'
-
 #
 # ==== Structure of Merb initializer
 #
@@ -47,6 +45,7 @@ $KCODE = 'UTF8'
 #
 # dependency "merb-action-args"   # Provides support for querystring arguments to be passed in to controller actions
 # dependency "merb-assets"        # Provides link_to, asset_path, auto_link, image_tag methods (and lots more)
+# dependency "merb-helpers"       # Provides the form, date/time, and other helpers
 # dependency "merb-cache"         # Provides your application with caching functions 
 # dependency "merb-haml"          # Adds rake tasks and the haml generators to your merb app
 # dependency "merb-jquery"        # Provides a #jquery method to insert jQuery code in to a content block
@@ -54,7 +53,6 @@ $KCODE = 'UTF8'
 
 # These are a few, but not all, of the merb-plugin dependencies:
 #
-# dependency "merb_helpers"           # Provides the form, date/time, and other helpers
 # dependency "merb_param_protection"  # Lets you have better control over your query string params and param logging
 # dependency "merb_stories"           # Provides rspec helper methods for your application
 
@@ -134,7 +132,6 @@ end
 # See http://wiki.merbivore.com/pages/merb-core-boot-process
 # if you want to know more.
 Merb::Config.use do |c|
-
   # Sets up a custom session id key which is used for the session persistence
   # cookie name.  If not specified, defaults to '_session_id'.
   # c[:session_id_key] = '_session_id'

data/lib/generators/templates/application/merb/config/router.rb

@@ -2,34 +2,40 @@
 #
 # You can route a specific URL to a controller / action pair:
 #
-#   r.match("/contact").
+#   match("/contact").
 #     to(:controller => "info", :action => "contact")
 #
 # You can define placeholder parts of the url with the :symbol notation. These
 # placeholders will be available in the params hash of your controllers. For example:
 #
-#   r.match("/books/:book_id/:action").
+#   match("/books/:book_id/:action").
 #     to(:controller => "books")
 #   
 # Or, use placeholders in the "to" results for more complicated routing, e.g.:
 #
-#   r.match("/admin/:module/:controller/:action/:id").
+#   match("/admin/:module/:controller/:action/:id").
 #     to(:controller => ":module/:controller")
 #
+# You can specify conditions on the placeholder by passing a hash as the second
+# argument of "match"
+#
+#   match("/registration/:course_name", :course_name => /^[a-z]{3,5}-\d{5}$/).
+#     to(:controller => "registration")
+#
 # You can also use regular expressions, deferred routes, and many other options.
 # See merb/specs/merb/router.rb for a fairly complete usage sample.
 
 Merb.logger.info("Compiling routes...")
-Merb::Router.prepare do |r|
+Merb::Router.prepare do
   # RESTful routes
-  # r.resources :posts
+  # resources :posts
 
   # This is the default route for /:controller/:action/:id
   # This is fine for most cases.  If you're heavily using resource-based
   # routes, you may want to comment/remove this line to prevent
   # clients from calling your create or destroy actions with a GET
-  r.default_routes
+  default_routes
   
   # Change this for your home page to be available at /
-  # r.match('/').to(:controller => 'whatever', :action =>'index')
+  # match('/').to(:controller => 'whatever', :action =>'index')
 end

data/lib/generators/templates/application/merb/public/robots.txt

@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-Agent: *
+# Disallow: /

data/lib/generators/templates/application/merb_flat/{application.rb → application.rbt}

@@ -1,4 +1,4 @@
-class Foo < Merb::Controller
+class <%= class_name %> < Merb::Controller
 
   def _template_location(action, type = nil, controller = controller_name)
     controller == "layout" ? "layout.#{action}.#{type}" : "#{action}.#{type}"

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

@@ -1,4 +1,121 @@
-$KCODE = 'UTF8'
+#
+# ==== Structure of Merb initializer
+#
+# 1. Load paths.
+# 2. Dependencies configuration.
+# 3. Libraries (ORM, testing tool, etc) you use.
+# 4. Application-specific configuration.
+
+#
+# ==== Set up load paths
+#
+
+# Add the app's "gems" directory to the gem load path.
+# Note that the gems directory must mirror the structure RubyGems uses for
+# directories under which gems are kept.
+#
+# To conveniently set it up, use gem install -i <merb_app_root/gems>
+# when installing gems. This will set up the structure under /gems
+# automagically.
+#
+# An example:
+#
+# You want to bundle ActiveRecord and ActiveSupport with your Merb
+# application to be deployment environment independent. To do so,
+# install gems into merb_app_root/gems directory like this:
+#
+# gem install -i merb_app_root/gems activesupport-post-2.0.2.gem activerecord-post-2.0.2.gem
+#
+# Since RubyGems will search merb_app_root/gems for dependencies, order
+# in the statement above is important: we need to install ActiveSupport which
+# ActiveRecord depends on first.
+#
+# Remember that bundling of dependencies as gems with your application
+# makes it independent of the environment it runs in and is a very
+# good, encouraged practice to follow.
+
+# If you want modules and classes from libraries organized like
+# merbapp/lib/magicwand/lib/magicwand.rb to autoload,
+# uncomment this.
+# Merb.push_path(:lib, Merb.root / "lib") # uses **/*.rb as path glob.
+
+# ==== Dependencies
+
+# These are a few, but not all, of the standard merb-more dependencies:
+#
+# dependency "merb-action-args"   # Provides support for querystring arguments to be passed in to controller actions
+# dependency "merb-assets"        # Provides link_to, asset_path, auto_link, image_tag methods (and lots more)
+# dependency "merb-helpers"       # Provides the form, date/time, and other helpers
+# dependency "merb-cache"         # Provides your application with caching functions 
+# dependency "merb-haml"          # Adds rake tasks and the haml generators to your merb app
+# dependency "merb-jquery"        # Provides a #jquery method to insert jQuery code in to a content block
+# dependency "merb-mailer"        # Integrates mail support via Merb Mailer
+
+# These are a few, but not all, of the merb-plugin dependencies:
+#
+# dependency "merb_param_protection"  # Lets you have better control over your query string params and param logging
+# dependency "merb_stories"           # Provides rspec helper methods for your application
+
+# Miscellaneous dependencies:
+#
+# Specify more than one dependency at a time with the #dependencies method:
+# dependencies "RedCloth", "BlueCloth"
+
+# Specify a specific version of a dependency
+# dependency "RedCloth", "> 3.0"
+
+# Specify more than one dependency at a time as well as the version:
+# dependencies "RedCloth" => "> 3.0", "BlueCloth" => "= 1.0.0"
+
+# You can also add in dependencies after your application loads.
+Merb::BootLoader.after_app_loads do
+  # For example, the magic_admin gem uses the app's model classes. This requires that the models be 
+  # loaded already. So, we can put the magic_admin dependency here:
+  # dependency "magic_admin"
+end
+
+#
+# ==== Set up your ORM of choice
+#
+
+# Merb doesn't come with database support by default.  You need
+# an ORM plugin.  Install one, and uncomment one of the following lines,
+# if you need a database.
+
+# Uncomment for DataMapper ORM
+<%= "# " unless orm == :datamapper %>use_orm :datamapper
+
+# Uncomment for ActiveRecord ORM
+<%= "# " unless orm == :activerecord %>use_orm :activerecord
+
+# Uncomment for Sequel ORM
+<%= "# " unless orm == :sequel %>use_orm :sequel
+
+
+#
+# ==== Pick what you test with
+#
+
+# This defines which test framework the generators will use.
+# RSpec is turned on by default.
+#
+# To use Test::Unit, you need to install the merb_test_unit gem.
+# To use RSpec, you don't have to install any additional gems, since
+# merb-core provides support for RSpec.
+#
+<%= "# " unless testing_framework == :test_unit %>use_test :test_unit
+<%= "# " unless testing_framework == :rspec %>use_test :rspec
+
+
+#
+# ==== Choose which template engine to use by default
+#
+
+# Merb can generate views for different template engines, choose your favourite as the default.
+
+<%= "# " unless template_engine == :erb %>use_template_engine :erb
+<%= "# " unless template_engine == :haml %>use_template_engine :haml
+
 
 # Move this to application.rb if you want it to be reloadable in dev mode.
 Merb::Router.prepare do |r|
@@ -9,7 +126,7 @@ end
 Merb::Config.use { |c|
   c[:environment]         = 'production',
   c[:framework]           = {},
-  c[:log_level]           = 'debug',
+  c[:log_level]           = :debug,
   c[:use_mutex]           = false,
   c[:session_store]       = 'cookie',
   c[:session_id_key]      = '_session_id',

data/lib/generators/templates/application/merb_flat/test/test_helper.rb

@@ -0,0 +1,19 @@
+require "rubygems"
+
+# Add the local gems dir if found within the app root; any dependencies loaded
+# hereafter will try to load from the local gems before loading system gems.
+if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
+  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
+end
+
+require "merb-core"
+
+# TODO: Boot Merb, via the Test Rack adapter
+Merb.start :environment => (ENV['MERB_ENV'] || 'test'),
+           :merb_root  => File.join(File.dirname(__FILE__), ".." )
+
+
+class Test::Unit::TestCase
+  include Merb::Test::RequestHelper
+  # Add more helper methods to be used by all tests here...
+end

data/lib/generators/templates/application/merb_plugin/Rakefile

@@ -1,11 +1,10 @@
 require 'rubygems'
 require 'rake/gempackagetask'
-require 'rubygems/specification'
-require 'date'
-require 'merb-core/version'
-require 'merb-core/tasks/merb_rake_helper'
 
-NAME = "<%= base_name %>"
+require 'merb-core'
+require 'merb-core/tasks/merb'
+
+GEM_NAME = "<%= base_name %>"
 GEM_VERSION = "0.0.1"
 AUTHOR = "Your Name"
 EMAIL = "Your Email"
@@ -14,7 +13,7 @@ SUMMARY = "Merb plugin that provides ..."
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = 'merb'
-  s.name = NAME
+  s.name = GEM_NAME
   s.version = GEM_VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
@@ -29,7 +28,7 @@ spec = Gem::Specification.new do |s|
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec<%= bin ? ',bin' : '' %>}/**/*")
   <% if bin %>
   s.bindir = "bin"
-  s.executables = [NAME]
+  s.executables = [GEM_NAME]
   <% end %>
 end
 
@@ -37,23 +36,19 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-desc "install the plugin locally"
-task :install => [:package] do
-  sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
+desc "install the plugin as a gem"
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
 end
 
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
 end
 
-namespace :jruby do
-
-  desc "Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
   end
-
-end
+end

data/lib/generators/templates/application/merb_plugin/spec/spec_helper.rb

@@ -1,2 +1 @@
-$TESTING=true
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')

data/lib/generators/templates/application/merb_plugin/test/test_helper.rb

@@ -1,2 +1 @@
-$TESTING=true
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')

data/lib/generators/templates/application/merb_very_flat/application.rbt

@@ -1,13 +1,47 @@
-$KCODE = 'UTF8'
-
 # run very flat apps with merb -I <app file>.
 
+# Uncomment for DataMapper ORM
+<%= "# " unless orm == :datamapper %>use_orm :datamapper
+
+# Uncomment for ActiveRecord ORM
+<%= "# " unless orm == :activerecord %>use_orm :activerecord
+
+# Uncomment for Sequel ORM
+<%= "# " unless orm == :sequel %>use_orm :sequel
+
+
+#
+# ==== Pick what you test with
+#
+
+# This defines which test framework the generators will use.
+# RSpec is turned on by default.
+#
+# To use Test::Unit, you need to install the merb_test_unit gem.
+# To use RSpec, you don't have to install any additional gems, since
+# merb-core provides support for RSpec.
+#
+<%= "# " unless testing_framework == :test_unit %>use_test :test_unit
+<%= "# " unless testing_framework == :rspec %>use_test :rspec
+
+#
+# ==== Choose which template engine to use by default
+#
+
+# Merb can generate views for different template engines, choose your favourite as the default.
+
+<%= "# " unless template_engine == :erb %>use_template_engine :erb
+<%= "# " unless template_engine == :haml %>use_template_engine :haml
+
 Merb::Config.use { |c|
   c[:framework]           = { :public => [Merb.root / "public", nil] },
   c[:session_store]       = 'none',
   c[:exception_details]   = true
+	c[:log_level]           = :debug # or error, warn, info or fatal
 }
 
+
+
 Merb::Router.prepare do |r|
   r.match('/').to(:controller => '<%= base_name %>', :action =>'index')
 end

data/lib/generators/templates/application/merb_very_flat/test/test_helper.rb

@@ -0,0 +1,19 @@
+require "rubygems"
+
+# Add the local gems dir if found within the app root; any dependencies loaded
+# hereafter will try to load from the local gems before loading system gems.
+if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
+  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
+end
+
+require "merb-core"
+
+# TODO: Boot Merb, via the Test Rack adapter
+Merb.start :environment => (ENV['MERB_ENV'] || 'test'),
+           :merb_root  => File.join(File.dirname(__FILE__), ".." )
+
+
+class Test::Unit::TestCase
+  include Merb::Test::RequestHelper
+  # Add more helper methods to be used by all tests here...
+end

data/spec/merb_flat_spec.rb

@@ -13,9 +13,9 @@ describe Merb::Generators::MerbFlatGenerator do
     it "should create a number of views"
     
     it "should render templates successfully" do
-      lambda { @generator.render! }.should_not raise_error
+      lambda do
+        @generator.render!
+      end.should_not raise_error
     end
-    
   end
-  
-end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-$TESTING=true
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 +03:00
+date: 2008-10-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.3.0
     version: 
 description: Generators suite for Merb.
 email: jonas.nicklas@gmail.com
@@ -65,6 +65,10 @@ files:
 - lib/generators/session_migration.rb
 - lib/generators/templates
 - lib/generators/templates/application
+- lib/generators/templates/application/common
+- lib/generators/templates/application/common/dotgitignore
+- lib/generators/templates/application/common/merb.thor
+- lib/generators/templates/application/common/Rakefile
 - lib/generators/templates/application/merb
 - lib/generators/templates/application/merb/app
 - lib/generators/templates/application/merb/app/controllers
@@ -89,31 +93,34 @@ files:
 - lib/generators/templates/application/merb/config/environments/development.rb
 - lib/generators/templates/application/merb/config/environments/production.rb
 - lib/generators/templates/application/merb/config/environments/rake.rb
+- lib/generators/templates/application/merb/config/environments/staging.rb
 - lib/generators/templates/application/merb/config/environments/test.rb
 - lib/generators/templates/application/merb/config/init.rb
 - lib/generators/templates/application/merb/config/rack.rb
 - lib/generators/templates/application/merb/config/router.rb
-- lib/generators/templates/application/merb/merb.thor
 - lib/generators/templates/application/merb/public
+- lib/generators/templates/application/merb/public/favicon.ico
 - lib/generators/templates/application/merb/public/images
 - lib/generators/templates/application/merb/public/images/merb.jpg
 - lib/generators/templates/application/merb/public/merb.fcgi
+- lib/generators/templates/application/merb/public/robots.txt
 - lib/generators/templates/application/merb/public/stylesheets
 - lib/generators/templates/application/merb/public/stylesheets/master.css
-- lib/generators/templates/application/merb/Rakefile
 - lib/generators/templates/application/merb/spec
 - lib/generators/templates/application/merb/spec/spec.opts
 - lib/generators/templates/application/merb/spec/spec_helper.rb
 - lib/generators/templates/application/merb/test
 - lib/generators/templates/application/merb/test/test_helper.rb
 - lib/generators/templates/application/merb_flat
-- lib/generators/templates/application/merb_flat/application.rb
+- lib/generators/templates/application/merb_flat/application.rbt
 - lib/generators/templates/application/merb_flat/config
 - lib/generators/templates/application/merb_flat/config/framework.rb
 - lib/generators/templates/application/merb_flat/config/init.rb
 - lib/generators/templates/application/merb_flat/README.txt
 - lib/generators/templates/application/merb_flat/spec
 - lib/generators/templates/application/merb_flat/spec/spec_helper.rb
+- lib/generators/templates/application/merb_flat/test
+- lib/generators/templates/application/merb_flat/test/test_helper.rb
 - lib/generators/templates/application/merb_flat/views
 - lib/generators/templates/application/merb_flat/views/foo.html.erb
 - lib/generators/templates/application/merb_plugin
@@ -135,6 +142,8 @@ files:
 - lib/generators/templates/application/merb_very_flat/application.rbt
 - lib/generators/templates/application/merb_very_flat/spec
 - lib/generators/templates/application/merb_very_flat/spec/spec_helper.rb
+- lib/generators/templates/application/merb_very_flat/test
+- lib/generators/templates/application/merb_very_flat/test/test_helper.rb
 - lib/generators/templates/component
 - lib/generators/templates/component/controller
 - lib/generators/templates/component/controller/app