hobo 0.7.5 → 0.8

data/lib/hobo/scopes/named_scope_extensions.rb

@@ -0,0 +1,27 @@
+module ActiveRecord
+  module NamedScope
+    class Scope
+
+      delegate :member_class, :to => :proxy_found
+
+      include Hobo::Scopes::ApplyScopes
+
+      def respond_to?(method)
+        super || scopes.include?(method) || proxy_scope.respond_to?(method)
+      end
+      
+      private
+      
+      def method_missing(method, *args, &block)
+        if respond_to?(method) && scopes.include?(method)
+          scopes[method].call(self, *args)
+        else
+          with_scope :find => proxy_options do
+            proxy_scope.send(method, *args, &block)
+          end
+        end
+      end
+
+    end
+  end
+end

data/{hobo_files/plugin/lib → lib}/hobo/static_tags

@@ -2,21 +2,17 @@ abbr
 acronym
 address
 applet
-area
 b
-base
 basefont
 bdo
 big
 blockquote
 body
-br
 button
 caption
 center
 cite
 code
-col
 colgroup
 dd
 del
@@ -29,7 +25,6 @@ em
 embed
 fieldset
 font
-frame
 frameset
 h1
 h2
@@ -38,21 +33,16 @@ h4
 h5
 h6
 head
-hr
-html
 i
 iframe
-img
 ins
 isindex
 kbd
 label
 legend
 li
-link
 map
 menu
-meta
 noframes
 noscript
 object
@@ -60,7 +50,6 @@ ol
 optgroup
 option
 p
-param
 pre
 q
 s
@@ -84,4 +73,5 @@ title
 tr
 tt
 u
+ul
 var

data/{hobo_files/plugin/lib → lib}/hobo/undefined.rb

@@ -34,7 +34,7 @@ module Hobo
     def method_missing(name, *args)
       raise UndefinedAccessError.new("call to: Hobo::Undefined##{name}")
     end
-    
+
     undef_method :==
 
   end

data/{hobo_files/plugin/lib → lib}/hobo/user.rb

@@ -3,13 +3,13 @@ require 'digest/sha1'
 module Hobo
 
   module User
-    
+
     @user_models = []
-    
+
     def self.default_user_model
       @user_models.first._?.constantize
     end
-    
+
     AUTHENTICATION_FIELDS = [:salt, :crypted_password, :remember_token, :remember_token_expires_at]
 
     # Extend the base class with AuthenticatedUser functionality
@@ -19,18 +19,18 @@ module Hobo
     # - login token for rembering a login during multiple browser sessions
     def self.included(base)
       @user_models << base.name
-      
+
       base.extend(ClassMethods)
 
       base.class_eval do
-        
+
         fields do
           crypted_password          :string, :limit => 40
           salt                      :string, :limit => 40
           remember_token            :string
           remember_token_expires_at :datetime
         end
-        
+
         validates_confirmation_of :password, :if => :password_required?
 
         # Virtual attributes for setting and changing the password
@@ -38,43 +38,46 @@ module Hobo
 
 
         validate :validate_current_password_when_changing_password
-        
+
         before_save :encrypt_password
-        
+
         never_show *AUTHENTICATION_FIELDS
-        
+
         attr_protected *AUTHENTICATION_FIELDS
-        
+
         password_validations
+
       end
     end
 
     # Additional classmethods for authentication
     module ClassMethods
-      
+
       # Validation of the plaintext password
       def password_validations
         validates_length_of :password, :within => 4..40, :if => :password_required?
       end
-      
+
       def login_attribute=(attr, validate=true)
         @login_attribute = attr = attr.to_sym
         unless attr == :login
           alias_attribute(:login, attr)
           declare_attr_type(:login, attr_type(attr)) if table_exists? # this breaks if the table doesn't exist
         end
-        
+
         if validate
           validates_length_of     attr, :within => 3..100
           validates_uniqueness_of attr, :case_sensitive => false
         end
       end
+
       attr_reader :login_attribute
 
+
       # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
       def authenticate(login, password)
         u = find(:first, :conditions => ["#{@login_attribute} = ?", login]) # need to get the salt
-        
+
         if u && u.authenticated?(password)
           if u.respond_to?(:last_login_at) || u.respond_to?(:login_count)
             u.last_login_at = Time.now if u.respond_to?(:last_login_at)
@@ -91,11 +94,6 @@ module Hobo
       def encrypt(password, salt)
         Digest::SHA1.hexdigest("--#{salt}--#{password}--")
       end
-      
-      
-      def set_admin_on_first_user
-        before_create { |user| user.administrator = true if count == 0 }
-      end
 
     end
 
@@ -131,9 +129,13 @@ module Hobo
     def guest?
       false
     end
-    
+
+    def signed_up?
+      true
+    end
+
     def changing_password?
-      crypted_password? && (password || password_confirmation)
+      crypted_password? && (password || password_confirmation) && !lifecycle.valid_key?
     end
 
     protected
@@ -144,17 +146,17 @@ module Hobo
       self.crypted_password = encrypt(password)
     end
 
-    
+
     # Is a password required for login? (or do we have an empty password?)
     def password_required?
       (crypted_password.blank? && password != nil) || !password.blank? || changing_password?
     end
 
-    
+
     def validate_current_password_when_changing_password
-      changing_password? && !authenticated?(current_password) and errors.add :current_password, "is not correct" 
+      changing_password? && !authenticated?(current_password) and errors.add :current_password, "is not correct"
     end
-    
+
   end
 
 end

data/{hobo_files/plugin/lib → lib}/hobo/user_controller.rb

@@ -4,32 +4,59 @@ module Hobo
 
     class << self
       def included(base)
-        base.class_eval do 
-          filter_parameter_logging "password"
-          skip_before_filter :login_required, :only => [:login, :signup]
+        base.class_eval do
+          extend ClassMethods
           
-          include_taglib "rapid_user_pages", :plugin => "hobo"
+          class << self
+            alias_method_chain :available_auto_actions, :user_actions
+            alias_method_chain :def_auto_actions, :user_actions
+          end
           
+          filter_parameter_logging "password"
+          skip_before_filter :login_required, :only => [:login, :signup, :forgot_password, :reset_password_page, :reset_password]
+
+          include_taglib "rapid_user_pages", :plugin => "hobo"
+
           show_action :account
-          
+
           alias_method_chain :hobo_update, :account_flash
         end
+        
       end
+
+          
     end
     
-    def login; hobo_login; end
-    
-    def signup; hobo_signup; end
-    
-    def logout; hobo_logout; end
-    
+    module ClassMethods
+
+      def available_auto_actions_with_user_actions
+        available_auto_actions_without_user_actions + 
+          [:login, :signup, :logout, :forgot_password, :reset_password]
+      end
+
+      
+      def def_auto_actions_with_user_actions
+        def_auto_actions_without_user_actions
+
+        class_eval do
+          def login; hobo_login;                         end if include_action?(:login)
+          def logout; hobo_logout;                       end if include_action?(:logout)
+          def do_signup; hobo_do_signup                  end if include_action?(:do_signup)
+          def forgot_password; hobo_forgot_password;     end if include_action?(:forgot_password)
+          def do_reset_password; hobo_do_reset_password; end if include_action?(:do_reset_password)
+        end
+      end
+
+    end
+
+
     private
-    
+
     def hobo_login(options={})
       login_attr = model.login_attribute.to_s.titleize.downcase
       options.reverse_merge!(:success_notice => "You have logged in.",
                              :failure_notice => "You did not provide a valid #{login_attr} and password.")
-      
+
       if request.post?
         user = model.authenticate(params[:login], params[:password])
         if user.nil?
@@ -37,7 +64,7 @@ module Hobo
         else
           old_user = current_user
           self.current_user = user
-          
+
           # If supplied, a block can be used to test if this user is
           # allowed to log in (e.g. the account may be disabled)
           account_available = block_given? ? yield : true
@@ -58,23 +85,18 @@ module Hobo
       end
     end
 
-    
-    def hobo_signup(&b)
-      if request.post?
-        self.this = model.user_create(current_user, params[model.name.underscore])
-        self.current_user = this if valid?
-        response_block(&b) or
-          if valid?
-            flash[:notice] ||= "Thanks for signing up!"
-            redirect_back_or_default(home_page)
-          end
-      else
-        self.this = model.new
-        yield if block_given?
+
+    def hobo_do_signup(&b)
+      do_creator_action(:signup) do
+        response_block(&b) or if valid?
+                                self.current_user = this
+                                flash[:notice] = "Thanks for signing up!"
+                                redirect_back_or_default(home_page)
+                              end
       end
     end
 
-    
+
     def hobo_logout(options={})
       options = options.reverse_merge(:notice => "You have logged out.",
                                       :redirect_to => base_url)
@@ -84,17 +106,41 @@ module Hobo
       flash[:notice] ||= options[:notice]
       redirect_back_or_default(options[:redirect_to]) unless performed?
     end
-    
-    
+
+
+    def hobo_forgot_password
+      if request.post?
+        user = model.find_by_email_address(params[:email_address])
+        if user && (!block_given? || yield(user))
+          Hobo::Controller.request_host = request.host_with_port
+          Hobo::Controller.app_name = call_tag(:app_name)
+          user.lifecycle.request_password_reset(:nobody)
+        end
+        render_tag :forgot_password_email_sent_page
+      end
+    end
+
+
+    def hobo_do_reset_password(&b)
+      do_transition_action :reset_password do
+        response_block(&b) or if valid?
+                                self.current_user = this
+                                flash[:notice] = "Your password has been reset"
+                                redirect_to home_page
+                              end
+      end
+    end
+
+
     def hobo_update_with_account_flash(*args)
       hobo_update_without_account_flash(*args) do
         flash[:notice] = "Changes to your account were saved" if valid? && @this == current_user
         yield if block_given?
       end
     end
-    
+
     private
-    
+
     def logout_current_user
       if logged_in?
         current_user.forget_me
@@ -103,7 +149,7 @@ module Hobo
         self.current_user = nil
       end
     end
-    
+
   end
-  
+
 end

data/{hobo_files/plugin/generators → rails_generators}/hobo/hobo_generator.rb

@@ -5,9 +5,7 @@ class HoboGenerator < Rails::Generator::Base
       routes_path = File.join(RAILS_ROOT, "config/routes.rb")
 
       route = "  Hobo.add_routes(map)\n"
-
       route_src = File.read(routes_path)
-      
       unless route_src.include?(route)
         head = "ActionController::Routing::Routes.draw do |map|"
         route_src.sub!(head, head + "\n\n" + route)
@@ -16,12 +14,14 @@ class HoboGenerator < Rails::Generator::Base
     end
 
     record do |m|
-      m.directory File.join("app/views/taglibs")
-      m.directory File.join("app/views/taglibs/themes")
-      m.directory File.join("public/hobothemes")
+      m.directory                     File.join("app/views/taglibs")
+      m.directory                     File.join("app/views/taglibs/themes")
+      m.directory                     File.join("public/hobothemes")
       m.template "application.dryml", File.join("app/views/taglibs/application.dryml")
-      m.file "guest.rb", File.join("app/models/guest.rb")
-      m.file "dryml-support.js", File.join("public/javascripts/dryml-support.js")
+      m.file "guest.rb",              File.join("app/models/guest.rb")
+      m.file "dryml-support.js",      File.join("public/javascripts/dryml-support.js")
+      m.file "application.css",       File.join("public/stylesheets/application.css")
+      m.file "initializer.rb",        File.join("config/initializers/hobo.rb")
     end
   end
 

data/{hobo_files/plugin/generators → rails_generators}/hobo/templates/application.dryml

@@ -1,5 +1,3 @@
-<!-- Define your application-wide tags here -->
-
 <def tag="app-name"><%= File.basename(Dir.chdir(RAILS_ROOT) { Dir.getwd }).strip.titleize %></def>