Skip to content

Commit

Permalink
updated documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
mattetti committed Oct 6, 2008
1 parent 9da83bd commit 57733f7
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 15 deletions.
34 changes: 22 additions & 12 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
require "rake"
require "fileutils"
require "merb-core/tasks/merb_rake_helper"
## THESE ARE CRUCIAL
module Merb
# Set this to the version of merb-core that you are building against/for
VERSION = "0.9.8"

# Set this to the version of merb-more you plan to release
MORE_VERSION = "0.9.8"
end

GEM_VERSION = Merb::VERSION

require 'rubygems'
require "rake/clean"
require "rake/gempackagetask"
require 'merb-core/tasks/merb_rake_helper'
require 'fileutils'
include FileUtils

gems = %w[merb_activerecord merb_sequel merb_param_protection merb_test_unit merb_stories merb_screw_unit]

gems = %w[merb_activerecord merb_sequel merb_param_protection merb_test_unit merb_stories merb_screw_unit merb_exceptions]

# Implement standard Rake::GemPackageTask tasks - see merb.thor
task :clobber_package do; FileUtils.rm_rf('pkg'); end
task :package do; end

desc "Install all gems"
task :install do
Merb::RakeHelper.install('merb-plugins')
end

desc "Uninstall all gems"
task :uninstall => :uninstall_gems

Expand All @@ -23,21 +33,21 @@ task :build_gems do
end
end

desc "Install the merb-more sub-gems"
desc "Install the merb-plugins sub-gems"
task :install_gems do
gems.each do |dir|
Dir.chdir(dir) { sh "#{Gem.ruby} -S rake install" }
end
end

desc "Uninstall the merb-more sub-gems"
desc "Uninstall the merb-plugins sub-gems"
task :uninstall_gems do
gems.each do |dir|
Dir.chdir(dir) { sh "#{Gem.ruby} -S rake uninstall" }
end
end

desc "Clobber the merb-more sub-gems"
desc "Clobber the merb-plugins sub-gems"
task :clobber_gems do
gems.each do |dir|
Dir.chdir(dir) { sh "#{Gem.ruby} -S rake clobber" }
Expand Down
6 changes: 3 additions & 3 deletions merb_auth/slices/merb_auth_password_slice/README.textile
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ file: config/init.rb

# add the slice as a regular dependency

dependency 'mauth_password_slice'
dependency 'merb_auth_password_slice'

# if needed, configure which slices to load and in which order

Expand All @@ -109,7 +109,7 @@ shown. The defaults are shown

file: config/router.rb

r.add_slice(:MerbAuthPasswordSlice, :path => "", :default_routes => false)
slice(:MerbAuthPasswordSlice, :name_prefix => nil, :path_prefix => "auth", :default_routes => false )

Normally you should also run the following rake task:

Expand All @@ -133,7 +133,7 @@ host-app/app/views/exceptions/unauthenticated.html.haml
The host-app's application layout is used by default

You can use the host application's layout by configuring the
mauth_password_slice slice in a before_app_loads block:
merb_auth_password_slice slice in a before_app_loads block:

You'll need to setup the Authentication::Manager#fetch_user and store_user
methods for your given user model.
Expand Down

0 comments on commit 57733f7

Please sign in to comment.