mack 0.8.2 → 0.8.3

data/lib/gems/treetop-1.2.4/lib/treetop/runtime/interval_skip_list/node.rb

@@ -0,0 +1,164 @@
+class IntervalSkipList
+  class Node < HeadNode
+    attr_accessor :key
+    attr_reader :markers, :endpoint_of
+
+    def initialize(key, height, path)
+      super(height)
+      @key = key
+      @markers = []
+      @endpoint_of = []
+      update_forward_pointers(path)
+      promote_markers(path)
+    end
+
+    def all_forward_markers
+      markers.flatten
+    end
+
+    def delete(path)
+      0.upto(top_level) do |i|
+        path[i].forward[i] = forward[i]
+      end
+      demote_markers(path)
+    end
+
+    def propagate_length_change(length_change)
+      cur_node = self
+      while cur_node do
+        cur_node.key += length_change
+        cur_node = cur_node.forward[0]
+      end
+    end
+
+    protected
+
+    def update_forward_pointers(path)
+      0.upto(top_level) do |i|
+        forward[i] = path[i].forward[i]
+        path[i].forward[i] = self
+      end
+    end
+
+    def promote_markers(path)
+      promoted = []
+      new_promoted = []
+      0.upto(top_level) do |i|
+        incoming_markers = path[i].forward_markers[i]
+        markers.concat(incoming_markers)
+
+        incoming_markers.each do |marker|
+          if can_be_promoted_higher?(marker, i)
+            new_promoted.push(marker)
+            forward[i].delete_marker_from_path(marker, i, forward[i+1])
+          else
+            forward_markers[i].push(marker)
+          end
+        end
+
+        promoted.each do |marker|
+          if can_be_promoted_higher?(marker, i)
+            new_promoted.push(marker)
+            forward[i].delete_marker_from_path(marker, i, forward[i+1])
+          else
+            forward_markers[i].push(marker)
+          end
+        end
+
+        promoted = new_promoted
+        new_promoted = []
+      end
+    end
+
+
+    def can_be_promoted_higher?(marker, level)
+      level < top_level && forward[level + 1] && forward[level + 1].markers.include?(marker)
+    end
+
+    def delete_marker_from_path(marker, level, terminus)
+      cur_node = self
+      until cur_node == terminus
+        cur_node.forward_markers[level].delete(marker)
+        cur_node.markers.delete(marker)
+        cur_node = cur_node.forward[level]
+      end
+    end
+
+    def demote_markers(path)
+      demote_inbound_markers(path)
+      demote_outbound_markers(path)
+    end
+
+    def demote_inbound_markers(path)
+      demoted = []
+      new_demoted = []
+
+      top_level.downto(0) do |i|
+        incoming_markers = path[i].forward_markers[i].dup
+        incoming_markers.each do |marker|
+          unless forward_node_with_marker_at_or_above_level?(marker, i)
+            path[i].forward_markers[i].delete(marker)
+            new_demoted.push(marker)
+          end
+        end
+
+        demoted.each do |marker|
+          path[i + 1].place_marker_on_inbound_path(marker, i, path[i])
+
+          if forward[i].markers.include?(marker)
+            path[i].forward_markers[i].push(marker)
+          else
+            new_demoted.push(marker)
+          end
+        end
+
+        demoted = new_demoted
+        new_demoted = []
+      end
+    end
+
+    def demote_outbound_markers(path)
+      demoted = []
+      new_demoted = []
+
+      top_level.downto(0) do |i|
+        forward_markers[i].each do |marker|
+          new_demoted.push(marker) unless path[i].forward_markers[i].include?(marker)
+        end
+
+        demoted.each do |marker|
+          forward[i].place_marker_on_outbound_path(marker, i, forward[i + 1])
+          new_demoted.push(marker) unless path[i].forward_markers[i].include?(marker)
+        end
+
+        demoted = new_demoted
+        new_demoted = []
+      end
+    end
+
+    def forward_node_with_marker_at_or_above_level?(marker, level)
+      level.upto(top_level) do |i|
+        return true if forward[i].markers.include?(marker)
+      end
+      false
+    end
+
+    def place_marker_on_outbound_path(marker, level, terminus)
+      cur_node = self
+      until cur_node == terminus
+        cur_node.forward_markers[level].push(marker)
+        cur_node.markers.push(marker)
+        cur_node = cur_node.forward[level]
+      end
+    end
+
+    def place_marker_on_inbound_path(marker, level, terminus)
+      cur_node = self
+      until cur_node == terminus
+        cur_node.forward_markers[level].push(marker)
+        cur_node = cur_node.forward[level]
+        cur_node.markers.push(marker)
+      end
+    end
+  end
+end

data/lib/gems/treetop-1.2.4/lib/treetop/runtime/syntax_node.rb

@@ -0,0 +1,72 @@
+module Treetop
+  module Runtime
+    class SyntaxNode
+      attr_reader :input, :interval, :elements
+      attr_accessor :parent
+
+      def initialize(input, interval, elements = nil)
+        @input = input
+        @interval = interval
+        if @elements = elements
+          elements.each do |element|
+            element.parent = self
+          end
+        end
+      end
+
+      def terminal?
+        @elements.nil?
+      end
+
+      def nonterminal?
+        !terminal?
+      end
+
+      def text_value
+        input[interval]
+      end
+
+      def empty?
+	      interval.first == interval.last && interval.exclude_end?
+      end
+
+      def extension_modules
+        local_extensions =
+          class <<self
+            included_modules-Object.included_modules
+          end
+        if local_extensions.size > 0
+          local_extensions
+        else
+          []    # There weren't any; must be a literal node
+        end
+      end
+
+      def inspect(indent="")
+        em = extension_modules
+        interesting_methods = methods-[em.last ? em.last.methods : nil]-self.class.instance_methods
+        im = interesting_methods.size > 0 ? " (#{interesting_methods.join(",")})" : ""
+        tv = text_value
+        tv = "...#{tv[-20..-1]}" if tv.size > 20
+
+        indent +
+        self.class.to_s.sub(/.*:/,'') +
+          em.map{|m| "+"+m.to_s.sub(/.*:/,'')}*"" +
+          " offset=#{interval.first}" +
+          ", #{tv.inspect}" +
+          im +
+          (elements && elements.size > 0 ?
+            ":" +
+              (@elements||[]).map{|e|
+          begin
+            "\n"+e.inspect(indent+"  ")
+          rescue  # Defend against inspect not taking a parameter
+            "\n"+indent+" "+e.inspect
+          end
+              }.join("") :
+            ""
+          )
+      end
+    end
+  end
+end

data/lib/gems/treetop-1.2.4/lib/treetop/runtime/terminal_parse_failure.rb

@@ -0,0 +1,16 @@
+module Treetop
+  module Runtime
+    class TerminalParseFailure
+      attr_reader :index, :expected_string
+
+      def initialize(index, expected_string)
+        @index = index
+        @expected_string = expected_string
+      end
+
+      def to_s
+        "String matching #{expected_string} expected."
+      end
+    end
+  end
+end

data/lib/gems/treetop-1.2.4/lib/treetop/runtime/terminal_syntax_node.rb

@@ -0,0 +1,17 @@
+module Treetop
+  module Runtime
+    class TerminalSyntaxNode < SyntaxNode
+
+      def initialize(input, interval)
+        super(input, interval, [])
+      end
+
+      def inspect(indent="")
+	indent+
+	  self.class.to_s.sub(/.*:/,'') +
+	  " offset=#{interval.first}" +
+	  " #{text_value.inspect}"
+      end
+    end
+  end
+end

data/lib/mack/application.rb

@@ -35,8 +35,8 @@ module Mack
           # There was an exception, let's see if there's a handler for this error in routes:
           route = Mack::Routes.retrieve_from_error(e.class)
           unless route.nil?
-            self.request.all_params[:original_controller] = @original_controller
-            self.request.all_params[:original_action] = @original_action
+            self.request.params[:original_controller] = @original_controller
+            self.request.params[:original_action] = @original_action
             # There is a handler, let's try running that:
             run_controller(route, e)
           else
@@ -73,7 +73,7 @@ module Mack
       runner_block = route[:runner_block]
       route - :runner_block
       
-      self.request.params = self.request.all_params.merge(route)
+      self.request.params = self.request.params.merge(route)
       self.response.content_type = Mack::Utils::MimeTypes[self.request.params[:format]]
       catch(:finished) do
         if runner_block
@@ -137,12 +137,12 @@ module Mack
     def redirect_to(route)
       status = route[:status] || 302
       url = route[:redirect_to]
-      options = self.request.all_params
+      options = self.request.params
       options.merge!(route)
       options - [:controller, :action, :redirect_to, :method, :status, :format]
       url = url_for_pattern(url, options)
       self.response.status = status
-      self.response[:location] = url
+      self.response['Location'] = url
       self.response.write(redirect_html(self.request.path_info, url, status))
     end
     

data/lib/mack/boot/configuration.rb

@@ -41,13 +41,15 @@ run_once do
       configatron.mack.log.use_colors = true
       configatron.mack.log.time_format = '%Y-%m-%d %H:%M:%S'
       
-      configatron.mack.static_paths = ["/css", "/images", "/files", "/images", "/stylesheets", "/javascripts", "/media", "/favicon.ico"]
+      configatron.mack.static_paths = ['/css', '/images', '/files', '/images', '/stylesheets', '/javascripts', '/media', '/favicon.ico']
       
       configatron.mack.portlet.verbose = false
       configatron.mack.portlet.need_tar = false
       configatron.mack.portlet.need_zip = false
       
       configatron.mack.use_deferred_routes = false
+      
+      configatron.mack.default_form_builder = 'mack/view/default_form_builder'
     
       if Mack.env?(:production)
         configatron.mack.use_lint = false

data/lib/mack/boot/console.rb

@@ -13,9 +13,9 @@ run_once do
 
   fl = File.join_from_here('..')
 
-  require File.join(fl, "..", "..", "bin", "gem_load_path.rb")
+  require File.join(fl, '..', '..', "bin", "gem_load_path.rb")
 
-  require File.join(fl, "..", "mack.rb")
+  require File.join(fl, '..', "mack.rb")
 
   require File.join(fl, "testing", "helpers.rb")
 

data/lib/mack/boot/core.rb

@@ -6,10 +6,10 @@ run_once do
   init_message('core')
   
   # 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"]
-  lib_dirs << "testing"# if Mack.env == "test"
+  lib_dirs = ["assets", "errors", "core_extensions", "utils", "sessions", "runner_helpers", "routing", "view_helpers", "rendering", "controller", 'tasks', "initialization/server", "generators", 'view']
+  lib_dirs << "testing"# if Mack.env == 'test'
   lib_dirs.each do |dir|
-    dir_globs = Dir.glob(File.join_from_here("..", dir, "**/*.rb"))
+    dir_globs = Dir.glob(File.join_from_here('..', dir, "**/*.rb"))
     dir_globs.sort.each do |d|
       # puts File.expand_path(d)
       require File.expand_path(d) unless d.match(/console/)

data/lib/mack/boot/environment.rb

@@ -12,7 +12,7 @@ run_once do
       # application load setup.
       def self.load
         ivar_cache do
-          require File.join_from_here("..", "..", "mack_app")
+          require File.join_from_here('..', '..', "mack_app")
         end
       end
 

data/lib/mack/boot/logging.rb

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

data/lib/mack/boot/logging/filter.rb

@@ -21,7 +21,7 @@ module Mack
     
       # Removes 'n' number of parameter names from the list
       def remove(*args)
-        @list.delete_values(*args)
+        @list = (@list - args)
       end
     
       class << self

data/lib/mack/boot/paths.rb

@@ -5,12 +5,12 @@ run_once do
     
     # Returns the root of the current Mack application
     def self.root
-      ENV["MACK_ROOT"] ||= FileUtils.pwd
+      ENV['MACK_ROOT'] ||= FileUtils.pwd
     end
   
     # Returns the environment of the current Mack application
     def self.env
-      ENV["MACK_ENV"] ||= "development"
+      ENV['MACK_ENV'] ||= 'development'
     end
     
     # Returns true/false based on whether the specified environment
@@ -71,37 +71,41 @@ run_once do
 
       # <MACK_PROJECT_ROOT>/public
       def self.public(*files)
-        Mack::Paths.root("public", *files)
+        Mack::Paths.root('public', *files)
       end
 
       # <MACK_PROJECT_ROOT>/public/images
       def self.images(*files)
-        Mack::Paths.public("images", *files)
+        Mack::Paths.public('images', *files)
       end
 
       # <MACK_PROJECT_ROOT>/public/javascripts
       def self.javascripts(*files)
-        Mack::Paths.public("javascripts", *files)
+        Mack::Paths.public('javascripts', *files)
       end
 
       # <MACK_PROJECT_ROOT>/public/stylesheets
       def self.stylesheets(*files)
-        Mack::Paths.public("stylesheets", *files)
+        Mack::Paths.public('stylesheets', *files)
       end
 
       # <MACK_PROJECT_ROOT>/app
       def self.app(*files)
-        Mack::Paths.root("app", *files)
+        Mack::Paths.root('app', *files)
+      end
+      
+      def self.form_builders(*files)
+        Mack::Paths.app('form_builders')
       end
 
       # <MACK_PROJECT_ROOT>/log
       def self.log(*files)
-        Mack::Paths.root("log", *files)
+        Mack::Paths.root('log', *files)
       end
 
       # <MACK_PROJECT_ROOT>/test
       def self.test(*files)
-        Mack::Paths.root("test", *files)
+        Mack::Paths.root('test', *files)
       end
 
       # <MACK_PROJECT_ROOT>/tmp
@@ -111,106 +115,106 @@ run_once do
 
       # <MACK_PROJECT_ROOT>/test/models
       def self.model_tests(*files)
-        Mack::Paths.test("models", *files)
+        Mack::Paths.test('models', *files)
       end
 
       # <MACK_PROJECT_ROOT>/test/controllers
       def self.controller_tests(*files)
-        Mack::Paths.test("controllers", *files)
+        Mack::Paths.test('controllers', *files)
       end
 
       def self.test_helpers(*files)
-        Mack::Paths.test("helpers", *files)
+        Mack::Paths.test('helpers', *files)
       end
 
       # <MACK_PROJECT_ROOT>/test/helpers/controllers
       def self.controller_helper_tests(*files)
-        Mack::Paths.test_helpers("controllers", *files)
+        Mack::Paths.test_helpers('controllers', *files)
       end
 
       # <MACK_PROJECT_ROOT>/test/helpers/views
       def self.view_helper_tests(*files)
-        Mack::Paths.test_helpers("views", *files)
+        Mack::Paths.test_helpers('views', *files)
       end
 
       # <MACK_PROJECT_ROOT>/app/views
       def self.views(*files)
-        Mack::Paths.app("views", *files)
+        Mack::Paths.app('views', *files)
       end
 
       # <MACK_PROJECT_ROOT>/app/views/layouts
       def self.layouts(*files)
-        Mack::Paths.views("layouts", *files)
+        Mack::Paths.views('layouts', *files)
       end
 
       # <MACK_PROJECT_ROOT>/app/controllers
       def self.controllers(*files)
-        Mack::Paths.app("controllers", *files)
+        Mack::Paths.app('controllers', *files)
       end
 
       # <MACK_PROJECT_ROOT>/app/models
       def self.models(*files)
-        Mack::Paths.app("models", *files)
+        Mack::Paths.app('models', *files)
       end
 
       # <MACK_PROJECT_ROOT>/app/helpers
       def self.helpers(*files)
-        Mack::Paths.app("helpers", *files)
+        Mack::Paths.app('helpers', *files)
       end
 
       # <MACK_PROJECT_ROOT>/app/helpers/controllers
       def self.controller_helpers(*files)
-        Mack::Paths.helpers("controllers", *files)
+        Mack::Paths.helpers('controllers', *files)
       end
 
       # <MACK_PROJECT_ROOT>/app/helpers/views
       def self.view_helpers(*files)
-        Mack::Paths.helpers("views", *files)
+        Mack::Paths.helpers('views', *files)
       end
 
       # <MACK_PROJECT_ROOT>/lib
       def self.lib(*files)
-        Mack::Paths.root("lib", *files)
+        Mack::Paths.root('lib', *files)
       end
 
       # <MACK_PROJECT_ROOT>/lib/tasks
       def self.tasks(*files)
-        Mack::Paths.lib("tasks", *files)
+        Mack::Paths.lib('tasks', *files)
       end
 
       # <MACK_PROJECT_ROOT>/db
       def self.db(*files)
-        Mack::Paths.root("db", *files)
+        Mack::Paths.root('db', *files)
       end
 
       # <MACK_PROJECT_ROOT>/db/migrations
       def self.migrations(*files)
-        Mack::Paths.db("migrations", *files)
+        Mack::Paths.db('migrations', *files)
       end
 
       # <MACK_PROJECT_ROOT>/config
       def self.config(*files)
-        Mack::Paths.root("config", *files)
+        Mack::Paths.root('config', *files)
       end
 
       # <MACK_PROJECT_ROOT>/config/configatron
       def self.configatron(*files)
-        Mack::Paths.config("configatron", *files)
+        Mack::Paths.config('configatron', *files)
       end
 
       # <MACK_PROJECT_ROOT>/config/initializers
       def self.initializers(*files)
-        Mack::Paths.config("initializers", *files)
+        Mack::Paths.config('initializers', *files)
       end
 
       # <MACK_PROJECT_ROOT>/vendor
       def self.vendor(*files)
-        Mack::Paths.root("vendor", *files)
+        Mack::Paths.root('vendor', *files)
       end
 
       # <MACK_PROJECT_ROOT>/vendor/plugins
       def self.plugins(*files)
-        Mack::Paths.vendor("plugins", *files)
+        Mack::Paths.vendor('plugins', *files)
       end
       
       # <MACK_PROJECT_ROOT>/tmp/portlet_package