updating depot from watirteach

Author: bret

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>depot_demo</name>
+	<name>framework-examples</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -13,5 +13,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.rubypeople.rdt.core.rubynature</nature>
+		<nature>org.radrails.rails.core.railsnature</nature>
 	</natures>
 </projectDescription>

depot/README.txt

@@ -1,12 +1,11 @@
 How to Run this Depot Application
 
-
 Install Rails
-1. "gem install rails -v 1.0 --include-dependencies"
+1. "gem install rails -v 1.0"
 
 Install & Configure MySQL
-1. Install MySQL 4.1. Choose "Typical" Installation. Select the option to add
-   commands to your path.
+1. Install MySQL 4.1 Essentials. Choose "Typical" Installation. 
+   Select the option to add commands to your path.
 2. Configure MySQL with a "Standard Configuation" Server Instance.
 
 Load Database

depot/config/boot.rb

@@ -1,44 +1,17 @@
-# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
-
 unless defined?(RAILS_ROOT)
   root_path = File.join(File.dirname(__FILE__), '..')
-
   unless RUBY_PLATFORM =~ /mswin32/
     require 'pathname'
-    root_path = Pathname.new(root_path).cleanpath(true).to_s
+    root_path = Pathname.new(root_path).cleanpath.to_s
   end
-
   RAILS_ROOT = root_path
 end
 
-unless defined?(Rails::Initializer)
-  if File.directory?("#{RAILS_ROOT}/vendor/rails")
-    require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-  else
-    require 'rubygems'
-
-    environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join
-    environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/
-    rails_gem_version = $1
-
-    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
-      rails_gem = Gem.cache.search('rails', "=#{version}").first
-
-      if rails_gem
-        require_gem "rails", "=#{version}"
-        require rails_gem.full_gem_path + '/lib/initializer'
-      else
-        STDERR.puts %(Cannot find gem for Rails =#{version}:
-    Install the missing gem with 'gem install -v=#{version} rails', or
-    change environment.rb to define RAILS_GEM_VERSION with your desired version.
-  )
-        exit 1
-      end
-    else
-      require_gem "rails"
-      require 'initializer'
-    end
-  end
+if File.directory?("#{RAILS_ROOT}/vendor/rails")
+  require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+else
+  require 'rubygems'
+  require 'initializer'
+end
 
-  Rails::Initializer.run(:set_load_path)
-end
+Rails::Initializer.run(:set_load_path)

depot/config/database.yml

@@ -3,18 +3,18 @@ development:
   database: depot_development
   host: localhost
   username: root
-  password: Trabajo
+  password: password
 
 test:
   adapter: mysql
   database: depot_test
   host: localhost
-  username: 
-  password:
+  username: root    
+  password: password
 
 production:
   adapter: mysql
   database: depot_development
   host: localhost
-  username: 
-  password: 
+  username: root
+  password: password

depot/config/environment.rb

@@ -1,71 +1,51 @@
-#---
-# Excerpted from "Agile Web Development with Rails"
-# We make no guarantees that this code is fit for any purpose. 
-# Visit http://www.pragmaticprogrammer.com for more book information.
-#---
-RAILS_ROOT = File.dirname(__FILE__) + "/../"
-RAILS_ENV  = ENV['RAILS_ENV'] || 'development'
+# Be sure to restart your webserver when you modify this file.
 
+# Uncomment below to force Rails into production mode
+# (Use only when you can't set environment variables through your web/app server)
+# ENV['RAILS_ENV'] = 'production'
 
-# Mocks first.
-ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
+# Bootstrap the Rails environment, frameworks, and default configuration
+require File.join(File.dirname(__FILE__), 'boot')
 
-# Then model subdirectories.
-ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"])
-ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/components/[_a-z]*"])
+Rails::Initializer.run do |config|
+  # Skip frameworks you're not going to use
+  # config.frameworks -= [ :action_web_service, :action_mailer ]
 
-# Followed by the standard includes.
-ADDITIONAL_LOAD_PATHS.concat %w(
-  app
-  app/models
-  app/controllers
-  app/helpers
-  app/apis
-  config
-  components
-  lib
-  vendor
-).map { |dir| "#{RAILS_ROOT}/#{dir}" }
+  # Add additional load paths for your own custom dirs
+  # config.load_paths += %W( #{RAILS_ROOT}/app/services )
 
-# Prepend to $LOAD_PATH
-ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
+  # Force all environments to use the same logger level 
+  # (by default production uses :info, the others :debug)
+  # config.log_level = :debug
 
+  # Use the database for sessions instead of the file system
+  # (create the session table with 'rake create_sessions_table')
+  # config.action_controller.session_store = :active_record_store
 
-# Require Rails gems.
-require 'rubygems'
-require_gem 'activesupport'
-require_gem 'activerecord'
-require_gem 'actionpack'
-require_gem 'actionmailer'
-require_gem 'actionwebservice'
-require_gem 'rails'
+  # Enable page/fragment caching by setting a file-based store
+  # (remember to create the caching directory and make it readable to the application)
+  # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
 
+  # Activate observers that should always be running
+  # config.active_record.observers = :cacher, :garbage_collector
 
-# Environment-specific configuration.
-require_dependency "environments/#{RAILS_ENV}"
-ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml"))
-ActiveRecord::Base.establish_connection
+  # Make Active Record use UTC-base instead of local time
+  # config.active_record.default_timezone = :utc
+  
+  # Use Active Record's schema dumper instead of SQL when creating the test database
+  # (enables use of different database adapters for development and test environments)
+  # config.active_record.schema_format = :ruby
 
-
-# Configure defaults if the included environment did not.
-begin
-  RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
-rescue StandardError
-  RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
-  RAILS_DEFAULT_LOGGER.level = Logger::WARN
-  RAILS_DEFAULT_LOGGER.warn(
-    "Rails Error: Unable to access log file. Please ensure that log/#{RAILS_ENV}.log exists and is chmod 0666. " +
-    "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
-  )
+  # See Rails::Configuration for more options
 end
 
-[ActiveRecord, ActionController, ActionMailer].each { |mod| mod::Base.logger ||= RAILS_DEFAULT_LOGGER }
-[ActionController, ActionMailer].each { |mod| mod::Base.template_root ||= "#{RAILS_ROOT}/app/views/" }
-ActionController::Routing::Routes.reload
-
-Controllers = Dependencies::LoadingModule.root(
-  File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers')),
-  File.expand_path(File.join(RAILS_ROOT, 'components'))
-)
+# Add new inflection rules using the following format 
+# (all these examples are active by default):
+# Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end
 
-# Include your app's configuration here:
+# Include your application configuration below

depot/db/development_structure.sql

@@ -3,19 +3,23 @@ CREATE TABLE `line_items` (
   `product_id` int(11) NOT NULL default '0',
   `order_id` int(11) NOT NULL default '0',
   `quantity` int(11) NOT NULL default '0',
-  `unit_price` float(10,2) NOT NULL default '0.00',
+  `unit_price` decimal(10,2) NOT NULL default '0.00',
   PRIMARY KEY  (`id`),
+  KEY `fk_items_product` (`product_id`),
   KEY `fk_items_order` (`order_id`),
-  KEY `fk_items_product` (`product_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+  CONSTRAINT `fk_items_product` FOREIGN KEY (`product_id`) REFERENCES `products` (`id`),
+  CONSTRAINT `fk_items_order` FOREIGN KEY (`order_id`) REFERENCES `orders` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE `orders` (
   `id` int(11) NOT NULL auto_increment,
   `name` varchar(100) NOT NULL default '',
-  `email` text NOT NULL,
+  `email` varchar(255) NOT NULL default '',
   `address` text NOT NULL,
+  `pay_type` varchar(10) NOT NULL default '',
+  `shipped_at` datetime default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE `products` (
   `id` int(11) NOT NULL auto_increment,
@@ -25,5 +29,12 @@ CREATE TABLE `products` (
   `price` decimal(10,2) NOT NULL default '0.00',
   `date_available` datetime NOT NULL default '0000-00-00 00:00:00',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
+
+CREATE TABLE `users` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(100) NOT NULL default '',
+  `hashed_password` varchar(40) default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;