mack 0.8.2 → 0.8.3

data/lib/mack/boot/plugins.rb

@@ -11,7 +11,7 @@ run_once do
   Mack.search_path(:plugins).each do |path|
     Dir.glob(File.join(path, '*')).each do |d|
       plugins << d
-      $: << File.join(d, "lib") # add the lib for this plugin to the global load path
+      $: << File.join(d, 'lib') # add the lib for this plugin to the global load path
     end
   end
   plugins.sort.each do |plug|
@@ -20,7 +20,7 @@ run_once do
     rescue Exception => e
       puts e.message
     end
-    $:.delete(File.join(plug, "lib")) # remove the plugins lib directory from the global load path.
+    $:.delete(File.join(plug, 'lib')) # remove the plugins lib directory from the global load path.
   end
   
 end

data/lib/mack/controller/controller.rb

@@ -38,7 +38,7 @@ module Mack
 
     # Gives access to all the parameters for this request.
     def params
-      self.request.all_params
+      self.request.params
     end
 
     # Gives access to the session. See Mack::Session for more information.
@@ -91,7 +91,7 @@ module Mack
       options = {:status => 302}.merge(options)
       raise Rack::ForwardRequest.new(url) if options[:server_side]
       response.status = options[:status]
-      response[:location] = url
+      response['Location'] = url
       render(:text, redirect_html(request.path_info, url, options[:status]))
     end
 

data/lib/mack/controller/request.rb

@@ -5,22 +5,48 @@ module Mack
     autoload :DateTimeParameter, File.join_from_here('request', 'date_time_parameter')
     autoload :Parameters, File.join_from_here('request', 'parameters')
     
+    alias_instance_method :params, :original_parameters # :nodoc:
+    
     def initialize(env) # :nodoc:
       super(env)
-      @mack_params = Mack::Request::Parameters.new
-      parse_params(rack_params)
     end
     
-    alias_instance_method :params, :rack_params # :nodoc:
+    # Gives access to the session. See Mack::Session for more information.
+    attr_accessor :session 
         
     # Merges another Hash with the parameters for this request.
     def merge_params(opts = {})
       parse_params(opts)
     end
     
-    # Gives access to the session. See Mack::Session for more information.
-    attr_accessor :session 
+    # Gives access to the request parameters. This includes 'get' parameters, 'post' parameters
+    # as well as parameters from the routing process. The parameter will also be 'unescaped'
+    # when it is returned.
+    # 
+    # Example:
+    #   uri: '/users/1?foo=bar'
+    #   route: '/users/:id' => {:controller => 'users', :action => 'show'}
+    #   parameters: {:controller => 'users', :action => 'show', :id => 1, :foo => "bar"}
+    def params
+      unless @mack_params
+        @mack_params = Mack::Request::Parameters.new
+        parse_params(original_parameters)
+      end
+      @mack_params
+    end
+    
+    def params=(p) # :nodoc:
+      @mack_params = Mack::Request::Parameters.new
+      parse_params(p)
+    end
     
+    # Returns a Mack::Request::UploadedFile object.
+    def file(key)
+      ivar_cache("file_#{key}") do
+        Mack::Request::UploadedFile.new(params[key] ||= {})
+      end
+    end
+
     # Examples:
     #  http://example.org
     #  https://example.org
@@ -56,33 +82,7 @@ module Mack
       end
       return full_host
     end
-    
-    # Gives access to the request parameters. This includes 'get' parameters, 'post' parameters
-    # as well as parameters from the routing process. The parameter will also be 'unescaped'
-    # when it is returned.
-    # 
-    # Example:
-    #   uri: '/users/1?foo=bar'
-    #   route: '/users/:id' => {:controller => 'users', :action => 'show'}
-    #   parameters: {:controller => 'users', :action => 'show', :id => 1, :foo => "bar"}
-    def params
-      @mack_params
-    end
-    
-    def params=(p) # :nodoc:
-      @mack_params = Mack::Request::Parameters.new
-      parse_params(p)
-    end
-    
-    alias_instance_method :params, :all_params
-    
-    # Returns a Mack::Request::UploadedFile object.
-    def file(key)
-      ivar_cache("file_#{key}") do
-        Mack::Request::UploadedFile.new(params[key] ||= {})
-      end
-    end
-    
+
     private
     def named_host?(host)
       !(host.nil? || /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.match(host))

data/lib/mack/core_extensions/kernel.rb

@@ -78,7 +78,7 @@ module Kernel
       # puts "gem_name: #{gem_name}"
       
       # try to normalize the version requirement string
-      ver = version_requirements.to_s.strip
+      ver = [version_requirements].flatten.first.to_s.strip
       if ver == nil || ver.empty?
         ver = '> 0.0.0'
       else

data/lib/mack/generators/controller_generator/controller_generator.rb

@@ -1,7 +1,13 @@
 # Generates a controller for Mack applications.
 # 
 # Example:
-#   rake generate:controller name=post
+#   rake generate:controller name=post # => Generates a PostsController that includes Mack::Controller.
+# 
+# Or you can get the generator to create some actions for you this way:
+#   rake generator:controller name=post actions=index,show # => Generates a PostController with a placeholder for the index and show actions.
+#   
+# Finally, the controller generator includes a magic word for the actions parameter:
+#   rake generator:controller name=post actions=restful # => Generates a PostsController with the 7 rest actions.
 class ControllerGenerator < Genosaurus
   
   require_param :name
@@ -12,7 +18,11 @@ class ControllerGenerator < Genosaurus
     @name_singular_camel = @name_singular.camelcase
     @name_plural_camel = @name_plural.camelcase
     @actions = []
-    @actions = param(:actions).split(",") unless param(:actions).blank?
+    if param(:actions).to_s == "restful"
+      @actions = %w{index show new edit create update destroy}
+    else      
+      @actions = param(:actions).split(",") unless param(:actions).blank?
+    end
   end
   
   def after_generate # :nodoc:
@@ -29,7 +39,7 @@ class ControllerGenerator < Genosaurus
       unless rf.match(".resource :#{@name_plural}")
         puts "Updating routes.rb"
         nrf = ""
-        rf.each do |line|
+        rf.each_line do |line|
           if line.match("Mack::Routes.build")
             x = line.match(/\|(.+)\|/).captures
             line << "\n  # Added by rake generate:controller name=#{param(:name)} actions=#{param(:actions)}"
@@ -50,7 +60,7 @@ class ControllerGenerator < Genosaurus
   
   def add_actions
     @actions.each do |action|
-      template(action_template(action), File.join("app", "views", @name_plural, "#{action}.html.erb"))
+      template(action_template(action), File.join('app', 'views', @name_plural, "#{action}.html.erb"))
     end    
   end
   

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

@@ -1,18 +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") %>
+  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) %>
+  output_path: <%= File.join('app', 'views', @name_plural) %>
 <% if configatron.mack.testing_framework.to_s == "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") %>
+  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 configatron.mack.testing_framework.to_s == "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") %>
+  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/test/controllers/rspec.rb.template

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
+require File.join(File.dirname(__FILE__), '..', "spec_helper.rb")
 
 describe <%= @name_plural_camel %>Controller do
   <% @actions.each do |action| %>

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

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper.rb")
+require File.join(File.dirname(__FILE__), '..', "test_helper.rb")
 
 class <%= @name_plural_camel %>ControllerTest < Test::Unit::TestCase
   

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

@@ -1,15 +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") %>
+  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 configatron.mack.testing_framework.to_s == "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") %>
+  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 configatron.mack.testing_framework.to_s == "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") %>
+  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/mack_application_generator/mack_application_generator.rb

@@ -1,8 +1,8 @@
-require File.join(File.dirname(__FILE__), "..", "..", "version")
+require File.join(File.dirname(__FILE__), '..', '..', "version")
 class MackApplicationGenerator < Genosaurus
   
   def app_name
-    @options["app"].underscore.downcase
+    @options['app'].underscore.downcase
   end
   
   def testing_framework

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

@@ -1,62 +1,62 @@
 # Files:
 default_controller:
   type: file
-  template_path: <%= File.join(templates_directory_path, "app", "controllers", "default_controller.rb.template") %>
-  output_path: <%= File.join(app_name, "app", "controllers", "default_controller.rb") %>
+  template_path: <%= File.join(templates_directory_path, 'app', 'controllers', "default_controller.rb.template") %>
+  output_path: <%= File.join(app_name, 'app', 'controllers', "default_controller.rb") %>
 application_helper:
   type: file
-  template_path: <%= File.join(templates_directory_path, "app", "helpers", "views", "application_helper.rb.template") %>
-  output_path: <%= File.join(app_name, "app", "helpers", "views", "application_helper.rb") %>
+  template_path: <%= File.join(templates_directory_path, 'app', 'helpers', 'views', "application_helper.rb.template") %>
+  output_path: <%= File.join(app_name, 'app', 'helpers', 'views', "application_helper.rb") %>
 default_controller_helper:
   type: file
-  template_path: <%= File.join(templates_directory_path, "app", "helpers", "controllers", "default_controller_helper.rb.template") %>
-  output_path: <%= File.join(app_name, "app", "helpers", "controllers", "default_controller_helper.rb") %>
+  template_path: <%= File.join(templates_directory_path, 'app', 'helpers', 'controllers', "default_controller_helper.rb.template") %>
+  output_path: <%= File.join(app_name, 'app', 'helpers', 'controllers', "default_controller_helper.rb") %>
 index_view:
   type: file
-  template_path: <%= File.join(templates_directory_path, "app", "views", "default", "index.html.erb.template") %>
-  output_path: <%= File.join(app_name, "app", "views", "default", "index.html.erb") %>
+  template_path: <%= File.join(templates_directory_path, 'app', 'views', "default", "index.html.erb.template") %>
+  output_path: <%= File.join(app_name, 'app', 'views', "default", "index.html.erb") %>
 application_layout:
   type: file
-  template_path: <%= File.join(templates_directory_path, "app", "views", "layouts", "application.html.erb.template") %>
-  output_path: <%= File.join(app_name, "app", "views", "layouts", "application.html.erb") %>
-<% ["default", "development", "production", "test"].each do |env| -%>
+  template_path: <%= File.join(templates_directory_path, 'app', 'views', 'layouts', "application.html.erb.template") %>
+  output_path: <%= File.join(app_name, 'app', 'views', 'layouts', "application.html.erb") %>
+<% ["default", 'development', "production", 'test'].each do |env| -%>
 <%= env %>_yml:
   type: file
-  template_path: <%= File.join(templates_directory_path, "config", "configatron", "#{env}.rb.template") %>
-  output_path: <%= File.join(app_name, "config", "configatron", "#{env}.rb") %>
+  template_path: <%= File.join(templates_directory_path, 'config', 'configatron', "#{env}.rb.template") %>
+  output_path: <%= File.join(app_name, 'config', 'configatron', "#{env}.rb") %>
 <% end -%>
 database_yml:
   type: file
-  template_path: <%= File.join(templates_directory_path, "config", "database.yml.template") %>
-  output_path: <%= File.join(app_name, "config", "database.yml") %>
+  template_path: <%= File.join(templates_directory_path, 'config', "database.yml.template") %>
+  output_path: <%= File.join(app_name, 'config', 'database.yml') %>
 <% ["routes.rb"].each do |f| -%>
 <%= f %>_config_file:
   type: file
-  template_path: <%= File.join(templates_directory_path, "config", "#{f}.template") %>
-  output_path: <%= File.join(app_name, "config", f) %>
+  template_path: <%= File.join(templates_directory_path, 'config', "#{f}.template") %>
+  output_path: <%= File.join(app_name, 'config', f) %>
 <% end -%>
 <% [:gems, :inflections, :mime_types, :portlets].each do |f| -%>
 initializers_<%= f %>_rb:
   type: file
-  template_path: <%= File.join(templates_directory_path, "config", "initializers", "#{f}.rb.template") %>
-  output_path: <%= File.join(app_name, "config", "initializers", "#{f}.rb") %>
+  template_path: <%= File.join(templates_directory_path, 'config', 'initializers', "#{f}.rb.template") %>
+  output_path: <%= File.join(app_name, 'config', 'initializers', "#{f}.rb") %>
 <% end -%>
 favicon:
   type: file
-  template_path: <%= File.join(templates_directory_path, "public", "favicon.ico.template") %>
-  output_path: <%= File.join(app_name, "public", "favicon.ico") %>
+  template_path: <%= File.join(templates_directory_path, 'public', "favicon.ico.template") %>
+  output_path: <%= File.join(app_name, 'public', "favicon.ico") %>
 404:
   type: file
-  template_path: <%= File.join(templates_directory_path, "public", "404.html.template") %>
-  output_path: <%= File.join(app_name, "public", "404.html") %>
+  template_path: <%= File.join(templates_directory_path, 'public', "404.html.template") %>
+  output_path: <%= File.join(app_name, 'public', "404.html") %>
 500:
   type: file
-  template_path: <%= File.join(templates_directory_path, "public", "500.html.template") %>
-  output_path: <%= File.join(app_name, "public", "500.html") %>
+  template_path: <%= File.join(templates_directory_path, 'public', "500.html.template") %>
+  output_path: <%= File.join(app_name, 'public', "500.html") %>
 scaffold_css:
   type: file
-  template_path: <%= File.join(templates_directory_path, "public", "stylesheets", "scaffold.css.template") %>
-  output_path: <%= File.join(app_name, "public", "stylesheets", "scaffold.css") %>
+  template_path: <%= File.join(templates_directory_path, 'public', 'stylesheets', "scaffold.css.template") %>
+  output_path: <%= File.join(app_name, 'public', 'stylesheets', "scaffold.css") %>
 rakefile:
   type: file
   template_path: <%= File.join(templates_directory_path, "Rakefile.template") %>
@@ -65,70 +65,73 @@ rakefile:
 # Directories:
 models:
   type: directory
-  output_path: <%= File.join(app_name, "app", "models") %>
+  output_path: <%= File.join(app_name, 'app', 'models') %>
 lib_tasks:
   type: directory
-  output_path: <%= File.join(app_name, "lib", "tasks") %>
+  output_path: <%= File.join(app_name, 'lib', 'tasks') %>
 db_migrations:
   type: directory
-  output_path: <%= File.join(app_name, "db", "migrations") %>
-<% ["images", "javascripts"].each do |f| -%>
+  output_path: <%= File.join(app_name, 'db', 'migrations') %>
+<% ['images', 'javascripts'].each do |f| -%>
 public_<%= f %>:
   type: directory
-  output_path: <%= File.join(app_name, "public", f) %>
+  output_path: <%= File.join(app_name, 'public', f) %>
 <% end -%>
+form_builders:
+  type: directory
+  output_path: <%= File.join(app_name, 'app', "form_builders") %>
 
 # Test
 <% if testing_framework == "test_case" %>
 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") %>
+  template_path: <%= File.join(templates_directory_path, 'test', "test_helper.rb.template") %>
+  output_path: <%= File.join(app_name, 'test', "test_helper.rb") %>
 test_controllers:
   type: directory
-  output_path: <%= File.join(app_name, "test", "controllers") %>
+  output_path: <%= File.join(app_name, 'test', 'controllers') %>
 test_example:
   type: file
-  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") %>
+  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", "models") %>
+  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") %>
+  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") %>
+  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
-  template_path: <%= File.join(templates_directory_path, "test", "spec_helper.rb.template") %>
-  output_path: <%= File.join(app_name, "test", "spec_helper.rb") %>
+  template_path: <%= File.join(templates_directory_path, 'test', "spec_helper.rb.template") %>
+  output_path: <%= File.join(app_name, 'test', "spec_helper.rb") %>
 test_spec_opts:
   type: file
-  template_path: <%= File.join(templates_directory_path, "test", "spec.opts.template") %>
-  output_path: <%= File.join(app_name, "test", "spec.opts") %>
+  template_path: <%= File.join(templates_directory_path, 'test', "spec.opts.template") %>
+  output_path: <%= File.join(app_name, 'test', "spec.opts") %>
 test_spec_example:
   type: file
-  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") %>
+  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") %>
+  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") %>
+  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", "models") %>
+  output_path: <%= File.join(app_name, 'test', 'models') %>
 <% end %>
 
 # Plugins
 vendor_plugins:
   type: directory
-  output_path: <%= File.join(app_name, "vendor", "plugins") %>
+  output_path: <%= File.join(app_name, 'vendor', 'plugins') %>

data/lib/mack/generators/mack_application_generator/templates/config/configatron/default.rb.template

@@ -18,7 +18,7 @@
 # configatron.default_time_limit # => 900
 # configatron.api.timeout_limit # => 15
 
-configatron.mack.session_id = '_<%= @options["app"].downcase %>_session_id'
+configatron.mack.session_id = '_<%= @options['app'].downcase %>_session_id'
 configatron.mack.testing_framework = '<%= @options["testing_framework"] %>'
 configatron.default_secret_key = '<%= String.randomize(80) %>'