mack 0.8.0.101 → 0.8.1

data/CHANGELOG

@@ -1,5 +1,34 @@
+* [#217] Fixed rake mack:dump:routes throws errors
+* [#216] Added ability to turn off view caching in distributed app
+* [#215] Asset path lookup flow update
+* [#213] Fixed the params method should be case insensitive
+* [#211] Added a pagination API to mack-data_mapper
+* [#210] Added a pagination API to mack-orm
+* [#209] inline form built by link_to should include authenticity token
+* [#208] Added support for DataMapper repository context per request
+* [#207] Fixed session cookie not being deleted properly
+* [#206] Portlet now have access to its base_path
+* [#205] Fixed testing of nested parameters and file uploads breaks
+* [#204] Resource routes can now take options when being defined.
+* [#203] Updated distributed: view_cache to include Mack::ViewHelpers instead of Mack::ViewHelpers::LinkHelpers
+* [#200] INCOMPATIBILITY NOTICE: mack-notifier configatron namespaces have changed from *_settings to * (e.g. smtp_settings to smtp)
+* [#198] Added Embedded parameters in 'host' for Routes
+* [#196] Extlib 0.9.8 support
+* [#195] DataMapper 0.9.6 support
+* [#193] Portlet Support
+* [#192] mack-localization now supports portlet
+* [#191] Asset-Packager support for Portlet
+* [#143] Nested resources in Routes
+* [#134] Form elements are now 'errorfied'.
+* [#131] Date/Time select boxes can now be easily re-arranged.
+* [#78] Jabber support
+* gem: configatron 2.1.5
+* gem: extlib 0.9.8
+
 === 0.8.0.2
 * [#190] Fixed ViewTemplate methods can easily be overridden
+* [#134] 'errorfy' form elements [this update include changes in mack-active_record, mack-data_mapper, and mack-notifier]
+* [#131] Added ability to rearrange date/time select
 
 === 0.8.0
 * [#187] Fixed: When an exception is raised, the request doesn't get 'logged'

data/bin/mackery-console

@@ -1,16 +1,17 @@
 #!/usr/local/bin/ruby
 # require File.join(File.dirname(__FILE__), "options_handler")
 
-require File.join(File.dirname(__FILE__), "env_handler")
+require File.expand_path(File.join(File.dirname(__FILE__), "env_handler.rb"))
 
-require File.join(File.dirname(__FILE__), "gem_load_path")
+require File.expand_path(File.join(File.dirname(__FILE__), "gem_load_path.rb"))
 
 libs = []
 libs << "-r irb/completion"
-mack_lib_path = File.join(FileUtils.pwd, 'vendor', 'framework', 'mack', 'lib', 'mack')
+mack_lib_path = File.expand_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')}"  
+  libs << "-r #{File.expand_path(File.join(mack_lib_path, 'boot', 'console'))}"  
 else
-  libs << "-r #{File.join(File.dirname(__FILE__), '..', 'lib', 'mack', 'initialization', 'console')}"
+  libs << "-r #{File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'mack', 'boot', 'console'))}"
 end
 system "irb #{libs.join(" ")} --simple-prompt"

data/bin/mackery-server

@@ -1,20 +1,15 @@
 #!/usr/local/bin/ruby
 # require File.join(File.dirname(__FILE__), "options_handler")
 
-require File.join(File.dirname(__FILE__), "env_handler")
+require File.expand_path(File.join(File.dirname(__FILE__), "env_handler.rb"))
 
-require File.join(File.dirname(__FILE__), "gem_load_path")
+require File.expand_path(File.join(File.dirname(__FILE__), "gem_load_path.rb"))
 
 require 'rubygems'
 
 require 'fileutils'
 require 'thin'
 
-module Rack
-  ADAPTERS[:mack] = 'config/configatron/default.rb' if ADAPTERS.is_a?(Hash)
-  ADAPTERS << [:mack, 'config/configatron/default.rb'] if ADAPTERS.is_a?(Array)
-end
-
 require 'mack'
 
 handler = "thin"
@@ -41,5 +36,26 @@ else
   if ARGV.include?("-p")
     port = ARGV[ARGV.index("-p") + 1]
   end
+  
+  module Mack
+    # Even though it's called, SimpleServer, this might be the only server you need to run
+    # a Mack application.
+    # 
+    # This SimpleServer does not use Thin. But does work with anything that Rack has a handler for.
+    class SimpleServer
+
+      class << self
+
+        def run(options)
+          r = "Rack::Handler::#{options[:handler].camelcase}"
+          puts "Starting app using: #{r} in #{options[:environment]} mode on port: #{options[:port]}"
+          eval(r).run(Mack::Utils::Server.build_app, :Port => options[:port])
+        end
+
+      end
+
+    end
+  end
+  
   Mack::SimpleServer.run(:handler => handler, :port => port, :environment => ENV["MACK_ENV"])
 end

data/lib/mack.rb

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

data/lib/mack/application.rb

@@ -0,0 +1,161 @@
+require File.join(File.dirname(__FILE__), 'routing', 'urls')
+module Mack
+  # This is the heart and soul of the Mack framework! This class interfaces with the Rack framework.
+  # It handles all the dispatching back and forth between the Rack framework and a Mack application.
+  class Application
+    include Extlib::Hook
+    include Mack::Routes::Urls
+    
+    attr_reader :response # :nodoc:
+    attr_reader :request # :nodoc:
+    attr_reader :cookies # :nodoc:
+    attr_reader :runner_helpers # :nodoc:
+    attr_reader :original_controller
+    attr_reader :original_action
+    
+    # This method needs to be defined as part of the Rack framework. As is noted for the Mack::Runner
+    # class, this is where the center of the Mack framework lies.
+    def call(env)
+      env["rack.errors"] = StringIO.new # Send Rack errors nowhere fast!
+      begin
+        setup(env)
+        begin
+          route = Mack::Routes.retrieve(self.request)
+          if route[:redirect_to]
+            # because the route is specified to be a redirect, let's do that:
+            redirect_to(route)
+          else
+            # set these in case we need them for handling errors:
+            @original_controller = route[:controller]
+            @original_action = route[:action]
+            run_controller(route)
+          end
+          # return teardown
+        rescue Exception => e
+          # There was an exception, let's see if there's a handler for this error in routes:
+          route = Mack::Routes.retrieve_from_error(e.class)
+          unless route.nil?
+            self.request.all_params[:original_controller] = @original_controller
+            self.request.all_params[:original_action] = @original_action
+            # There is a handler, let's try running that:
+            run_controller(route, e)
+          else
+            # If we can't find the resource, or there's no route, let's check the public directory:
+            case e
+            when Mack::Errors::ResourceNotFound, Mack::Errors::UndefinedRoute
+              return try_to_find_resource(env, e)
+            else
+              # Re-raise the exception
+              raise e
+            end
+          end
+          # return teardown
+        end
+      # Capture all the Exceptions for this call:
+      rescue Exception => e
+        Mack.logger.error e
+        case e
+        when Mack::Errors::ResourceNotFound, Mack::Errors::UndefinedRoute
+          handle_error(404, 'Page Not Found!', e)
+        # If it's any other type of exception render the 500.html page:
+        else
+          handle_error(500, 'Server Error!', e)
+        end
+        # return teardown
+      ensure
+        teardown
+      end
+      return self.response.finish
+    end
+    
+    #private
+    def run_controller(route, e = nil)
+      runner_block = route[:runner_block]
+      route - :runner_block
+      
+      self.request.params = self.request.all_params.merge(route)
+      self.response.content_type = Mack::Utils::MimeTypes[self.request.params[:format]]
+      catch(:finished) do
+        if runner_block
+          runner_block.call(self.request, self.response, self.cookies)
+        end
+      
+        # let's handle a normal request:
+        begin
+          cont = "#{route[:controller].to_s.camelcase}Controller".constantize
+        rescue NameError => e
+          raise Mack::Errors::ResourceNotFound.new(self.request.path_info)
+        end
+      
+        c = cont.new
+        c.configure_controller(self.request, self.response, self.cookies)
+        c.caught_exception = e unless e.nil?
+
+        self.response.controller = c
+        return self.response.write(c.run)
+      end
+    end
+    
+    # Setup the request, response, cookies, session, etc...
+    # yield up, and then clean things up afterwards.
+    def setup(env)
+      @request = Mack::Request.new(env) 
+      @response = Mack::Response.new
+      @cookies = Mack::CookieJar.new(self.request, self.response)
+      @runner_helpers = []
+      Mack::RunnerHelpers::Registry.registered_items.each do |helper|
+        help = helper.new
+        help.start(self.request, self.response, self.cookies)
+        @runner_helpers << help
+      end
+    end
+    
+    def teardown
+      self.runner_helpers.reverse.each do |help|
+        help.complete(self.request, self.response, self.cookies)
+      end
+      # self.response.finish
+    end
+    
+    def try_to_find_resource(env, exception)
+      # we can't find a route for this, so let's try and see if it's in the public directory:
+      path = env["PATH_INFO"].dup
+      path << ".html" if File.extname(path).blank?
+      
+      Mack.search_path(:public).each do |p|
+        f = File.join(p, path)
+        if File.exists?(f)
+          return Rack::File.new(p).call(Rack::MockRequest.env_for(path))
+        end
+      end
+      raise exception
+    end
+    
+    # This will redirect the request to the specified url. A default status of
+    # 302, Moved Temporarily, is set if no status is specified. A simple HTML
+    # page is rendered in case the redirect does not occur.
+    def redirect_to(route)
+      status = route[:status] || 302
+      url = route[:redirect_to]
+      options = self.request.all_params
+      options.merge!(route)
+      options - [:controller, :action, :redirect_to, :method, :status, :format]
+      url = url_for_pattern(url, options)
+      self.response.status = status
+      self.response[:location] = url
+      self.response.write(redirect_html(self.request.path_info, url, status))
+    end
+    
+    private
+    def handle_error(status, body, e)
+      self.response.status = status
+      raise e if configatron.mack.show_exceptions
+      path = Mack::Paths.public("#{status}.html")
+      if File.exists?(path)
+        body = File.read(path)
+      end
+      self.response.write(body)
+    end
+    
+  end
+end

data/lib/mack/assets/asset_helpers.rb

@@ -1,5 +1,13 @@
 module Mack
   module Assets
+    
+    def get_resource_root(resource)
+      path = ""
+      path = Mack::Assets::Helpers.instance.asset_hosts(resource) if path.empty?
+      path = "#{configatron.mack.distributed.site_domain}" unless !path.empty? or configatron.mack.distributed.site_domain.nil?
+      return path
+    end
+    
     class Helpers # :nodoc:
       include Singleton
 

data/lib/mack/assets/assets_mgr.rb

@@ -153,13 +153,3 @@ module Mack
   end
 end
 
-  
-
-module Kernel
-  #
-  # Return the instance of the AssetManager class.
-  #
-  def assets_mgr
-    return Mack::Assets::Manager.instance
-  end
-end

data/lib/mack/boot/app.rb

@@ -0,0 +1,46 @@
+run_once do
+  
+  require File.join_from_here('paths.rb')
+  require File.join_from_here('configuration.rb')
+  require File.join_from_here('logging.rb')
+  require File.join_from_here('extensions.rb')
+  require File.join_from_here('assets.rb')
+  require File.join_from_here('core.rb')
+  require File.join_from_here('gems.rb')
+  require File.join_from_here('plugins.rb')
+  require File.join_from_here('lib.rb')
+  
+  init_message('application')
+    
+  Mack.search_path(:app).each do |path|
+    # make sure that default_controller is available to other controllers
+    dcont = File.join(path, 'controllers', 'default_controller.rb')
+    require dcont if File.exists?(dcont)
+    
+    Dir.glob(File.join(path, "**/*.rb")).each do |d|
+      begin
+        d = File.expand_path(d)
+        # puts d
+        require d
+      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
+  
+  # Add default assets
+  assets_mgr.defaults do |a| 
+    a.add_css "scaffold" if File.exists?Mack::Paths.stylesheets("scaffold.css")
+  end
+  
+end

data/lib/mack/boot/assets.rb

@@ -0,0 +1,10 @@
+run_once do
+  
+  # init_message('assets')
+  
+  Dir.glob(File.join_from_here('..', 'assets', '**/*.rb')).each do |f|
+    f = File.expand_path(f)
+    require f
+  end
+  
+end

data/lib/mack/boot/configuration.rb

@@ -0,0 +1,87 @@
+require 'configatron'
+
+run_once do
+  require File.join_from_here('paths.rb')
+  require File.join_from_here('extensions.rb')
+  
+  # init_message('configuration')
+  
+  module Mack
+    module Configuration
+      
+      configatron.mack.render_url_timeout = 5
+      configatron.mack.cache_classes = true
+      configatron.mack.reload_classes = 1
+      configatron.mack.deep_class_reload = false
+      configatron.mack.use_lint = true
+      configatron.mack.show_exceptions = true
+      configatron.mack.use_sessions = true
+      configatron.mack.session_id = '_mack_session_id'
+      configatron.mack.cookie_values = {:path => '/'}
+      configatron.mack.site_domain = 'http://localhost:3000'
+      configatron.mack.testing_framework = :rspec
+      configatron.mack.rspec_file_pattern = 'test/**/*_spec.rb'
+      configatron.mack.test_case_file_pattern = 'test/**/*_test.rb'
+      configatron.mack.session_store = :cookie
+      configatron.mack.disable_forgery_detector = false
+      configatron.mack.assets.max_distribution = 4
+      configatron.mack.assets.hosts = ''
+      configatron.mack.assets.stamp = Time.now.to_i
+      configatron.mack.cookie_session_store.expiry_time = 4.hours
+      
+      configatron.mack.log.level = :info
+      configatron.mack.log.detailed_requests = true
+      configatron.mack.log.disable_initialization_logging = false
+      configatron.mack.log.root = Mack::Paths.log
+      configatron.mack.log.colors.db = :cyan
+      configatron.mack.log.colors.error = :red
+      configatron.mack.log.colors.fatal = :red
+      configatron.mack.log.colors.warn = :yellow
+      configatron.mack.log.colors.completed = :purple
+      configatron.mack.log.use_colors = true
+      configatron.mack.log.time_format = '%Y-%m-%d %H:%M:%S'
+      
+      configatron.mack.static_paths = ["/css", "/images", "/files", "/images", "/stylesheets", "/javascripts", "/media", "/favicon.ico"]
+      
+      configatron.mack.portlet.verbose = false
+      configatron.mack.portlet.need_tar = false
+      configatron.mack.portlet.need_zip = false
+    
+      if Mack.env?(:production)
+        configatron.mack.use_lint = false
+        configatron.mack.show_exceptions = false
+        configatron.mack.log.level = :info
+        configatron.mack.log.detailed_requests = true
+        configatron.mack.log.use_colors = false
+      end
+    
+      if Mack.env?(:development)
+        configatron.mack.cache_classes = false
+        configatron.mack.log.level = :debug
+      end
+
+      if Mack.env?(:test)
+        configatron.mack.cookie_values = {}
+        configatron.mack.session_store = :test
+        configatron.mack.disable_forgery_detector = true
+        configatron.mack.run_remote_tests = true
+        configatron.mack.log.level = :error
+      end
+      
+      Mack.search_path(:configatron).each do |path|
+        [:default, Mack.env].each do |f|
+          fp = File.join(path, "#{f}.rb")
+          if File.exists?(fp)
+            require fp
+          end
+        end
+      end
+  
+      def self.dump
+        configatron.inspect
+      end
+      
+    end # Configuration
+  end # Mack
+  
+end # run_once