package this up

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 log/*
 tmp/*
+gems/*
 TAGS
 *~
 .#*
@@ -15,4 +16,5 @@ schema/*.db
 src/*
 .hgignore
 .hg/*
-.svn/*
+.svn/*
+.gemrc

app/controllers/users.rb

@@ -28,7 +28,7 @@ def edit(id)
   def create(user)
     @user = User.new(user)
     if @user.save
-      redirect resource(@user), :message => {:notice => "User was successfully created"}
+      redirect url(:user, @user.id), :message => {:notice => "User was successfully created"}
     else
       message[:error] = "User failed to be created"
       render :new
@@ -40,7 +40,7 @@ def update(id, user)
     raise NotFound unless @user
     @user.update_attributes(user)
     if @user.errors.empty?
-       redirect resource(@user)
+       redirect url(:user, @user.id), :message => {:notice => "User was successfully updated"}
     else
       display @user, :edit
     end

config/dependencies.rb

@@ -1,24 +1,19 @@
-# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
-merb_gems_version = "0.9.12"
-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", 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  
+# auto generated from config/gems.yml
+dependency 'extlib', '0.9.8'
+dependency 'merb-core', '0.9.12'
+dependency 'merb-param-protection', '0.9.12'
+dependency 'merb-haml', '0.9.12'
+dependency 'merb-auth-core', '0.9.12'
+dependency 'merb-auth-more', '0.9.12'
+dependency 'merb-cache', '0.9.12'
+dependency 'merb-helpers', '0.9.12'
+dependency 'merb-assets', '0.9.12'
+dependency 'merb-slices', '0.9.12'
+dependency 'merb-action-args', '0.9.12'
+dependency 'merb-auth-slice-password', '0.9.12'
+dependency 'merb_datamapper', '0.9.6'
+dependency 'dm-core', '0.9.6'
+dependency 'dm-validations', '0.9.6'
+dependency 'dm-serializer', '0.9.6'
+dependency 'dm-timestamps', '0.9.6'
+dependency 'dm-types', '0.9.6'

config/gems.yml

@@ -0,0 +1,107 @@
+---
+sources:
+  - http://gems.rubyforge.org/
+
+gems:
+  - name: rspec
+    version: 1.1.11
+    implied: true
+
+  - name: ruby-debug
+    implied: true
+
+  - name: rake
+    implied: true
+
+  - name: rcov
+    implied: true
+
+  - name: mongrel
+    implied: true
+
+  - name: rr
+    implied: true
+
+  - name: libxml-ruby
+    implied: true
+
+  - name: extlib
+    version: '=0.9.8'
+    require: extlib
+
+  - name: merb-core
+    version: '=0.9.12'
+    require: merb-core
+
+  - name: merb-gen
+    version: '=0.9.12'
+
+  - name: merb-param-protection
+    version: '=0.9.12'
+    require: merb-param-protection
+
+  - name: merb-haml
+    version: '=0.9.12'
+    require: merb-haml
+
+  - name: merb-auth-core
+    version: '=0.9.12'
+    require: merb-auth-core
+
+  - name: merb-auth-more
+    version: '=0.9.12'
+    require: merb-auth-more
+
+  - name: merb-cache
+    version: '=0.9.12'
+    require: merb-cache
+
+  - name: merb-helpers
+    version: '=0.9.12'
+    require: merb-helpers
+
+  - name: merb-assets
+    version: '=0.9.12'
+    require: merb-assets
+
+  - name: merb-slices
+    version: '=0.9.12'
+    require: merb-slices
+
+  - name: merb-action-args
+    version: '=0.9.12'
+    require: merb-action-args
+
+  - name: merb-auth-slice-password
+    version: '=0.9.12'
+    require: merb-auth-slice-password
+
+  - name: merb_datamapper
+    version: '=0.9.6'
+    require: merb_datamapper
+
+  - name: dm-core
+    version: '=0.9.6'
+    require: 'dm-core'
+
+  - name: dm-validations
+    version: '=0.9.6'
+    require: dm-validations
+
+  - name: dm-serializer
+    version: '=0.9.6'
+    require: dm-serializer
+
+  - name: dm-timestamps
+    version: '=0.9.6'
+    require: dm-timestamps
+
+  - name: dm-types
+    version: '=0.9.6'
+    require: dm-types
+
+  - name: do_sqlite3
+    version: '=0.9.6'
+
+  - name: ruby-openid
+    version: '=2.1.2'

script/check

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'yaml'
+
+begin
+  root = File.expand_path(File.dirname(__FILE__) + '/..')
+  ENV["GEM_HOME"] = root + '/gems'
+  ENV["GEM_PATH"] = root + '/gems'
+
+  gem_config = YAML.load_file(root + "/config/gems.yml")
+
+  require 'rubygems'
+  gem 'merb-core', gem_config['gems'].find { |g| g['name'] == 'merb-core' }['version']
+  require 'merb-core'
+
+  Merb.start_environment(:adapter => 'runner', :environment => ENV['MERB_ENV'] || 'development')
+  DataMapper.repository.adapter.query "SELECT 1"
+
+  puts "OK, You can start Merb successfully!"
+rescue SystemExit => e
+  exit 0
+rescue Exception => e
+  puts "Got an exception: #{e.class}, #{e.message}"
+  puts e.backtrace
+  exit 1
+end

script/merb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+require 'yaml'
+
+root = File.expand_path(File.dirname(__FILE__) + '/..')
+ENV["GEM_HOME"] = root + '/gems'
+ENV["GEM_PATH"] = root + '/gems'
+gem_config = YAML.load_file(root + "/config/gems.yml")
+
+begin
+  require 'minigems'
+rescue LoadError
+  require 'rubygems'
+end
+gem 'merb-core', gem_config['gems'].find { |g| g['name'] == 'merb-core' }['version']
+require 'merb-core'
+
+load 'merb'

script/merb-gen

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+require 'yaml'
+
+root = File.expand_path(File.dirname(__FILE__) + '/..')
+ENV["GEM_HOME"] = root + '/gems'
+ENV["GEM_PATH"] = root + '/gems'
+gem_config = YAML.load_file(root + "/config/gems.yml")
+
+begin
+  require 'minigems'
+rescue LoadError
+  require 'rubygems'
+end
+gem 'merb-gen', gem_config['gems'].find { |g| g['name'] == 'merb-gen' }['version']
+require 'merb-gen'
+
+load 'merb-gen'

script/rake

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+root = File.expand_path(File.dirname(__FILE__) + '/..')
+ENV["GEM_HOME"] = root + '/gems'
+ENV["GEM_PATH"] = root + '/gems'
+
+require 'rubygems'
+gem 'rake'
+require 'rake'
+
+load 'rake'

script/spec

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+root = File.expand_path(File.dirname(__FILE__) + '/..')
+ENV["GEM_HOME"] = root + '/gems'
+ENV["GEM_PATH"] = root + '/gems'
+
+begin
+  require 'minigems'
+rescue LoadError
+  require 'rubygems'
+end
+require 'spec'
+
+load 'spec'

script/update

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+
+if env = ARGV.shift
+  ENV["MERB_ENV"] = env
+end
+
+root = File.expand_path(File.dirname(__FILE__) + "/..")
+
+gem_config = YAML.load_file(root + "/config/gems.yml")
+command_source = "gem --config-file #{root}/.gemrc"
+
+File.open("#{root}/.gemrc", "w") do |f|
+  f.puts({
+    :sources => gem_config['sources'],
+    :update_sources => true,
+    :bulk_threshold => 1000,
+    :verbose => false,
+    'gemhome' => root + '/gems',
+    'gempath' => [root + '/gems'],
+    :backtrace => false,
+    :benchmark => false
+  }.to_yaml)
+end
+
+File.open('config/dependencies.rb', 'w') do |fp|
+  fp.puts "# auto generated from config/gems.yml"
+  gem_config['gems'].each do |g|
+    name_and_version = "#{g['name']}"
+    if v = g['version']
+      name_and_version << " --version='#{v}'"
+    end
+
+    fp.puts "dependency '#{g['require']}', '#{g['version'].gsub(%r![<>=]!, '')}'" if g['require']
+    next if system("#{command_source} spec #{name_and_version} >/dev/null 2>/dev/null")
+    puts "Installing #{name_and_version}"
+    unless system("#{command_source} install #{name_and_version} --no-ri --no-rdoc")
+      abort "Failed to install #{g.inspect}"
+    end
+
+  end
+end
+
+if system("#{root}/script/check #{ENV['MERB_ENV']} >/dev/null 2>/dev/null")
+  puts "Merb is ready to rumble!"
+else
+  puts "Merb is not ready!"
+  puts "Check the database.yml"
+  puts "Run script/check for more info"
+  exit 1
+end

spec/requests/users_spec.rb

@@ -48,7 +48,7 @@
       end
 
       it "redirects to resource(:users)" do
-        @response.should redirect_to(resource(User.first), :message => {:notice => "user was successfully created"})
+        @response.should redirect_to(url(:user, User.first.id), :message => {:notice => "user was successfully created"})
       end
 
     end
@@ -114,9 +114,8 @@
       end
 
       it "redirect to the article show action" do
-        @response.should redirect_to(resource(User.first))
+        @response.should redirect_to(url(:user, User.first.id), :message => {:notice => "User was successfully updated"})
       end
     end
-
   end
 end