mack 0.8.1 → 0.8.2

data/lib/mack/boot/logging.rb

@@ -7,7 +7,7 @@ run_once do
   
   # init_message('logging')
   
-  gem 'logging'
+  # gem 'logging'
   require 'logging'
   
   require File.join_from_here("..", "utils", "ansi", "ansi_color.rb")

data/lib/mack/controller/request.rb

@@ -2,30 +2,8 @@ module Mack
   
   class Request < Rack::Request
     
-    class Parameters < Hash # :nodoc:
-      alias_instance_method :[], :old_hash
-      alias_instance_method :store
-      def [](key)
-        key = key.to_s.downcase
-        data = old_hash(key.to_sym) || old_hash(key)
-        data = data.to_s if data.is_a?(Symbol)
-        return data
-      end
-      
-      def []=(key, value)
-        _original_store(key.downcase.to_sym, value)
-      end
-      
-      def to_s
-        s = self.inspect
-        Mack::Logging::Filter.list.each do |p|
-          s.gsub!(/:#{p}=>\"[^\"]+\"/, ":#{p}=>\"<FILTERED>\"")
-        end
-        s
-      end
-      
-    end
-    
+    autoload :DateTimeParameter, File.join_from_here('request', 'date_time_parameter')
+    autoload :Parameters, File.join_from_here('request', 'parameters')
     
     def initialize(env) # :nodoc:
       super(env)
@@ -148,36 +126,5 @@ module Mack
       end
     end
     
-    class DateTimeParameter # :nodoc:
-      attr_accessor :year
-      attr_accessor :month
-      attr_accessor :day
-      attr_accessor :hour
-      attr_accessor :minute
-      attr_accessor :second
-      
-      def initialize
-        self.year = Time.now.year
-        self.month = 1
-        self.day = 1
-        self.hour = 0
-        self.minute = 0
-        self.second = 0
-      end
-      
-      def add(key, value)
-        self.send("#{key}=", value)
-      end
-      
-      def to_s
-        "#{year}-#{month}-#{day} #{hour}:#{minute}:#{second}"
-      end
-      
-      def to_time
-        Time.parse(self.to_s)
-      end
-      
-    end
-    
   end # Request
 end # Mack

data/lib/mack/controller/request/date_time_parameter.rb

@@ -0,0 +1,37 @@
+module Mack
+  class Request
+    
+    private
+    class DateTimeParameter # :nodoc:
+      attr_accessor :year
+      attr_accessor :month
+      attr_accessor :day
+      attr_accessor :hour
+      attr_accessor :minute
+      attr_accessor :second
+      
+      def initialize
+        self.year = Time.now.year
+        self.month = 1
+        self.day = 1
+        self.hour = 0
+        self.minute = 0
+        self.second = 0
+      end
+      
+      def add(key, value)
+        self.send("#{key}=", value)
+      end
+      
+      def to_s
+        "#{year}-#{month}-#{day} #{hour}:#{minute}:#{second}"
+      end
+      
+      def to_time
+        Time.parse(self.to_s)
+      end
+      
+    end
+    
+  end # Request
+end # Mack

data/lib/mack/controller/request/parameters.rb

@@ -0,0 +1,31 @@
+module Mack
+  class Request
+    
+    private
+    class Parameters < Hash # :nodoc:
+      
+      alias_instance_method :[], :old_hash
+      alias_instance_method :store
+      
+      def [](key)
+        key = key.to_s.downcase
+        data = old_hash(key.to_sym) || old_hash(key)
+        data = data.to_s if data.is_a?(Symbol)
+        return data
+      end
+      
+      def []=(key, value)
+        _original_store(key.downcase.to_sym, value)
+      end
+      
+      def to_s
+        s = self.inspect
+        Mack::Logging::Filter.list.each do |p|
+          s.gsub!(/:#{p}=>\"[^\"]+\"/, ":#{p}=>\"<FILTERED>\"")
+        end
+        s
+      end
+      
+    end # Parameters
+  end # Request
+end # Mack

data/lib/mack/core_extensions/gem_kernel.rb

@@ -0,0 +1,30 @@
+unless Object.const_defined?('GEM_PATHS_MOD')
+  module Gem
+  
+    class << self
+      def clear_source_index
+        @@source_index = nil
+      end
+  
+      def clear_searcher
+        @searcher = nil
+      end
+  
+      def reset!
+        Gem.clear_source_index
+        Gem.clear_searcher
+      end
+  
+      alias_method :__original_set_paths, :set_paths
+  
+      def set_paths(*gpaths)
+        __original_set_paths([@gem_path, gpaths].flatten.compact.uniq.join(File::PATH_SEPARATOR))
+        Gem.reset!
+        @gem_path.uniq!
+        @gem_path
+      end
+    end
+  
+  end
+  GEM_PATHS_MOD = true
+end

data/lib/mack/core_extensions/kernel.rb

@@ -67,28 +67,45 @@ module Kernel
     end
   end
   
-  unless Module.const_defined?('GEM_MOD')
-    Module.const_set('GEM_MOD', 1)
-    
+  run_once do
+    Gem.set_paths(File.join(Mack.root, 'vendor', 'gems'))
+    FALSE_GEM_NAMES = %w{specifications gems doc cache}
     alias_instance_method :gem, :old_gem
     
     def gem(gem_name, *version_requirements)
-      vendor_path = File.join(Mack.root, 'vendor')
-      gem_path = File.join(vendor_path, 'gems')
+      return if FALSE_GEM_NAMES.include?(gem_name)
+      # puts '***************'
+      # puts "gem_name: #{gem_name}"
       
       # try to normalize the version requirement string
       ver = version_requirements.to_s.strip
-      ver = "> 0.0.0" if ver == nil or ver.empty?
-      # if the version string starts with number, then prepend = to it (since the developer wants an exact match)
-      ver = "= " + ver if ver[0,1] != '=' and ver[0,1] != '>' and ver[0,1] != '<'
+      if ver == nil || ver.empty?
+        ver = '> 0.0.0'
+      else
+        # if the version string starts with number, then prepend = to it (since the developer wants an exact match)
+        ver = "= " + ver if ver[0,1] != '=' && ver[0,1] != '>' && ver[0,1] != '<' && ver[0,1] != '~'
+      end
       
       num = ver.match(/\d.+/).to_s
       op  = ver.delete(num).strip
-      op  += "=" if op == '=' 
+      op  += '=' if op == '='
+      
+      op = '>=' if op == '~>'
       
       found_local_gem = false
       
-      Dir.glob(File.join(gem_path, "#{gem_name}*")).each_with_index do |file, i|
+      dirs = []
+      Gem.path.each do |p|
+        dirs << Dir.glob(File.join(p, "#{gem_name}*"))
+      end
+      dirs.flatten!
+      dirs.uniq!
+      # puts "Gem.path: #{Gem.path.inspect}"
+      # puts "--------"
+      # puts "dirs: #{dirs.inspect}" 
+      
+      dirs.each_with_index do |file, i|
+        file = File.basename(file)
         # all frozen gem has the pattern [gem_name]-[version]
         next if !file.include?'-'
   
@@ -101,13 +118,12 @@ module Kernel
         
         # generate number comparison string that we can evaluate, to make sure that we
         # pick the correct gem based on the requested version requirements
-        comparison = "'#{file_ver}' #{op} '#{num}'"  # e.g.: "'0.8.0' > '0.0.0'"
         
         # if we find the match (i.e. the comparison string checks out) then
         # read the frozen spec file in that directory (so we can see what the require path is)
         # and prepend the new require path(s) to the global search path.
         # If we didn't find it, then continue to look (obviously)
-        if eval(comparison)           
+        if eval("'#{file_ver}' #{op} '#{num}'")
           spec_file = File.join(file, 'spec.yaml')
           
           if File.exists?(spec_file)
@@ -116,10 +132,11 @@ module Kernel
             spec = nil
           end
           
-          if spec and spec.require_path
+          if spec && spec.require_path
             spec.require_path.each { |rp| $:.insert(0, File.expand_path(File.join(file, rp))) }
           else
-            $:.insert(0, File.expand_path(file))
+            # puts "File.expand_path(file): #{File.expand_path(file)}"
+            # $:.insert(0, File.expand_path(file))
           end
 
           found_local_gem = true

data/lib/mack/routing/route_map.rb

@@ -13,6 +13,7 @@ module Mack
       def reset! # :nodoc:
         @_default_routes = []
         @_route_map = {:get => [], :post => [], :put => [], :delete => [], :errors => {}}
+        @_deferred_route_map = {:get => [], :post => [], :put => [], :delete => [], :errors => {}}
       end
       
       def any? # :nodoc:
@@ -46,22 +47,13 @@ module Mack
         format = format[1..format.length]
         routes = @_route_map[verb]
         routes.each do |route|
-          if route.options[:host]
-            next unless !host.nil? && host.match(route.regex_patterns[:host])
-          end
-          if route.options[:scheme]
-            next unless route.options[:scheme].downcase == scheme
-          end
-          if route.options[:port]
-            next unless route.options[:port].to_i == port.to_i
-          end
-          if route.match?(path)
+          if route.match?(:uri => path, :host => host, :scheme => scheme, :port => port)
             ret_val = route.options_with_parameters(path, host)
             return ret_val
           end
         end
         @_default_routes.each do |route|
-          if route.match?(path) && route.options[:method] == verb
+          if route.match?(:uri => path) && route.options[:method] == verb
             ret_val = route.options_with_parameters(path)
             return ret_val
           end
@@ -81,6 +73,7 @@ module Mack
         end
         route = RouteObject.new(path, options)
         @_route_map[options[:method]] << route
+        @_deferred_route_map[options[:method]] << route if route.deferred
         route
       end
       
@@ -126,6 +119,10 @@ module Mack
         @_route_map
       end
       
+      def deferred_routes_list # :nodoc:
+        @_deferred_route_map
+      end
+      
       def default_routes_list # :nodoc:
         @_default_routes || []
       end
@@ -151,13 +148,17 @@ module Mack
       end
       
       def build_resource_routes(method_base, path_base, controller, options) # :nodoc:
-        connect_with_name("#{method_base}_index", "/#{path_base}", {:controller => controller, :action => :index, :method => :get}.merge(options))
-        connect_with_name("#{method_base}_create", "/#{path_base}", {:controller => controller, :action => :create, :method => :post}.merge(options))
-        connect_with_name("#{method_base}_new", "/#{path_base}/new", {:controller => controller, :action => :new, :method => :get}.merge(options))
-        connect_with_name("#{method_base}_show", "/#{path_base}/:id", {:controller => controller, :action => :show, :method => :get}.merge(options))
-        connect_with_name("#{method_base}_edit", "/#{path_base}/:id/edit", {:controller => controller, :action => :edit, :method => :get}.merge(options))
-        connect_with_name("#{method_base}_update", "/#{path_base}/:id", {:controller => controller, :action => :update, :method => :put}.merge(options))
-        connect_with_name("#{method_base}_delete", "/#{path_base}/:id", {:controller => controller, :action => :delete, :method => :delete}.merge(options))
+        deferred = options.delete(:deferred?) || []
+        if deferred && !deferred.is_a?(Array)
+          deferred = [:create, :update]
+        end
+        connect_with_name("#{method_base}_index", "/#{path_base}", {:controller => controller, :action => :index, :method => :get, :deferred? => deferred.include?(:index)}.merge(options))
+        connect_with_name("#{method_base}_create", "/#{path_base}", {:controller => controller, :action => :create, :method => :post, :deferred? => deferred.include?(:create)}.merge(options))
+        connect_with_name("#{method_base}_new", "/#{path_base}/new", {:controller => controller, :action => :new, :method => :get, :deferred? => deferred.include?(:new)}.merge(options))
+        connect_with_name("#{method_base}_show", "/#{path_base}/:id", {:controller => controller, :action => :show, :method => :get, :deferred? => deferred.include?(:show)}.merge(options))
+        connect_with_name("#{method_base}_edit", "/#{path_base}/:id/edit", {:controller => controller, :action => :edit, :method => :get, :deferred? => deferred.include?(:edit)}.merge(options))
+        connect_with_name("#{method_base}_update", "/#{path_base}/:id", {:controller => controller, :action => :update, :method => :put, :deferred? => deferred.include?(:update)}.merge(options))
+        connect_with_name("#{method_base}_delete", "/#{path_base}/:id", {:controller => controller, :action => :delete, :method => :delete, :deferred? => deferred.include?(:delete)}.merge(options))
       end
       
       private

data/lib/mack/routing/route_object.rb

@@ -9,10 +9,12 @@ module Mack
       attr_accessor :embedded_parameters
       attr_accessor :regex_patterns
       attr_accessor :insertion_order
+      attr_accessor :deferred
       
       def initialize(path, options = {})
         self.path = path
         self.options = {:action => :index}.merge(options)
+        self.deferred = self.options.delete(:deferred?) || false
         # self.embedded_parameters = []
         # self.host_embedded_parameters = []
         self.regex_patterns = {}
@@ -26,10 +28,19 @@ module Mack
         self.options == other
       end
       
-      def match?(url)
-        if url.downcase.match(self.regex_patterns[:uri])
+      def match?(env = {})
+        if self.options[:host]
+          return false unless !env[:host].nil? && env[:host].match(self.regex_patterns[:host])
+        end
+        if self.options[:scheme]
+          return false unless !env[:scheme].nil? && self.options[:scheme].downcase == env[:scheme]
+        end
+        if self.options[:port]
+          return false unless !env[:port].nil? && self.options[:port].to_i == env[:port].to_i
+        end
+        if env[:uri].downcase.match(self.regex_patterns[:uri])
           if self.options[:format]
-            format = (File.extname(url).blank? ? '.html' : File.extname(url))
+            format = (File.extname(env[:uri]).blank? ? '.html' : File.extname(env[:uri]))
             format = format[1..format.length]
             return format.to_sym == self.options[:format]
           end

data/lib/mack/routing/routes.rb

@@ -163,6 +163,10 @@ module Mack
         Mack::Routes::RouteMap.instance.inspect
       end
       
+      def deferred_routes_list # :nodoc:
+        Mack::Routes::RouteMap.instance.deferred_routes_list
+      end
+      
     end
     
   end # Routes

data/lib/mack/runner.rb

@@ -7,5 +7,16 @@ module Mack
       Mack::Application.new.call(env)
     end
     
+    def deferred?(env) # :nodoc:
+      if configatron.mack.use_deferred_routes
+        method = env["REQUEST_METHOD"].downcase.to_sym
+        routes = Mack::Routes.deferred_routes_list[method]
+        routes.each do |route|
+          return true if route.match?(:uri => env['PATH_INFO'], :host => env['SERVER_NAME'], :port => env['SERVER_PORT'], :scheme => env['rack.url_scheme'])
+        end
+      end
+      return false
+    end
+    
   end # Runner
 end # Mack

data/lib/mack/version.rb

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

data/lib/mack_app.rb

@@ -1,30 +1,5 @@
-if __FILE__ == $0
-  require 'fileutils'
-  require 'mack-facets'
-  ENV["MACK_ROOT"] = File.join(FileUtils.pwd, '..', 'test', 'fake_application')
-end
-
 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
-
-# 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)
+end

data/lib/mack_core.rb

@@ -1,8 +1,4 @@
-if __FILE__ == $0
-  require 'fileutils'
-  ENV["MACK_ROOT"] = File.join(FileUtils.pwd, 'test', 'fake_application')
-end
-
+require File.join(File.dirname(__FILE__), 'gems')
 require 'rubygems'
 require 'rack'
 require 'digest'
@@ -10,7 +6,6 @@ require 'mack-facets'
 require 'mack-encryption'
 require 'configatron'
 require 'fileutils'
-require 'log4r'
 require 'singleton'
 require 'uri'
 require 'drb'
@@ -34,47 +29,4 @@ 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
-
-# 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)
+end