merb-gen 0.9.8 → 0.9.9

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

@@ -0,0 +1,44 @@
+# This file is specifically setup for use with the merb-auth plugin.
+# This file should be used to setup and configure your authentication stack.
+# It is not required and may safely be deleted.
+#
+# To change the parameter names for the password or login field you may set either of these two options
+#
+# Merb::Plugins.config[:"merb-auth"][:login_param]    = :email 
+# Merb::Plugins.config[:"merb-auth"][:password_param] = :my_password_field_name
+
+begin
+  # Sets the default class ofr authentication.  This is primarily used for 
+  # Plugins and the default strategies
+  Merb::Authentication.user_class = User 
+  
+  
+  # Mixin the salted user mixin
+  require 'merb-auth-more/mixins/salted_user'
+  Merb::Authentication.user_class.class_eval{ include Merb::Authentication::Mixins::SaltedUser }
+    
+  # Setup the session serialization
+  class Merb::Authentication
+
+    def fetch_user(session_user_id)
+      Merb::Authentication.user_class.get(session_user_id)
+    end
+
+    def store_user(user)
+      user.nil? ? user : user.id
+    end
+  end
+  
+rescue
+  Merb.logger.error <<-TEXT
+  
+    You need to setup some kind of user class with merb-auth.  
+    Merb::Authentication.user_class = User
+    
+    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
+
+    TEXT
+end
+

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

@@ -0,0 +1,11 @@
+# This file is specifically for you to define your strategies 
+#
+# You should declare you strategies directly and/or use 
+# Merb::Authentication.activate!(:label_of_strategy)
+#
+# To load and set the order of strategy processing
+
+Merb::Slices::config[:"merb-auth-slice-password"][:no_default_strategies] = true
+
+Merb::Authentication.activate!(:default_password_form)
+Merb::Authentication.activate!(:default_basic_auth)

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

@@ -0,0 +1,9 @@
+module Merb
+  module Session
+    
+    # The Merb::Session module gets mixed into Merb::SessionContainer to allow 
+    # app-level functionality; it will be included and methods will be available 
+    # through request.session as instance methods.
+    
+  end
+end

data/lib/generators/templates/application/merb_stack/public/javascripts/application.js

@@ -0,0 +1 @@
+// Common JavaScript code across your application goes here.

data/lib/generators/templates/application/merb_stack/public/merb.fcgi

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+                                                               
+require 'rubygems'
+require 'merb-core'
+
+# this is Merb.root, change this if you have some funky setup.
+merb_root = File.expand_path(File.dirname(__FILE__) / '../')
+        
+# If the fcgi process runs as apache, make sure
+# we have an inlinedir set for Rubyinline action-args to work
+unless ENV["INLINEDIR"] || ENV["HOME"]
+  tmpdir = merb_root / "tmp"
+  unless File.directory?(tmpdir)
+    Dir.mkdir(tmpdir)
+  end                
+  ENV["INLINEDIR"] = tmpdir
+end
+   
+# start merb with the fcgi adapter, add options or change the log dir here
+Merb.start(:adapter => 'fcgi',
+           :merb_root => merb_root,
+           :log_file => merb_root /'log'/'merb.log')

data/lib/generators/templates/application/merb_stack/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_stack/public/stylesheets/master.css

@@ -0,0 +1,119 @@
+body {
+  font-family: Arial, Verdana, sans-serif;
+  font-size: 12px;
+  background-color: #fff;
+}
+* {
+  margin: 0px;
+  padding: 0px;
+  text-decoration: none;
+}
+html {
+  height: 100%;
+  margin-bottom: 1px;
+}
+#container {
+  width: 80%;
+  text-align: left;
+  background-color: #fff;
+  margin-right: auto;
+  margin-left: auto;
+}
+#header-container {
+  width: 100%;
+  padding-top: 15px;
+}
+#header-container h1, #header-container h2 {
+  margin-left: 6px;
+  margin-bottom: 6px;
+}
+.spacer {
+  width: 100%;
+  height: 15px;
+}
+hr {
+  border: 0px;
+  color: #ccc;
+  background-color: #cdcdcd;
+  height: 1px;
+  width: 100%;
+  text-align: left;
+}
+h1 {
+  font-size: 28px;
+  color: #c55;
+  background-color: #fff;
+  font-family: Arial, Verdana, sans-serif;
+  font-weight: 300;
+}
+h2 {
+  font-size: 15px;
+  color: #999;
+  font-family: Arial, Verdana, sans-serif;
+  font-weight: 300;
+  background-color: #fff;
+}
+h3 {
+  color: #4d9b12;
+  font-size: 15px;
+  text-align: left;
+  font-weight: 300;
+  padding: 5px;
+  margin-top: 5px;
+}
+
+#left-container {
+  float: left;
+  width: 250px;
+  background-color: #FFFFFF;
+  color: black;
+}
+
+#left-container h3 {
+  color: #c55;
+}
+
+#main-container {
+  margin: 5px 5px 5px 260px;
+  padding: 15px;
+  border-left: 1px solid silver;
+  min-height: 400px;
+}
+p {
+  color: #000;
+  background-color: #fff;
+  line-height: 20px;
+  padding: 5px;
+}
+a {
+  color: #4d9b12;
+  background-color: #fff;
+  text-decoration: none;
+}
+a:hover {
+  color: #4d9b12;
+  background-color: #fff;
+  text-decoration: underline;
+}
+#footer-container {
+  clear: both;
+  font-size: 12px;
+  font-family: Verdana, Arial, sans-serif;
+}
+.right {
+  float: right;
+  font-size: 100%;
+  margin-top: 5px;
+  color: #999;
+  background-color: #fff;
+}
+.left {
+  float: left;
+  font-size: 100%;
+  margin-top: 5px;
+  color: #999;
+  background-color: #fff;
+}
+#main-container ul {
+  margin-left: 3.0em;
+}

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

@@ -0,0 +1,20 @@
+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"
+require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
+
+# this loads all plugins required in your init file so don't add them
+# here again, Merb will do it for you
+Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
+
+Spec::Runner.configure do |config|
+  config.include(Merb::Test::ViewHelper)
+  config.include(Merb::Test::RouteHelper)
+  config.include(Merb::Test::ControllerHelper)
+end

data/lib/generators/templates/application/merb_stack/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_very_flat/application.rbt

@@ -34,20 +34,26 @@
 <%= "# " unless template_engine == :haml %>use_template_engine :haml
 
 Merb::Config.use { |c|
-  c[:framework]           = { :public => [Merb.root / "public", nil] },
-  c[:session_store]       = 'none',
+  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
+  c[:log_stream]          = STDOUT
+  # or use file for loggine:
+  # c[:log_file]          = Merb.root / "log" / "merb.log"
+
+	c[:reload_classes]   = true
+	c[:reload_templates] = true
 }
 
 
 
-Merb::Router.prepare do |r|
-  r.match('/').to(:controller => '<%= base_name %>', :action =>'index')
+Merb::Router.prepare do
+  match('/').to(:controller => '<%= base_name %>', :action =>'index')
 end
 
 class <%= class_name %> < Merb::Controller
   def index
-    "hi"
+    "Hi, I am 'very flat' Merb application. I have everything in one single file and well suited for dynamic stub pages."
   end
 end

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

@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="/stylesheets/master.css" type="text/css" media="screen" charset="utf-8" />
   </head>
   <body>
+    <%%#= message[:notice] %>
     <%%= catch_content :for_layout %>
   </body>
 </html>

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

@@ -0,0 +1,53 @@
+require File.join(File.dirname(__FILE__), <%= go_up(modules.size + 1) %>, 'spec_helper.rb')
+
+given "a <%= singular_model %> exists" do
+  request(resource(:<%= plural_model %>), :method => "POST", 
+    :params => { :<%= singular_model %> => {  }})
+end
+
+describe "resource(:<%= plural_model %>)" do
+  describe "GET" do
+    
+    before(:each) do
+      @response = request(resource(:<%= singular_model %>s))
+    end
+    
+    it "responds successfully" do
+      @response.should be_successful
+    end
+
+    it "contains a list of speakers" do
+      pending
+      @response.should have_xpath("//ul")
+    end
+    
+  end
+  
+  describe "GET", :given => "a <%= singular_model %> exists" do
+    before(:each) do
+      @response = request(resource(:<%= plural_model %>))
+    end
+    
+    it "has a list of <%= plural_model %>" do
+      pending
+      @response.should have_xpath("//ul/li")
+    end
+  end
+  
+  describe "a successful POST" do
+    before(:each) do
+      @response = request(resource(:<%= plural_model %>), :method => "POST", 
+        :params => { :<%= singular_model %> => {  }})
+    end
+    
+    it "redirects to resource(:<%= plural_model %>)" do
+      <%- if orm.to_sym == :datamapper -%>
+      @response.should redirect_to(resource(<%= singular_model.capitalize %>.first), :message => {:notice => "<%= singular_model %> was successfully created"})
+      <%- elsif orm.to_sym == :activerecord -%>
+      @response.should redirect_to(resource(<%= singular_model.capitalize %>.first), :message => {:notice => "<%= singular_model %> was successfully created"})
+      <% end -%>
+    end
+    
+  end
+end
+

data/lib/merb-gen/app_generator.rb

@@ -0,0 +1,13 @@
+module Merb
+  module Generators
+
+    class AppGenerator < NamedGenerator
+
+      def initialize(*args)
+        Merb.disable(:initfile)
+        super
+      end
+
+    end
+  end
+end

data/lib/merb-gen/generator.rb

@@ -1,4 +1,21 @@
 module Merb
+  
+  module ColorfulMessages
+    # red
+    def error(*messages)
+      puts messages.map { |msg| "\033[1;31m#{msg}\033[0m" }
+    end
+    # yellow
+    def warning(*messages)
+      puts messages.map { |msg| "\033[1;33m#{msg}\033[0m" }
+    end
+    # green
+    def success(*messages)
+      puts messages.map { |msg| "\033[1;32m#{msg}\033[0m" }
+    end
+
+    alias_method :message, :success
+  end
 
   module Generators
     
@@ -10,7 +27,25 @@ module Merb
     
     class Generator < Templater::Generator
       
+      include Merb::ColorfulMessages
+      
       def initialize(*args)
+        Merb::Config.setup({
+          :log_level        => :fatal,
+          :log_delimiter    => " ~ ",
+          :log_auto_flush   => false,
+          :reload_templates => false,
+          :reload_classes   => false
+        })
+
+        Merb::BootLoader::Logger.run
+        Merb::BootLoader::BuildFramework.run
+        Merb::BootLoader::Dependencies.run
+
+        Merb::BootLoader::BeforeAppLoads.run
+        Merb::BootLoader::ReloadClasses.run
+        Merb::BootLoader::AfterAppLoads.run
+        
         super
         options[:orm] ||= Merb.orm
         options[:testing_framework] ||= Merb.test_framework
@@ -50,4 +85,4 @@ module Merb
     
   end  
   
-end
+end

data/lib/merb-gen/named_generator.rb

@@ -2,11 +2,14 @@ module Merb
   module Generators
 
     class NamedGenerator < Generator
-      
       # NOTE: Currently this is not inherited, it will have to be declared in each generator
       # that inherits from this.
       first_argument :name, :required => true
       
+      def initialize(*args)
+        super
+      end
+      
       def class_name
         name.gsub('-', '_').camel_case
       end
@@ -30,4 +33,4 @@ module Merb
     end
  
   end
-end
+end

data/lib/merb-gen.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'merb-core'
 require 'sha1'
-gem 'templater', '>= 0.2.0'
+gem 'templater', '>= 0.3.2'
 require 'templater'
 
 path = File.join(File.dirname(__FILE__))
@@ -9,8 +9,9 @@ path = File.join(File.dirname(__FILE__))
 require path / "merb-gen"   / "generator"
 require path / "merb-gen"   / "named_generator"
 require path / "merb-gen"   / "namespaced_generator"
-require path / "generators" / "merb"
-require path / "generators" / "merb" / "merb_full"
+require path / "merb-gen"   / "app_generator"
+require path / "generators" / "merb" / "merb_stack"
+require path / "generators" / "merb" / "merb_core"
 require path / "generators" / "merb" / "merb_flat"
 require path / "generators" / "merb" / "merb_very_flat"
 require path / "generators" / "merb_plugin"
@@ -26,9 +27,6 @@ require path / "generators" / "layout"
 
 Templater::Discovery.discover!("merb-gen")
 
-# Require all generators that plugins have added to merb, after the app has loaded.
-Merb::BootLoader.after_app_loads do
-  Merb.generators.each do |file|
-    require file
-  end
+Merb.generators.each do |file|
+  require file
 end

data/spec/controller_spec.rb

@@ -16,19 +16,11 @@ describe Merb::Generators::ControllerGenerator do
     @generator.should create('/tmp/app/views/stuff/index.html.erb')
   end
   
-  it "should create a helper" do
-    @generator.should create('/tmp/app/helpers/stuff_helper.rb')
-  end
-  
   describe "with rspec" do
     
     it "should create a controller spec" do
       @generator.should create('/tmp/spec/controllers/stuff_spec.rb')
     end
-
-    it "should create a helper spec" do
-      @generator.should create('/tmp/spec/helpers/stuff_helper_spec.rb')
-    end
     
     it "should render templates successfully" do
       lambda { @generator.render! }.should_not raise_error
@@ -71,14 +63,6 @@ describe Merb::Generators::ControllerGenerator do
     end
     
     describe "with rspec" do
-
-      it "should create a controller spec" do
-        @generator.should create('/tmp/spec/controllers/john/monkey/stuff_spec.rb')
-      end
-
-      it "should create a helper spec" do
-        @generator.should create('/tmp/spec/helpers/john/monkey/stuff_helper_spec.rb')
-      end
       
       it "should render templates successfully" do
         lambda { @generator.render! }.should_not raise_error
@@ -91,10 +75,6 @@ describe Merb::Generators::ControllerGenerator do
       before do
         @generator = Merb::Generators::ControllerGenerator.new('/tmp', { :testing_framework => :test_unit }, 'John::Monkey::Stuff')
       end
-
-      it "should create a controller test" do
-        @generator.should create('/tmp/test/controllers/john/monkey/stuff_test.rb')
-      end
       
       it "should render templates successfully" do
         lambda { @generator.render! }.should_not raise_error

data/spec/{merb_full_spec.rb → merb_core_spec.rb}

@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Merb::Generators::MerbFullGenerator do
+describe Merb::Generators::MerbCoreGenerator do
   
   describe "templates" do
     
     before do
-      @generator = Merb::Generators::MerbFullGenerator.new('/tmp', {}, 'testing')
+      @generator = Merb::Generators::MerbCoreGenerator.new('/tmp', {}, 'testing')
     end
     
     it "should create an init.rb" do
@@ -19,6 +19,14 @@ describe Merb::Generators::MerbFullGenerator do
     it "should have an exceptions controller" do
       @generator.should create('/tmp/testing/app/controllers/exceptions.rb')
     end
+
+    it "should have a gitignore file" do
+      @generator.should create('/tmp/testing/.gitignore')
+    end
+    
+    it "should have an htaccess file" do
+      @generator.should create('/tmp/testing/public/.htaccess')
+    end
     
     it "should create a number of views"
     
@@ -28,4 +36,4 @@ describe Merb::Generators::MerbFullGenerator do
     
   end
   
-end
+end

data/spec/merb_stack_spec.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Merb::Generators::MerbStackGenerator do
+
+  describe "templates" do
+
+    before do
+      @generator = Merb::Generators::MerbStackGenerator.new('/tmp', {}, 'testing')
+    end
+
+    it "should create config/init.rb" do
+      @generator.should create('/tmp/testing/config/init.rb')
+    end
+
+    it "should create config/dependencies.rb" do
+      @generator.should create('/tmp/testing/config/dependencies.rb')
+    end
+
+    it "should create config/database.yml" do
+      @generator.should create('/tmp/testing/config/database.yml')
+    end
+
+    it "should have an application controller" do
+      @generator.should create('/tmp/testing/app/controllers/application.rb')
+    end
+
+    it "should have an exceptions controller" do
+      @generator.should create('/tmp/testing/app/controllers/exceptions.rb')
+    end
+
+    it "should have a gitignore file" do
+      @generator.should create('/tmp/testing/.gitignore')
+    end
+
+    it "should have an htaccess file" do
+      @generator.should create('/tmp/testing/public/.htaccess')
+    end
+
+    it "should create a number of views"
+
+    it "should render templates successfully" do
+      lambda { @generator.render! }.should_not raise_error
+    end
+
+  end
+
+end

data/spec/part_controller_spec.rb

@@ -16,26 +16,6 @@ describe Merb::Generators::PartControllerGenerator do
     @generator.should create('/tmp/app/parts/views/stuff_part/index.html.erb')
   end
   
-  it "should create a helper" do
-    @generator.should create('/tmp/app/helpers/stuff_part_helper.rb')
-  end
-  
-  describe "with rspec" do
-    
-    it "should create a controller spec"
-
-    it "should create a helper spec" do
-      @generator.should create('/tmp/spec/helpers/stuff_part_helper_spec.rb')
-    end
-    
-  end
-  
-  describe "with test_unit" do
-    
-    it "should create a controller test"
-    
-  end
-  
   describe "with a namespace" do
     
     before(:each) do
@@ -50,25 +30,6 @@ describe Merb::Generators::PartControllerGenerator do
       @generator.should create('/tmp/app/parts/views/john/monkey/stuff_part/index.html.erb')
     end
 
-    it "should create a helper" do
-      @generator.should create('/tmp/app/helpers/john/monkey/stuff_part_helper.rb')
-    end
-
-    describe "with rspec" do
-
-      it "should create a controller spec"
-
-      it "should create a helper spec" do
-        @generator.should create('/tmp/spec/helpers/john/monkey/stuff_part_helper_spec.rb')
-      end
-
-    end
-
-    describe "with test_unit" do
-
-      it "should create a controller test"
-
-    end
   end
   
 end