mack 0.7.1.1 → 0.8.0

data/lib/mack/view_helpers/date_time_helpers.rb

@@ -3,18 +3,24 @@ module Mack
     module FormHelpers
       
       MONTHS = [["January", 1], ["February", 2], ["March", 3], ["April", 4], ["May", 5], ["June", 6], ["July", 7], ["August", 8], 
-                ["September", 9], ["October", 10], ["November", 11], ["December", 12]]
-      DAYS = []
-      1.upto(31) do |m| 
-        DAYS << [(m < 10 ? "0#{m}" : m), m]
+                ["September", 9], ["October", 10], ["November", 11], ["December", 12]] unless defined?(MONTHS)
+      unless defined?(DAYS)
+        DAYS = []
+        1.upto(31) do |m| 
+          DAYS << [(m < 10 ? "0#{m}" : m), m]
+        end
       end
-      HOURS = []
-      1.upto(24) do |h|
-        HOURS << [(h < 10 ? "0#{h}" : h), h]
+      unless defined?(HOURS)
+        HOURS = []
+        1.upto(24) do |h|
+          HOURS << [(h < 10 ? "0#{h}" : h), h]
+        end
       end
-      MINUTES = []
-      1.upto(59) do |m| 
-        MINUTES << [(m < 10 ? "0#{m}" : m), m]
+      unless defined?(MINUTES)
+        MINUTES = []
+        1.upto(59) do |m| 
+          MINUTES << [(m < 10 ? "0#{m}" : m), m]
+        end
       end
       
       # This will create a series of select boxes that compromise a time object. By default boxes will be

data/lib/mack/view_helpers/form_helpers.rb

@@ -44,7 +44,7 @@ module Mack
         end
         concat("<form#{build_options(options)}>\n", block.binding)
         concat(meth, block.binding) unless meth.blank?
-        concat(form_authenticity_field, block.binding) if !app_config.mack.disable_forgery_detector
+        concat(form_authenticity_field, block.binding) unless configatron.mack.disable_forgery_detector
         yield
         concat("\n</form>", block.binding)
         # content_tag(:form, options, &block)

data/lib/mack/view_helpers/html_helpers.rb

@@ -1,7 +1,7 @@
 module Mack
   module ViewHelpers # :nodoc:
     module HtmlHelpers
-      
+
       # Builds an HTML tag.
       # 
       # Examples:
@@ -28,6 +28,7 @@ module Mack
       
       # Builds a HTML image tag.
       def img(image_src, options = {})
+        image_src = "#{get_resource_root(image_src)}#{image_src}?#{configatron.mack.assets.stamp}"
         non_content_tag(:img, {:src => image_src}.merge(options))
       end
       
@@ -37,6 +38,18 @@ module Mack
         "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"#{url}\">"
       end
       
+      def google_analytics(id)
+        %{
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("#{id}");
+pageTracker._trackPageview();
+</script>}.strip
+      end
+      
       private
       def build_options(options)
         if options[:disabled]
@@ -49,6 +62,14 @@ module Mack
         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
+      
+      
     end # HtmlHelpers
   end # ViewHelpers
 end # Mack

data/lib/mack/view_helpers/link_helpers.rb

@@ -47,6 +47,25 @@ module Mack
         a(link_text, options)
       end
       
+      # If the current page matches the link requested, then it will only return the text.
+      # If the current page does not match the link requested then link_to is call.
+      def link_unless_current(text, link = text, options = {})
+        link_to_unless((link == request.fullpath), text, link, options)
+      end
+      
+      # Only creates a link if the expression is true, otherwise, it passes back the text.
+      def link_to_if(expr, text, link = text, options = {})
+        if expr
+          return link_to(text, link, options)
+        end
+        return text
+      end
+      
+      # Only creates a link unless the expression is true, otherwise, it passes back the text.
+      def link_to_unless(expr, text, link = text, options = {})
+        link_to_if(!expr, text, link, options)
+      end
+      
       # Used in views to create href links. It takes link_text, url, and a Hash that gets added
       # to the href as options.
       # 
@@ -122,14 +141,15 @@ module Mack
       #
       # If distributed_site_domain is specified, it will be used.
       #
-      def javascript(files)
+      def javascript(files, options = {})
         files = [files].flatten
-                
+        files = resolve_bundle('javascripts', files)                
+        
         link = ""
         files.each do |name|
           file_name = !name.to_s.end_with?(".js") ? "#{name}.js" : "#{name}"
           resource = "/javascripts/#{file_name}"
-          link += "<script src=\"#{get_resource_root(resource)}#{resource}?#{Time.now.to_i}\" type=\"text/javascript\"></script>\n"
+          link += "<script src=\"#{get_resource_root(resource)}#{resource}?#{configatron.mack.assets.stamp}\" type=\"text/javascript\"></script>\n"
         end
         return link
       end
@@ -148,26 +168,47 @@ module Mack
       #
       def stylesheet(files, options = {})
         files = [files].flatten
+        files = resolve_bundle('stylesheets', files)
         options = {:media => 'screen', :rel => 'stylesheet', :type => 'text/css'}.merge(options)
         
         link = ""
         files.each do |name|
           file_name = !name.to_s.end_with?(".css") ? "#{name}.css" : "#{name}"
           resource = "/stylesheets/#{file_name}"
-          link += "<link href=\"#{get_resource_root(resource)}#{resource}\" media=\"#{options[:media]}\" rel=\"#{options[:rel]}\" type=\"#{options[:type]}\" />\n"
+          link += "<link href=\"#{get_resource_root(resource)}#{resource}?#{configatron.mack.assets.stamp}\" media=\"#{options[:media]}\" rel=\"#{options[:rel]}\" type=\"#{options[:type]}\" />\n"
         end
         
         return link
       end
       
-      private
-      def get_resource_root(resource)
-        path = ""
-        path = "#{app_config.mack.distributed_site_domain}" if app_config.mack.distributed_site_domain
-        path = Mack::AssetHelpers.instance.asset_hosts(resource) if path.empty?
-        return path
+      def assets_bundle(names)
+        names = [names].flatten
+        names.collect { |s| s.to_s }
+        arr = []
+        names.each do |name|
+          arr << javascript(name) if assets_mgr.has_group?(name, :javascripts)
+          arr << stylesheet(name) if assets_mgr.has_group?(name, :stylesheets)
+        end
+        return arr.join("\n")
       end
       
+      private
+      
+      def resolve_bundle(asset_type, sources)
+        groups = assets_mgr.groups_by_asset_type(asset_type)
+        sources.collect! { |s| s.to_s }
+        groups.collect! { |s| s.to_s }
+        
+        groups.each do |group|
+          if sources.include?(group)
+            sources = sources[0..(sources.index(group))] +
+              assets_mgr.send(asset_type, group) +
+              sources[(sources.index(group) + 1)..sources.length]
+            sources.delete(group)
+          end
+        end
+        return sources
+      end
     end # LinkHelpers
   end # ViewHelpers
 end # Mack

data/lib/mack/view_helpers/string_helpers.rb

@@ -56,7 +56,7 @@ module Mack
         end
       end
       
-      alias_method :s, :sanitize_html
+      alias_instance_method :sanitize_html, :s
       
     end # StringHelpers
   end # ViewHelpers

data/lib/mack.rb

@@ -1,7 +1,6 @@
 # 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_core.rb

@@ -3,8 +3,7 @@ require 'rack'
 require 'digest'
 require 'mack-facets'
 require 'mack-encryption'
-require 'application_configuration'
-require 'cachetastic'
+require 'configatron'
 require 'fileutils'
 require 'log4r'
 require 'singleton'
@@ -18,7 +17,8 @@ require 'erb'
 require 'genosaurus'
 require 'net/http'
 require 'pp'
-require 'test/unit'
+require 'test/unit' 
+require 'thread'
 begin
   # just in case people don't have it installed.
   require 'ruby-debug'
@@ -40,19 +40,19 @@ boot_load(:paths) do
 end
 
 boot_load(:gems) do
-  Mack.logger.debug "Initializing custom gems..." unless app_config.log.disable_initialization_logging
+  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 app_config.log.disable_initialization_logging
+  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 = ["errors", "core_extensions", "utils", "sessions", "runner_helpers", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators", "distributed"]
+  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.each do |d|
+    dir_globs.sort.each do |d|
       require d unless d.match(/console/)
     end
   end
@@ -63,7 +63,7 @@ boot_load(:runner) do
 end
 
 boot_load(:load_mack_core, :version, :paths, :configuration, :logging, :core_classes, :gems) do
-  Mack.logger.debug "Initialization of Mack Core finished." unless app_config.log.disable_initialization_logging
+  Mack.logger.debug "Initialization of Mack Core finished." unless configatron.mack.log.disable_initialization_logging
 end
 
 Mack::BootLoader.run(:load_mack_core)

data/lib/mack_tasks.rb

@@ -4,7 +4,7 @@ require 'rake/rdoctask'
 require 'fileutils'
 require 'rubygems'
 require 'mack-facets'
-require 'application_configuration'
+require 'configatron'
 
 fl = File.join(File.dirname(__FILE__), 'mack')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.7.1.1
+  version: 0.8.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-14 00:00:00 -04:00
+date: 2008-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,27 +30,27 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.1.1
+        version: 0.8.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: application_configuration
+  name: configatron
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.5.3
+        version: 2.1.4
     version: 
 - !ruby/object:Gem::Dependency 
-  name: log4r
+  name: logging
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.5
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: thin
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.2
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -120,7 +120,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.4
+        version: 1.1.8
     version: 
 description: Mack is a powerful, yet simple, web application framework.  It takes some cues from the likes of Rails and Merb, so it's not entirely unfamiliar. Mack hopes to provide developers a great framework for building, and deploying, portal and distributed applications.
 email: mark@mackframework.com
@@ -136,6 +136,8 @@ extra_rdoc_files:
 - CHANGELOG
 files: 
 - README
+- lib/mack/assets/asset_helpers.rb
+- lib/mack/assets/assets_mgr.rb
 - lib/mack/controller/all_helpers.rb
 - lib/mack/controller/controller.rb
 - lib/mack/controller/cookie_jar.rb
@@ -164,15 +166,17 @@ files:
 - lib/mack/generators/mack_application_generator/templates/app/helpers/views/application_helper.rb.template
 - lib/mack/generators/mack_application_generator/templates/app/views/default/index.html.erb.template
 - lib/mack/generators/mack_application_generator/templates/app/views/layouts/application.html.erb.template
-- lib/mack/generators/mack_application_generator/templates/config/app_config/default.yml.template
-- lib/mack/generators/mack_application_generator/templates/config/app_config/development.yml.template
-- lib/mack/generators/mack_application_generator/templates/config/app_config/production.yml.template
-- lib/mack/generators/mack_application_generator/templates/config/app_config/test.yml.template
+- lib/mack/generators/mack_application_generator/templates/config/configatron/default.rb.template
+- lib/mack/generators/mack_application_generator/templates/config/configatron/development.rb.template
+- lib/mack/generators/mack_application_generator/templates/config/configatron/production.rb.template
+- lib/mack/generators/mack_application_generator/templates/config/configatron/test.rb.template
 - lib/mack/generators/mack_application_generator/templates/config/database.yml.template
 - lib/mack/generators/mack_application_generator/templates/config/initializers/gems.rb.template
 - lib/mack/generators/mack_application_generator/templates/config/initializers/inflections.rb.template
 - lib/mack/generators/mack_application_generator/templates/config/initializers/mime_types.rb.template
 - lib/mack/generators/mack_application_generator/templates/config/routes.rb.template
+- lib/mack/generators/mack_application_generator/templates/public/404.html.template
+- lib/mack/generators/mack_application_generator/templates/public/500.html.template
 - lib/mack/generators/mack_application_generator/templates/public/favicon.ico.template
 - lib/mack/generators/mack_application_generator/templates/public/stylesheets/scaffold.css.template
 - lib/mack/generators/mack_application_generator/templates/Rakefile.template
@@ -204,6 +208,9 @@ files:
 - lib/mack/initialization/console.rb
 - lib/mack/initialization/environment.rb
 - lib/mack/initialization/helpers.rb
+- lib/mack/initialization/logging/basic_layout.rb
+- lib/mack/initialization/logging/color_layout.rb
+- lib/mack/initialization/logging/filter.rb
 - lib/mack/initialization/logging.rb
 - lib/mack/initialization/plugins.rb
 - lib/mack/initialization/server/simple_server.rb
@@ -223,7 +230,10 @@ files:
 - lib/mack/rendering/type/url.rb
 - lib/mack/rendering/type/xml.rb
 - lib/mack/rendering/view_template.rb
+- lib/mack/routing/resource_proxy.rb
 - lib/mack/routing/route_map.rb
+- lib/mack/routing/route_object.rb
+- lib/mack/routing/routes.rb
 - lib/mack/routing/urls.rb
 - lib/mack/runner.rb
 - lib/mack/runner_helpers/base.rb
@@ -255,13 +265,15 @@ files:
 - lib/mack/utils/content_length_handler.rb
 - lib/mack/utils/forgery_detector.rb
 - lib/mack/utils/gem_manager.rb
+- lib/mack/utils/http_status_codes.rb
+- lib/mack/utils/http_status_codes.yml
 - lib/mack/utils/mime_types.rb
 - lib/mack/utils/mime_types.yml
 - lib/mack/utils/paths.rb
+- lib/mack/utils/reloader.rb
 - lib/mack/utils/server.rb
 - lib/mack/version.rb
 - lib/mack/view_helpers/all_helpers.rb
-- lib/mack/view_helpers/asset_helpers.rb
 - lib/mack/view_helpers/date_time_helpers.rb
 - lib/mack/view_helpers/form_helpers.rb
 - lib/mack/view_helpers/html_helpers.rb
@@ -305,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: magrathea
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Mack is a powerful, yet simple, web application framework.

data/lib/mack/view_helpers/asset_helpers.rb

@@ -1,50 +0,0 @@
-module Mack
-  class AssetHelpers # :nodoc:
-    include Singleton
-    
-    # 
-    # Set the asset hosts for this app.  It supports the following format:
-    # - plain string: the string literal will be considered as the asset hosts (e.g. 'http://assets.foo.com')
-    # - formatted string: to support asset host distribution (e.g. 'http://asset%d.foo.com')
-    # - a proc object: to support custom asset hosts generation (e.g. Proc.new { |source| 'assets.foo.com' }
-    #
-    # The max number of distribution can be set from app_config's asset_hosts_max_distribution.
-    # The default value is 4
-    #
-    def asset_hosts=(host)
-      @hosts = host
-    end
-    
-    # 
-    # Return the max number of asset hosts distribution
-    #
-    def max_distribution
-      return app_config.asset_hosts_max_distribution.to_i || 4
-    end
-    
-    #
-    # Return the asset hosts for this application.
-    #
-    def asset_hosts(source = '')
-      ret_val = ''
-      
-      # if no explicit asset_host setting, then use the one defined in app_config (if exists)
-      host = @hosts || app_config.asset_hosts
-      host = '' if host.nil?
-      
-      if host.kind_of?(Proc)
-        ret_val = host.call(source)
-      else
-        ret_val = sprintf(host, rand(max_distribution))
-      end
-      return ret_val
-    end
-    
-    #
-    # Clear previously set configuration for asset hosts
-    #
-    def reset!
-      @hosts = nil
-    end
-  end
-end