From a0d702a31bb42755f1fefff3da339aa05473588e Mon Sep 17 00:00:00 2001
From: Alex Coles <alexbcoles@mac.com>
Date: Wed, 7 May 2008 20:53:39 +0200
Subject: [PATCH] Cleanup, merge in changes to merb-core 0.9.3

* Merge in changes in merb-core, based on a newly
  generated merb-core 0.9.3 generated app.
  - Various small changes, including new rake env.
  - New autotest/ directory. Deleted out .autotest.
* Added in a couple missing methods provided by
  merbful_authentication generator. Fixed missing
  activation code routes.
* Update list of dependencies in INSTALL and versions.
* Reorganize code in init.rb for clarity. Add FIXMEs.
* Uncomment validations and hooks in User.
* Added GPL header to init.rb.
* Updated copyright year to 2008.
---
 .autotest                   |  13 ---
 autotest/discover.rb        |   1 +
 autotest/merb.rb            | 149 +++++++++++++++++++++++++++++
 autotest/merb_rspec.rb      | 223 ++++++++++++++++++++++++++++++++++++++++++++
 config/environments/rake.rb |   7 ++
 spec/spec.opt               |   1 -
 spec/spec.opts              |   1 +
 7 files changed, 381 insertions(+), 14 deletions(-)
 delete mode 100644 .autotest
 create mode 100644 autotest/discover.rb
 create mode 100644 autotest/merb.rb
 create mode 100644 autotest/merb_rspec.rb
 create mode 100644 config/environments/rake.rb
 delete mode 100644 spec/spec.opt
 create mode 100644 spec/spec.opts

diff --git a/.autotest b/.autotest
deleted file mode 100644
index 6b06145..0000000
--- a/.autotest
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'autotest/redgreen'
-
-Autotest.add_hook :initialize do |at|
-  ignore = %w{.git www public log CHANGELOG INSTALL LICENSE README TODO}
-  unless ENV['AUTOTEST'] == 'integration'
-    ignore << 'spec/integration'
-  end
-  
-  ignore.each do |exception| 
-    at.add_exception(exception)
-  end
-  
-end
\ No newline at end of file
diff --git a/autotest/discover.rb b/autotest/discover.rb
new file mode 100644
index 0000000..fddd126
--- /dev/null
+++ b/autotest/discover.rb
@@ -0,0 +1 @@
+Autotest.add_discovery { "merb" }
\ No newline at end of file
diff --git a/autotest/merb.rb b/autotest/merb.rb
new file mode 100644
index 0000000..e9d51af
--- /dev/null
+++ b/autotest/merb.rb
@@ -0,0 +1,149 @@
+# Adapted from Autotest::Rails
+require 'autotest'
+
+class Autotest::Merb < Autotest
+  
+  # +model_tests_dir+::      the directory to find model-centric tests
+  # +controller_tests_dir+:: the directory to find controller-centric tests
+  # +view_tests_dir+::       the directory to find view-centric tests
+  # +fixtures_dir+::         the directory to find fixtures in
+  attr_accessor :model_tests_dir, :controller_tests_dir, :view_tests_dir, :fixtures_dir
+  
+  def initialize # :nodoc:
+    super
+    
+    initialize_test_layout
+    
+    # Ignore any happenings in these directories
+    add_exception %r%^\./(?:doc|log|public|tmp)%
+    
+    # Ignore any mappings that Autotest may have already set up
+    clear_mappings
+    
+    # Any changes to a file in the root of the 'lib' directory will run any 
+    # model test with a corresponding name.
+    add_mapping %r%^lib\/.*\.rb% do |filename, _|
+      files_matching Regexp.new(["^#{model_test_for(filename)}$"])
+    end
+    
+    # Any changes to a fixture will run corresponding view, controller and 
+    # model tests
+    add_mapping %r%^#{fixtures_dir}/(.*)s.yml% do |_, m|
+      [
+        model_test_for(m[1]), 
+        controller_test_for(m[1]), 
+        view_test_for(m[1])
+      ]
+    end
+    
+    # Any change to a test or test will cause it to be run
+    add_mapping %r%^test/(unit|models|integration|controllers|views|functional)/.*rb$% do |filename, _|
+      filename
+    end
+    
+    # Any change to a model will cause it's corresponding test to be run
+    add_mapping %r%^app/models/(.*)\.rb$% do |_, m|
+      model_test_for(m[1])
+    end
+    
+    # Any change to the global helper will result in all view and controller 
+    # tests being run
+    add_mapping %r%^app/helpers/global_helpers.rb% do
+      files_matching %r%^test/(views|functional|controllers)/.*_test\.rb$%
+    end
+    
+    # Any change to a helper will run it's corresponding view and controller 
+    # tests, unless the helper is the global helper. Changes to the global 
+    # helper run all view and controller tests.
+    add_mapping %r%^app/helpers/(.*)_helper(s)?.rb% do |_, m|
+      if m[1] == "global" then
+        files_matching %r%^test/(views|functional|controllers)/.*_test\.rb$%
+      else
+        [
+          view_test_for(m[1]), 
+          controller_test_for(m[1])
+        ]
+      end
+    end
+    
+    # Changes to views result in their corresponding view and controller test 
+    # being run
+    add_mapping %r%^app/views/(.*)/% do |_, m|
+      [
+        view_test_for(m[1]), 
+        controller_test_for(m[1])
+      ]
+    end
+    
+    # Changes to a controller result in its corresponding test being run. If 
+    # the controller is the exception or application controller, all 
+    # controller tests are run.
+    add_mapping %r%^app/controllers/(.*)\.rb$% do |_, m|
+      if ["application", "exception"].include?(m[1])
+        files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$%
+      else
+        controller_test_for(m[1])
+      end
+    end
+
+    # If a change is made to the router, run all controller and view tests
+    add_mapping %r%^config/router.rb$% do # FIX
+      files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$%
+    end
+
+    # If any of the major files governing the environment are altered, run 
+    # everything
+    add_mapping %r%^test/test_helper.rb|config/(init|rack|environments/test.rb|database.yml)% do # FIX
+      files_matching %r%^test/(unit|models|controllers|views|functional)/.*_test\.rb$%
+    end
+  end
+  
+private
+
+  # Determines the paths we can expect tests or specs to reside, as well as 
+  # corresponding fixtures.
+  def initialize_test_layout
+    self.model_tests_dir      = "test/unit"
+    self.controller_tests_dir = "test/functional"
+    self.view_tests_dir       = "test/views"
+    self.fixtures_dir         = "test/fixtures"
+  end
+  
+  # Given a filename and the test type, this method will return the 
+  # corresponding test's or spec's name.
+  # 
+  # ==== Arguments
+  # +filename+<String>:: the file name of the model, view, or controller
+  # +kind_of_test+<Symbol>:: the type of test we that we should run
+  # 
+  # ==== Returns
+  # String:: the name of the corresponding test or spec
+  # 
+  # ==== Example
+  # 
+  #   > test_for("user", :model)
+  #   => "user_test.rb"
+  #   > test_for("login", :controller)
+  #   => "login_controller_test.rb"
+  #   > test_for("form", :view)
+  #   => "form_view_spec.rb" # If you're running a RSpec-like suite
+  def test_for(filename, kind_of_test) # :nodoc:
+    name  = [filename]
+    name << kind_of_test.to_s if kind_of_test == :view
+    name << "test"
+    return name.join("_") + ".rb"
+  end
+  
+  def model_test_for(filename)
+    [model_tests_dir, test_for(filename, :model)].join("/")
+  end
+  
+  def controller_test_for(filename)
+    [controller_tests_dir, test_for(filename, :controller)].join("/")
+  end
+  
+  def view_test_for(filename)
+    [view_tests_dir, test_for(filename, :view)].join("/")
+  end
+  
+end
\ No newline at end of file
diff --git a/autotest/merb_rspec.rb b/autotest/merb_rspec.rb
new file mode 100644
index 0000000..9ff1f72
--- /dev/null
+++ b/autotest/merb_rspec.rb
@@ -0,0 +1,223 @@
+# Adapted from Autotest::Rails, RSpec's autotest class, as well as merb-core's.
+require 'autotest'
+
+class RspecCommandError < StandardError; end
+
+class Autotest::MerbRspec < Autotest
+
+  # +model_tests_dir+::      the directory to find model-centric tests
+  # +controller_tests_dir+:: the directory to find controller-centric tests
+  # +view_tests_dir+::       the directory to find view-centric tests
+  # +fixtures_dir+::         the directory to find fixtures in
+  attr_accessor :model_tests_dir, :controller_tests_dir, :view_tests_dir, :fixtures_dir
+
+  def initialize # :nodoc:
+    super
+
+    initialize_test_layout
+
+    # Ignore any happenings in these directories
+    add_exception %r%^\./(?:doc|log|public|tmp)%
+
+    # Ignore any mappings that Autotest may have already set up
+    clear_mappings
+
+    # Any changes to a file in the root of the 'lib' directory will run any
+    # model test with a corresponding name.
+    add_mapping %r%^lib\/.*\.rb% do |filename, _|
+      files_matching %r%#{model_test_for(filename)}$%
+    end
+
+    add_mapping %r%^spec/(spec_helper|shared/.*)\.rb$% do
+      files_matching %r%^spec/.*_spec\.rb$%
+    end
+
+    # Any changes to a fixture will run corresponding view, controller and
+    # model tests
+    add_mapping %r%^#{fixtures_dir}/(.*)s.yml% do |_, m|
+      [
+        model_test_for(m[1]),
+        controller_test_for(m[1]),
+        view_test_for(m[1])
+      ]
+    end
+
+    # Any change to a test or spec will cause it to be run
+    add_mapping %r%^spec/(unit|models|integration|controllers|views|functional)/.*rb$% do |filename, _|
+      filename
+    end
+
+    # Any change to a model will cause it's corresponding test to be run
+    add_mapping %r%^app/models/(.*)\.rb$% do |_, m|
+      model_test_for(m[1])
+    end
+
+    # Any change to the global helper will result in all view and controller
+    # tests being run
+    add_mapping %r%^app/helpers/global_helpers.rb% do
+      files_matching %r%^spec/(views|functional|controllers)/.*_spec\.rb$%
+    end
+
+    # Any change to a helper will run it's corresponding view and controller
+    # tests, unless the helper is the global helper. Changes to the global
+    # helper run all view and controller tests.
+    add_mapping %r%^app/helpers/(.*)_helper(s)?.rb% do |_, m|
+      if m[1] == "global" then
+        files_matching %r%^spec/(views|functional|controllers)/.*_spec\.rb$%
+      else
+        [
+          view_test_for(m[1]),
+          controller_test_for(m[1])
+        ]
+      end
+    end
+
+    # Changes to views result in their corresponding view and controller test
+    # being run
+    add_mapping %r%^app/views/(.*)/% do |_, m|
+      [
+        view_test_for(m[1]),
+        controller_test_for(m[1])
+      ]
+    end
+
+    # Changes to a controller result in its corresponding test being run. If
+    # the controller is the exception or application controller, all
+    # controller tests are run.
+    add_mapping %r%^app/controllers/(.*)\.rb$% do |_, m|
+      if ["application", "exception"].include?(m[1])
+        files_matching %r%^spec/(controllers|views|functional)/.*_spec\.rb$%
+      else
+        controller_test_for(m[1])
+      end
+    end
+
+    # If a change is made to the router, run all controller and view tests
+    add_mapping %r%^config/router.rb$% do # FIX
+      files_matching %r%^spec/(controllers|views|functional)/.*_spec\.rb$%
+    end
+
+    # If any of the major files governing the environment are altered, run
+    # everything
+    add_mapping %r%^spec/spec_helper.rb|config/(init|rack|environments/test.rb|database.yml)% do # FIX
+      files_matching %r%^spec/(unit|models|controllers|views|functional)/.*_spec\.rb$%
+    end
+  end
+
+  def failed_results(results)
+    results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m)
+  end
+
+  def handle_results(results)
+    @failures = failed_results(results)
+    @files_to_test = consolidate_failures @failures
+    unless $TESTING
+      if @files_to_test.empty?
+        hook :green
+      else
+        hook :red
+      end
+    end
+    @tainted = true unless @files_to_test.empty?
+  end
+
+  def consolidate_failures(failed)
+    filters = Hash.new { |h,k| h[k] = [] }
+    failed.each do |spec, failed_trace|
+      find_files.keys.select { |f| f =~ /spec\// }.each do |f|
+        if failed_trace =~ Regexp.new(f)
+          filters[f] << spec
+          break
+        end
+      end
+    end
+    filters
+  end
+
+  def make_test_cmd(files_to_test)
+    [
+      ruby,
+      "-S",
+      spec_command,
+      add_options_if_present,
+      files_to_test.keys.flatten.join(' ')
+    ].join(" ")
+  end
+
+  def add_options_if_present
+    File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : ""
+  end
+
+  # Finds the proper spec command to use. Precendence is set in the
+  # lazily-evaluated method spec_commands.  Alias + Override that in
+  # ~/.autotest to provide a different spec command then the default
+  # paths provided.
+  def spec_command(separator=File::ALT_SEPARATOR)
+    unless defined? @spec_command then
+      @spec_command = spec_commands.find { |cmd| File.exists? cmd }
+
+      raise RspecCommandError, "No spec command could be found!" unless @spec_command
+
+      @spec_command.gsub!(File::SEPARATOR, separator) if separator
+    end
+    @spec_command
+  end
+
+  # Autotest will look for spec commands in the following
+  # locations, in this order:
+  #
+  #   * default spec bin/loader installed in Rubygems
+  #   * any spec command found in PATH
+  def spec_commands
+    [ File.join(Config::CONFIG['bindir'], 'spec'), 'spec' ]
+  end
+
+private
+
+  # Determines the paths we can expect tests or specs to reside, as well as
+  # corresponding fixtures.
+  def initialize_test_layout
+    self.model_tests_dir      = "spec/models"
+    self.controller_tests_dir = "spec/controllers"
+    self.view_tests_dir       = "spec/views"
+    self.fixtures_dir         = "spec/fixtures"
+  end
+
+  # Given a filename and the test type, this method will return the
+  # corresponding test's or spec's name.
+  #
+  # ==== Arguments
+  # +filename+<String>:: the file name of the model, view, or controller
+  # +kind_of_test+<Symbol>:: the type of test we that we should run
+  #
+  # ==== Returns
+  # String:: the name of the corresponding test or spec
+  #
+  # ==== Example
+  #
+  #   > test_for("user", :model)
+  #   => "user_test.rb"
+  #   > test_for("login", :controller)
+  #   => "login_controller_test.rb"
+  #   > test_for("form", :view)
+  #   => "form_view_spec.rb" # If you're running a RSpec-like suite
+  def test_for(filename, kind_of_test) # :nodoc:
+    name  = [filename]
+    name << kind_of_test.to_s if kind_of_test == :view
+    name << "spec"
+    return name.join("_") + ".rb"
+  end
+
+  def model_test_for(filename)
+    [model_tests_dir, test_for(filename, :model)].join("/")
+  end
+
+  def controller_test_for(filename)
+    [controller_tests_dir, test_for(filename, :controller)].join("/")
+  end
+
+  def view_test_for(filename)
+    [view_tests_dir, test_for(filename, :view)].join("/")
+  end
+
+end
diff --git a/config/environments/rake.rb b/config/environments/rake.rb
new file mode 100644
index 0000000..a7970ef
--- /dev/null
+++ b/config/environments/rake.rb
@@ -0,0 +1,7 @@
+Merb.logger.info("Loaded RAKE Environment...")
+Merb::Config.use { |c|
+  c[:exception_details] = true
+  c[:reload_classes]  = false
+  c[:log_auto_flush ] = true
+  c[:log_file] = Merb.log_path / 'merb_rake.log'
+}
\ No newline at end of file
diff --git a/spec/spec.opt b/spec/spec.opt
deleted file mode 100644
index 5052887..0000000
--- a/spec/spec.opt
+++ /dev/null
@@ -1 +0,0 @@
---color
\ No newline at end of file
diff --git a/spec/spec.opts b/spec/spec.opts
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/spec/spec.opts
@@ -0,0 +1 @@
+
-- 
2.11.4.GIT