devise-guests 0.2.0 → 0.3.0

data/lib/devise-guests/controllers/helpers.rb

@@ -30,7 +30,20 @@ module DeviseGuests::Controllers
 
  
         def guest_#{mapping}
-          #{class_name}.find(session[:guest_#{mapping}_id].nil? ? session[:guest_#{mapping}_id] = create_guest_#{mapping}.id : session[:guest_#{mapping}_id])
+          return @guest_#{mapping} if @guest_#{mapping}
+
+          if session[:guest_#{mapping}_id]
+            @guest_#{mapping} = #{class_name}.find_by_email(session[:guest_#{mapping}_id]) rescue nil
+            @guest_#{mapping} = nil if @guest_#{mapping}.respond_to? :guest and !@guest_#{mapping}.guest 
+          end
+
+          @guest_#{mapping} ||= begin
+            u = create_guest_#{mapping}(session[:guest_#{mapping}_id])
+            session[:guest_#{mapping}_id] = u.email
+            u
+          end
+
+          @guest_#{mapping}
         end
 
         def current_or_guest_#{mapping}
@@ -48,9 +61,11 @@ module DeviseGuests::Controllers
         end
 
         private
-        def create_guest_#{mapping}
-          u = #{class_name}.create(:email => "guest_" + guest_#{mapping}_unique_suffix + "@example.com")
-          u.save(:validate => false)
+        def create_guest_#{mapping} email = nil
+          email ||= "guest_" + guest_#{mapping}_unique_suffix + "@example.com"
+          u = #{class_name}.create(:email => email)
+          u.password = u.password_confirmation = email
+          u.guest = true if u.respond_to? :guest
           u
         end
 

data/lib/devise-guests/engine.rb

@@ -8,5 +8,15 @@ module DeviseGuests
       Devise.include_helpers(DeviseGuests::Controllers)
       Devise.helpers << DeviseGuests::Controllers::Helpers
     end
+
+     # This makes our rake tasks visible.
+    rake_tasks do
+      Dir.chdir(File.expand_path(File.join(File.dirname(__FILE__), '..'))) do
+        Dir.glob(File.join('railties', '*.rake')).each do |railtie|
+          load railtie
+        end
+      end
+    end
+    
   end
 end

data/lib/devise-guests/version.rb

@@ -1,3 +1,3 @@
 module DeviseGuests
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/generators/active_record/devise_guests_generator.rb

@@ -0,0 +1,22 @@
+require 'rails/generators/active_record'
+require 'generators/devise/orm_helpers'
+
+module ActiveRecord
+  module Generators
+    class DeviseGuestsGenerator < ActiveRecord::Generators::Base
+      include Devise::Generators::OrmHelpers
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_devise_migration
+          migration_template "migration_existing.rb", "db/migrate/add_devise_guests_to_#{table_name}"
+      end
+
+      def migration_data
+<<RUBY
+      ## Database authenticatable
+      t.boolean :guest, :default => false
+RUBY
+      end
+    end
+  end
+end

data/lib/generators/active_record/templates/migration_existing.rb

@@ -0,0 +1,14 @@
+class AddDeviseGuestsTo<%= table_name.camelize %> < ActiveRecord::Migration
+  def self.up
+    change_table(:<%= table_name %>) do |t|
+<%= migration_data -%>
+    end
+
+  end
+
+  def self.down
+    # By default, we don't want to make any assumption about how to roll back a migration when your
+    # model already existed. Please edit below which fields you would like to remove in this migration.
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/lib/generators/devise_guests/devise_guests_generator.rb

@@ -0,0 +1,18 @@
+module DeviseGuests
+  module Generators
+    class DeviseGuestsGenerator < Rails::Generators::NamedBase
+      include Rails::Generators::ResourceHelpers
+
+      namespace "devise_guests"
+      source_root File.expand_path("../templates", __FILE__)
+
+      desc "Generates devise guests attributes into a model with the given NAME"
+
+      hook_for :orm
+
+      def do_nothing
+
+      end
+    end
+  end
+end

data/lib/railties/devise_guests.rake

@@ -0,0 +1,12 @@
+namespace :devise_guests do
+  # task to clean out old guest users
+  # rake devise_guests:delete_old_guest_users[days_old]
+  # example cron entry to delete users older than 7 days at 2:00 AM every day: 
+  # 0 2 * * * cd /path/to/your/app && /path/to/rake devise_guests:delete_old_guest_users[7] RAILS_ENV=your_env
+  desc "Removes entries in the users table for guest users that are older than the number of days given."
+  task :delete_old_guest_users, [:days_old] => [:environment] do |t, args|
+    args.with_defaults(:days_old => 7)    
+    User.where("guest = ? and updated_at < ?", true, Time.now - args[:days_old].to_i.days).each { |x| x.destroy }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-guests
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -142,6 +142,10 @@ files:
 - lib/devise-guests/controllers/url_helpers.rb
 - lib/devise-guests/engine.rb
 - lib/devise-guests/version.rb
+- lib/generators/active_record/devise_guests_generator.rb
+- lib/generators/active_record/templates/migration_existing.rb
+- lib/generators/devise_guests/devise_guests_generator.rb
+- lib/railties/devise_guests.rake
 - spec/controllers/application_controller_spec.rb
 - spec/helpers/devise_guests_helpers_spec.rb
 - spec/integration/simple_integration_spec.rb
@@ -168,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2973806746937180540
+      hash: 2571116811496388903
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2973806746937180540
+      hash: 2571116811496388903
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23