mack 0.7.1.1 → 0.8.0

data/CHANGELOG

@@ -1,3 +1,35 @@
+=== 0.8.0
+* [#187] Fixed: When an exception is raised, the request doesn't get 'logged'
+* [#185] Fixed: .html is being appended to logged requests when there's a 404
+* [#184] Request logging should also print the message of the status code
+* [#183] Updates to asset mgr/host
+* [#181] Content-type can now be set with calling render.
+* [#179] When configatron.mack.show_exceptions is false you now either the public/404.html or public/500.html file.
+* [#178] Added a configure parameter to turn off log coloring
+* [#176] Added a Google Analytics helper.
+* [#175] Generating urls should use host or scheme if defined
+* [#171] Ability to extend resources in routes
+* [#170] Regex support in routes
+* [#169] Proc support for Routes
+* [#168] Fixed ERB errors not being reported correctly.
+* [#167] Rake task to convert app config yamls to configatron
+* [#165] Asset Packager
+* [#164] Response helper for 'attachments'
+* [#159] Added link_unless_current and link_if helpers
+* [#156] Added 'Wildcard' Routes support
+* [#152] INCOMPATIBILITY NOTICE: Removed deprecated support for delivered_emails use delivered_notifiers instead.
+* [#138] Added support for 'host' & 'scheme' parameters in routes
+* [#135] Replaced log4r with logging gem.
+* [#119] Freeze gems
+* [#106] INCOMPATIBILITY NOTICE: Removed deprecated support for droute_url
+* [#93] INCOMPATIBILITY NOTICE: Removed deprecated support for 'top' level ApplicationHelper
+* [#23] INCOMPATIBILITY NOTICE: Removed support for application_configuration and added support for configatron
+* gem: logging 0.9.4
+* gem: thin 1.0.0
+* gem: rspec 1.1.8
+* gem: configatron 2.1.4
+* gem: cachetastic 2.0.0
+
 === 0.7.1.1
 * [#163] Fixed jQuery code is being generated with double quotes instead of single quotes
 * [#162] Fixed View helpers for mack-javascript aren't being required

data/bin/gem_load_path.rb

@@ -5,7 +5,7 @@ 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')
+gem_path = File.join(vendor_path, 'gems')
 
 if File.exists?(mack_path)
   $:.insert(0, File.expand_path(mack_path))

data/bin/mackery

@@ -18,5 +18,4 @@ 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-server

@@ -10,6 +10,11 @@ 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"
@@ -30,7 +35,6 @@ if handler == "thin"
     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

data/lib/mack/assets/asset_helpers.rb

@@ -0,0 +1,51 @@
+module Mack
+  module Assets
+    class Helpers # :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 configatron.mack.assets.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 configatron.mack.assets.max_distribution
+      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 configatron (if exists)
+        host = @hosts || (configatron.mack.assets.hosts.nil? ? '' : configatron.mack.assets.hosts)
+
+        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
+end

data/lib/mack/assets/assets_mgr.rb

@@ -0,0 +1,165 @@
+module Mack
+  module Assets
+    class Bundle # :nodoc:
+      attr_accessor :data
+      attr_accessor :name
+
+      def initialize(bundle_name)
+        self.name = bundle_name
+        self.data = {:javascripts => [], :stylesheets => []}
+      end
+
+      def assets(asset_type)
+        self.data[asset_type]
+      end
+
+      #
+      # Add javascript file(s) to the group/bundle
+      #
+      def add_js(files)
+        return add_data(files, :javascripts, '.js')
+      end
+      alias_method :javascript, :add_js
+      
+      def remove_js(files)
+        files = [files].flatten
+        self.data[:javascripts] -= files
+      end
+
+      #
+      # Add stylesheet file(s) to the group/bundle
+      #
+      def add_css(files)
+        return add_data(files, :stylesheets, '.css')
+      end
+      alias_method :stylesheet, :add_css
+
+      def remove_css(files)
+        files = [files].flatten
+        self.data[:stylesheets] -= files
+      end
+
+      def reset!(type = :all)
+        if type == :all
+          self.data.keys.each do |key|
+            self.data[key].clear
+          end
+        else
+          self.data[type].clear if self.data[type]
+        end
+      end
+
+      private
+      def add_data(data, type, file_type)
+        data = [data].flatten
+        data.each do |elt|
+          elt = elt.to_s
+          elt += file_type if !elt.end_with?(file_type)
+          self.data[type.to_sym] << elt
+        end
+        return true
+      end
+
+    end
+  
+    #
+    # Like the name suggests, this object will manage
+    # assets (i.e. scripts and stylesheets) used in a mack application.
+    # Developer will be able to use the manager to create
+    # assets groups, and refer them later in the erb file.
+    # <br>
+    # There's a convenient method available, called assets_mgr.
+    # Application should use that method to create new bundle, and to access
+    # defined bundles.
+    # <br>
+    # Example:
+    #   # This will create new bundle called foo
+    #   assets_mgr.foo do |a|
+    #     a.add_js "foo"
+    #     a.add_css "bar"
+    #   end
+    #   
+    # Note that nested group is not supported.
+    #
+    class Manager
+      include Singleton
+
+      def initialize # :nodoc:
+        @bundles = {}
+      end
+
+      #
+      # Clear the defined assets
+      #
+      def reset!
+        @bundles.clear
+      end
+
+      def method_missing(sym, *args, &block) # :nodoc:
+        if @bundles.has_key?(sym.to_s)
+          bundle = @bundles[sym.to_s]
+        else
+          bundle = Mack::Assets::Bundle.new(sym.to_s)
+          @bundles[sym.to_s] = bundle
+        end
+        if block_given?
+          yield bundle
+        end
+        return bundle
+      end
+
+      # 
+      # return all groups defined for both javascript and stylesheets
+      #
+      def groups
+        @bundles.keys
+      end
+
+      # 
+      # Return all groups defined by specified asset type
+      #
+      # <i>Params:</i>
+      #   type -- asset type (can be either :javascript or :stylesheet)
+      def groups_by_asset_type(type)
+        arr = []
+        groups.each do |group|
+          arr << group if !@bundles[group.to_s].assets(type.to_sym).empty?
+        end
+        return arr
+      end
+      
+      def has_group?(group, asset_type = nil)
+        if asset_type
+          return groups_by_asset_type(asset_type).include?(group.to_s)
+        else
+          return groups.include?(group)
+        end
+      end
+
+      def assets(asset_type, group)
+        return nil if !@bundles.has_key?(group.to_s)
+        return @bundles[group.to_s].assets(asset_type)
+      end
+
+      def javascripts(group)
+        return assets(:javascripts, group)
+      end
+
+      def stylesheets(group)
+        return assets(:stylesheets, group)
+      end
+    end
+    
+  end
+end
+
+  
+
+module Kernel
+  #
+  # Return the instance of the AssetManager class.
+  #
+  def assets_mgr
+    return Mack::Assets::Manager.instance
+  end
+end

data/lib/mack/controller/controller.rb

@@ -54,7 +54,7 @@ module Mack
         run_filters(:before)
         # check to see if this controller responds to this action.
         # only run public methods!
-        if self.public_methods.include?(self.action_name)
+        if self.public_methods.include?(self.action_name.to_s)
           # call the action and capture the results to a variable.
           self.send(self.action_name)
         else
@@ -260,9 +260,9 @@ module Mack
     #   end
     def render(render_type = :action, render_value = self.action_name, options = {})
       raise Mack::Errors::DoubleRender.new if render_performed?
-      response.status = options[:status] unless options[:status].nil?
-      options = {:content_type => Mack::Utils::MimeTypes[params[:format]], :layout => layout}.merge(options)
-      response["Content-Type"] = options[:content_type]
+      response.status = options[:status] if options[:status]
+      options = {:layout => layout}.merge(options)
+      response.content_type = options[:content_type] if options[:content_type]
       options.delete(:content_type)
       @view_template = Mack::Rendering::ViewTemplate.new(render_type, render_value, 
       {:format => params[:format].to_sym, :controller => self}.merge(options))

data/lib/mack/controller/cookie_jar.rb

@@ -43,7 +43,7 @@ module Mack
       unless value.is_a?(Hash)
         value = {:value => value}
       end
-      value = app_config.mack.cookie_values.symbolize_keys.merge(value)
+      value = configatron.mack.cookie_values.to_hash.symbolize_keys.merge(value)
       self.all_cookies[key] = value
       self.response.set_cookie(key, value)
     end

data/lib/mack/controller/request.rb

@@ -3,13 +3,18 @@ module Mack
   class Request < Rack::Request
     
     class Parameters < Hash # :nodoc:
-      alias_method :old_hash, :[]
+      alias_instance_method :[], :old_hash
+      alias_instance_method :store
       def [](key)
         data = old_hash(key.to_sym) || old_hash(key.to_s)
         data = data.to_s if data.is_a?(Symbol)
         return data
       end
       
+      def []=(key, value)
+        _original_store(key.to_sym, value)
+      end
+      
       def to_s
         s = self.inspect
         Mack::Logging::Filter.list.each do |p|
@@ -27,7 +32,7 @@ module Mack
       parse_params(rack_params)
     end
     
-    alias_method :rack_params, :params # :nodoc:
+    alias_instance_method :params, :rack_params # :nodoc:
         
     # Merges another Hash with the parameters for this request.
     def merge_params(opts = {})
@@ -85,7 +90,12 @@ module Mack
       @mack_params
     end
     
-    alias_method :all_params, :params
+    def params=(p) # :nodoc:
+      @mack_params = Mack::Request::Parameters.new
+      parse_params(p)
+    end
+    
+    alias_instance_method :params, :all_params
     
     # Returns a Mack::Request::UploadedFile object.
     def file(key)

data/lib/mack/controller/response.rb

@@ -9,5 +9,17 @@ module Mack
       self.controller.instance_variable_get("@#{key}")
     end
     
+    def attachment=(file_name)
+      self['Content-Disposition'] = "attachment; filename=#{file_name}"
+    end
+    
+    def content_type=(type)
+      self['Content-Type'] = type
+    end
+    
+    def content_type
+      self['Content-Type']
+    end
+    
   end
 end

data/lib/mack/core_extensions/kernel.rb

@@ -41,6 +41,75 @@ module Kernel
     end
   end
   
+  unless Module.const_defined?('GEM_MOD')
+    Module.const_set('GEM_MOD', 1)
+    
+    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')
+      
+      # 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] != '<'
+      
+      num = ver.match(/\d.+/).to_s
+      op  = ver.delete(num).strip
+      op  += "=" if op == '=' 
+      
+      found_local_gem = false
+      
+      Dir.glob(File.join(gem_path, "#{gem_name}*")).each_with_index do |file, i|
+        # all frozen gem has the pattern [gem_name]-[version]
+        next if !file.include?'-'
+  
+        # make sure we're not loading gem with almost the same name, e.g. "#{gem_name}-foo_bar-0.89.1"
+        file_gem_name = file.match(/\D*-/).to_s
+        next if !file.starts_with?(file_gem_name)
+        
+        # find the version number from the file name
+        file_ver = file.match(/\d.+/).to_s
+        
+        # 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)           
+          spec_file = File.join(file, 'spec.yaml')
+          
+          if File.exists?(spec_file)
+            spec = YAML.load(File.read(spec_file))
+          else
+            spec = nil
+          end
+          
+          if spec and spec.require_path
+            spec.require_path.each { |rp| $:.insert(0, File.expand_path(File.join(file, rp))) }
+          else
+            $:.insert(0, File.expand_path(file))
+          end
+
+          found_local_gem = true
+          break
+        end
+      end 
+    
+      # if After going through the vendor/gems folder and we still didn't find
+      # any frozen gem that matched the criteria, then call the system's gem loader
+      if !found_local_gem
+        # puts "Loading installed gem: #{gem_name}"
+        old_gem(gem_name, *version_requirements)
+      end
+    end
+  end
+    
   private
   class DeprecatedRegistryList < Mack::Utils::RegistryList # :nodoc:
   end

data/lib/mack/core_extensions/symbol.rb

@@ -1,5 +1,9 @@
 class Symbol
   
+  def method_missing(sym, *args)
+    self.to_s.send(sym, *args)
+  end
+  
   # See Mack::ViewHelpers::FormHelpers date_time_select for more information
   def date_time_select(*args)
     Thread.current[:view_template].date_time_select(self, *args)

data/lib/mack/errors/errors.rb

@@ -56,7 +56,11 @@ module Mack
     class UndefinedRoute < StandardError
       # Takes a request object.
       def initialize(req)
-        super("#{req.path_info}; #{req.request_method}")
+        if req.is_a?(Mack::Request)
+          super("#{req.path_info}; #{req.request_method}")
+        else
+          super(req)
+        end
       end
     end # UndefinedRoute
     

data/lib/mack/generators/controller_generator/manifest.yml

@@ -5,12 +5,12 @@ controller_template:
 views_migrations:
   type: directory
   output_path: <%= File.join("app", "views", @name_plural) %>
-<% if app_config.mack.testing_framework == "test_case" -%>
+<% if configatron.mack.testing_framework.to_s == "test_case" -%>
 test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test", "controllers", "test_case.rb.template") %>
   output_path: <%= File.join("test", "controllers", "#{@name_plural}_controller_test.rb") %>
-<% elsif app_config.mack.testing_framework == "rspec" -%>
+<% elsif configatron.mack.testing_framework.to_s == "rspec" -%>
 test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test", "controllers", "rspec.rb.template") %>

data/lib/mack/generators/controller_helper_generator/manifest.yml

@@ -2,12 +2,12 @@ helper_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "app", "helpers", "controllers", "helper.rb.template") %>
   output_path: <%= File.join("app", "helpers", "controllers", "#{@name_plural}_controller_helper.rb") %>
-<% if app_config.mack.testing_framework == "test_case" -%>
+<% if configatron.mack.testing_framework.to_s == "test_case" -%>
 helper_test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "test_case.rb.template") %>
   output_path: <%= File.join("test", "helpers", "controllers", "#{@name_plural}_controller_helper_test.rb") %>
-<% elsif app_config.mack.testing_framework == "rspec" -%>
+<% elsif configatron.mack.testing_framework.to_s == "rspec" -%>
 helper_test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test", "helpers", "controllers", "rspec.rb.template") %>

data/lib/mack/generators/mack_application_generator/manifest.yml

@@ -22,8 +22,8 @@ application_layout:
 <% ["default", "development", "production", "test"].each do |env| -%>
 <%= env %>_yml:
   type: file
-  template_path: <%= File.join(templates_directory_path, "config", "app_config", "#{env}.yml.template") %>
-  output_path: <%= File.join(app_name, "config", "app_config", "#{env}.yml") %>
+  template_path: <%= File.join(templates_directory_path, "config", "configatron", "#{env}.rb.template") %>
+  output_path: <%= File.join(app_name, "config", "configatron", "#{env}.rb") %>
 <% end -%>
 database_yml:
   type: file
@@ -43,6 +43,14 @@ favicon:
   type: file
   template_path: <%= File.join(templates_directory_path, "public", "favicon.ico.template") %>
   output_path: <%= File.join(app_name, "public", "favicon.ico") %>
+404:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "public", "404.html.template") %>
+  output_path: <%= File.join(app_name, "public", "404.html") %>
+500:
+  type: file
+  template_path: <%= File.join(templates_directory_path, "public", "500.html.template") %>
+  output_path: <%= File.join(app_name, "public", "500.html") %>
 scaffold_css:
   type: file
   template_path: <%= File.join(templates_directory_path, "public", "stylesheets", "scaffold.css.template") %>

data/lib/mack/generators/mack_application_generator/templates/config/{app_config/default.yml.template → configatron/default.rb.template}

@@ -6,29 +6,24 @@
 # 
 # Configuration parameters can be used in your application like such:
 # 
-#   app_config.<setting_name>
+#   configatron.<setting_name>
 # 
 # Nested parameters can be defined using ::.
 # 
 # Examples:
-# default.yml:
-#   default_time_limit: <%%= 15.minutes %>
-#   api::timeout_limit: <%%= 15.seconds %>
+# default.rb: 
+#   configatron.default_time_limit: <%%= 15.minutes %>
+#   configatron.api.timeout_limit: <%%= 15.seconds %>
 # 
-# app_config.default_time_limit # => 900
-# app_config.api.timeout_limit # => 15
+# configatron.default_time_limit # => 900
+# configatron.api.timeout_limit # => 15
 
-
-whiny_config_missing: false
-
-mack::session_id: _<%= @options["app"].downcase %>_session_id
-
-mack::testing_framework: <%= @options["testing_framework"] %>
-
-default_secret_key: <%= String.randomize(80) %>
+configatron.mack.session_id = '_<%= @options["app"].downcase %>_session_id'
+configatron.mack.testing_framework = '<%= @options["testing_framework"] %>'
+configatron.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
 # 2.  run:  rake generate:javascript
-# mack::js_framework: <%= @options["js_framework"] %>
+# configatron.mack.js_framework = '<%= @options["js_framework"] %>'

data/lib/mack/generators/mack_application_generator/templates/config/{app_config/development.yml.template → configatron/development.rb.template}

@@ -1 +1 @@
-# Any settings in here will override the settings in default.yml for the development environment.
+# Any settings in here will override the settings in default.yml for the development environment.

data/lib/mack/generators/mack_application_generator/templates/config/{app_config/test.yml.template → configatron/test.rb.template}

@@ -1 +1 @@
-# Any settings in here will override the settings in default.yml for the test environment.
+# Any settings in here will override the settings in default.yml for the test environment.

data/lib/mack/generators/mack_application_generator/templates/public/404.html.template

@@ -0,0 +1,15 @@
+<html>
+<head>
+  <title>Page Not Found! (404)</title>
+  <style>
+    body {
+      font-family: Verdana;
+    }
+  </style>
+</head>
+<body>
+  <h1>Page Not Found!</h1>
+
+  <p>We're sorry the page you have tried to access does not appear to exist. Please check the URL and try again.</p>
+</body>
+</html>

data/lib/mack/generators/mack_application_generator/templates/public/500.html.template

@@ -0,0 +1,15 @@
+<html>
+<head>
+  <title>Server Error! (500)</title>
+  <style>
+    body {
+      font-family: Verdana;
+    }
+  </style>
+</head>
+<body>
+  <h1>Server Error!</h1>
+
+  <p>We're sorry there appears to be a problem. Please try back again later.</p>
+</body>
+</html>

data/lib/mack/generators/view_helper_generator/manifest.yml

@@ -2,12 +2,12 @@ helper_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "app", "helpers", "views", "helper.rb.template") %>
   output_path: <%= File.join("app", "helpers", "views", "#{@name_singular}_helper.rb") %>
-<% if app_config.mack.testing_framework == "test_case" -%>
+<% if configatron.mack.testing_framework.to_s == "test_case" -%>
 helper_test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "test_case.rb.template") %>
   output_path: <%= File.join("test", "helpers", "views", "#{@name_singular}_helper_test.rb") %>
-<% elsif app_config.mack.testing_framework == "rspec" -%>
+<% elsif configatron.mack.testing_framework.to_s == "rspec" -%>
 helper_test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "rspec.rb.template") %>