mack 0.8.0.101 → 0.8.1

data/lib/mack/tasks/mack_tasks.rake

@@ -3,22 +3,9 @@ namespace :mack do
   
   desc "Loads the Mack environment. Default is development."
   task :environment do
-    require File.join(File.dirname(__FILE__), '..', '..', 'mack')
+    require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'mack'))
     Mack::Environment.load
   end # environment
-
-  # desc "Loads an irb console allow you full access to the application w/o a browser."
-  task :console do
-    puts %{
-This task has been removed. Please use the 'mackery' command to access the console:
-
-  $ mackery console
-
-The environment can be set like this:
-
-  $ mackery console -e test
-    }
-  end # console
   
   namespace :freeze do
     
@@ -42,5 +29,4 @@ The environment can be set like this:
   
 end # mack
 
-alias_task :console, "mack:console"
 alias_task :environment, "mack:environment"

data/lib/mack/tasks/portlet_tasks.rake

@@ -0,0 +1,33 @@
+require 'rake/gempackagetask'
+namespace :mack do
+  
+  namespace :portlet do
+    
+    desc 'Removes any generated portlet files.'
+    task :clean => :environment do
+      Mack::Portlet.clean
+    end
+    
+    desc 'Prepares your application to become a portlet.'
+    task :prepare => [:clean] do
+      Mack::Portlet.prepare
+    end
+    
+    desc 'Packages up your application into a portlet gem.'
+    task :package => [:prepare] do
+      Mack::Portlet.package
+    end
+    
+    desc 'Installs your application as a portlet gem.'
+    task :install => :package do
+      sudo = ENV['SUDOLESS'] == 'true' || RUBY_PLATFORM =~ /win32|cygwin/ ? '' : 'sudo'
+      puts `#{sudo} gem install #{Mack::Paths.root('pkg', Mack::Portlet.portlet_spec.name)}-#{Mack::Portlet.portlet_spec.version}.gem --no-update-sources`
+    end
+    
+    task :unpacker => :environment do
+      Mack::Portlet::Unpacker.instance.unpack(ENV['unpacker_key'], ENV['FORCE'])
+    end
+    
+  end
+  
+end

data/lib/mack/tasks/rake_rules.rake

@@ -36,4 +36,10 @@ rule /^gems:freeze:/ do |t|
   gem_name = t.name.gsub('gems:freeze:', '')
   ENV['gem_name'] = gem_name
   Rake::Task["gems:install_and_freeze"].invoke
+end
+
+rule /^mack:portlet:unpack:/ do |t|
+  key = t.name.gsub('mack:portlet:unpack:', '')
+  ENV['unpacker_key'] = key
+  Rake::Task["mack:portlet:unpacker"].invoke
 end

data/lib/mack/tasks/test_tasks.rake

@@ -3,6 +3,7 @@ require 'pathname'
 require 'spec'
 require 'spec/rake/spectask'
 require 'fileutils'
+require 'mack-facets'
 namespace :test do
   
   task :setup do
@@ -10,8 +11,7 @@ namespace :test do
   
   desc "Run test code."
   Rake::TestTask.new(:test_case) do |t|
-    require File.join(File.dirname(__FILE__), '..', 'initialization', 'configuration')
-    Mack::BootLoader.run(:configuration)
+    require File.join_from_here('..', 'boot', 'configuration.rb')
     t.libs << "test"
     t.pattern = configatron.mack.send("#{configatron.mack.testing_framework}_file_pattern")
     t.verbose = true
@@ -19,8 +19,7 @@ namespace :test do
   
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:rspec) do |t|
-    require File.join(File.dirname(__FILE__), '..', 'initialization', 'configuration')
-    Mack::BootLoader.run(:configuration)
+    require File.join_from_here('..', 'boot', 'configuration.rb')
     t.spec_opts << '--options' << 'test/spec.opts' if File.exists?('test/spec.opts')
     t.spec_files = Dir.glob(configatron.mack.send("#{configatron.mack.testing_framework}_file_pattern"))
   end
@@ -80,8 +79,7 @@ namespace :test do
 end
 
 task :default do
-  require File.join(File.dirname(__FILE__), '..', 'initialization', 'configuration')
-  Mack::BootLoader.run(:configuration)
+  require File.join_from_here('..', 'boot', 'configuration.rb')
   tf = "rspec"
   begin
     tf = configatron.mack.testing_framework

data/lib/mack/testing/helpers.rb

@@ -151,11 +151,19 @@ module Mack
             form_input += "content-disposition: form-data; name=\"#{k}\"; filename=\"#{v.file_name}\"\r\n"
             form_input += "Content-Type: #{v.mime}\r\n\r\n"
             form_input += "#{v.content}\r\n"
-          elsif k != :multipart 
+            options - k
+          elsif k == :multipart 
+            options - k
+          end
+        end
+        unless options.empty?
+          params = options.to_params
+          params.split('&').each do |p|
+            k_v = p.split('=')
             form_input += boundary
-            form_input += "content-disposition: form-data; name=\"#{k}\"\r\n"
+            form_input += "content-disposition: form-data; name=\"#{k_v[0]}\"\r\n"
             form_input += "Content-Type: text/plain\r\n\r\n"
-            form_input += "#{v}\r\n"
+            form_input += "#{k_v[1]}\r\n"
           end
         end
         form_input += boundary
@@ -170,7 +178,7 @@ module Mack
     
       def mack_app
         if $mack_app.nil?
-          $mack_app = Rack::Recursive.new(Mack::Runner.new)
+          $mack_app = Rack::Recursive.new(Mack::Application.new)
         end
         $mack_app
       end

data/lib/mack/utils/server.rb

@@ -18,7 +18,13 @@ module Mack
         end
 
         # Any urls listed will go straight to the public directly and will not be served up via the app:
-        app = Rack::Static.new(app, :urls => ["/css", "/images", "/files", "/images", "/stylesheets", "/javascripts", "/media", "/favicon.ico"], :root => "public")
+        Mack.search_path(:public, false).reverse.each do |path|
+          app = Mack::Static.new(app, :urls =>  configatron.mack.static_paths, :root => path)
+        end
+        
+        app = Mack::Static.new(app, :urls =>  configatron.mack.static_paths, :root => Mack::Paths.public)
+        
+        # app = Mack::Static.new(app)
         app = Mack::Utils::ContentLengthHandler.new(app)
         app = Rack::Lint.new(app) if configatron.mack.use_lint 
         app = Rack::ShowStatus.new(app) 

data/lib/mack/utils/static.rb

@@ -0,0 +1,19 @@
+module Mack
+  class Static < Rack::Static # :nodoc:
+    
+    def call(env)
+      path = env["PATH_INFO"]
+      can_serve = @urls.any? { |url| path.index(url) == 0 }
+
+      if can_serve
+        res = @file_server.call(env)
+        # This is the BIG difference between Mack::Static and Rack::Static:
+        return @app.call(env) if res.nil? || res[0] == 404
+        return res
+      else
+        return @app.call(env)
+      end
+    end
+    
+  end # Static
+end # Mack

data/lib/mack/version.rb

@@ -1,3 +1,3 @@
 module Mack
-  VERSION = '0.8.0.101' unless const_defined?("VERSION")
+  VERSION = '0.8.1' unless const_defined?("VERSION")
 end

data/lib/mack/view_helpers/all_helpers.rb

@@ -1,13 +1,5 @@
 module Mack
   module ViewHelpers # :nodoc:
-    
-    def get_resource_root(resource)
-      path = ""
-      path = "#{configatron.mack.distributed.site_domain}" unless configatron.mack.distributed.site_domain.nil?
-      path = Mack::Assets::Helpers.instance.asset_hosts(resource) if path.empty?
-      return path
-    end
-
     # Used to easily include all Mack::ViewHelpers. It will NOT include itself!
     # This is primarily used to aid in testing view helpers.
     def self.included(base)

data/lib/mack/view_helpers/date_time_helpers.rb

@@ -50,7 +50,7 @@ module Mack
         years = []
         (time.year - 5).upto(time.year + 5) { |y| years << [y, y]}
         
-        options = {:years => true, :months => true, :days => true, :hours => true, :minutes => true, :seconds => false, :year_options => years, :month_options => MONTHS, :day_options => DAYS, :hour_options => HOURS, :minute_options => MINUTES, :second_options => MINUTES, :date_separator => '/', :time_separator => ':'}.merge(fe.options)
+        options = {:years => true, :months => true, :days => true, :hours => true, :minutes => true, :seconds => false, :year_options => years, :month_options => MONTHS, :day_options => DAYS, :hour_options => HOURS, :minute_options => MINUTES, :second_options => MINUTES, :date_separator => '/', :time_separator => ':', :date_order => [:month, :day, :year], :time_order => [:hour, :minute, :second], :date_time_order => [:date, :time]}.merge(fe.options)
         
         [:year, :month, :day, :hour, :minute, :second].each do |v|
           if options["#{v}_values".to_sym]
@@ -59,27 +59,33 @@ module Mack
           end
         end
         
-        fe.options - [:years, :months, :days, :hours, :minutes, :seconds, :year_options, :month_options, :day_options, :hour_options, :minute_options, :second_options, :year_values, :month_values, :day_values, :hour_values, :minute_values, :second_values]
+        fe.options - [:years, :months, :days, :hours, :minutes, :seconds, :year_options, :month_options, :day_options, :hour_options, :minute_options, :second_options, :year_values, :month_values, :day_values, :hour_values, :minute_values, :second_values, :date_order, :time_order, :date_time_order]
         
         label = label_parameter_tag(name, (fe.calling_method == :to_s ? name : "#{name}_#{fe.calling_method}"), var, fe)
 
         
         date_boxes = []
-        date_boxes << dt_select(:month, name, fe, time.month, options[:month_options]) if options[:months]
-        date_boxes << dt_select(:day, name, fe, time.day, options[:day_options]) if options[:days]
-        date_boxes << dt_select(:year, name, fe, time.year, options[:year_options]) if options[:years]
+        options[:date_order].collect! { |s| s.to_sym }
+        date_boxes[options[:date_order].index(:month)] = dt_select(:month, name, fe, time.month, options[:month_options]) if options[:months]
+        date_boxes[options[:date_order].index(:day)] = dt_select(:day, name, fe, time.day, options[:day_options]) if options[:days]
+        date_boxes[options[:date_order].index(:year)] = dt_select(:year, name, fe, time.year, options[:year_options]) if options[:years]
+        date_boxes.compact!
         
         time_boxes = []
-        time_boxes << dt_select(:hour, name, fe, time.hour, options[:hour_options]) if options[:hours]
-        time_boxes << dt_select(:minute, name, fe, time.min, options[:minute_options]) if options[:minutes]
-        time_boxes << dt_select(:second, name, fe, time.sec, options[:second_options]) if options[:seconds]
+        options[:time_order].collect! { |s| s.to_sym }
+        time_boxes[options[:time_order].index(:hour)] = dt_select(:hour, name, fe, time.hour, options[:hour_options]) if options[:hours]
+        time_boxes[options[:time_order].index(:minute)] = dt_select(:minute, name, fe, time.min, options[:minute_options]) if options[:minutes]
+        time_boxes[options[:time_order].index(:second)] = dt_select(:second, name, fe, time.sec, options[:second_options]) if options[:seconds]
+        time_boxes.compact!
         
-        boxes = date_boxes.join(options[:date_separator])
-        
-        unless time_boxes.empty?
-          boxes << " " << time_boxes.join(options[:time_separator])
+        elts = []
+        elts[options[:date_time_order].index(:date)] = date_boxes.join(options[:date_separator])
+        unless elts.empty?
+          elts[options[:date_time_order].index(:time)] = time_boxes.join(options[:time_separator])
         end
+        elts.compact!
         
+        boxes = elts.join(" ").strip
         return label + boxes
       end
       

data/lib/mack/view_helpers/form_helpers.rb

@@ -288,8 +288,17 @@ module Mack
           end
           options[:value] = var.send(fe.calling_method)
           
+          if var.has_errors?(fe.calling_method)
+            fe.options = {:error_class => "error"}.merge(fe.options)
+            class_arr = fe.options[:class].to_s.split(" ").collect { |s| s.strip }
+            class_arr << fe.options[:error_class]
+            fe.options[:class] = class_arr.join(" ")
+          end
+          
           yield var, fe, options if block_given?
           
+          # we don't need the error_class by this time, since if used it will get appended into options[:class]
+          fe.options.delete(:error_class)
           return label_parameter_tag(name, options[:id], var, fe) + non_content_tag(:input, options.merge(fe.options))
         end
       end

data/lib/mack/view_helpers/html_helpers.rb

@@ -1,7 +1,8 @@
 module Mack
   module ViewHelpers # :nodoc:
     module HtmlHelpers
-
+      include Mack::Assets
+      
       # Builds an HTML tag.
       # 
       # Examples:
@@ -28,6 +29,16 @@ module Mack
       
       # Builds a HTML image tag.
       def img(image_src, options = {})
+        image_src = case image_src.to_s
+        when /^\/images/
+          image_src
+        when /^images/
+          '/' + image_src
+        when /^\//
+          image_src
+        else
+          '/images/' + image_src
+        end
         image_src = "#{get_resource_root(image_src)}#{image_src}?#{configatron.mack.assets.stamp}"
         non_content_tag(:img, {:src => image_src}.merge(options))
       end
@@ -62,12 +73,12 @@ pageTracker._trackPageview();
         opts
       end
       
-      def get_resource_root(resource)
-        path = ""
-        path = "#{configatron.mack.distributed.site_domain}" unless configatron.mack.distributed.site_domain.nil?
-        path = Mack::Assets::Helpers.instance.asset_hosts(resource) if path.empty?
-        return path
-      end
+      # def get_resource_root(resource)
+      #   path = ""
+      #   path = "#{configatron.mack.distributed.site_domain}" unless configatron.mack.distributed.site_domain.nil?
+      #   path = Mack::Assets::Helpers.instance.asset_hosts(resource) if path.empty?
+      #   return path
+      # end
       
       
     end # HtmlHelpers

data/lib/mack/view_helpers/link_helpers.rb

@@ -1,6 +1,7 @@
 module Mack
   module ViewHelpers # :nodoc:
     module LinkHelpers
+      include Mack::Assets
       
       # Generates a javascript popup window. It will create the javascript needed for the window,
       # as well as the href to call it.
@@ -87,7 +88,7 @@ module Mack
           meth = nil
           confirm = nil
         
-          meth = %{var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var s = document.createElement('input'); s.setAttribute('type', 'hidden'); s.setAttribute('name', '_method'); s.setAttribute('value', '#{options[:method]}'); f.appendChild(s);f.submit()}
+          meth = %{var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var s = document.createElement('input'); s.setAttribute('type', 'hidden'); s.setAttribute('name', '_method'); s.setAttribute('value', '#{options[:method]}'); f.appendChild(s); var s2 = document.createElement('input'); s2.setAttribute('type', 'hidden'); s2.setAttribute('name', '__authenticity_token'); s2.setAttribute('value', '#{Mack::Utils::AuthenticityTokenDispenser.instance.dispense_token(session.id)}'); f.appendChild(s2); f.submit()}
           options.delete(:method)
         
           if options[:confirm]

data/lib/mack/view_helpers/object_helpers.rb

@@ -6,7 +6,7 @@ module Mack
       # and will grap the pretty print of the inspect and wrap it in 
       # HTML pre tags.
       def debug(obj)
-        "<pre>#{pp_to_s(obj)}</pre>"
+        "<pre>#{pp_to_s(obj).gsub('<', '&lt;')}</pre>"
       end
       
     end # ObjectHelpers

data/lib/mack_app.rb

@@ -1,18 +1,30 @@
-fl = File.join(File.dirname(__FILE__), "mack")
-require File.join(fl, "initialization", "application.rb")
-require File.join(fl, "initialization", "helpers.rb")
-require File.join(fl, "initialization", "plugins.rb")
-
-boot_load(:start_mack_application, :configuration, :print_hello_banner, :lib, :routes, :app_files, :helpers, :runner) do
-  Mack::Environment.load
-  Mack.logger.debug "Initialization of Mack Application Environment finished."
+if __FILE__ == $0
+  require 'fileutils'
+  require 'mack-facets'
+  ENV["MACK_ROOT"] = File.join(FileUtils.pwd, '..', 'test', 'fake_application')
 end
 
-boot_load(:print_hello_banner, :configuration) do
-  Mack.reset_logger!
-  Mack.logger.debug "Mack root: #{Mack.root}"
-  Mack.logger.debug "Mack version: #{Mack::VERSION}"
-  Mack.logger.debug "Starting application in #{Mack.env} mode."
+run_once do
+  [:hello, :core, :gems, :plugins, :lib, :initializers, :routes, :app, :helpers].each do |f|
+    require File.join_from_here('mack', 'boot', "#{f}.rb")
+  end
 end
 
-Mack::BootLoader.run(:start_mack_application)
+# fl = File.join(File.dirname(__FILE__), "mack")
+# require File.join(fl, "initialization", "application.rb")
+# require File.join(fl, "initialization", "helpers.rb")
+# require File.join(fl, "initialization", "plugins.rb")
+# 
+# boot_load(:start_mack_application, :configuration, :print_hello_banner, :lib, :routes, :app_files, :helpers, :runner) do
+#   Mack::Environment.load
+#   Mack.logger.debug "Initialization of Mack Application Environment finished."
+# end
+# 
+# boot_load(:print_hello_banner, :configuration) do
+#   Mack.reset_logger!
+#   Mack.logger.debug "Mack root: #{Mack.root}"
+#   Mack.logger.debug "Mack version: #{Mack::VERSION}"
+#   Mack.logger.debug "Starting application in #{Mack.env} mode."
+# end
+# 
+# Mack::BootLoader.run(:start_mack_application)

data/lib/mack_core.rb

@@ -1,3 +1,8 @@
+if __FILE__ == $0
+  require 'fileutils'
+  ENV["MACK_ROOT"] = File.join(FileUtils.pwd, 'test', 'fake_application')
+end
+
 require 'rubygems'
 require 'rack'
 require 'digest'
@@ -25,45 +30,51 @@ begin
 rescue Exception => e
 end
 
-fl = File.join(File.dirname(__FILE__), "mack")
-require File.join(fl, "initialization", "boot_loader.rb")
-require File.join(fl, "initialization", "environment.rb")
-require File.join(fl, "initialization", "configuration.rb")
-require File.join(fl, "initialization", "logging.rb")
-
-boot_load(:version) do
-  require File.join(File.dirname(__FILE__), "mack", "version")
-end
-
-boot_load(:paths) do
-  require File.join(File.dirname(__FILE__), "mack", "utils", "paths")
-end
-
-boot_load(:gems) do
-  Mack.logger.debug "Initializing custom gems..." unless configatron.mack.log.disable_initialization_logging
-  load Mack::Paths.initializers("gems.rb")
-  Mack::Utils::GemManager.instance.do_requires
-end
-
-boot_load(:core_classes) do
-  Mack.logger.debug "Initializing core classes..." unless configatron.mack.log.disable_initialization_logging
-  # Require all the necessary files to make Mack actually work!
-  lib_dirs = ["assets", "errors", "core_extensions", "utils", "sessions", "runner_helpers", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators", "distributed"]
-  lib_dirs << "testing"# if Mack.env == "test"
-  lib_dirs.each do |dir|
-    dir_globs = Dir.glob(File.join(File.dirname(__FILE__), "mack", dir, "**/*.rb"))
-    dir_globs.sort.each do |d|
-      require d unless d.match(/console/)
-    end
+run_once do
+  [:version, :extensions, :paths, :portlets, :environment, :configuration, :logging, :assets, :core, :gems].each do |f|
+    require File.join_from_here('mack', 'boot', "#{f}.rb")
   end
 end
 
-boot_load(:runner) do
-  require File.join(File.dirname(__FILE__), "mack", "runner")
-end
-
-boot_load(:load_mack_core, :version, :paths, :configuration, :logging, :core_classes, :gems) do
-  Mack.logger.debug "Initialization of Mack Core finished." unless configatron.mack.log.disable_initialization_logging
-end
-
-Mack::BootLoader.run(:load_mack_core)
+# fl = File.join(File.dirname(__FILE__), "mack")
+# require File.join(fl, "initialization", "boot_loader.rb")
+# require File.join(fl, "initialization", "environment.rb")
+# require File.join(fl, "initialization", "configuration.rb")
+# require File.join(fl, "initialization", "logging.rb")
+# 
+# boot_load(:version) do
+#   require File.join(File.dirname(__FILE__), "mack", "version")
+# end
+# 
+# boot_load(:paths) do
+#   require File.join(File.dirname(__FILE__), "mack", "utils", "paths")
+# end
+# 
+# boot_load(:gems) do
+#   Mack.logger.debug "Initializing custom gems..." unless configatron.mack.log.disable_initialization_logging
+#   load Mack::Paths.initializers("gems.rb")
+#   Mack::Utils::GemManager.instance.do_requires
+# end
+# 
+# boot_load(:core_classes) do
+#   Mack.logger.debug "Initializing core classes..." unless configatron.mack.log.disable_initialization_logging
+#   # Require all the necessary files to make Mack actually work!
+#   lib_dirs = ["assets", "errors", "core_extensions", "utils", "sessions", "runner_helpers", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators", "distributed"]
+#   lib_dirs << "testing"# if Mack.env == "test"
+#   lib_dirs.each do |dir|
+#     dir_globs = Dir.glob(File.join(File.dirname(__FILE__), "mack", dir, "**/*.rb"))
+#     dir_globs.sort.each do |d|
+#       require d unless d.match(/console/)
+#     end
+#   end
+# end
+# 
+# boot_load(:runner) do
+#   require File.join(File.dirname(__FILE__), "mack", "runner")
+# end
+# 
+# boot_load(:load_mack_core, :version, :paths, :configuration, :logging, :core_classes, :gems) do
+#   Mack.logger.debug "Initialization of Mack Core finished." unless configatron.mack.log.disable_initialization_logging
+# end
+# 
+# Mack::BootLoader.run(:load_mack_core)