mack 0.6.1.2 → 0.7.0

data/lib/mack/view_helpers/html_helpers.rb

@@ -2,59 +2,6 @@ module Mack
   module ViewHelpers # :nodoc:
     module HtmlHelpers
       
-      # This is just an alias to 
-      # 
-      # Examples:
-      #   <%= link_to("http://www.mackframework.com") %> # => <a href="http://www.mackframework.com">http://www.mackframework.com</a>
-      #   <%= link_to("Mack", "http://www.mackframework.com") %> # => <a href="http://www.mackframework.com">Mack</a>
-      #   <%= link_to("Mack", "http://www.mackframework.com", :target => "_blank") %> # => <a href="http://www.mackframework.com" target="_blank">Mack</a>
-      #   <%= link_to("Mack", "http://www.mackframework.com", :target => "_blank", :rel => :nofollow) %> # => <a href="http://www.mackframework.com" target="_blank" rel="nofollow">Mack</a>
-      # If you pass in :method as an option it will be a JavaScript form that will post to the specified link with the 
-      # methd specified.
-      #   <%= link_to("Mack", "http://www.mackframework.com", :method => :delete) %>
-      # If you use the :method option you can also pass in a :confirm option. The :confirm option will generate a 
-      # javascript confirmation window. If 'OK' is selected the the form will submit. If 'cancel' is selected, then
-      # nothing will happen. This is extremely useful for 'delete' type of links.
-      #   <%= link_to("Mack", "http://www.mackframework.com", :method => :delete, :confirm => "Are you sure?") %>
-      def link_to(link_text, url = link_text, html_options = {})
-        options = {:href => url}.merge(html_options)
-        a(link_text, 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.
-      # 
-      # Examples:
-      #    a("http://www.mackframework.com") # => <a href="http://www.mackframework.com">http://www.mackframework.com</a>
-      #    a("Mack", :href => "http://www.mackframework.com") # => <a href="http://www.mackframework.com">Mack</a>
-      #    a("Mack", :href => "http://www.mackframework.com", :target => "_blank") # => <a href="http://www.mackframework.com" target="_blank">Mack</a>
-      #    a("Mack", :href => "http://www.mackframework.com", :target => "_blank", :rel => :nofollow) # => <a href="http://www.mackframework.com" target="_blank" rel="nofollow">Mack</a>
-      # If you pass in :method as an option it will be a JavaScript form that will post to the specified link with the 
-      # methd specified.
-      #    a("Mack", :href => "http://www.mackframework.com", :method => :delete)
-      # If you use the :method option you can also pass in a :confirm option. The :confirm option will generate a 
-      # javascript confirmation window. If 'OK' is selected the the form will submit. If 'cancel' is selected, then
-      # nothing will happen. This is extremely useful for 'delete' type of links.
-      #    a("Mack", :href => "http://www.mackframework.com", :method => :delete, :confirm => "Are you sure?")
-      def a(link_text, options = {})
-        options = {:href => link_text}.merge(options)
-        if options[:method]
-          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()}
-          options.delete(:method)
-        
-          if options[:confirm]
-            confirm = %{if (confirm('#{options[:confirm]}'))}
-            options.delete(:confirm)
-          end
-        
-          options[:onclick] = (confirm ? (confirm + " { ") : "") << meth << (confirm ? (" } ") : "") << ";return false;"
-        end
-        content_tag(:a, options, link_text)
-      end
-      
       # Builds an HTML tag.
       # 
       # Examples:
@@ -64,7 +11,7 @@ module Mack
         if block_given?
           concat("<#{tag}#{build_options(options)}>\n", block.binding)
           yield
-          concat("</#{tag}>", block.binding)
+          concat("\n</#{tag}>", block.binding)
         else
            "<#{tag}#{build_options(options)}>#{content}</#{tag}>"
         end
@@ -84,48 +31,17 @@ module Mack
         non_content_tag(:img, {:src => image_src}.merge(options))
       end
       
-      # Builds an HTML submit tag
-      def submit_tag(value = "Submit", options = {})
-        non_content_tag(:input, {:type => :submit, :value => value}.merge(options))
-      end
-      
-      # Wraps an image tag with a link tag.
-      # 
-      # Examples:
-      #   <%= link_image_to("/images/foo.jpg", "#" %> # => <a href="#"><img src="/images/foo.jpg"></a>
-      def link_image_to(image_url, url, image_options = {}, html_options = {})
-        link_to(img(image_url, image_options), url, html_options)
-      end
-      
       # Example:
       #   <%= rss_tag(posts_index_url(:format => :xml)) %>
       def rss_tag(url)
         "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"#{url}\">"
       end
       
-      def form(action, options = {}, &block)
-        options = {:method => :post, :action => action}.merge(options)
-        if options[:id]
-          options = {:class => options[:id]}.merge(options)
-        end
-        if options[:multipart]
-          options = {:enctype => "multipart/form-data"}.merge(options)
-          options.delete(:multipart)
-        end
-        meth = nil
-        unless options[:method] == :get || options[:method] == :post
-          meth = "<input name=\"_method\" type=\"hidden\" value=\"#{options[:method]}\" />\n"
-          options[:method] = :post
-        end
-        concat("<form#{build_options(options)}>\n", block.binding)
-        concat(meth, block.binding) unless meth.blank?
-        yield
-        concat("</form>", block.binding)
-        # content_tag(:form, options, &block)
-      end
-      
       private
       def build_options(options)
+        if options[:disabled]
+          options[:disabled] = :disabled
+        end
         opts = ""
         unless options.empty?
           opts = " " << options.join("%s=\"%s\"", " ")

data/lib/mack/view_helpers/link_helpers.rb

@@ -0,0 +1,171 @@
+module Mack
+  module ViewHelpers # :nodoc:
+    module LinkHelpers
+      
+      # Generates a javascript popup window. It will create the javascript needed for the window,
+      # as well as the href to call it.
+      # 
+      # Example:
+      #   popup('click here', 'http://www.example.com', {:toolbar => :yes, :name => :example_window}, {:alt => 'hello'}) # => 
+      #   <script>
+      #     function popup_r8b3edqgpbhm3zkthlgp(u) {
+      #       window.open(u, 'example_window', "height=400,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,titlebar=no,toolbar=yes,width=500");
+      #     }
+      #   </script>
+      #   <a alt="hello" href="javascript:popup_r8b3edqgpbhm3zkthlgp('http://www.example.com')">click here</a>
+      def popup(link_text, url = link_text, popup_options = {}, html_options = {})
+        m = String.randomize(20).downcase
+        popup_options = {:menubar => :no, :width => 500, :height => 400, :toolbar => :no, :scrollbars => :yes, :resizable => :yes, :titlebar => :no, :status => :no, :location => :no, :name => m}.merge(popup_options)
+        window_name = popup_options[:name]
+        popup_options.delete(:name)
+        %{
+<script>
+  function popup_#{m}(u) {
+    window.open(u, '#{window_name}', "#{popup_options.join("%s=%s", ",")}");
+  }
+</script>
+#{link_to(link_text, "javascript:popup_#{m}('#{url}')", html_options)}
+        }.strip
+      end
+      
+      # This is just an alias to the a method
+      # 
+      # Examples:
+      #   <%= link_to("http://www.mackframework.com") %> # => <a href="http://www.mackframework.com">http://www.mackframework.com</a>
+      #   <%= link_to("Mack", "http://www.mackframework.com") %> # => <a href="http://www.mackframework.com">Mack</a>
+      #   <%= link_to("Mack", "http://www.mackframework.com", :target => "_blank") %> # => <a href="http://www.mackframework.com" target="_blank">Mack</a>
+      #   <%= link_to("Mack", "http://www.mackframework.com", :target => "_blank", :rel => :nofollow) %> # => <a href="http://www.mackframework.com" target="_blank" rel="nofollow">Mack</a>
+      # If you pass in :method as an option it will be a JavaScript form that will post to the specified link with the 
+      # methd specified.
+      #   <%= link_to("Mack", "http://www.mackframework.com", :method => :delete) %>
+      # If you use the :method option you can also pass in a :confirm option. The :confirm option will generate a 
+      # javascript confirmation window. If 'OK' is selected the the form will submit. If 'cancel' is selected, then
+      # nothing will happen. This is extremely useful for 'delete' type of links.
+      #   <%= link_to("Mack", "http://www.mackframework.com", :method => :delete, :confirm => "Are you sure?") %>
+      def link_to(link_text, url = link_text, html_options = {})
+        options = {:href => url}.merge(html_options)
+        a(link_text, 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.
+      # 
+      # Examples:
+      #    a("http://www.mackframework.com") # => <a href="http://www.mackframework.com">http://www.mackframework.com</a>
+      #    a("Mack", :href => "http://www.mackframework.com") # => <a href="http://www.mackframework.com">Mack</a>
+      #    a("Mack", :href => "http://www.mackframework.com", :target => "_blank") # => <a href="http://www.mackframework.com" target="_blank">Mack</a>
+      #    a("Mack", :href => "http://www.mackframework.com", :target => "_blank", :rel => :nofollow) # => <a href="http://www.mackframework.com" target="_blank" rel="nofollow">Mack</a>
+      # If you pass in :method as an option it will be a JavaScript form that will post to the specified link with the 
+      # methd specified.
+      #    a("Mack", :href => "http://www.mackframework.com", :method => :delete)
+      # If you use the :method option you can also pass in a :confirm option. The :confirm option will generate a 
+      # javascript confirmation window. If 'OK' is selected the the form will submit. If 'cancel' is selected, then
+      # nothing will happen. This is extremely useful for 'delete' type of links.
+      #    a("Mack", :href => "http://www.mackframework.com", :method => :delete, :confirm => "Are you sure?")
+      def a(link_text, options = {})
+        options = {:href => link_text}.merge(options)
+        if options[:method]
+          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()}
+          options.delete(:method)
+        
+          if options[:confirm]
+            confirm = %{if (confirm('#{options[:confirm]}'))}
+            options.delete(:confirm)
+          end
+        
+          options[:onclick] = (confirm ? (confirm + " { ") : "") << meth << (confirm ? (" } ") : "") << ";return false;"
+        end
+        content_tag(:a, options, link_text)
+      end
+      
+      # Wraps an image tag with a link tag.
+      # 
+      # Examples:
+      #   <%= link_image_to("/images/foo.jpg", "#" %> # => <a href="#"><img src="/images/foo.jpg"></a>
+      def link_image_to(image_url, url, image_options = {}, html_options = {})
+        link_to(img(image_url, image_options), url, html_options)
+      end
+      
+      # Builds a mailto href. By default it will generate 
+      # JavaScript to help prevent phishing. To turn this off
+      # pass in the option :format => :plain
+      # 
+      #   mail_to("Saul Frami", "frami.saul@klocko.ca") # => 
+      #   <script>document.write(String.fromCharCode(60,97,32,104,114,101,
+      #   102,61,34,109,97,105,108,116,111,58,102,114,97,109,105,46,115,97,117,
+      #   108,64,107,108,111,99,107,111,46,99,97,34,62,83,97,117,108,32,70,114,97,109,105,60,47,97,62));</script>
+      def mail_to(text, email_address = nil, options = {})
+        email_address = text if email_address.blank?
+        options = {:format => :js}.merge(options)
+        format = options[:format]
+        options - [:format]
+        link = link_to(text, "mailto:#{email_address}", options)
+        if format == :js
+          y = ''
+          link.size.times {y << 'a'}
+          js_link = "<script>"
+          c_code = []
+          link.each_byte {|c| c_code << c}
+          js_link << "document.write(String.fromCharCode(#{c_code.join(",")}));"
+          js_link << "</script>"
+          return js_link
+        else
+          return link
+        end
+      end
+      
+      #
+      # Generate Javascript tag (<javascript src="/javascripts/foo.js?1241225" type="text/javascript" />)
+      #
+      # If distributed_site_domain is specified, it will be used.
+      #
+      def javascript(files, options = {})
+        files = [files].flatten
+        options = {:type => "text/javascript"}.merge(options)
+        
+        link = ""
+        files.each do |name|
+          file_name = !name.to_s.end_with?(".js") ? "#{name}.js" : "#{name}"
+          link += "<javascript src=\"#{get_resource_root}/javascripts/#{file_name}?#{Time.now.to_i}\" type=\"#{options[:type]}\" />\n"
+        end
+        return link
+      end
+      
+      #
+      # Generate Stylesheet tag
+      # If distributed_site_domain is specified, then it will use it as the host of the css file
+      # example:
+      # stylesheet("foo") => <link href="/stylesheets/scaffold.css" media="screen" rel="stylesheet" type="text/css" />
+      # 
+      # distributed_site_domain is set to 'http://localhost:3001'
+      # then, stylesheet("foo") will generate
+      # <link href="http://localhost:3001/stylesheets/scaffold.css" media="screen" rel="stylesheet" type="text/css" />
+      #
+      # Supported options are: :media, :rel, and :type
+      #
+      def stylesheet(files, options = {})
+        files = [files].flatten
+        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}"
+          link += "<link href=\"#{get_resource_root}/stylesheets/#{file_name}\" media=\"#{options[:media]}\" rel=\"#{options[:rel]}\" type=\"#{options[:type]}\" />\n"
+        end
+        
+        return link
+      end
+      
+      private
+      def get_resource_root
+        path = ""
+        path = "#{app_config.mack.distributed_site_domain}" if app_config.mack.distributed_site_domain
+        return path
+      end
+      
+    end # LinkHelpers
+  end # ViewHelpers
+end # Mack

data/lib/mack/view_helpers/object_helpers.rb

@@ -0,0 +1,14 @@
+module Mack
+  module ViewHelpers # :nodoc:
+    module ObjectHelpers
+      
+      # Useful for debugging objects in views. Just pass it an object
+      # 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>"
+      end
+      
+    end # ObjectHelpers
+  end # ViewHelpers
+end # Mack

data/lib/mack/view_helpers/string_helpers.rb

@@ -17,6 +17,47 @@ module Mack
         end
       end
       
+      # Applies a simple HTML formatting scheme to the text. It first wraps the
+      # whole string in a p tag. Then it converts any double carriage returns to
+      # new p tags, and any single break tags to br tags.
+      # 
+      # Examples:
+      #   simple_format("hello\n\ngoodbye\nhello, goodbye") # => "<p>hello</p>\n\n<p>goodbye\n<br />\nhello, goodbye</p>"
+      def simple_format(text, options = {})
+        if options.empty?
+          p = "<p>"
+        else
+          p = "<p #{options.join("%s=\"%s\"", " ")}>"
+        end
+        x = text.to_s.dup
+        x.gsub!(/\r\n?/, "\n")                    # \r\n and \r -> \n
+        x.gsub!(/\n\n+/, "</p>\n\n#{p}")  # 2+ newline  -> paragraph
+        x.gsub!(/([^\n]\n)(?=[^\n])/, "\\1<br />\n") # 1 newline   -> br
+        "#{p}#{x}</p>"
+      end
+      
+      # By this will convert all '<' tags to &lt;. You can specify specific tags
+      # with the :tags => [...] option.
+      # 
+      # Examples:
+      #   sanitize_html("<script>foo;</script>hello <b>mark</b>") # => "&lt;script>foo;&lt;/script>hello &lt;b>mark&lt;/b>"
+      #   sanitize_html("<script>foo;</script>hello <b>mark</b>", :tags => :script) # =>  "&lt;script>foo;&lt;/script>hello <b>mark</b>"
+      #   sanitize_html("< script>foo;</ script>hello <b>mark</b>", :tags => :script) # => "&lt;script>foo;&lt;/script>hello <b>mark</b>"
+      def sanitize_html(html, options = {})
+        h = html.to_s.dup
+        unless options[:tags]
+          return h.gsub("<", "&lt;")
+        else
+          [options[:tags]].flatten.each do |tag|
+            h.gsub!(/<\s*#{tag}/i, "&lt;#{tag}")
+            h.gsub!(/<\/\s*#{tag}/i, "&lt;/#{tag}")
+          end
+          return h
+        end
+      end
+      
+      alias_method :s, :sanitize_html
+      
     end # StringHelpers
   end # ViewHelpers
 end # Mack

data/lib/mack_app.rb

@@ -8,6 +8,7 @@ unless Mack::Configuration.initialized_application
   
   Mack.logger.debug "Starting application in #{Mack.env} mode."
   Mack.logger.debug "Mack root: #{Mack.root}"
+  Mack.logger.debug "Mack version: #{Mack::VERSION}"
 
   require File.join(fl, "initialization", "application.rb")
   

data/lib/mack_core.rb

@@ -6,7 +6,6 @@ require 'application_configuration'
 require 'cachetastic'
 require 'fileutils'
 require 'log4r'
-require 'crypt/rijndael'
 require 'singleton'
 require 'uri'
 require 'drb'
@@ -19,10 +18,9 @@ require 'genosaurus'
 require 'net/http'
 require 'pp'
 require 'test/unit'
-require 'redgreen'
 
 fl = File.join(File.dirname(__FILE__), "mack")
-
+require File.join(fl, "version")
 require File.join(fl, "initialization", "configuration.rb")
 
 unless Mack::Configuration.initialized_core
@@ -31,7 +29,7 @@ unless Mack::Configuration.initialized_core
   require File.join(fl, "initialization", "logging.rb")
   
 
-  Mack.logger.debug "Initializing core classes..."
+  Mack.logger.debug "Initializing core classes..." unless app_config.log.disable_initialization_logging
   # Require all the necessary files to make Mack actually work!
   lib_dirs = ["errors", "core_extensions", "utils", "runner_helpers", "routing", "view_helpers", "rendering", "controller", "tasks", "initialization/server", "generators", "distributed"]
   lib_dirs << "testing"# if Mack.env == "test"
@@ -44,9 +42,7 @@ unless Mack::Configuration.initialized_core
   
   require File.join(fl, "runner")
   
-  require File.join(fl, "initialization", "orm_support.rb")
-  
   Mack::Configuration.initialized_core = true if Mack::Configuration.initialized_core.nil?
 
-  Mack.logger.debug "Initialization of Mack Core finished."
+  Mack.logger.debug "Initialization of Mack Core finished." unless app_config.log.disable_initialization_logging
 end

data/lib/mack_tasks.rb

@@ -2,27 +2,19 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rubygems'
+require 'mack-facets'
 require 'application_configuration'
 
 require File.join(File.dirname(__FILE__), "mack", "initialization", "configuration.rb")
 
 require File.join(File.dirname(__FILE__), 'mack_core')
-require File.join(Mack.root, "config", "initializers", "gems.rb")
-Mack::Utils::GemManager.instance.do_requires
-
-orm = app_config.orm
-unless orm.nil?
-  Mack.logger.warn %{
-    Please note that setting up orm in app_config has been deprecated, and will not be supported in future mack releases.
-    Here's how to update your existing application:
-    1.  Remove the line:
-        orm: data_mapper
-        from the app_config/default.yml file
-    2.  In gem.rb, add the following line in the require_gems block:
-        gem.add "mack-data_mapper", :libs => "mack-data_mapper"
-        ** if you use active record, then change it to mack-active_record instead of mack-data_mapper
-    }
-  require "mack-#{orm}_tasks"
+gems_rb = File.join(Mack.root, "config", "initializers", "gems.rb")
+if File.exists?(gems_rb)
+  begin
+    require File.join(Mack.root, "config", "initializers", "gems.rb")
+    Mack::Utils::GemManager.instance.do_requires
+  rescue Gem::LoadError
+  end
 end
 
 # Requires all rake tasks that ship with the Mack framework.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.6.1.2
+  version: 0.7.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-29 00:00:00 -04:00
+date: 2008-08-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.6.1.2
+        version: 0.7.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: application_configuration
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.5.3
+        version: 1.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: cachetastic
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.7.4
+        version: 1.7.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: log4r
@@ -82,16 +82,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.1.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: crypt
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.1.4
-    version: 
 - !ruby/object:Gem::Dependency 
   name: daemons
   type: :runtime
@@ -120,7 +110,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rcov
@@ -156,7 +146,6 @@ description: Mack is a powerful, yet simple, web application framework.  It take
 email: mark@mackframework.com
 executables: 
 - mack
-- mack_ring_server
 extensions: []
 
 extra_rdoc_files: 
@@ -171,13 +160,21 @@ files:
 - lib/mack/controller/request.rb
 - lib/mack/controller/response.rb
 - lib/mack/controller/session.rb
+- lib/mack/controller/tell.rb
 - lib/mack/controller/uploaded_file.rb
 - lib/mack/core_extensions/kernel.rb
-- lib/mack/core_extensions/string.rb
-- lib/mack/distributed/errors/errors.rb
-- lib/mack/distributed/routing/urls.rb
-- lib/mack/distributed/utils/rinda.rb
+- lib/mack/core_extensions/symbol.rb
 - lib/mack/errors/errors.rb
+- lib/mack/generators/controller_generator/controller_generator.rb
+- lib/mack/generators/controller_generator/manifest.yml
+- lib/mack/generators/controller_generator/templates/app/controllers/controller.rb.template
+- lib/mack/generators/controller_generator/templates/test/controllers/rspec.rb.template
+- lib/mack/generators/controller_generator/templates/test/controllers/test_case.rb.template
+- lib/mack/generators/controller_helper_generator/controller_helper_generator.rb
+- lib/mack/generators/controller_helper_generator/manifest.yml
+- lib/mack/generators/controller_helper_generator/templates/app/helpers/controllers/helper.rb.template
+- lib/mack/generators/controller_helper_generator/templates/test/helpers/controllers/rspec.rb.template
+- lib/mack/generators/controller_helper_generator/templates/test/helpers/controllers/test_case.rb.template
 - lib/mack/generators/mack_application_generator/mack_application_generator.rb
 - lib/mack/generators/mack_application_generator/manifest.yml
 - lib/mack/generators/mack_application_generator/templates/app/controllers/default_controller.rb.template
@@ -191,13 +188,18 @@ files:
 - lib/mack/generators/mack_application_generator/templates/config/app_config/test.yml.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/favicon.ico.template
 - lib/mack/generators/mack_application_generator/templates/public/stylesheets/scaffold.css.template
 - lib/mack/generators/mack_application_generator/templates/Rakefile.template
-- lib/mack/generators/mack_application_generator/templates/test/functional/default_controller_spec.rb.template
-- lib/mack/generators/mack_application_generator/templates/test/functional/default_controller_test.rb.template
+- lib/mack/generators/mack_application_generator/templates/test/controllers/default_controller_spec.rb.template
+- lib/mack/generators/mack_application_generator/templates/test/controllers/default_controller_test.rb.template
+- lib/mack/generators/mack_application_generator/templates/test/helpers/controllers/default_controller_helper_spec.rb.template
+- lib/mack/generators/mack_application_generator/templates/test/helpers/controllers/default_controller_helper_test.rb.template
+- lib/mack/generators/mack_application_generator/templates/test/helpers/views/application_helper_spec.rb.template
+- lib/mack/generators/mack_application_generator/templates/test/helpers/views/application_helper_test.rb.template
 - lib/mack/generators/mack_application_generator/templates/test/spec.opts.template
 - lib/mack/generators/mack_application_generator/templates/test/spec_helper.rb.template
 - lib/mack/generators/mack_application_generator/templates/test/test_helper.rb.template
@@ -206,12 +208,16 @@ files:
 - lib/mack/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/init.rb.template
 - lib/mack/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/lib/%=@plugin_name%.rb.template
 - lib/mack/generators/plugin_generator/templates/vendor/plugins/%=@plugin_name%/lib/tasks/%=@plugin_name%_tasks.rake.template
+- lib/mack/generators/view_helper_generator/manifest.yml
+- lib/mack/generators/view_helper_generator/templates/app/helpers/views/helper.rb.template
+- lib/mack/generators/view_helper_generator/templates/test/helpers/views/rspec.rb.template
+- lib/mack/generators/view_helper_generator/templates/test/helpers/views/test_case.rb.template
+- lib/mack/generators/view_helper_generator/view_helper_generator.rb
 - lib/mack/initialization/application.rb
 - lib/mack/initialization/configuration.rb
 - lib/mack/initialization/console.rb
 - lib/mack/initialization/helpers.rb
 - lib/mack/initialization/logging.rb
-- lib/mack/initialization/orm_support.rb
 - lib/mack/initialization/plugins.rb
 - lib/mack/initialization/server/simple_server.rb
 - lib/mack/rendering/engine/base.rb
@@ -242,7 +248,6 @@ files:
 - lib/mack/tasks/generator_tasks.rake
 - lib/mack/tasks/log_tasks.rake
 - lib/mack/tasks/mack_dump_tasks.rake
-- lib/mack/tasks/mack_ring_server_tasks.rake
 - lib/mack/tasks/mack_server_tasks.rake
 - lib/mack/tasks/mack_tasks.rake
 - lib/mack/tasks/mack_update_tasks.rake
@@ -250,20 +255,24 @@ files:
 - lib/mack/tasks/rake_rules.rake
 - lib/mack/tasks/test_tasks.rake
 - lib/mack/tasks/tmp_tasks.rake
+- lib/mack/testing/file.rb
 - lib/mack/testing/helpers.rb
 - lib/mack/testing/response.rb
 - lib/mack/testing/rspec.rb
 - lib/mack/testing/test_assertions.rb
 - lib/mack/testing/test_case.rb
 - lib/mack/utils/ansi/ansi_color.rb
-- lib/mack/utils/crypt/default_worker.rb
-- lib/mack/utils/crypt/keeper.rb
 - lib/mack/utils/gem_manager.rb
 - lib/mack/utils/mime_types.rb
 - lib/mack/utils/mime_types.yml
 - lib/mack/utils/server.rb
+- lib/mack/version.rb
 - lib/mack/view_helpers/all_helpers.rb
+- lib/mack/view_helpers/date_time_helpers.rb
+- lib/mack/view_helpers/form_helpers.rb
 - lib/mack/view_helpers/html_helpers.rb
+- lib/mack/view_helpers/link_helpers.rb
+- lib/mack/view_helpers/object_helpers.rb
 - lib/mack/view_helpers/string_helpers.rb
 - lib/mack.rb
 - lib/mack_app.rb