merbful_authentication 0.1.2 → 0.9.0

data/README

@@ -30,7 +30,8 @@ Datamapper
 
 === Required Routes
 
-At the moment this version of the plugin requires some named routes
+At the moment this version of the plugin requires some named routes.  These are included in 
+lib/authenticated_system/authenticated_routes.rb
     
     In config/router.rb
     

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merbful_authentication"
 NAME = "merbful_authentication"
-VERSION = "0.1.2"
+VERSION = "0.9.0"
 AUTHOR = "Daniel Neighman"
 EMAIL = "has.sox@gmail.com"
 HOMEPAGE = "http://rubyforge.org/projects/merbful-auth/"
@@ -20,8 +20,8 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 0.5.0')
-  s.add_dependency('merb_helpers', '>= 0.5.0')
+  s.add_dependency('merb-core', '>= 0.9.0')
+  s.add_dependency('merb-gen')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO) +

data/activerecord_generators/merbful_authentication_model/merbful_authentication_model_generator.rb

@@ -1,4 +1,4 @@
-class MerbfulAuthenticationModelGenerator < RubiGen::Base
+class MerbfulAuthenticationModelGenerator < Merb::GeneratorBase
   
   attr_reader   :name,  
                 :class_name, 
@@ -8,31 +8,45 @@ class MerbfulAuthenticationModelGenerator < RubiGen::Base
                 :class_nesting_depth, 
                 :plural_name, 
                 :singular_name,
-                :include_activation
+                :include_activation,
+                :migration_name,
+                :migration_file_name
   
   def initialize(runtime_args, runtime_options = {})
+    @base = File.dirname(__FILE__)
     super
-    usage if args.empty?
     @name = args.shift
     extract_options
-    runtime_options.each{ |k,v| self.instance_variable_set("@#{k}", v) }
+    runtime_options.each do |k,v| 
+      ivar_name = "@#{k}"
+      self.instance_variable_set("@#{k}", v) unless ivar_name.include?("/")  
+    end
   end
 
   def manifest
     record do |m|
-      # Ensure appropriate folder(s) exists
-      m.class_collisions [], 'AuthenticatedSystem::OrmMap'
+      @m = m
       
-      m.directory File.join('app/models', class_path)
-      m.directory File.join('lib')
+      highest_migration = Dir[Dir.pwd+'/schema/migrations/*'].map{|f| File.basename(f) =~ /^(\d+)/; $1}.max
+      @migration_file_name = format("%03d_%s", (highest_migration.to_i+1), "create_#{plural_name}")
+      @migration_name = "Create#{plural_name.camelcase.gsub(/::/,'')}"
       
-      m.template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
-      m.template 'authenticated_system_orm_map.rb', "lib/authenticated_system_orm_map.rb"
+      @assigns = { 
+                 :name => name,  
+                 :class_name => class_name,
+                 :class_path => class_path, 
+                 :file_name => file_name, 
+                 :class_nesting => class_nesting, 
+                 :class_nesting_depth => class_nesting_depth, 
+                 :plural_name => plural_name, 
+                 :singular_name => singular_name,
+                 :include_activation => options[:include_activation],
+                 :migration_name  => migration_name,
+                 :migration_file_name => migration_file_name
+      }
       
-      m.migration_template('migration.rb', 'schema/migrations', :migration_file_name => "create_#{plural_name}", 
-                                                                :assigns => {
-                                                                  :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
-                                                                })
+      copy_dirs
+      copy_files
     end
   end
 

data/activerecord_generators/merbful_authentication_model/templates/{model.rb → app/models/%singular_name%.rb}

@@ -1,5 +1,9 @@
 require 'digest/sha1'
-dependency 'authenticated_system_model'
+begin
+  require File.join(File.dirname(__FILE__), '..', '..', "lib", "authenticated_system", "authenticated_dependencies")
+rescue 
+  nil
+end
 class <%= class_name %> < ActiveRecord::Base
   include AuthenticatedSystem::Model
   

data/activerecord_generators/merbful_authentication_model/templates/{migration.rb → schema/migrations/%migration_file_name%.rb}

@@ -13,8 +13,8 @@ class <%= migration_name %> < ActiveRecord::Migration
       t.column :activated_at, :datetime<% end %>
     end
   end
-
+ 
   def self.down
     drop_table "<%= singular_name %>"
   end
-end
+end

data/datamapper_generators/merbful_authentication_model/merbful_authentication_model_generator.rb

@@ -1,4 +1,4 @@
-class MerbfulAuthenticationModelGenerator < RubiGen::Base
+class MerbfulAuthenticationModelGenerator < Merb::GeneratorBase
 
   attr_reader   :name,  
                 :class_name, 
@@ -11,23 +11,31 @@ class MerbfulAuthenticationModelGenerator < RubiGen::Base
                 :include_activation
   
   def initialize(runtime_args, runtime_options = {})
+    @base = File.dirname(__FILE__)
     super
-    usage if args.empty?
     @name = args.shift
-    extract_options
-    runtime_options.each{ |k,v| self.instance_variable_set("@#{k}", v) }
+    runtime_options.each do |k,v| 
+      ivar_name = "@#{k}"
+      self.instance_variable_set("@#{k}", v) unless ivar_name.include?("/")  
+    end
   end
 
   def manifest
     record do |m|
-      # Ensure appropriate folder(s) exists
-      m.class_collisions [], 'AuthenticatedSystem::OrmMap'
-      
-      m.directory File.join('app/models', class_path)
-      m.directory File.join('lib')
-      
-      m.template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
-      m.template 'authenticated_system_orm_map.rb', "lib/authenticated_system_orm_map.rb"         
+      @m = m
+      @assigns = {
+        :name                 => name,  
+        :class_name           => class_name,
+        :class_path           => class_path, 
+        :file_name            => file_name, 
+        :class_nesting        => class_nesting, 
+        :class_nesting_depth  => class_nesting_depth, 
+        :plural_name          => plural_name, 
+        :singular_name        => singular_name,
+        :include_activation   => include_activation
+      }
+      copy_dirs
+      copy_files        
     end
   end
 
@@ -39,22 +47,4 @@ Creates a ...
 USAGE: #{$0} #{spec.name} name"
 EOS
     end
-
-    def add_options!(opts)
-      # opts.separator ''
-      # opts.separator 'Options:'
-      # For each option below, place the default
-      # at the top of the file next to "default_options"
-      # opts.on("-a", "--author=\"Your Name\"", String,
-      #         "Some comment about this option",
-      #         "Default: none") { |options[:author]| }
-      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-    end
-    
-    def extract_options
-      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
-      # Templates can access these value via the attr_reader-generated methods, but not the
-      # raw instance variable value.
-      # @author = options[:author]
-    end
 end

data/datamapper_generators/merbful_authentication_model/templates/{model.rb → app/models/%singular_name%.rb}

@@ -1,5 +1,9 @@
 require 'digest/sha1'
-dependency 'authenticated_system_model'
+begin
+  require File.join(File.dirname(__FILE__), '..', '..', "lib", "authenticated_system", "authenticated_dependencies")
+rescue 
+  nil
+end
 class <%= class_name %> < DataMapper::Base
   include AuthenticatedSystem::Model
   

data/merb_generators/authenticated/authenticated_generator.rb

@@ -1,5 +1,4 @@
-require 'merb'
-class AuthenticatedGenerator < RubiGen::Base
+class AuthenticatedGenerator < Merb::GeneratorBase
   
   default_options :author => nil
   
@@ -31,10 +30,14 @@ class AuthenticatedGenerator < RubiGen::Base
                 :model_controller_plural_name
   alias_method  :model_controller_file_name,  :model_controller_singular_name
   alias_method  :model_controller_table_name, :model_controller_plural_name
-  attr_reader   :include_activation
+  attr_reader   :include_activation,
+                :controller_view_path, 
+                :model_controller_view_path,
+                :controller_full_path,
+                :model_controller_full_path
   
   def initialize(runtime_args, runtime_options = {})
-    usage if runtime_args.empty?
+    @base = File.dirname(__FILE__)
     super
     extract_options
     assign_names!(runtime_args.shift)
@@ -53,6 +56,8 @@ class AuthenticatedGenerator < RubiGen::Base
     else
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
+    @controller_full_path = File.join(controller_class_path, controller_file_name)
+    @controller_view_path = File.join("app/views", @controller_full_path)
 
     # model controller
     base_name, @model_controller_class_path, @model_controller_file_path, @model_controller_class_nesting, @model_controller_class_nesting_depth = extract_modules(@model_controller_name)
@@ -63,79 +68,33 @@ class AuthenticatedGenerator < RubiGen::Base
     else
       @model_controller_class_name = "#{@model_controller_class_nesting}::#{@model_controller_class_name_without_nesting}"
     end    
+    @model_controller_full_path = File.join(model_controller_class_path, model_controller_file_name)
+    @model_controller_view_path = File.join("app/views", @model_controller_full_path)
   end
 
   def manifest
     manifest_result = record do |m|
-      # Check for class naming collisions.
-      m.class_collisions controller_class_path,       "#{controller_class_name}", # Sessions Controller
-                                                      "Merb::#{controller_class_name}Helper"
-      m.class_collisions model_controller_class_path, "#{model_controller_class_name}", # Model Controller
-                                                      "Merb::#{model_controller_class_name}Helper"
-      m.class_collisions class_path,                  "#{class_name}", "#{class_name}Mailer"# , "#{class_name}MailerTest", "#{class_name}Observer"
-      m.class_collisions [], 'AuthenticatedSystem::Controller', 'AuthenticatedSystem::Model'
-
-      # Generate the model first.  These can then throw an error when generating if there is no ORM present
-      model_attributes = { 
-        :class_name           => class_name,
-        :class_path           => class_path, 
-        :file_name            => file_name, 
-        :class_nesting        => class_nesting, 
-        :class_nesting_depth  => class_nesting_depth, 
-        :plural_name          => plural_name, 
-        :singular_name        => singular_name,
-        :include_activation   => options[:include_activation]     
-      }
-      m.dependency "merbful_authentication_model", [name], model_attributes
-
-
-      # Controller, helper, views, and test directories.
-      
-      m.directory File.join('app/controllers', controller_class_path)
-      m.directory File.join('app/controllers', model_controller_class_path)
-      
-      m.directory File.join('app/helpers', controller_class_path)
-      m.directory File.join('app/views', controller_class_path, controller_file_name)
-      
-      m.directory File.join('app/controllers', model_controller_class_path)
-      m.directory File.join('app/helpers', model_controller_class_path)
-      m.directory File.join('app/views', model_controller_class_path, model_controller_file_name)
-      
-      # Generate the authenticated system" libraries
-      m.directory "lib"
-      m.template "authenticated_system_controller.rb",  "lib/authenticated_system_controller.rb"
-      m.template "authenticated_system_model.rb",       "lib/authenticated_system_model.rb"
-      
-      # Mailer directory for activation
-      if options[:include_activation]
-        m.directory File.join('app/mailers/views', "#{singular_name}_mailer")
-        m.template  "mail_controller.rb",       File.join('app/mailers', 
-                                                          "#{singular_name}_mailer.rb")
-        [:html, :text].each do |format|
-          [:signup, :activation].each do |action|
-            m.template "#{action}.#{format}.erb",   File.join('app/mailers/views',
-                                                              "#{singular_name}_mailer",
-                                                              "#{action}_notification.#{format}.erb")
-          end
-        end
+      @m = m
+          
+      @choices = []
+      @choices << "app/mailers"
+      Dir[File.join(@base, "templates", "app", "mailers", "**", "*")].each do |f|
+        @choices << relative(f)
       end
       
-      # Generate the sessions controller
-      m.template "session_controller.rb", File.join('app/controllers', 
-                                                    controller_class_path, 
-                                                    "#{controller_file_name}.rb")
-      
-      # Generate the model controller
-      m.template "model_controller.rb",   File.join('app/controllers',
-                                                    model_controller_class_path,
-                                                    "#{model_controller_file_name}.rb")
-                                                    
-      # Controller templates
-      m.template 'login.html.erb',  File.join('app/views', controller_class_path, controller_file_name, "new.html.erb")
-      m.template 'new_model.html.erb', File.join('app/views', model_controller_class_path, model_controller_file_name, "new.html.erb")
-      
-      
-      controller_attributes = {
+      @choices.each do |f|
+        options[f] = options[:include_activation] ? true : false
+      end
+
+      @assigns = {
+        :class_name                               => class_name,
+        :class_path                               => class_path, 
+        :file_name                                => file_name, 
+        :class_nesting                            => class_nesting, 
+        :class_nesting_depth                      => class_nesting_depth, 
+        :plural_name                              => plural_name, 
+        :singular_name                            => singular_name,
+        :include_activation                       => options[:include_activation],
         :controller_name                          => controller_name,
         :controller_class_path                    => controller_class_path,
         :controller_file_path                     => controller_file_path,
@@ -152,10 +111,27 @@ class AuthenticatedGenerator < RubiGen::Base
         :model_controller_class_name              => model_controller_class_name,
         :model_controller_singular_name           => model_controller_singular_name,
         :model_controller_plural_name             => model_controller_plural_name,
-        :include_activation                       => options[:include_activation]
+        :controller_view_path                     => controller_view_path,
+        :model_controller_view_path               => model_controller_view_path,
+        :controller_full_path                     => controller_full_path,
+        :model_controller_full_path               => model_controller_full_path
       }
-      # Generate the tests
-      m.dependency "merbful_authentication_tests", [name], model_attributes.dup.merge!(controller_attributes)
+      
+      # Do these first to allow an error to be raised
+      m.dependency "merbful_authentication_tests", [name], @assigns
+      m.dependency "merbful_authentication_model", [name], @assigns
+      
+      m.directory File.join('app/controllers', controller_class_path)
+      m.directory File.join('app/controllers', model_controller_class_path)
+      m.directory File.join('app/helpers', controller_class_path)
+      m.directory File.join('app/controllers', model_controller_class_path)
+      m.directory File.join('app/helpers', model_controller_class_path)
+      
+      copy_dirs
+      copy_files
+      
+
+      
     end
     
     action = nil
@@ -218,7 +194,7 @@ class AuthenticatedGenerator < RubiGen::Base
     end
     
     def assign_names!(name)
-      @name = name
+      @name = name.singularize
       base_name, @class_path, @file_name, @class_nesting, @class_nesting_depth = extract_modules(@name)
       @class_name_without_nesting, @singular_name, @plural_name = inflect_names(base_name)
       @table_name = @name.pluralize

data/merb_generators/authenticated/templates/{session_controller.rb → app/controllers/%controller_name%.rb}

@@ -1,14 +1,15 @@
-dependencies "authenticated_system_controller", "merb_helpers"
+# require  'lib/authenticated_system_controller'
+require File.join(File.dirname(__FILE__), '..', '..', "lib", "authenticated_system", "authenticated_dependencies")
 class <%= controller_class_name %> < Application
-
+  
   skip_before :login_required
   
   def new
     render
   end
 
-  def create(login = "", password = "")
-    self.current_<%= singular_name %> = <%= class_name %>.authenticate(login, password)
+  def create
+    self.current_<%= singular_name %> = <%= class_name %>.authenticate(params[:login], params[:password])
     if logged_in?
       if params[:remember_me] == "1"
         self.current_<%= singular_name %>.remember_me
@@ -16,7 +17,7 @@ class <%= controller_class_name %> < Application
       end
       redirect_back_or_default('/')
     else
-      render :action => "new"
+      render :new
     end
   end
 

data/merb_generators/authenticated/templates/{model_controller.rb → app/controllers/%model_controller_name%.rb}

@@ -1,29 +1,29 @@
-dependencies "authenticated_system_controller", "merb_helpers"
+require File.join(File.dirname(__FILE__), '..', '..', "lib", "authenticated_system", "authenticated_dependencies")
 class <%= model_controller_class_name %> < Application
   provides :xml
   
   skip_before :login_required
   
-  def new(<%= singular_name %> = {})
+  def new
     only_provides :html
-    @<%= singular_name %> = <%= class_name %>.new(<%= singular_name %>)
-    render @<%= singular_name %>
+    @<%= singular_name %> = <%= class_name %>.new(params[:<%= singular_name %>] || {})
+    display @<%= singular_name %>
   end
   
-  def create(<%= singular_name %>)
+  def create
     cookies.delete :auth_token
     
-    @<%= singular_name %> = <%= class_name %>.new(<%= singular_name %>)
+    @<%= singular_name %> = <%= class_name %>.new(params[:<%= singular_name %>])
     if @<%= singular_name %>.save
       redirect_back_or_default('/')
     else
-      render :action => :new
+      render :new
     end
   end
   
 <% if include_activation -%>
-  def activate(activation_code)
-    self.current_<%= singular_name %> = <%= class_name %>.find_activated_authenticated_model(activation_code)
+  def activate
+    self.current_<%= singular_name %> = <%= class_name %>.find_activated_authenticated_model(params[:activation_code])
     if logged_in? && !current_<%= singular_name %>.active?
       current_<%= singular_name %>.activate
     end

data/merb_generators/authenticated/templates/{mail_controller.rb → app/mailers/%singular_name%_mailer.rb}

@@ -1,3 +1,4 @@
+dependency "merb-mailer", ">= 0.9"
 class <%= class_name %>Mailer < Merb::MailController
   
   def signup_notification

data/merb_generators/authenticated/templates/lib/authenticated_system/authenticated_dependencies.rb

@@ -0,0 +1,7 @@
+dependency 'merb_helpers', '>= 0.9' rescue NoMethodError
+
+base = File.dirname(__FILE__)
+
+%w(authenticated_routes authenticated_system_controller authenticated_system_model authenticated_system_orm_map).each do |f|
+  require File.join(base, f)
+end

data/merb_generators/authenticated/templates/lib/authenticated_system/authenticated_routes.rb

@@ -0,0 +1,9 @@
+# Put the correct routes in place
+Merb::BootLoader.after_app_loads do
+  Merb::Router.prepend do |r|
+    r.match("/login").to(:controller => "<%= controller_class_name %>", :action => "create").name(:login)
+    r.match("/logout").to(:controller => "<%= controller_class_name %>", :action => "destroy").name(:logout)
+    r.match("/<%= plural_name %>/activate/:activation_code").to(:controller => "<%= model_controller_class_name %>", :action => "activate").name(:<%= singular_name %>_activation)
+    r.resources :users
+  end
+end

data/merb_generators/authenticated/templates/{authenticated_system_controller.rb → lib/authenticated_system/authenticated_system_controller.rb}

@@ -84,8 +84,9 @@ module AuthenticatedSystem
       # Redirect to the URI stored by the most recent store_location call or
       # to the passed default.
       def redirect_back_or_default(default)
-        redirect(session[:return_to] || default)
+        loc = session[:return_to] || default
         session[:return_to] = nil
+        redirect loc
       end
     
       # Inclusion hook to make #current_<%= singular_name %> and #logged_in?

data/merb_generators/authenticated/templates/{authenticated_system_model.rb → lib/authenticated_system/authenticated_system_model.rb}

@@ -1,4 +1,4 @@
-dependency 'authenticated_system_orm_map'
+
 module AuthenticatedSystem
   module Model
     
@@ -87,7 +87,7 @@ module AuthenticatedSystem
       
       # Authenticates a <%= singular_name %> by their login name and unencrypted password.  Returns the <%= singular_name %> or nil.
       def authenticate(login, password)
-        u = find_activated_authenticated_model_with_login(login.downcase) # need to get the salt
+        u = find_activated_authenticated_model_with_login(login) # need to get the salt
         u && u.authenticated?(password) ? u : nil
       end
     end

data/rspec_generators/merbful_authentication_tests/merbful_authentication_tests_generator.rb

@@ -1,5 +1,4 @@
-class MerbfulAuthenticationTestsGenerator < RubiGen::Base
-  
+class MerbfulAuthenticationTestsGenerator < Merb::GeneratorBase
   attr_reader   :name,  
                 :class_name, 
                 :class_path, 
@@ -27,30 +26,65 @@ class MerbfulAuthenticationTestsGenerator < RubiGen::Base
                 :include_activation
   
   def initialize(runtime_args, runtime_options = {})
+    @base = File.dirname(__FILE__)
     super
     usage if args.empty?
     @name = args.shift
     extract_options
-    runtime_options.each{ |k,v| self.instance_variable_set("@#{k}", v) }    
+    runtime_options.each do |k,v| 
+      ivar_name = "@#{k}"
+      self.instance_variable_set("@#{k}", v) unless ivar_name.include?("/")  
+    end
   end
 
   def manifest
     record do |m|
+      
+      @m = m
       # Ensure appropriate folder(s) exists
-      m.directory "spec"
-      m.directory "spec/models"
-      m.directory "spec/controllers"
-      m.directory "spec/mailers"
-      # Create stubs
-      m.template "model_spec_helper.rb", File.join("spec",  "#{file_name}_spec_helper.rb")
-      m.template "authenticated_system_spec_helper.rb", File.join("spec", "authenticated_system_spec_helper.rb")
-      m.template "session_controller_spec.rb", File.join("spec/controllers", "#{controller_file_path}_spec.rb")
-      m.template "model_controller_spec.rb", File.join("spec/controllers", "#{model_controller_file_path}_spec.rb")
-      m.template "model_spec.rb", File.join('spec/models', "#{file_name}_spec.rb")     
+      @assigns = {
+        :name                                 => name,  
+        :class_name                           => class_name, 
+        :class_path                           => class_path, 
+        :file_name                            => file_name, 
+        :class_nesting                        => class_nesting, 
+        :class_nesting_depth                  => class_nesting_depth, 
+        :plural_name                          => plural_name, 
+        :singular_name                        => singular_name,
+        :controller_name                      => controller_name,
+        :controller_class_path                => controller_class_path,
+        :controller_file_path                 => controller_file_path,
+        :controller_class_nesting             => controller_class_nesting,
+        :controller_class_nesting_depth       => controller_class_nesting_depth,
+        :controller_class_name                => controller_class_name,
+        :controller_singular_name             => controller_singular_name,
+        :controller_plural_name               => controller_plural_name,
+        :model_controller_name                => model_controller_name,
+        :model_controller_class_path          => model_controller_class_path,
+        :model_controller_file_path           => model_controller_file_path,
+        :model_controller_class_nesting       => model_controller_class_nesting,
+        :model_controller_class_nesting_depth => model_controller_class_nesting_depth,
+        :model_controller_class_name          => model_controller_class_name,
+        :model_controller_singular_name       => model_controller_singular_name,
+        :model_controller_plural_name         => model_controller_plural_name,
+        :include_activation                   => include_activation
+      }
       
-      if include_activation
-        m.template "user_mailer_spec.rb", File.join("spec/mailers", "#{singular_name}_mailer_spec.rb")
+      @choices = []
+      @choices << "spec/mailers"
+      Dir[File.join(@base, "spec", "mailers")].each do |f|
+        @choices << relative(f)
       end
+      
+      @choices.each do |f|
+        options[f] = include_activation ? true : false
+      end
+      
+      m.directory( File.join("spec", "controllers", controller_class_path))
+      m.directory( File.join("spec", "controllers", model_controller_class_path))
+
+      copy_dirs
+      copy_files
     end
   end
 

data/rspec_generators/merbful_authentication_tests/templates/spec/authenticated_system_spec_helper.rb

@@ -0,0 +1,25 @@
+Merb::Config.use do |c|
+  c[:session_store] = "memory"
+end
+
+[Merb::Test::ControllerHelper, Merb::Test::ViewHelper, Merb::Test::RouteHelper].each do |m|
+  Merb::Test::Helpers.send(:include, m)
+end
+
+<% if include_activation -%>
+class Merb::Mailer
+  self.delivery_method = :test_send
+end
+<% end -%>
+
+class Hash
+  
+  def with( opts )
+    self.merge(opts)
+  end
+  
+  def without(*args)
+    self.dup.delete_if{ |k,v| args.include?(k)}
+  end
+  
+end

data/rspec_generators/merbful_authentication_tests/templates/{session_controller_spec.rb → spec/controllers/%controller_file_path%_spec.rb}

@@ -9,84 +9,83 @@ describe "<%= controller_class_name %> Controller", "index action" do
   before(:each) do
     <%= class_name %>.clear_database_table
     @quentin = <%= class_name %>.create(valid_<%= singular_name %>_hash.with(:login => "quentin", :password => "test", :password_confirmation => "test"))
-    @controller = <%= controller_class_name %>.build(fake_request)
+    @controller = <%= controller_class_name %>.new(fake_request)
 <% if include_activation -%>
     @quentin.activate
 <% end -%>
   end
   
   it "should have a route to <%= controller_class_name %>#new from '/login'" do
-    with_route("/login") do |params|
+    request_to("/login") do |params|
       params[:controller].should == "<%= controller_class_name %>"
       params[:action].should == "create"
     end   
   end
   
   it "should route to <%= controller_class_name %>#create from '/login' via post" do
-    with_route("/login", "POST") do |params|
+    request_to("/login", :post) do |params|
       params[:controller].should  == "<%= controller_class_name %>"
       params[:action].should      == "create"
     end      
   end
   
   it "should have a named route :login" do
-    controller.url(:login).should == "/login"
+    @controller.url(:login).should == "/login"
   end
   
   it "should have route to <%= controller_class_name %>#destroy from '/logout' via delete" do
-    with_route("/logout", "DELETE") do |params|
+    request_to("/logout", :delete) do |params|
       params[:controller].should == "<%= controller_class_name %>"
       params[:action].should    == "destroy"
     end   
   end
   
   it "should route to <%= controller_class_name %>#destroy from '/logout' via get" do
-    with_route("/logout", "GET") do |params|
+    request_to("/logout") do |params|
       params[:controller].should == "<%= controller_class_name %>" 
       params[:action].should     == "destroy"
     end
   end
 
   it 'logins and redirects' do
-    post "/login", :login => 'quentin', :password => 'test'
-    session[:<%= singular_name %>].should_not be_nil
-    session[:<%= singular_name %>].should == @quentin.id
+    controller = post "/login", :login => 'quentin', :password => 'test'
+    controller.session[:<%= singular_name %>].should_not be_nil
+    controller.session[:<%= singular_name %>].should == @quentin.id
     controller.should redirect_to("/")
   end
    
   it 'fails login and does not redirect' do
-    post "/login", :login => 'quentin', :password => 'bad password'
-    session[:<%= singular_name %>].should be_nil
-    controller.template.should match(/^new\./)
-    controller.should be_success
+    controller = post "/login", :login => 'quentin', :password => 'bad password'
+    controller.session[:<%= singular_name %>].should be_nil
+    controller.should be_successful
   end
 
   it 'logs out' do
-    get("/logout"){|response| response.stub!(:current_<%= singular_name %>).and_return(@quentin) }
-    session[:<%= singular_name %>].should be_nil
+    controller = get("/logout"){|controller| controller.stub!(:current_<%= singular_name %>).and_return(@quentin) }
+    controller.session[:<%= singular_name %>].should be_nil
     controller.should redirect
   end
 
   it 'remembers me' do
-    post "/login", :login => 'quentin', :password => 'test', :remember_me => "1"
-    cookies["auth_token"].should_not be_nil
+    controller = post "/login", :login => 'quentin', :password => 'test', :remember_me => "1"
+    controller.cookies["auth_token"].should_not be_nil
   end
  
   it 'does not remember me' do
-    post "login", :login => 'quentin', :password => 'test', :remember_me => "0"
-    cookies["auth_token"].should be_nil
+    controller = post "/login", :login => 'quentin', :password => 'test', :remember_me => "0"
+    controller.cookies["auth_token"].should be_nil
   end
   
   it 'deletes token on logout' do
-    get("/logout") {|request| request.stub!(:current_<%= singular_name %>).and_return(@quentin) }
-    cookies["auth_token"].should == nil
+    controller = get("/logout") {|request| request.stub!(:current_<%= singular_name %>).and_return(@quentin) }
+    controller.cookies["auth_token"].should == nil
   end
   
   
   it 'logs in with cookie' do
     @quentin.remember_me
-    get "/login" do |request|
-      request.env[Merb::Const::HTTP_COOKIE] = "auth_token=#{@quentin.remember_token}"
+    controller = get "/login" do |c|
+      c.request.env[Merb::Const::HTTP_COOKIE] = "auth_token=#{@quentin.remember_token}"
     end
     controller.should be_logged_in
   end

data/rspec_generators/merbful_authentication_tests/templates/{model_controller_spec.rb → spec/controllers/%model_controller_file_path%_spec.rb}

@@ -12,46 +12,46 @@ describe <%= model_controller_class_name %> do
   
   it 'allows signup' do
      lambda do
-       create_<%= singular_name %>
+       controller = create_<%= singular_name %>
        controller.should redirect      
      end.should change(<%= class_name %>, :count).by(1)
    end
 
    it 'requires login on signup' do
      lambda do
-       create_<%= singular_name %>(:login => nil)
+       controller = create_<%= singular_name %>(:login => nil)
        controller.assigns(:<%= singular_name %>).errors.on(:login).should_not be_nil
-       controller.should be_successful
+       controller.should respond_successfully
      end.should_not change(<%= class_name %>, :count)
    end
     
    it 'requires password on signup' do
      lambda do
-       create_<%= singular_name %>(:password => nil)
+       controller = create_<%= singular_name %>(:password => nil)
        controller.assigns(:<%= singular_name %>).errors.on(:password).should_not be_nil
-       controller.should be_successful
+       controller.should respond_successfully
      end.should_not change(<%= class_name %>, :count)
    end
      
    it 'requires password confirmation on signup' do
      lambda do
-       create_<%= singular_name %>(:password_confirmation => nil)
+       controller = create_<%= singular_name %>(:password_confirmation => nil)
        controller.assigns(:<%= singular_name %>).errors.on(:password_confirmation).should_not be_nil
-       controller.should be_successful
+       controller.should respond_successfully
      end.should_not change(<%= class_name %>, :count)
    end
    
    it 'requires email on signup' do
      lambda do
-       create_<%= singular_name %>(:email => nil)
+       controller = create_<%= singular_name %>(:email => nil)
        controller.assigns(:<%= singular_name %>).errors.on(:email).should_not be_nil
-       controller.should be_successful
+       controller.should respond_successfully
      end.should_not change(<%= class_name %>, :count)
    end
    
 <% if include_activation -%>
    it "should have a route for <%= singular_name %> activation" do
-     with_route("/<%= model_controller_plural_name %>/activate/1234") do |params|
+     request_to("/<%= model_controller_singular_name %>/activate/1234") do |params|
        params[:controller].should == "<%= model_controller_class_name %>"
        params[:action].should == "activate" 
        params[:activation_code].should == "1234"    
@@ -59,20 +59,15 @@ describe <%= model_controller_class_name %> do
    end
 
    it 'activates <%= singular_name %>' do
-     create_<%= singular_name %>(:login => "aaron", :password => "test", :password_confirmation => "test")
+     controller = create_<%= singular_name %>(:login => "aaron", :password => "test", :password_confirmation => "test")
      @<%= singular_name %> = controller.assigns(:<%= singular_name %>)
      <%= class_name %>.authenticate('aaron', 'test').should be_nil
-     get "/<%= model_controller_plural_name %>/activate/1234" 
+     controller = get "/<%= model_controller_singular_name %>/activate/1234" 
      controller.should redirect_to("/")
    end
-
-   it 'does not activate <%= singular_name %> without key' do
-       get "/<%= model_controller_plural_name %>/activate"
-       controller.should be_missing
-   end
 <% end -%>
      
    def create_<%= singular_name %>(options = {})
-     post "/<%= model_controller_plural_name %>", :<%= singular_name %> => valid_<%= singular_name %>_hash.merge(options)
+     post "/<%= model_controller_singular_name %>", :<%= singular_name %> => valid_<%= singular_name %>_hash.merge(options)
    end
 end

data/test_unit_generators/merbful_authentication_tests/merbful_authentication_tests_generator.rb

@@ -1,4 +1,4 @@
-class MerbfulAuthenticationTestsGenerator < RubiGen::Base
+class MerbfulAuthenticationTestsGenerator < Merb::GeneratorBase
   
   attr_reader   :name,  
                 :class_name, 
@@ -27,31 +27,59 @@ class MerbfulAuthenticationTestsGenerator < RubiGen::Base
                 :include_activation
   
   def initialize(runtime_args, runtime_options = {})
+    @base = File.dirname(__FILE__)
     super
-    usage if args.empty?
     @name = args.shift
     extract_options
-    runtime_options.each{ |k,v| self.instance_variable_set("@#{k}", v) }    
+    runtime_options.each do |k,v| 
+      ivar_name = "@#{k}"
+      self.instance_variable_set("@#{k}", v) unless ivar_name.include?("/")  
+    end  
   end
 
   def manifest
     record do |m|
-      # Ensure appropriate folder(s) exists
-      m.directory "test"
-      m.directory "test/unit"
-      m.directory "test/functional"
+      @m = m
+      
+      @choices = []
+      @choices << relative(File.join(@base, "test", "mailers"))
+      @choices << relative(File.join(@base, "test", "mailers", "%singular_name%_mailer_test.rb"))
+      
+      @assigns = {
+        :name                                   => name,  
+        :class_name                             => class_name, 
+        :class_path                             => class_path, 
+        :file_name                              => file_name, 
+        :class_nesting                          => class_nesting, 
+        :class_nesting_depth                    => class_nesting_depth, 
+        :plural_name                            => plural_name, 
+        :singular_name                          => singular_name,
+        :controller_name                        => controller_name,
+        :controller_class_path                  => controller_class_path,
+        :controller_file_path                   => controller_file_path,
+        :controller_class_nesting               => controller_class_nesting,
+        :controller_class_nesting_depth         => controller_class_nesting_depth,
+        :controller_class_name                  => controller_class_name,
+        :controller_singular_name               => controller_singular_name,
+        :controller_plural_name                 => controller_plural_name,
+        :model_controller_name                  => model_controller_name,
+        :model_controller_class_path            => model_controller_class_path,
+        :model_controller_file_path             => model_controller_file_path,
+        :model_controller_class_nesting         => model_controller_class_nesting,
+        :model_controller_class_nesting_depth   => model_controller_class_nesting_depth,
+        :model_controller_class_name            => model_controller_class_name,
+        :model_controller_singular_name         => model_controller_singular_name,
+        :model_controller_plural_name           => model_controller_plural_name,
+        :include_activation                     => include_activation
+      }
+
+      
+      m.directory File.join("test", "functional", controller_class_path)
+      m.directory File.join("test", "functional", model_controller_class_path)
+      
+      copy_dirs
+      copy_files
       
-      m.directory "test/mailers" if include_activation
-      # Create stubs
-      m.template "model_test_helper.rb", File.join("test",  "#{file_name}_test_helper.rb")
-      m.template "authenticated_system_test_helper.rb", File.join("test", "authenticated_system_test_helper.rb")
-      m.template "model_functional_test.rb", File.join("test", "functional", "#{model_controller_file_path}_test.rb")
-      m.template "functional_test.rb", File.join("test", "functional", "#{controller_file_path}_test.rb")
-      m.template "unit_test.rb", File.join("test", "unit", "#{singular_name}_test.rb")
-    
-      if include_activation
-        m.template "mailer_test.rb", File.join("test/mailers", "#{singular_name}_mailer_test.rb")
-      end
     end
   end
 

data/test_unit_generators/merbful_authentication_tests/templates/{authenticated_system_test_helper.rb → test/authenticated_system_test_helper.rb}

@@ -1,13 +1,16 @@
-class Merb::Controller
-  require "merb/session/memory_session"
-  Merb::MemorySessionContainer.setup
-  include ::Merb::SessionMixin
-  self.session_secret_key = "foo to the bar to the baz"
+Merb::Config.use do |c|
+  c[:session_store] = "memory"
 end
 
+[Merb::Test::ControllerHelper, Merb::Test::ViewHelper, Merb::Test::RouteHelper].each do |m|
+  Merb::Test::Helpers.send(:include, m)
+end
+
+<% if include_activation -%>
 class Merb::Mailer
   self.delivery_method = :test_send
 end
+<% end -%>
 
 class Hash
   
@@ -20,7 +23,6 @@ class Hash
   end
   
 end
-
 # Assert difference(s) methods were taken from RubyOnRails to support the port of restful_authentication
 
 def assert_difference(expressions, difference = 1, message = nil, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbful_authentication
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.9.0
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,26 +9,26 @@ autorequire: merbful_authentication
 bindir: bin
 cert_chain: []
 
-date: 2008-01-18 00:00:00 +11:00
+date: 2008-02-27 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: merb
+  name: merb-core
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: 0.9.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: merb_helpers
+  name: merb-gen
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: "0"
     version: 
 description: A Merb plugin that is essentially a port of Rick Olsons restful_authentication plugin for rails
 email: has.sox@gmail.com
@@ -51,53 +51,82 @@ files:
 - merb_generators/authenticated
 - merb_generators/authenticated/authenticated_generator.rb
 - merb_generators/authenticated/templates
-- merb_generators/authenticated/templates/activation.html.erb
-- merb_generators/authenticated/templates/activation.text.erb
-- merb_generators/authenticated/templates/authenticated_system_controller.rb
-- merb_generators/authenticated/templates/authenticated_system_model.rb
-- merb_generators/authenticated/templates/login.html.erb
-- merb_generators/authenticated/templates/mail_controller.rb
-- merb_generators/authenticated/templates/model_controller.rb
-- merb_generators/authenticated/templates/new_model.html.erb
-- merb_generators/authenticated/templates/session_controller.rb
-- merb_generators/authenticated/templates/signup.html.erb
-- merb_generators/authenticated/templates/signup.text.erb
+- merb_generators/authenticated/templates/app
+- merb_generators/authenticated/templates/app/controllers
+- merb_generators/authenticated/templates/app/controllers/%controller_name%.rb
+- merb_generators/authenticated/templates/app/controllers/%model_controller_name%.rb
+- merb_generators/authenticated/templates/app/mailers
+- merb_generators/authenticated/templates/app/mailers/%singular_name%_mailer.rb
+- merb_generators/authenticated/templates/app/mailers/views
+- merb_generators/authenticated/templates/app/mailers/views/%singular_name%_mailer
+- merb_generators/authenticated/templates/app/mailers/views/%singular_name%_mailer/activation_notification.html.erb
+- merb_generators/authenticated/templates/app/mailers/views/%singular_name%_mailer/activation_notification.text.erb
+- merb_generators/authenticated/templates/app/mailers/views/%singular_name%_mailer/signup_notification.html.erb
+- merb_generators/authenticated/templates/app/mailers/views/%singular_name%_mailer/signup_notification.text.erb
+- merb_generators/authenticated/templates/app/views
+- merb_generators/authenticated/templates/app/views/%controller_name%
+- merb_generators/authenticated/templates/app/views/%controller_name%/new.html.erb
+- merb_generators/authenticated/templates/app/views/%model_controller_name%
+- merb_generators/authenticated/templates/app/views/%model_controller_name%/new.html.erb
+- merb_generators/authenticated/templates/lib
+- merb_generators/authenticated/templates/lib/authenticated_system
+- merb_generators/authenticated/templates/lib/authenticated_system/authenticated_dependencies.rb
+- merb_generators/authenticated/templates/lib/authenticated_system/authenticated_routes.rb
+- merb_generators/authenticated/templates/lib/authenticated_system/authenticated_system_controller.rb
+- merb_generators/authenticated/templates/lib/authenticated_system/authenticated_system_model.rb
 - merb_generators/authenticated/USAGE
 - datamapper_generators/merbful_authentication_model
 - datamapper_generators/merbful_authentication_model/merbful_authentication_model_generator.rb
 - datamapper_generators/merbful_authentication_model/templates
-- datamapper_generators/merbful_authentication_model/templates/authenticated_system_orm_map.rb
-- datamapper_generators/merbful_authentication_model/templates/model.rb
+- datamapper_generators/merbful_authentication_model/templates/app
+- datamapper_generators/merbful_authentication_model/templates/app/models
+- datamapper_generators/merbful_authentication_model/templates/app/models/%singular_name%.rb
+- datamapper_generators/merbful_authentication_model/templates/lib
+- datamapper_generators/merbful_authentication_model/templates/lib/authenticated_system
+- datamapper_generators/merbful_authentication_model/templates/lib/authenticated_system/authenticated_system_orm_map.rb
 - activerecord_generators/merbful_authentication_model
 - activerecord_generators/merbful_authentication_model/merbful_authentication_model_generator.rb
 - activerecord_generators/merbful_authentication_model/templates
-- activerecord_generators/merbful_authentication_model/templates/authenticated_system_orm_map.rb
-- activerecord_generators/merbful_authentication_model/templates/migration.rb
-- activerecord_generators/merbful_authentication_model/templates/model.rb
+- activerecord_generators/merbful_authentication_model/templates/app
+- activerecord_generators/merbful_authentication_model/templates/app/models
+- activerecord_generators/merbful_authentication_model/templates/app/models/%singular_name%.rb
+- activerecord_generators/merbful_authentication_model/templates/lib
+- activerecord_generators/merbful_authentication_model/templates/lib/authenticated_system
+- activerecord_generators/merbful_authentication_model/templates/lib/authenticated_system/authenticated_system_orm_map.rb
+- activerecord_generators/merbful_authentication_model/templates/schema
+- activerecord_generators/merbful_authentication_model/templates/schema/migrations
+- activerecord_generators/merbful_authentication_model/templates/schema/migrations/%migration_file_name%.rb
 - merb_default_generators/merbful_authentication_model
 - merb_default_generators/merbful_authentication_model/merbful_authentication_model_generator.rb
-- merb_default_generators/merbful_authentication_model/templates
 - sequel_generators/merbful_authentication_model
-- sequel_generators/merbful_authentication_model/merbful_authentication_model_generator.rb
-- sequel_generators/merbful_authentication_model/templates
+- sequel_generators/merbful_authentication_model/lib
+- sequel_generators/merbful_authentication_model/lib/merbful_authentication_model_generator.rb
 - rspec_generators/merbful_authentication_tests
 - rspec_generators/merbful_authentication_tests/merbful_authentication_tests_generator.rb
 - rspec_generators/merbful_authentication_tests/templates
-- rspec_generators/merbful_authentication_tests/templates/authenticated_system_spec_helper.rb
-- rspec_generators/merbful_authentication_tests/templates/model_controller_spec.rb
-- rspec_generators/merbful_authentication_tests/templates/model_spec.rb
-- rspec_generators/merbful_authentication_tests/templates/model_spec_helper.rb
-- rspec_generators/merbful_authentication_tests/templates/session_controller_spec.rb
-- rspec_generators/merbful_authentication_tests/templates/user_mailer_spec.rb
+- rspec_generators/merbful_authentication_tests/templates/spec
+- rspec_generators/merbful_authentication_tests/templates/spec/%singular_name%_spec_helper.rb
+- rspec_generators/merbful_authentication_tests/templates/spec/authenticated_system_spec_helper.rb
+- rspec_generators/merbful_authentication_tests/templates/spec/controllers
+- rspec_generators/merbful_authentication_tests/templates/spec/controllers/%controller_file_path%_spec.rb
+- rspec_generators/merbful_authentication_tests/templates/spec/controllers/%model_controller_file_path%_spec.rb
+- rspec_generators/merbful_authentication_tests/templates/spec/mailers
+- rspec_generators/merbful_authentication_tests/templates/spec/mailers/%singular_name%_mailer_spec.rb
+- rspec_generators/merbful_authentication_tests/templates/spec/models
+- rspec_generators/merbful_authentication_tests/templates/spec/models/%singular_name%_spec.rb
 - test_unit_generators/merbful_authentication_tests
 - test_unit_generators/merbful_authentication_tests/merbful_authentication_tests_generator.rb
 - test_unit_generators/merbful_authentication_tests/templates
-- test_unit_generators/merbful_authentication_tests/templates/authenticated_system_test_helper.rb
-- test_unit_generators/merbful_authentication_tests/templates/functional_test.rb
-- test_unit_generators/merbful_authentication_tests/templates/mailer_test.rb
-- test_unit_generators/merbful_authentication_tests/templates/model_functional_test.rb
-- test_unit_generators/merbful_authentication_tests/templates/model_test_helper.rb
-- test_unit_generators/merbful_authentication_tests/templates/unit_test.rb
+- test_unit_generators/merbful_authentication_tests/templates/test
+- test_unit_generators/merbful_authentication_tests/templates/test/%file_name%_test_helper.rb
+- test_unit_generators/merbful_authentication_tests/templates/test/authenticated_system_test_helper.rb
+- test_unit_generators/merbful_authentication_tests/templates/test/functional
+- test_unit_generators/merbful_authentication_tests/templates/test/functional/%controller_file_path%_test.rb
+- test_unit_generators/merbful_authentication_tests/templates/test/functional/%model_controller_file_path%_test.rb
+- test_unit_generators/merbful_authentication_tests/templates/test/mailers
+- test_unit_generators/merbful_authentication_tests/templates/test/mailers/%singular_name%_mailer_test.rb
+- test_unit_generators/merbful_authentication_tests/templates/test/unit
+- test_unit_generators/merbful_authentication_tests/templates/test/unit/%singular_name%_test.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/merbful-auth/
 post_install_message: 

data/rspec_generators/merbful_authentication_tests/templates/authenticated_system_spec_helper.rb

@@ -1,22 +0,0 @@
-class Merb::Controller
-  require "merb/session/memory_session"
-  Merb::MemorySessionContainer.setup
-  include ::Merb::SessionMixin
-  self.session_secret_key = "foo to the bar to the baz"
-end
-
-class Merb::Mailer
-  self.delivery_method = :test_send
-end
-
-class Hash
-  
-  def with( opts )
-    self.merge(opts)
-  end
-  
-  def without(*args)
-    self.dup.delete_if{ |k,v| args.include?(k)}
-  end
-  
-end