mack 0.6.1.2 → 0.7.0

data/lib/mack/generators/controller_generator/manifest.yml

@@ -0,0 +1,18 @@
+controller_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "app", "controllers", "controller.rb.template") %>
+  output_path: <%= File.join("app", "controllers", "#{@name_plural}_controller.rb") %>
+views_migrations:
+  type: directory
+  output_path: <%= File.join("app", "views", @name_plural) %>
+<% if app_config.mack.testing_framework == "test_case" -%>
+test_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "controllers", "test_case.rb.template") %>
+  output_path: <%= File.join("test", "controllers", "#{@name_plural}_controller_test.rb") %>
+<% elsif app_config.mack.testing_framework == "rspec" -%>
+test_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "controllers", "rspec.rb.template") %>
+  output_path: <%= File.join("test", "controllers", "#{@name_plural}_controller_spec.rb") %>
+<% end -%>

data/lib/mack/generators/controller_generator/templates/app/controllers/controller.rb.template

@@ -0,0 +1,7 @@
+class <%= @name_plural_camel %>Controller
+  include Mack::Controller
+  <% @actions.each do |action| %>
+  def <%= action %>
+  end
+  <% end %>
+end

data/lib/mack/generators/controller_generator/templates/test/controllers/rspec.rb.template

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
+
+describe <%= @name_plural_camel %>Controller do
+  <% @actions.each do |action| %>
+  describe "<%= action %>" do
+    
+    it "should get the <%= action %> action" do
+      get <%= @name_plural %>_<%= action %>_url
+      response.should be_successful
+      response.body.should match(/<%= @name_plural_camel %>Controller#<%= action %>/)
+    end
+    
+  end
+  <% end %>
+end

data/lib/mack/generators/controller_generator/templates/test/controllers/test_case.rb.template

@@ -0,0 +1,15 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper.rb")
+
+class <%= @name_plural_camel %>ControllerTest < Test::Unit::TestCase
+  
+  def test_truth
+    assert true
+  end
+  <% @actions.each do |action| %>
+  def test_<%= action %>
+    get <%= @name_plural %>_<%= action %>_url
+    assert response.successful?
+    assert_match /<%= @name_plural_camel %>Controller#<%= action %>/, response.body
+  end
+  <% end %>
+end

data/lib/mack/generators/controller_helper_generator/controller_helper_generator.rb

@@ -0,0 +1,16 @@
+# Generates controller helpers for Mack applications.
+# 
+# Example:
+#   rake generate:controller_helper name=post
+class ControllerHelperGenerator < Genosaurus
+  
+  require_param :name
+  
+  def setup # :nodoc:
+    @name_singular = param(:name).singular.underscore
+    @name_plural = param(:name).plural.underscore
+    @name_singular_camel = @name_singular.camelcase
+    @name_plural_camel = @name_plural.camelcase
+  end
+  
+end

data/lib/mack/generators/controller_helper_generator/manifest.yml

@@ -0,0 +1,15 @@
+helper_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "app", "helpers", "controllers", "helper.rb.template") %>
+  output_path: <%= File.join("app", "helpers", "controllers", "#{@name_plural}_controller_helper.rb") %>
+<% if app_config.mack.testing_framework == "test_case" -%>
+helper_test_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "test_case.rb.template") %>
+  output_path: <%= File.join("test", "helpers", "controllers", "#{@name_plural}_controller_helper_test.rb") %>
+<% elsif app_config.mack.testing_framework == "rspec" -%>
+helper_test_template:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "rspec.rb.template") %>
+  output_path: <%= File.join("test", "helpers", "controllers", "#{@name_plural}_controller_helper_spec.rb") %>
+<% end -%>

data/lib/mack/generators/controller_helper_generator/templates/app/helpers/controllers/helper.rb.template

@@ -0,0 +1,7 @@
+module Mack
+  module ControllerHelpers
+    module <%= @name_plural_camel %>Controller
+      # methods here will automatically be included as protected methods into <%= @name_plural_camel %>Controller as protected methods.
+    end
+  end
+end

data/lib/mack/generators/controller_helper_generator/templates/test/helpers/controllers/rspec.rb.template

@@ -0,0 +1,6 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+describe Mack::ControllerHelpers::<%= @name_plural_camel %>Controller do
+  include Mack::ControllerHelpers::<%= @name_plural_camel %>Controller
+  
+end

data/lib/mack/generators/controller_helper_generator/templates/test/helpers/controllers/test_case.rb.template

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+
+class <%= @name_plural_camel %>ControllerHelperTest < Test::Unit::TestCase
+  include Mack::ControllerHelpers::<%= @name_plural_camel %>Controller
+  
+  def test_truth
+    assert true
+  end
+  
+end

data/lib/mack/generators/mack_application_generator/mack_application_generator.rb

@@ -1,3 +1,4 @@
+require File.join(File.dirname(__FILE__), "..", "..", "version")
 class MackApplicationGenerator < Genosaurus
   
   def app_name

data/lib/mack/generators/mack_application_generator/manifest.yml

@@ -74,16 +74,24 @@ test_helper:
   type: file
   template_path: <%= File.join(templates_directory_path, "test", "test_helper.rb.template") %>
   output_path: <%= File.join(app_name, "test", "test_helper.rb") %>
-test_functional:
+test_controllers:
   type: directory
-  output_path: <%= File.join(app_name, "test", "functional") %>
+  output_path: <%= File.join(app_name, "test", "controllers") %>
 test_example:
   type: file
-  template_path: <%= File.join(templates_directory_path, "test", "functional", "default_controller_test.rb.template") %>
-  output_path: <%= File.join(app_name, "test", "functional", "default_controller_test.rb") %>
-test_unit:
+  template_path: <%= File.join(templates_directory_path, "test", "controllers", "default_controller_test.rb.template") %>
+  output_path: <%= File.join(app_name, "test", "controllers", "default_controller_test.rb") %>
+test_models:
   type: directory
-  output_path: <%= File.join(app_name, "test", "unit") %>
+  output_path: <%= File.join(app_name, "test", "models") %>
+helper_test_example:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "default_controller_helper_test.rb.template") %>
+  output_path: <%= File.join(app_name, "test", "helpers", "controllers", "default_controller_helper_test.rb") %>
+app_helper_test_example:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "application_helper_test.rb.template") %>
+  output_path: <%= File.join(app_name, "test", "helpers", "view", "application_helper_test.rb") %>
 <% elsif testing_framework == "rspec" %>
 test_spec_helper:
   type: file
@@ -95,11 +103,19 @@ test_spec_opts:
   output_path: <%= File.join(app_name, "test", "spec.opts") %>
 test_spec_example:
   type: file
-  template_path: <%= File.join(templates_directory_path, "test", "functional", "default_controller_spec.rb.template") %>
-  output_path: <%= File.join(app_name, "test", "functional", "default_controller_spec.rb") %>
-test_spec_unit:
+  template_path: <%= File.join(templates_directory_path, "test", "controllers", "default_controller_spec.rb.template") %>
+  output_path: <%= File.join(app_name, "test", "controllers", "default_controller_spec.rb") %>
+helper_test_spec_example:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "default_controller_helper_spec.rb.template") %>
+  output_path: <%= File.join(app_name, "test", "helpers", "controllers", "default_controller_helper_spec.rb") %>
+app_helper_test_spec_example:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "application_helper_spec.rb.template") %>
+  output_path: <%= File.join(app_name, "test", "helpers", "views", "application_helper_spec.rb") %>
+test_spec_models:
   type: directory
-  output_path: <%= File.join(app_name, "test", "unit") %>
+  output_path: <%= File.join(app_name, "test", "models") %>
 <% end %>
 
 # Plugins

data/lib/mack/generators/mack_application_generator/templates/Rakefile.template

@@ -2,5 +2,5 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-gem 'mack', '<%= @options["version"] %>'
+gem 'mack', '<%= Mack::VERSION %>'
 require 'mack_tasks'

data/lib/mack/generators/mack_application_generator/templates/app/controllers/default_controller.rb.template

@@ -1,7 +1,13 @@
+# This controller has been generated so we can give you a 'pretty' and dynamic welcome page.
+# You are under no obligation to extend from this controller, as some other frameworks would
+# you too. :) If you do decide to extend this controller, you'll be happy to know that it
+# will get loaded first, before your other controllers, so it will be present for their use.
 class DefaultController
   include Mack::Controller
   
-  # /
+  # '/'
+  # Note: You do not need to actually have an empty action like this defined for Mack to
+  # find the view on disk. This is only included here for the sake of 'completeness'.
   def index
   end
 

data/lib/mack/generators/mack_application_generator/templates/app/helpers/controllers/default_controller_helper.rb.template

@@ -1,7 +1,7 @@
 module Mack
   module ControllerHelpers
     module DefaultController
-      # Anything in this module will be included into the DefaultController
+      # Anything in this module will be included into the DefaultController as protected methods.
     end
   end
 end

data/lib/mack/generators/mack_application_generator/templates/app/helpers/views/application_helper.rb.template

@@ -1,4 +1,7 @@
 module Mack
+  # Any modules below Mack::ViewHelpers will automatically be included into all views.
+  # If you would like to include all Mack::ViewHelpers modules into another class you
+  # can do so by simply including Mack::ViewHelpers
   module ViewHelpers
     module ApplicationHelper
       # Anything in this module will be included into all views

data/lib/mack/generators/mack_application_generator/templates/app/views/default/index.html.erb.template

@@ -1,3 +1,61 @@
-<h1>Welcome to your Mack application!</h1>
+<div>
+  <h1>Welcome to your Mack application!</h1>
 
-<p>If you are seeing this page, it means that your Mack application has been generated properly!</p>
+  <h4>If you are seeing this page, it means that your Mack application has been generated properly!</h4>
+</div>
+
+<div id="general_info_div">
+  <h4>General Information:</h4>
+  <table>
+    <tr>
+      <td align="right">Generated with Mack Version:</td>
+      <td><%= Mack::VERSION %></td>
+    </tr>
+    <tr>
+      <td align="right">Running with Mack Version:</td>
+      <td><%%= Mack::VERSION %></td>
+    </tr>
+    <tr>
+      <td align="right">Mack Root:</td>
+      <td><%%= Mack.root %></td>
+    </tr>
+    <tr>
+      <td align="right">Current Environment:</td>
+      <td><%%= Mack.env %></td>
+    </tr>
+  </table>
+</div>
+
+<%% unless required_gem_list.empty? -%>
+<div id="gems_div">
+  <h4>Gems:</h4>
+  <%% required_gem_list.each do |g| -%>
+    <p>-- <%%= g %></p>
+  <%% end -%>
+</div>
+<%% end -%>
+
+<div id="request_div">
+  <h4>Request:</h4>
+  <%%= debug request %>
+</div>
+
+<div id="cookies_div">
+  <h4>Cookies:</h4>
+  <%%= debug cookies %>
+</div>
+
+<div id="parameters_div">
+  <h4>Parameters:</h4>
+  <%%= debug params %>
+</div>
+
+<div id="session_div">
+  <h4>Session:</h4>
+  <%%= debug session %>
+</div>
+
+<div id="config_div">
+  <h4>Configuration:</h4>
+  <%%= debug Mack::Configuration.dump %>
+</div>

data/lib/mack/generators/mack_application_generator/templates/app/views/layouts/application.html.erb.template

@@ -5,11 +5,19 @@
 <head>
   <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
   <title><%%= controller.controller_name %>: <%%= controller.action_name %></title>
-  <link href="/stylesheets/scaffold.css" media="screen" rel="stylesheet" type="text/css" />
+  <%%= stylesheet 'scaffold.css' %>
 </head>
 <body>
 
-<%%= yield_to :view  %>
+<div id="wrapper">
+
+  <%% if tell[:notice] -%>
+    <div id="tell_notice"><%%= tell[:notice] %></div>
+  <%% end -%>
+
+  <div><%%= yield_to :view  %></div>
+
+</div>
 
 </body>
 </html>

data/lib/mack/generators/mack_application_generator/templates/config/app_config/default.yml.template

@@ -1,3 +1,24 @@
+# This is where you would override any of the default Mack configuration settings,
+# as well as create your own settings. The configuration settings for your environment
+# can be dumped out using this rake task:
+# 
+#   rake mack:dump:config#<environment>
+# 
+# Configuration parameters can be used in your application like such:
+# 
+#   app_config.<setting_name>
+# 
+# Nested parameters can be defined using ::.
+# 
+# Examples:
+# default.yml:
+#   default_time_limit: <%%= 15.minutes %>
+#   api::timeout_limit: <%%= 15.seconds %>
+# 
+# app_config.default_time_limit # => 900
+# app_config.api.timeout_limit # => 15
+
+
 whiny_config_missing: false
 
 mack::session_id: _<%= @options["app"].downcase %>_session_id

data/lib/mack/generators/mack_application_generator/templates/config/app_config/development.yml.template

@@ -0,0 +1 @@
+# Any settings in here will override the settings in default.yml for the development environment.

data/lib/mack/generators/mack_application_generator/templates/config/app_config/production.yml.template

@@ -0,0 +1 @@
+# Any settings in here will override the settings in default.yml for the production environment.

data/lib/mack/generators/mack_application_generator/templates/config/app_config/test.yml.template

@@ -0,0 +1 @@
+# Any settings in here will override the settings in default.yml for the test environment.

data/lib/mack/generators/mack_application_generator/templates/config/database.yml.template

@@ -26,6 +26,30 @@ when "data_mapper"
 #     username: root
 #     password:
 
+# development:
+#   default:
+#     adapter: postgres
+#     database: <%= @options["app"].downcase %>_development
+#     host: localhost
+#     username: root
+#     password: 
+#     
+# test:
+#   default:
+#     adapter: postgres
+#     database: <%= @options["app"].downcase %>_test
+#     host: localhost
+#     username: root
+#     password:
+# 
+# production:
+#   default:
+#     adapter: postgres
+#     database: <%= @options["app"].downcase %>_production
+#     host: localhost
+#     username: root
+#     password:
+
 development:
   default:
     adapter: sqlite3

data/lib/mack/generators/mack_application_generator/templates/config/initializers/inflections.rb.template

@@ -0,0 +1,13 @@
+# You can define your own rules for the Inflector here.
+Mack::Utils::Inflector.inflections do |inflect|
+
+  # Example of defining a plural rule:
+  # inflect.plural('ox', 'oxen')
+
+  # Example of defining a singular rule:
+  # inflect.singular('oxen', 'ox')
+
+  # Example of defining an 'irregular' rule:
+  # inflect.irregular('person', 'people')
+  
+end

data/lib/mack/generators/mack_application_generator/templates/config/initializers/mime_types.rb.template

@@ -1,3 +1,4 @@
 # Register mime types for a file extension in this file.
+# 
 # Example:
 # Mack::Utils::MimeTypes.register(:iphone, "app/iphone")

data/lib/mack/generators/mack_application_generator/templates/public/stylesheets/scaffold.css.template

@@ -1,4 +1,65 @@
-body { background-color: #fff; color: #333; }
+/* http://meyerweb.com/eric/tools/css/reset/ v1.0 | 20080212 */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  font-size: 100%;
+  vertical-align: baseline;
+  background: transparent;
+}
+body {
+  line-height: 1;
+}
+ol, ul {
+  list-style: none;
+}
+blockquote, q {
+  quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+  content: '';
+  content: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+  outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+  text-decoration: none;
+}
+del {
+  text-decoration: line-through;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+
+/* @override public/stylesheets/scaffold.css */
+
+body { 
+  background-color: #e6e6e6; color: #333;
+  text-align: center;
+  min-width: 1px;
+  padding: 10px;
+}
 
 body, p, ol, ul, td {
   font-family: verdana, arial, helvetica, sans-serif;
@@ -12,9 +73,49 @@ pre {
   font-size: 11px;
 }
 
-a { color: #000; }
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
+h1 {
+  font-size: xx-large;
+}
+
+h2 {
+  font-size: x-large;
+}
+
+h3 {
+  font-size: large;
+}
+
+h1, h2, h3 {
+  padding: 5px 0px 10px 0px;
+}
+
+td, th {
+  padding: 2px;
+}
+
+div {
+  padding: 2px;
+  margin: 2px;
+  border: 1px dotted #999;
+}
+
+a {
+  color: #000;
+}
+
+a:visited {
+  color: #666;
+}
+
+a:hover {
+  color: #fff;
+  background-color:#000;
+}
+
+label {
+  font-weight: bold;
+  display: block;
+}
 
 .fieldWithErrors {
   padding: 2px;
@@ -22,13 +123,23 @@ a:hover { color: #fff; background-color:#000; }
   display: table;
 }
 
+#wrapper {
+  background-color: #fff;
+  border-style: dotted;
+  border-width: 1px;
+  margin: 0 auto; 
+  text-align: left;
+  width: 80%;
+  padding: 4px;
+}
+
 #errorExplanation {
   width: 400px;
-  border: 2px solid red;
-  padding: 7px;
+  border: 2px solid #c00;
   padding-bottom: 12px;
   margin-bottom: 20px;
   background-color: #f0f0f0;
+  padding: 2px;  
 }
 
 #errorExplanation h2 {
@@ -36,39 +147,24 @@ a:hover { color: #fff; background-color:#000; }
   font-weight: bold;
   padding: 5px 5px 5px 15px;
   font-size: 12px;
-  margin: -7px;
+  margin: -4px;
   background-color: #c00;
   color: #fff;
 }
 
-#errorExplanation p {
-  color: #333;
-  margin-bottom: 0;
-  padding: 5px;
-}
-
 #errorExplanation ul li {
   font-size: 12px;
   list-style: square;
 }
 
-div.uploadStatus {
-  margin: 5px;
-}
-
-div.progressBar {
-  margin: 5px;
-}
-
-div.progressBar div.border {
-  background-color: #fff;
-  border: 1px solid gray;
-  width: 100%;
+#errorExplanation ol, ul {
+  padding-left: 27px;
+  padding-top: 15px;
+  padding-bottom: 7px;
 }
 
-div.progressBar div.background {
-  background-color: #333;
-  height: 18px;
-  width: 0%;
+#tell_notice {
+  color: green;
+  display: inline-block;
 }