Upgrade to Merb 1.0.

.gitignore

@@ -1,2 +1,19 @@
-nbproject
-log/*.log
+.DS_Store
+log/*
+tmp/*
+TAGS
+*~
+.#*
+schema/schema.rb
+schema/*_structure.sql
+schema/*.sqlite3
+schema/*.sqlite
+schema/*.db
+*.sqlite
+*.sqlite3
+*.db
+src/*
+.hgignore
+.hg/*
+.svn/*
+nbproject/*

Rakefile

@@ -1,54 +1,9 @@
 require 'rubygems'
-Gem.clear_paths
-Gem.path.unshift(File.join(File.dirname(__FILE__), "gems"))
-
-require 'rake'
 require 'rake/rdoctask'
-require 'rake/testtask'
-require 'spec/rake/spectask'
-require 'fileutils'
-
-##
-# requires frozen merb-core (from /framework)
-# adds the other components to the load path
-def require_frozen_framework
-  framework = File.join(File.dirname(__FILE__), "framework")
-  if File.directory?(framework)
-    puts "Running from frozen framework"
-    core = File.join(framework,"merb-core")
-    if File.directory?(core)
-      puts "using merb-core from #{core}"
-      $:.unshift File.join(core,"lib")
-      require 'merb-core'
-    end
-    more = File.join(framework,"merb-more")
-    if File.directory?(more)
-      Dir.new(more).select {|d| d =~ /merb-/}.each do |d|
-        $:.unshift File.join(more,d,'lib')
-      end
-    end
-    plugins = File.join(framework,"merb-plugins")
-    if File.directory?(plugins)
-      Dir.new(plugins).select {|d| d =~ /merb_/}.each do |d|
-        $:.unshift File.join(plugins,d,'lib')
-      end
-    end
-    require "merb-core/core_ext/kernel"
-    require "merb-core/core_ext/rubygems"
-  else
-    p "merb doesn't seem to be frozen in /framework"
-    require 'merb-core'
-  end
-end
-
-if ENV['FROZEN']
-  require_frozen_framework
-else
-  require 'merb-core'
-end
 
-require 'rubigen'
+require 'merb-core'
 require 'merb-core/tasks/merb'
+
 include FileUtils
 
 # Load the basic runtime dependencies; this will include 
@@ -64,15 +19,17 @@ tasks_path = File.join(File.dirname(__FILE__), "lib", "tasks")
 rake_files = Dir["#{tasks_path}/*.rake"]
 rake_files.each{|rake_file| load rake_file }
 
-
-desc "start runner environment"
+desc "Start runner environment"
 task :merb_env do
   Merb.start_environment(:environment => init_env, :adapter => 'runner')
 end
 
+require 'spec/rake/spectask'
+require 'merb-core/test/tasks/spectasks'
+desc 'Default: run spec examples'
+task :default => 'spec'
+
 ##############################################################################
 # ADD YOUR CUSTOM TASKS IN /lib/tasks
 # NAME YOUR RAKE FILES file_name.rake
 ##############################################################################
-
-task :default => :spec

app/controllers/exceptions.rb

@@ -1,4 +1,4 @@
-class Exceptions < Application
+class Exceptions < Merb::Controller
 
   # handle NotFound exceptions (404)
   def not_found

app/models/user.rb

@@ -0,0 +1,17 @@
+# This is a default user class used to activate merb-auth.  Feel free to change from a User to 
+# Some other class, or to remove it altogether.  If removed, merb-auth may not work by default.
+#
+# Don't forget that by default the salted_user mixin is used from merb-more
+# You'll need to setup your db as per the salted_user mixin, and you'll need
+# To use :password, and :password_confirmation when creating a user
+#
+# see merb/merb-auth/setup.rb to see how to disable the salted_user mixin
+# 
+# You will need to setup your database and create a user.
+class User
+  include DataMapper::Resource
+
+  property :id,     Serial
+  property :login,  String
+
+end

app/views/exceptions/not_acceptable.html.erb

@@ -8,7 +8,7 @@
 
   <div id="left-container">
     <h3>Exception:</h3>
-    <p><%= params[:exception] %></p>
+    <p><%= request.exceptions.first.message %></p>
   </div>
 
   <div id="main-container">
@@ -57,7 +57,7 @@
   <div id="footer-container">
     <hr />
     <div class="left"></div>
-    <div class="right">&copy; 2007 the merb dev team</div>
+    <div class="right">&copy; 2008 the merb dev team</div>
     <p>&nbsp;</p>
   </div>
 </div>

app/views/exceptions/not_found.html.erb

@@ -8,7 +8,7 @@
 
   <div id="left-container">
     <h3>Exception:</h3>
-    <p><%= params[:exception] %></p>
+    <p><%= request.exceptions.first.message %></p>
   </div>
 
   <div id="main-container">
@@ -41,7 +41,7 @@
   <div id="footer-container">
     <hr />
     <div class="left"></div>
-    <div class="right">&copy; 2007 the merb dev team</div>
+    <div class="right">&copy; 2008 the merb dev team</div>
     <p>&nbsp;</p>
   </div>
 </div>

autotest/discover.rb

@@ -1 +1,2 @@
-Autotest.add_discovery { "merb" }
+Autotest.add_discovery { "merb" }
+Autotest.add_discovery { "rspec" }

autotest/merb.rb

@@ -15,7 +15,10 @@ def initialize
     initialize_test_layout
 
     # Ignore any happenings in these directories
-    add_exception %r%^\./(?:doc|log|public|tmp)%
+    add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3)% 
+    # Ignore SCM directories and custom Autotest mappings
+    %w[.svn .hg .git .autotest].each { |exception| add_exception(exception) }
+
 
     # Ignore any mappings that Autotest may have already set up
     clear_mappings
@@ -36,7 +39,7 @@ def initialize
       ]
     end
 
-    # Any change to a test or test will cause it to be run
+    # Any change to a test will cause it to be run
     add_mapping %r%^test/(unit|models|integration|controllers|views|functional)/.*rb$% do |filename, _|
       filename
     end

autotest/merb_rspec.rb

@@ -14,8 +14,7 @@ def initialize
     super
 
     # Ignore any happenings in these directories
-    add_exception %r%^\./(?:doc|log|public|tmp)%
-
+    add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3|.*\.thor)% 
     # Ignore SCM directories and custom Autotest mappings
     %w[.svn .hg .git .autotest].each { |exception| add_exception(exception) }
 
@@ -45,11 +44,11 @@ def initialize
     # Any change to global_helpers will result in all view and controller
     # tests being run
     add_mapping %r%^app/helpers/global_helpers\.rb% do
-      files_matching %r%^spec/(views|controllers|helpers)/.*_spec\.rb$%
+      files_matching %r%^spec/(views|controllers|helpers|requests)/.*_spec\.rb$%
     end
 
     # Any change to a helper will cause its spec to be run
-    add_mapping %r%^app/helpers/(.*)_helper(s)?\.rb% do |_, m|
+    add_mapping %r%^app/helpers/((.*)_helper(s)?)\.rb% do |_, m|
       spec_for(m[1], 'helper')
     end
 

config/database.yml

@@ -1,16 +1,19 @@
 ---
 # This is a sample database file for the DataMapper ORM
-:development: &defaults
-  :adapter: mysql
-  :database: gutenberg_dev
-  :username: root
-  :password: 
-  :host: localhost
+development: &defaults
+  adapter: mysql
+  database: gutenberg_dev
+  username: root
+  password: 
+  host: localhost
 
-:test:
+test:
   <<: *defaults
-  :database: gutenberg_test
+  database: gutenberg_test
 
-:production:
+production:
+  <<: *defaults
+  database: gutenberg_prod
+
+rake:
   <<: *defaults
-  :database: gutenberg_prod

config/dependencies.rb

@@ -0,0 +1,23 @@
+# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
+merb_gems_version = "1.0"
+dm_gems_version   = "0.9.6"
+
+# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
+dependency "merb-action-args", merb_gems_version
+dependency "merb-assets", merb_gems_version  
+dependency "merb-cache", merb_gems_version   
+dependency "merb-helpers", merb_gems_version 
+dependency "merb-mailer", merb_gems_version  
+dependency "merb-slices", merb_gems_version  
+dependency "merb-auth-core", merb_gems_version
+dependency "merb-auth-more", merb_gems_version
+dependency "merb-auth-slice-password", merb_gems_version
+dependency "merb-param-protection", merb_gems_version
+dependency "merb-exceptions", merb_gems_version
+
+dependency "dm-core", dm_gems_version         
+dependency "dm-aggregates", dm_gems_version   
+dependency "dm-migrations", dm_gems_version   
+dependency "dm-timestamps", dm_gems_version   
+#dependency "dm-types", dm_gems_version
+dependency "dm-validations", dm_gems_version  

config/environments/development.rb

@@ -1,7 +1,15 @@
 Merb.logger.info("Loaded DEVELOPMENT Environment...")
 Merb::Config.use { |c|
   c[:exception_details] = true
+  c[:reload_templates] = true
   c[:reload_classes] = true
   c[:reload_time] = 0.5
+  c[:ignore_tampered_cookies] = true
   c[:log_auto_flush ] = true
-}
+  c[:log_level] = :debug
+
+  c[:log_stream] = STDOUT
+  c[:log_file]   = nil
+  # Or redirect logging into a file:
+  # c[:log_file]  = Merb.root / "log" / "development.log"
+}

config/environments/production.rb

@@ -3,5 +3,8 @@
   c[:exception_details] = false
   c[:reload_classes] = false
   c[:log_level] = :error
-  c[:log_file] = Merb.log_path + "/production.log"
-}
+
+  c[:log_file]  = Merb.root / "log" / "production.log"
+  # or redirect logger using IO handle
+  # c[:log_stream] = STDOUT
+}

config/environments/rake.rb

@@ -3,5 +3,9 @@
   c[:exception_details] = true
   c[:reload_classes]  = false
   c[:log_auto_flush ] = true
-  c[:log_file] = Merb.log_path / 'merb_rake.log'
-}
+
+  c[:log_stream] = STDOUT
+  c[:log_file]   = nil
+  # Or redirect logging into a file:
+  # c[:log_file]  = Merb.root / "log" / "development.log"
+}

config/environments/staging.rb

@@ -0,0 +1,10 @@
+Merb.logger.info("Loaded STAGING Environment...")
+Merb::Config.use { |c|
+  c[:exception_details] = false
+  c[:reload_classes]    = false
+  c[:log_level]         = :error
+
+  c[:log_file]  = Merb.root / "log" / "staging.log"
+  # or redirect logger using IO handle
+  # c[:log_stream] = STDOUT
+}

config/environments/test.rb

@@ -1,6 +1,12 @@
 Merb.logger.info("Loaded TEST Environment...")
 Merb::Config.use { |c|
-  c[:testing] = true
+  c[:testing]           = true
   c[:exception_details] = true
-  c[:log_auto_flush ] = true
-}
+  c[:log_auto_flush ]   = true
+  # log less in testing environment
+  c[:log_level]         = :error
+
+  #c[:log_file]  = Merb.root / "log" / "test.log"
+  # or redirect logger using IO handle
+  c[:log_stream] = STDOUT
+}