radiant-reader-extension 1.3.9 → 1.3.10

data/VERSION

@@ -1 +1 @@
-1.3.9
+1.3.10

data/app/controllers/reader_sessions_controller.rb

@@ -41,7 +41,7 @@ class ReaderSessionsController < ReaderActionController
     @reader_session = ReaderSession.new(params[:reader_session])
     if @reader_session.save
       if @reader_session.reader.activated? && @reader_session.reader.clear_password        
-        @reader_session.reader.clear_password = ""                          # we forget the cleartext version on the first successful login after activation
+        @reader_session.reader.clear_password = ""                          # we forget the cleartext version on the first successful login
         @reader_session.reader.save(false)
       end
       respond_to do |format|

data/app/models/reader.rb

@@ -26,11 +26,10 @@ class Reader < ActiveRecord::Base
   attr_accessor :current_password   # used for authentication on update
   attr_accessor :email_field        # used in blocking spam registrations
   
-  before_save :set_login
   before_update :update_user
 
   validates_presence_of :name, :email, :message => 'is required'
-  validates_uniqueness_of :login, :message => "is already in use here"
+  validates_uniqueness_of :login, :message => "is already in use here", :allow_blank => true
   validate :email_must_not_be_in_use
 
   include RFC822
@@ -89,13 +88,8 @@ class Reader < ActiveRecord::Base
     message.deliver_to(self)
   end
 
-  def generate_password(length=12)
-    chars = ("a".."z").to_a + ("A".."Z").to_a + ("1".."9").to_a
-    Array.new(length, '').collect{chars[rand(chars.size)]}.join
-  end
-
   def generate_email_field_name
-    self.email_field = generate_password(32)
+    self.email_field = Authlogic::Random.friendly_token
   end
 
   def is_user?
@@ -122,37 +116,37 @@ class Reader < ActiveRecord::Base
     reader
   end
 
-  protected
+  def create_password!
+    self.clear_password = self.randomize_password # randomize_password is provided by authlogic
+    self.save! unless self.new_record?
+    self.clear_password
+  end
 
-    def set_login
-      self.login = self.email if self.login.blank?
-    end
+private
 
-  private
-
-    def email_must_not_be_in_use
-      reader = Reader.find_by_email(self.email)   # the finds will be site-scoped if appropriate
-      user = User.find_by_email(self.email)
-      if user && user != self.user
-        errors.add(:email, "belongs to an author here")
-      elsif reader && reader != self
-        errors.add(:email, "is already registered here")
-      else
-        return true
-      end
-      return false
+  def email_must_not_be_in_use
+    reader = Reader.find_by_email(self.email)   # the finds will be site-scoped if appropriate
+    user = User.find_by_email(self.email)
+    if user && user != self.user
+      errors.add(:email, "belongs to an author already known here")
+    elsif reader && reader != self
+      errors.add(:email, "is already registered here")
+    else
+      return true
     end
+    return false
+  end
 
-    def validate_length_of_password?
-      new_record? or not password.to_s.empty?
-    end
+  def validate_length_of_password?
+    new_record? or not password.to_s.empty?
+  end
 
-    def update_user
-      if self.user
-        user_columns.each { |att| self.user.send("#{att.to_s}=", send(att)) if send("#{att.to_s}_changed?") }
-        self.user.password_confirmation = password_confirmation if password_changed?
-        self.user.save! if self.user.changed?
-      end
+  def update_user
+    if self.user
+      user_columns.each { |att| self.user.send("#{att.to_s}=", send(att)) if send("#{att.to_s}_changed?") }
+      self.user.password_confirmation = password_confirmation if password_changed?
+      self.user.save! if self.user.changed?
     end
+  end
 
 end

data/radiant-reader-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "1.3.9"
+  s.version = "1.3.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]

data/reader_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ReaderExtension < Radiant::Extension
-  version "1.3.9"
+  version "1.3.10"
   description "Provides reader/member/user registration and management functions"
   url "http://spanner.org/radiant/reader"
   

data/spec/controllers/readers_controller_spec.rb

@@ -41,10 +41,6 @@ describe ReadersController do
       @reader.email.should == 'registrant@spanner.org'
     end
 
-    it "should have defaulted to email address as login" do
-      @reader.login.should == @reader.email
-    end
-    
     if defined? Site
       it "should have assigned the new reader to the current site" do
         @reader.site.should == sites(:test)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 3
-  - 9
-  version: 1.3.9
+  - 10
+  version: 1.3.10
 platform: ruby
 authors: 
 - spanner