mack 0.7.0.1 → 0.7.1

data/CHANGELOG

@@ -1,3 +1,37 @@
+=== 0.7.1
+* [#153] Emails with just a single 'part' are now being sent correctly.
+* [#147] Added :confirm to button helpers.
+* [#146] [Diogo Almeida] Added :disable_with to submit_button form helper.
+* [#145] Added rake generate:<generator_name>:desc task to 'describe' a Genosaurus generator
+* [#144] INCOMPATIBILITY NOTICE: rake server is no more. Please use mackery server instead.
+* [#142] INCOMPATIBILITY NOTICE: rake console is no more. Please use mackery console instead.
+* [#140] Added Mack::BootLoader
+* [#139] Added ability to change the pattern for test files
+* [#137] Added subdomains method on request.
+* [#130] Added ability to 'reload' the console
+* [#129] DataMapper 0.9.5 support
+* [#128] Updated json_pure to 1.1.3 and removed ruby-debug dependency
+* [#127] Moved mack-paths into core
+* [#126] XSS Prevention
+* [#125] Cookie store is now the default session store, not cachetastic
+* [#124] Opened up the session store API
+* [#122] Added DataMapper session store.
+* [#121] Cookie session store support.
+* [#120] Added PassengerGenerator to generate the necessary files to run Mack with Passenger Phusion (mod_rails)
+* [#118] Mack/mack-more can be loaded from vendor/framework/mack and vendor/framework/mack-more
+* [#117] Added rake task: mack:freeze:edge
+* [#107] Updated to Rack 0.4.0
+* [#95] Removed deprecated model_* methods
+* [#94] Removed deprecated submit_tag
+* [#40] Added Mack::Utils::ContentLengthHandler so response will now have 'Content-Length' in its header.
+* [#21] Asset Hosts
+* gem: rack 0.4.0
+* gem: json_pure 1.1.3
+* gem: data_mapper 0.9.5
+* gem: genosaurus 1.2.4
+* gem: ezcrypto 0.7
+* gem: facets 2.4.4
+
 === 0.7.0.1
 gem: application_configuration 1.5.3
 gem: cachetastic 1.7.4

data/README

@@ -12,23 +12,16 @@ First things first, let's generate your application:
   $ mack <app_name>
 
 To run a Mack application:
-  $ rake mack:server:start
+  $ mackery server
 
-It will try and run the app using the following servers in this order:
-  * Thin
-  * Mongrel
-  * WEBrick
-
-rake script:server takes the following options:
-  $ rake server PORT=<port> Mack.env=<environment> HANDLER=<rack_handler>
-  
-The port and rack_handler flags don't apply if you're using Thin[http://code.macournoyer.com/thin] to run the app, which is the default if it is installed. Use the thin.yml file in your application's config directory to configure Thin. The rack_handler one will allow you to switch which server is used to run the app. See Rack for more Rack::Handlers.
+mackery server takes the following options:
+  $ mackery server -p <port> -e <environment> -h <rack_handler>
   
-The environment can also be changed like this:
-  $ rake mack:server:start#<environment>
+The rack_handler one will allow you to switch which server is used to run the app. See Rack for more Rack::Handlers.
   
 You can also run:
-  $ rake mack:console
+  $ mackery console
+  
 This will give you console level access to your application.
 
 

data/bin/env_handler.rb

@@ -0,0 +1,10 @@
+if ARGV.include?("-e")
+  ENV["MACK_ENV"] = ARGV[ARGV.index("-e") + 1] unless ENV["MACK_ENV"]
+end
+
+@mack_gem_version = nil
+begin
+  rakefile = File.read(File.join(FileUtils.pwd, 'Rakefile'))
+  @mack_gem_version = rakefile.match(/gem.['"]mack['"].+['"](.+)['"]/).captures.first
+rescue Exception => e
+end

data/bin/gem_load_path.rb

@@ -0,0 +1,25 @@
+require 'fileutils'
+require File.join(File.dirname(__FILE__), "env_handler")
+
+vendor_path = File.join(FileUtils.pwd, 'vendor')
+
+mack_path = File.join(vendor_path, 'framework', 'mack', 'lib')
+mack_more_path = File.join(vendor_path, 'framework', 'mack-more')
+# gem_path = File.join(vendor_path, 'gems')
+
+if File.exists?(mack_path)
+  $:.insert(0, File.expand_path(mack_path))
+else
+  require 'rubygems'
+  if @mack_gem_version
+    gem 'mack', @mack_gem_version
+  else
+    gem 'mack'
+  end
+end
+
+if File.exists?(mack_more_path)
+  Dir.glob(File.join(mack_more_path, '*')).each_with_index do |d, i|
+    $:.insert(i+1, File.expand_path(File.join(d, 'lib')))
+  end
+end

data/bin/mack

@@ -6,6 +6,7 @@ require 'ostruct'
 require 'pp'
 require 'erb'
 require 'genosaurus'
+require 'mack-facets'
 require File.join(File.dirname(__FILE__), "..", "lib", "mack", "generators", "mack_application_generator", "mack_application_generator")
 
 app = ARGV[0]

data/bin/mackery

@@ -0,0 +1,22 @@
+#!/usr/local/bin/ruby
+
+@app = ARGV[0]
+if @app.nil?
+  @app = "server"
+end
+
+ARGV.shift # get rid of the app name, cause we don't need it.
+@app = @app.strip.downcase
+
+case @app
+when "start"
+  @app = "server"
+else
+end
+
+require File.join(File.dirname(__FILE__), "env_handler")
+
+cmd = "mackery-#{@app} #{ARGV.join(" ")}"
+cmd << " _#{@mack_gem_version}_" if @mack_gem_version
+# puts cmd
+system cmd

data/bin/mackery-console

@@ -0,0 +1,16 @@
+#!/usr/local/bin/ruby
+# require File.join(File.dirname(__FILE__), "options_handler")
+
+require File.join(File.dirname(__FILE__), "env_handler")
+
+require File.join(File.dirname(__FILE__), "gem_load_path")
+
+libs = []
+libs << "-r irb/completion"
+mack_lib_path = File.join(FileUtils.pwd, 'vendor', 'framework', 'mack', 'lib', 'mack')
+if File.exists?(mack_lib_path)
+  libs << "-r #{File.join(mack_lib_path, 'initialization', 'console')}"  
+else
+  libs << "-r #{File.join(File.dirname(__FILE__), '..', 'lib', 'mack', 'initialization', 'console')}"
+end
+system "irb #{libs.join(" ")} --simple-prompt"

data/bin/mackery-server

@@ -0,0 +1,41 @@
+#!/usr/local/bin/ruby
+# require File.join(File.dirname(__FILE__), "options_handler")
+
+require File.join(File.dirname(__FILE__), "env_handler")
+
+require File.join(File.dirname(__FILE__), "gem_load_path")
+
+require 'rubygems'
+
+require 'fileutils'
+require 'thin'
+
+require 'mack'
+
+handler = "thin"
+
+if ARGV.include?("-h")
+  handler = ARGV[ARGV.index("-h") + 1]
+  ARGV.delete("-h")
+  ARGV.delete(handler)
+end
+
+if handler == "thin"
+  # thin_opts = ["start", ARGV]
+  thin_opts = []
+  if ARGV[0] == "start" || ARGV[0] == "stop" || ARGV[0] == "restart"
+    thin_opts << ARGV[0]
+    ARGV.shift
+  else
+    thin_opts << "start"
+  end
+  thin_opts << ARGV
+  # puts "thin_opts: #{thin_opts.flatten.inspect}"
+  Thin::Runner.new(thin_opts.flatten.reject{|a| a.match(/^_[\d\.]+_$/)}).run!
+else
+  port = 3000
+  if ARGV.include?("-p")
+    port = ARGV[ARGV.index("-p") + 1]
+  end
+  Mack::SimpleServer.run(:handler => handler, :port => port, :environment => ENV["MACK_ENV"])
+end

data/lib/mack.rb

@@ -1,2 +1,8 @@
+# require the core classes:
+
+# puts "Loading mack from: #{File.dirname(__FILE__)}"
+
 require File.join(File.dirname(__FILE__), 'mack_core')
-require File.join(File.dirname(__FILE__), 'mack_app')
+
+# load the environment:
+Mack::Environment.load

data/lib/mack/controller/controller.rb

@@ -348,9 +348,7 @@ module Mack
       #     end
       #   end
       # 
-      # The default layout is "#{Mack.root}/app/views/layouts/application.html.erb".
-      # 
-      # If a layout is specified, and it doesn't exist a Mack::Errors::UnknownLayout error will be raised.
+      # The default layout is "#{Mack.root}/app/views/layouts/application.<format>.erb".
       def layout(lay)
         self.class_eval do
           define_method(:layout) do
@@ -367,11 +365,14 @@ module Mack
     def self.included(base)
       Mack::Controller::Registry.add(base)
       base.extend(ClassMethods)
+      base.extend(Mack::Utils::ForgeryDetector::ClassMethods)
+      base.before_filter :detect_forgery
     end
     
     # Houses a repository of all the controllers in the system.
     class Registry < Mack::Utils::RegistryList
-    end
+    end    
     
+    include Mack::Utils::ForgeryDetector
   end # Controller
 end # Mack

data/lib/mack/controller/request.rb

@@ -51,12 +51,26 @@ module Mack
       u
     end
     
+    # Returns all the subdomains as an array, so ["dev", "www"] would be returned for 
+    # "dev.www.mackframework.com". You can specify a different tld_length, such as 2 
+    # to catch ["www"] instead of ["www", "mackframework"] in "www.mackframework.co.uk".
+    # 
+    # Thanks Ruby on Rails for this.
+    def subdomains(tld_length = 1)
+      return [] unless named_host?(host)
+      parts = host.split('.')
+      parts[0..-(tld_length+2)]
+    end
+    
     # Examples:
     #  http://example.org:80
     #  https://example.org:443
     #  http://example.org:8080
     def full_host_with_port
-      full_host << ":#{self.port}"
+      unless full_host.match(/:#{self.port}/)
+        return full_host + ":#{self.port}"
+      end
+      return full_host
     end
     
     # Gives access to the request parameters. This includes 'get' parameters, 'post' parameters
@@ -81,6 +95,10 @@ module Mack
     end
     
     private
+    def named_host?(host)
+      !(host.nil? || /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.match(host))
+    end
+    
     def parse_params(ps)
       
       # look for date time selects:

data/lib/mack/errors/errors.rb

@@ -60,14 +60,6 @@ module Mack
       end
     end # UndefinedRoute
     
-    # Raised when a layout is specified that doesn't exist.
-    class UnknownLayout < StandardError
-      # Takes a layout name.
-      def initialize(layout)
-        super("Could not find layout in: #{File.join(Mack.root, "app", "views", layout.to_s + ".html.erb")}")
-      end
-    end
-    
     # Raised if an unsupported render option is supplied.
     class UnknownRenderOption < StandardError
       # Takes a render option.
@@ -111,5 +103,13 @@ module Mack
       end
     end
     
+    # Raised if a request (other than GET request) has an invalid authenticity token
+    class InvalidAuthenticityToken < StandardError
+      # Takes the mismatched token
+      def initialize(token)
+        super("TOKEN: #{token.to_s} is an invalid request authenticity token.")
+      end
+    end
+    
   end # Errors
 end # Mack

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

@@ -24,7 +24,7 @@ class ControllerGenerator < Genosaurus
   private
   def update_routes_file # :nodoc:
     unless @actions.empty?
-      routes = File.join(Mack.root, "config", "routes.rb")
+      routes = Mack::Paths.config("routes.rb")
       rf = File.open(routes).read
       unless rf.match(".resource :#{@name_plural}")
         puts "Updating routes.rb"

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

@@ -1,5 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>

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

@@ -25,6 +25,8 @@ mack::session_id: _<%= @options["app"].downcase %>_session_id
 
 mack::testing_framework: <%= @options["testing_framework"] %>
 
+default_secret_key: <%= String.randomize(80) %>
+
 # Mack provides RJS support through mack-javascript gem.
 # In order to have RJS support, you will need to perform the following steps:
 # 1.  Uncomment the code below, and make sure that the framework is the one you want to use

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

@@ -53,17 +53,17 @@ when "data_mapper"
 development:
   default:
     adapter: sqlite3
-    database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_development.db") %>
+    database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_development.db") %>
  
 test:
   default:
     adapter: sqlite3
-    database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_test.db") %>
+    database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_test.db") %>
  
 production:
   default:
     adapter: sqlite3
-    database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_production.db") %>
+    database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_production.db") %>
 
 <% else -%>
 # development:
@@ -89,13 +89,13 @@ production:
 
 development:
   adapter: sqlite3
-  database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_development.db") %>
+  database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_development.db") %>
  
 test:
   adapter: sqlite3
-  database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_test.db") %>
+  database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_test.db") %>
  
 production:
   adapter: sqlite3
-  database: <%%= File.join(Mack.root, "db", "<%= @options["app"].downcase %>_production.db") %>
+  database: <%%= Mack::Paths.db("<%= @options["app"].downcase %>_production.db") %>
 <% end -%>

data/lib/mack/generators/passenger_generator/passenger_generator.rb

@@ -0,0 +1,2 @@
+class PassengerGenerator < Genosaurus
+end

data/lib/mack/generators/passenger_generator/templates/config.ru.template

@@ -0,0 +1,5 @@
+ENV["MACK_ENV"] = 'development'
+require 'rubygems'
+load("Rakefile")
+require 'mack'
+run Mack::Utils::Server.build_app

data/lib/mack/generators/passenger_generator/templates/tmp/README.template

@@ -0,0 +1,2 @@
+Temporary folder.
+Do not delete this folder if you are using Phusion Passenger (mod_rails) to host your Mack application.

data/lib/mack/initialization/application.rb

@@ -1,46 +1,49 @@
-# set up initializers:
-Mack.logger.debug "Initializing custom initializers..." unless app_config.log.disable_initialization_logging
-Dir.glob(File.join(Mack.root, "config", "initializers", "**/*.rb")) do |d|
-  require d
+boot_load(:initializers) do
+  Mack.logger.debug "Initializing custom initializers..." unless app_config.log.disable_initialization_logging
+  Dir.glob(Mack::Paths.initializers("**/*.rb")) do |d|
+    require d
+  end  
 end
-Mack.logger.debug "Initializing custom gems..." unless app_config.log.disable_initialization_logging
-Mack::Utils::GemManager.instance.do_requires
-
-# require 'plugins':
-Mack.logger.debug "Initializing plugins..." unless app_config.log.disable_initialization_logging
-require File.join(File.dirname(__FILE__), "plugins.rb")
 
-# make sure that default_controller is available to other controllers
-path = File.join(Mack.root, "app", "controllers", "default_controller.rb")
-require path if File.exists?(path) 
+boot_load(:lib, :plugins, :gems) do
+  # require 'lib' files:
+  Mack.logger.debug "Initializing lib classes..." unless app_config.log.disable_initialization_logging
+  Dir.glob(Mack::Paths.lib("**/*.rb")).each do |d|
+    require d
+  end
+end
 
-# require 'lib' files:
-Mack.logger.debug "Initializing lib classes..." unless app_config.log.disable_initialization_logging
-Dir.glob(File.join(Mack.root, "lib", "**/*.rb")).each do |d|
-  require d
+boot_load(:default_controller, :lib) do
+  # make sure that default_controller is available to other controllers
+  path = Mack::Paths.controllers("default_controller.rb")
+  require path if File.exists?(path)
 end
 
-# set up routes:
-Mack.logger.debug "Initializing routes..." unless app_config.log.disable_initialization_logging
-require File.join(Mack.root, "config", "routes")
+boot_load(:routes) do
+  # set up routes:
+  Mack.logger.debug "Initializing routes..." unless app_config.log.disable_initialization_logging
+  require Mack::Paths.config("routes")
+end
 
-# require 'app' files:
-Mack.logger.debug "Initializing 'app' classes..." unless app_config.log.disable_initialization_logging
-Dir.glob(File.join(Mack.root, "app", "**/*.rb")).each do |d|
-  # puts "d: #{d}"
-  begin
-    require d
-  rescue NameError => e
-    if e.message.match("uninitialized constant")
-      mod = e.message.gsub("uninitialized constant ", "")
-      x =%{
-        module ::#{mod}
-        end
-      }
-      eval(x)
+boot_load(:app_files, :default_controller) do
+  # require 'app' files:
+  Mack.logger.debug "Initializing 'app' classes..." unless app_config.log.disable_initialization_logging
+  Dir.glob(Mack::Paths.app("**/*.rb")).each do |d|
+    # puts "d: #{d}"
+    begin
       require d
-    else
-      raise e
+    rescue NameError => e
+      if e.message.match("uninitialized constant")
+        mod = e.message.gsub("uninitialized constant ", "")
+        x =%{
+          module ::#{mod}
+          end
+        }
+        eval(x)
+        require d
+      else
+        raise e
+      end
     end
   end
 end