merb-auth 0.1.0 → 0.9.9

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 PragmaQuest Inc
+Copyright (c) 2008 Adam French, Daniel Neighman
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile

@@ -0,0 +1,90 @@
+h1. MerbAuth - Merb Merb::Authentication
+
+h2. An extensible architecture for authentication
+
+* Stupidly Simple
+* Speaks fluent HTTP, even the errors
+* Pluggable Architecture (so that you can use any authentication algorithms you like)
+* Cascading Merb::Authentication (if one method fails, another is attempted, then another. When no methods succeed, authentication fails)
+
+h2. Principles
+
+#  Sessions are authenticated
+#  Just because one method of authentication fails doesn't mean the session, can't be authenticated another way.  This is especially true if your application has an external API as well as a public interface.
+#  HTTP has built-in "Errors":http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html which every web-browser (should) know how to speak.  If you're application speaks in HTTP Verbs (GET, POST, PUT, DELETE), it should also serve the correct HTTP Errors when things go wrong.
+
+h2.  What is it
+
+The merb-auth gem is the default implementation of merb-auth-core and merb-auth-more for
+the default Merb Stack.  Included are:
+
+merb-auth-slice-password # A basic slice that provides everything you need for basic password logins
+
+Strategies: 
+  :default_password_form # Form based login via a "login" field and "password" field
+  :default_basic_auth    # Basic authentication 
+
+Mixins:
+  redirect_back # For redirect_back_or functionality
+  salted_user   # Automtaically provides the required methods on your user model
+
+h3. Get merb-auth
+
+merb-auth is bundled with the merb gem.  To get it as stand alone you can get it two ways. 
+
+Gem Style
+@sudo gem install merb-auth@
+
+From Source
+<pre><code>
+git clone http://github.com/wycats/merb-more.git
+cd merb-more/merb-auth
+sudo rake install
+</code></pre>
+
+h2. Basic Setup
+
+h3. Application Setup
+
+h4. Setup your user
+
+Setup your User resource 
+$ merb-gen resource users
+
+Ensure you have a login property
+property :login, String
+
+Make sure you have the following in your migrations (if required)
+crypted_password - String
+salt             - String
+
+
+h4. Setup your configuration
+
+Include merb-auth in your application config/init.rb 
+<pre><code>
+  dependency "merb-auth"
+</code></pre>
+
+Setup the routing: config/router.rb
+
+<pre><code>
+  Merb::Router.prepare do
+    merb_auth_routes(:name_prefix => nil, :path_prefix => nil)
+  end
+</code></pre>
+
+Protect Your Controller
+<pre><code>
+  class MyController < Application
+    before :ensure_authenticated
+    
+    #...
+  end
+</pre></code>
+
+
+
+
+
+

data/Rakefile

@@ -1,47 +1,91 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-require 'spec/rake/spectask'
-require 'merb-core/version'
-require 'merb-core/test/tasks/spectasks'
-
-PLUGIN = "merb-auth"
-NAME = "merb-auth"
-AUTHOR = "Cuong Tran"
-EMAIL = "ctran@pragmaquest.com"
-HOMEPAGE = "http://merb-slices.rubyforge.org/merb-auth/"
-SUMMARY = "Merb Slice that provides user authentication"
-SLICE_VERSION = "0.1.0"
-
-spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = SLICE_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE"]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-slices', '>= 0.9.4')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README Rakefile) + Dir.glob("{lib,spec,app,public}/**/*")
+require File.join(File.dirname(__FILE__), "../merb-core/lib/merb-core/version.rb")
+
+GEM_VERSION = Merb::VERSION
+GEM_NAME    = "merb-auth"
+require "rake/clean"
+require "rake/gempackagetask"
+require 'rubygems/specification'
+require "spec/rake/spectask"
+require 'merb-core/tasks/merb_rake_helper'
+require 'fileutils'
+include FileUtils
+
+require "extlib/tasks/release"
+
+RUBY_FORGE_PROJECT  = "merb-auth"
+PROJECT_URL         = "http://merbivore.com"
+PROJECT_SUMMARY     = "merb-auth.  The official authentication plugin for merb.  Setup for the default stack"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY
+
+GEM_AUTHOR = "Daniel Neighman"
+GEM_EMAIL  = "has.sox@gmail.com"
+
+GEM_NAME    = "merb-auth"
+PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+GEM_VERSION = Merb::VERSION + PKG_BUILD
+
+RELEASE_NAME    = "REL #{GEM_VERSION}"
+
+gems = %w[
+  merb-auth-core merb-auth-more merb-auth-slice-password
+]
+
+merb_auth_spec = Gem::Specification.new do |s|
+  s.rubyforge_project = RUBY_FORGE_PROJECT
+  s.name         = GEM_NAME
+  s.version      = GEM_VERSION
+  s.platform     = Gem::Platform::RUBY
+  s.author       = GEM_AUTHOR
+  s.email        = GEM_EMAIL
+  s.homepage     = "http://www.merbivore.com"
+  s.summary      = PROJECT_SUMMARY
+  s.description  = PROJECT_SUMMARY
+  s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
+  s.add_dependency "merb-core", "~> #{GEM_VERSION}"
+  gems.each do |gem|
+    s.add_dependency gem, "~> #{GEM_VERSION}"
+  end
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
+CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache"]
+
+Rake::GemPackageTask.new(merb_auth_spec) do |package|
+  package.gem_spec = merb_auth_spec
 end
 
-desc "Install Foo as a gem"
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{NAME}-#{SLICE_VERSION} --no-update-sources --local}
+task :package => ["lib/merb-auth.rb"]
+desc "Create merb-auth.rb"
+task "lib/merb-auth.rb" do
+  mkdir_p "lib"
+  File.open("lib/merb-auth.rb","w+") do |file|
+    file.puts "### AUTOMATICALLY GENERATED. DO NOT EDIT!"
+    gems.each do |gem|
+      next if gem == "merb-gen"
+      file.puts "require '#{gem}'"
+    end
+  end
 end
 
-namespace :jruby do
+desc "install the plugin as a gem"
+task :install do
+  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
+end
 
-  desc "Run :package and install the resulting .gem with jruby"
-  task :install => :package do
-    sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{VERSION}.gem --no-rdoc --no-ri}
-  end
+desc "Uninstall the gem"
+task :uninstall do
+  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
+end
 
+desc "Create a gemspec file"
+task :gemspec do
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
+  end
 end
+
+desc "Run all specs"
+task :spec do
+  gems.each do |gem|
+    Dir.chdir(gem) { sh "#{Gem.ruby} -S rake spec" }
+  end
+end

data/lib/merb-auth.rb

@@ -1,72 +1,4 @@
-if defined?(Merb::Plugins)
-
-  load_dependency 'merb-slices'
-  load_dependency 'merb_helpers'
-  
-  require File.join(File.dirname(__FILE__), 'merb-auth', 'model')
-
-  Merb::Plugins.add_rakefiles "merb-auth/merbtasks", "merb-auth/slicetasks"
-
-  # Register the Slice for the current host application
-  Merb::Slices::register(__FILE__)
-  
-  # Slice configuration - set this in a before_app_loads callback.
-  # By default a Slice uses its own layout.
-  Merb::Slices::config[:merb_auth][:layout] ||= :merb_auth
-  
-  # Use a short name for the user model class.  Set this to false to use MerbAuth::User
-  Merb::Slices::config[:merb_auth][:user_class_alias] = "User"
-  
-  # All Slice code is expected to be namespaced inside a module
-  module MerbAuth
-    # Slice metadata
-    self.description = "MerbAuth is an user authentication Merb slice!"
-    self.version = "0.1.0"
-    self.author = "ctran@pragmaquest.com"
-    
-    # Stub classes loaded hook - runs before LoadClasses BootLoader
-    # right after a slice's classes have been loaded internally.
-    def self.loaded
-      MerbAuth.use_adapter(Merb.orm_generator_scope) if Merb.orm_generator_scope != :merb_default
-      Object.const_set(Merb::Slices::config[:merb_auth][:user_class_alias], MerbAuth::User) if Merb::Slices::config[:merb_auth][:user_class_alias]      
-    end
-    
-    # Initialization hook - runs before AfterAppLoads BootLoader
-    def self.init
-    end
-    
-    # Activation hook - runs after AfterAppLoads BootLoader
-    def self.activate
-    end
-    
-    # Deactivation hook - triggered by Merb::Slices.deactivate(Bar)
-    def self.deactivate
-    end
-    
-    # Setup routes inside the host application
-    #
-    # @param scope<Merb::Router::Behaviour>
-    #  Routes will be added within this scope (namespace). In fact, any 
-    #  router behaviour is a valid namespace, so you can attach
-    #  routes at any level of your router setup.
-    def self.setup_router(scope)
-      scope.match('/login').to(:controller => 'users', :action => 'login').name(:login)
-      scope.match('/logout').to(:controller => 'users', :action => 'logout').name(:logout)
-      scope.match('/signup').to(:controller => 'users', :action => 'signup').name(:signup)
-    end
-  end
-  
-  # Setup the slice layout for MerbAuth
-  #
-  # Use MerbAuth.push_path and MerbAuth.push_app_path
-  # to set paths to merb-auth-level and app-level paths. Example:
-  #
-  # MerbAuth.push_path(:application, MerbAuth.root)
-  # MerbAuth.push_app_path(:application, Merb.root / 'slices' / 'merb-auth')
-  # ...
-  #
-  # Any component path that hasn't been set will default to MerbAuth.root
-  #
-  # Or just call setup_default_structure! to setup a basic Merb MVC structure.
-  MerbAuth.setup_default_structure!
-end
+### AUTOMATICALLY GENERATED. DO NOT EDIT!
+require 'merb-auth-core'
+require 'merb-auth-more'
+require 'merb-auth-slice-password'

metadata

@@ -1,75 +1,73 @@
 --- !ruby/object:Gem::Specification 
 name: merb-auth
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.9.9
 platform: ruby
 authors: 
-- Cuong Tran
+- Daniel Neighman
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-06-11 00:00:00 -05:00
+date: 2008-10-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: merb-slices
+  name: merb-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.9
     version: 
-description: Merb Slice that provides user authentication
-email: ctran@pragmaquest.com
+- !ruby/object:Gem::Dependency 
+  name: merb-auth-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: merb-auth-more
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: merb-auth-slice-password
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.9.9
+    version: 
+description: merb-auth.  The official authentication plugin for merb.  Setup for the default stack
+email: has.sox@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
-- LICENSE
+extra_rdoc_files: []
+
 files: 
 - LICENSE
-- README
+- README.textile
 - Rakefile
-- lib/merb-auth
-- lib/merb-auth/adapter
-- lib/merb-auth/adapter/activerecord.rb
-- lib/merb-auth/adapter/datamapper.rb
-- lib/merb-auth/merbtasks.rb
-- lib/merb-auth/model.rb
-- lib/merb-auth/slicetasks.rb
+- TODO
 - lib/merb-auth.rb
-- spec/controllers
-- spec/controllers/router_spec.rb
-- spec/controllers/session_spec.rb
-- spec/controllers/users_spec.rb
-- spec/controllers/view_helper_spec.rb
-- spec/merb-auth_spec.rb
-- spec/models
-- spec/models/ar_user_spec.rb
-- spec/models/dm_user_spec.rb
-- spec/models/shared_user_spec.rb
-- spec/spec_helper.rb
-- app/controllers
-- app/controllers/application.rb
-- app/controllers/controller_mixin.rb
-- app/controllers/users.rb
-- app/helpers
-- app/helpers/application_helper.rb
-- app/views
-- app/views/layout
-- app/views/layout/merb_auth.html.erb
-- app/views/users
-- app/views/users/login.html.erb
-- app/views/users/signup.html.erb
-- public/javascripts
-- public/stylesheets
-- public/stylesheets/master.css
-has_rdoc: true
-homepage: http://merb-slices.rubyforge.org/merb-auth/
+has_rdoc: false
+homepage: http://www.merbivore.com
 post_install_message: 
 rdoc_options: []
 
@@ -89,10 +87,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.1.1
+rubyforge_project: merb-auth
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Merb Slice that provides user authentication
+summary: merb-auth.  The official authentication plugin for merb.  Setup for the default stack
 test_files: []
 

data/README

@@ -1,64 +0,0 @@
-MerbAuth
-=========
-
-An user authentication slice for Merb, with support for ActiveRecord and DataMapper.  
-See http://github.com/ctran/merb-skel for an example application that uses this slice
-
-== Installation:
-
-> gem install merb
-> gem install merb-slices
-
-To use activerecord adapter
-> gem install activerecord
-> gem merb_activerecord
-
-To use datamapper adapter
-> gem install datamapper
-> gem install merb_datamapper
-
-=== config/init.rb
-
-# add the slice as a regular dependency
-dependency 'merb-auth'
-
-=== config/router.rb
-
-# This will add the following routes /login, /logout and /signup
-r.slice(:MerbAuth)
-
-# This will add the following routes /merb-auth/login, /merb-auth/logout and /merb-auth/signup
-r.add_slice(:MerbAuth)
-
-# This will add the following routes /user/login, /user/logout and /user/signup
-r.add_slice(:MerbAuth, 'user') # same as :path => 'user'
-
-=== Normally you should also run the following rake task:
-> rake slices:merb_auth:install
-
-== Customization/Overrides
-
-By default, the user model class MerbAuth::User is aliased to User. 
-
-You can also put your application-level overrides in:
-
-host-app/slices/merb-auth/app - controllers, models, views ...
-
-Templates are located in this order:
-
-1. host-app/slices/merb-auth/app/views/*
-2. gems/merb-auth/app/views/*
-3. host-app/app/views/*
-
-You can use the host application's layout by configuring the
-merb-auth slice in a before_app_loads block:
-
-Merb::Slices.config[:merb_auth] = { :layout => :application }
-
-By default :merb_auth is used. If you need to override
-stylesheets or javascripts, just specify your own files in your layout
-instead/in addition to the ones supplied (if any) in 
-host-app/public/slices/merb-auth.
-
-In any case don't edit those files directly as they may be clobbered any time
-rake merb_auth:install is run.