radiant-reader-extension 3.0.20 → 3.0.23

data/README.md

@@ -14,7 +14,7 @@ Multi-site compatibility is currently missing but will follow as soon as I can a
 
 ## Note on internationalisation and customisation
 
-The locale strings here are generally defined in a functional rather than grammatical way. That is, they have labels like `activation_required_explanation` rather than being assembled out of lexical units. This is partly because for flexibility of translation, but also because it gives you an easy way to change the text on functional pages like reader-preferences and registration forms.
+The locale strings here are generally defined in a functional rather than grammatical way. That is, they have labels like `activation_required_explanation` rather than being assembled out of lexical units. This is partly for flexibility of translation, but also because it gives you an easy way to change the text on functional pages like reader-preferences and registration forms.
 
 ## Requirements
 
@@ -31,13 +31,12 @@ Install the gem:
 add it to your application's Gemfile:
 
 	gem 'authlogic', "~> 2.1.6"
-	gem radiant-reader-extension, '~>2.0.0'
+	gem radiant-reader-extension, '~>3.1.0'
 
 and then you can bring over assets and create data tables:
 
-	rake radiant:extensions:update_all
-	rake radiant:extensions:reader:migrate
 	rake radiant:extensions:reader:update
+	rake radiant:extensions:reader:migrate
 
 ## Configuration
 
@@ -47,8 +46,7 @@ All the main configuration settings can now be managed through the `settings > r
 
 This is primarily a framework and its main purpose is to take care of the dull minutiae of account-management. The basic reader framework provides for:
 
-* registration
-* honeypot spam trap
+* registration with honeypot spam trap
 * activation by email confirmation
 * logging in and out
 * password reminders
@@ -58,6 +56,10 @@ This is primarily a framework and its main purpose is to take care of the dull m
 * configurable members directory with csv and vcard export
 * administrative email messages for welcome, invitation, etc
 * ad-hoc email messages to some or all readers
+* group-membership
+* group-based access control
+* group-based messaging
+* configurable directory service
 
 ## Reader groups
 
@@ -78,7 +80,7 @@ For more reader-facing usefulness please see our [forum extension](http://github
 
 ## Layouts
 
-We use the `layouts` extension to wrap the appearance of your public site around the views produced by the reader extension. You can configure this with the dropdown list on the reader configuration page.
+We use the `layouts` extension to wrap the appearance of your public site around the views produced by the reader extension. You can select a layout with the dropdown list on the reader configuration page.
 
 The laying-out is achieved by defining lots of fake page parts in the reader views. All your layout has to do is include those page parts with the usual `<r:content />` calls.
 
@@ -107,9 +109,9 @@ Some standard formatting and interaction is included for you to build upon.
 `/stylesheets/sass/reader.sass` includes the default formatting of reader-facing forms and lists. It could probably stand to be reorganised a bit but you should find it a useful starting point and I recommend that you override it selectively rather than replacing it completely. There are two ways to do that:
 
 * @import 'reader.sass' at the top of your (SASS-based) stylesheet within radiant
-* link to /stylesheets/reader.css in the old-fashioned way and then bring in your own stylesheets any way you like.
+* link to /stylesheets/reader.css in the old-fashioned way and then bring in your own stylesheets afterwards.
 
-Or you can replace all this with your own, of course.
+Or you can replace the whole lot with your own recipe, of course.
 
 ## ReaderPages
 
@@ -130,30 +132,7 @@ All the reader pages (both public and administrative) are sharded in the AdminUI
 
 Most of your reader-facing controllers will want to inherit from `ReaderActionController`.
 
-Marking a reader as untrusted does nothing here apart from making them go red, but we assume that in other extensions it will have some limiting effect.
-
-## Latest changes
-
-This version requires edge radiant, or radiant 1 when it becomes available.
-
-New ReaderPages provide flexible directory services with configurable access control. The old controller and page parts mechanism is likely to be phased out gradually both here and in the forum in favour of more orthodox radiant page-types. We will always need to use the layout-wrapper approach for login and registration forms, though.
-
-Right now we are **not compatible with multi_site or the sites extension**: that's mostly because neither is radiant edge: it will all be sorted out in time for the release of v1, which isn't far away.
-
-Also:
-
-* groups hierarchical
-* public interface internationalized;
-* Uses the new configuration interface;
-* Messaging much simplified and now intended to be purely administrative.
-* ajaxable status panel returned by `reader_session_url` (ie. you just have to call /reader_session.js over xmlhttp to get a sensible welcome and control block)
-
-## See also
-
-* [reader_group](http://github.com/spanner/radiant-reader_group-extension)
-* [downloads](http://github.com/spanner/radiant-downloads-extension)
-* [forum](http://github.com/spanner/radiant-forum-extension)
-* [group_forum](http://github.com/spanner/radiant-group_forum-extension)
+Marking a reader as untrusted does nothing here apart from making them go red, but in the forum it prevents participation and we assume that in other extensions it will have a similar limiting effect.
 
 ## Bugs and comments
 

data/app/controllers/admin/group_invitations_controller.rb

@@ -57,22 +57,14 @@ private
     CSV::StringReader.parse(readerdata).each do |line|
       csv = line.collect {|value| value ? value.gsub(/^ */, '').chomp : ''}
       input = {}
-      input[:honorific] = csv.shift if Radiant::Config['reader.use_honorifics?']
-      [:name, :email, :login, :phone].each {|field| input[field] = csv.shift}
+      input[:honorific] = csv.shift if Radiant::Config['reader.show_honorifics?']
+      [:name, :email, :phone].each {|field| input[field] = csv.shift}
       r = Reader.find_by_email(input[:email]) || Reader.new(input)
-      r.create_password!    #only for validation purposes: not saved not passed through
-      r.login = generate_login(input[:name]) if r.login.blank?
-      r.valid?    # so that errors can be shown on the confirmation form
+      r.create_password!    # only for validation purposes: not saved nor passed through
+      r.valid?              # so that errors can be shown on the confirmation form
       readers << r
     end
     readers
   end
 
-  def generate_login(name)
-    names = name.split
-    initials = names.map {|n| n.slice(0,1)}
-    initials.pop
-    initials.push(names.last).join('_').downcase
-  end
-
 end

data/app/controllers/admin/memberships_controller.rb

@@ -10,7 +10,7 @@ class Admin::MembershipsController < ApplicationController
     @membership = Membership.find_or_create_by_reader_id_and_group_id(@reader.id, @group.id)
     respond_to do |format|
       format.html { 
-        flash[:notice] = "#{@reader.name} added to group #{@group.name}"
+        flash[:notice] = "#{@reader.preferred_name} added to group #{@group.name}"
         redirect_to admin_group_url(@group) 
       }
       format.js { render :partial => 'reader' }
@@ -23,7 +23,7 @@ class Admin::MembershipsController < ApplicationController
     @membership.delete if @membership
     respond_to do |format|
       format.html { 
-        flash[:notice] = "#{@reader.name} removed from group #{@group.name}" if @membership
+        flash[:notice] = "#{@reader.preferred_name} removed from group #{@group.name}" if @membership
         redirect_to admin_group_url(@group) 
       }
       format.js { render :partial => 'reader' }

data/app/controllers/reader_activations_controller.rb

@@ -48,7 +48,7 @@ protected
 
   def check_reader_inactive
     if @reader && @reader.activated?
-      flash[:notice] = t('reader_extension.hello').titlecase + " #{@reader.name}! " + t('reader_extension.already_active')
+      flash[:notice] = t('reader_extension.hello').titlecase + " #{@reader.preferred_name}! " + t('reader_extension.already_active')
       redirect_back_or_to default_welcome_url(@reader)
       false
     end

data/app/controllers/reader_sessions_controller.rb

@@ -47,7 +47,7 @@ class ReaderSessionsController < ReaderActionController
         end
         respond_to do |format|
           format.html {
-            flash[:notice] = t('reader_extension.hello').titlecase + " #{@reader_session.reader.name}. " + t('reader_extension.welcome_back')
+            flash[:notice] = t('reader_extension.hello').titlecase + " #{@reader_session.reader.preferred_name}. " + t('reader_extension.welcome_back')
             redirect_back_or_to default_welcome_url(@reader_session.reader)
           }
           format.js { 

data/app/helpers/reader_helper.rb

@@ -17,7 +17,7 @@ module ReaderHelper
     size = gravatar_options[:size] || 40
     img_options[:size] ||= "#{size}x#{size}"
     gravatar_options[:default] ||= "#{request.protocol}#{request.host_with_port}/images/furniture/no_gravatar.png"
-    img_options[:alt] ||= reader.name if reader
+    img_options[:alt] ||= reader.preferred_name if reader
     if reader.nil? || reader.email.blank?
       image_tag gravatar_options[:default], img_options
     else
@@ -88,11 +88,11 @@ module ReaderHelper
   def message_preview(subject, body, reader)
     preview = <<EOM
 From: #{current_user.name} &lt;#{current_user.email}&gt;
-To: #{reader.name} &lt;#{reader.email}&gt;
+To: #{reader.preferred_name} &lt;#{reader.email}&gt;
 Date: #{Time.now.to_date.to_s :long}
 <strong>Subject: #{subject}</strong>
 
-Dear #{reader.name},
+Dear #{reader.preferred_name},
 
 #{body}
 

data/app/models/reader.rb

@@ -5,7 +5,7 @@ require 'vcard'
 require "fastercsv"
 
 class Reader < ActiveRecord::Base
-  @@user_columns = %w{name email login created_at password password_confirmation notes}
+  @@user_columns = %w{name email created_at password password_confirmation notes}
   cattr_accessor :user_columns
   cattr_accessor :current
   attr_accessor :email_field, :newly_activated, :skip_user_update
@@ -29,12 +29,14 @@ class Reader < ActiveRecord::Base
   has_many :groups, :through => :memberships, :uniq => true
   accepts_nested_attributes_for :memberships
 
-  validates_presence_of :name, :email
-  validates_length_of :name, :maximum => 100, :allow_nil => true
+  before_validation :combine_names
+
+  validates_presence_of :name, :forename, :surname, :email
+  validates_uniqueness_of :nickname, :allow_blank => true
+  validates_length_of :name, :forename, :surname, :maximum => 100, :allow_nil => false
   validates_length_of :password, :minimum => 5, :allow_nil => false, :unless => :existing_reader_keeping_password?
   # validates_format_of :password, :with => /[^A-Za-z]/, :unless => :existing_reader_keeping_password?  # we have to match radiant so that users can log in both ways
   validates_confirmation_of :password, :unless => :existing_reader_keeping_password?
-  validates_uniqueness_of :login, :allow_blank => true
   validate :email_must_not_be_in_use
 
   include RFC822
@@ -65,8 +67,8 @@ class Reader < ActiveRecord::Base
     }
   }
 
-  def self.find_by_login_or_email(login_or_email)
-    reader = find(:first, :conditions => ["login = ? OR email = ?", login_or_email, login_or_email])
+  def self.find_by_nickname_or_email(nickname_or_email)
+    reader = find(:first, :conditions => ["nickname = ? OR email = ?", nickname_or_email, nickname_or_email])
   end
   
   def self.for_user(user)
@@ -149,15 +151,10 @@ class Reader < ActiveRecord::Base
     groups.any?
   end
   
-  # not very i18nal, this
-  def forename
-    read_attribute(:forename) || name.split(/\s+/).first
-  end
-
-  def surname
-    read_attribute(:surname) || name.split(/\s+/).last
+  def preferred_name
+    nickname? ? nickname : name
   end
-
+  
   def postal_address?
     !post_line1.blank? && !post_city.blank?
   end
@@ -287,6 +284,15 @@ class Reader < ActiveRecord::Base
   
 private
 
+  def combine_names
+    if self.name?
+      self.forename ||= self.name.split(/\s+/).first
+      self.surname ||= self.name.split(/\s+/).last
+    else
+      self.name = "#{self.forename} #{self.surname}"
+    end
+  end
+
   def email_must_not_be_in_use
     reader = Reader.find_by_email(self.email)
     user = User.find_by_email(self.email)
@@ -319,7 +325,6 @@ private
     if att['password']
       att["clear_password"] = att["password_confirmation"] = att["password"]
     end
-    p "updating reader attributes with #{att.inspect}"
     self.update_attributes(att)
     self.skip_user_update = false
   end

data/app/models/reader_page.rb

@@ -51,7 +51,7 @@ class ReaderPage < Page
     self.reader = Reader.find_by_id(params.last) if params.last !~ /\D/
 
     raise ReaderError::AccessDenied, "Group visibility denied" if group && !group.visible_to?(current_reader)
-    raise ReaderError::AccessDenied, "Reader visibility denied: #{current_reader} (#{current_reader.name}) cannot see #{reader} (#{reader.name})" if reader && !reader.visible_to?(current_reader)
+    raise ReaderError::AccessDenied, "Reader visibility denied: #{current_reader} (#{current_reader.preferred_name}) cannot see #{reader} (#{reader.preferred_name})" if reader && !reader.visible_to?(current_reader)
     raise ActiveRecord::RecordNotFound if reader && group && !reader.has_group?(group)
 
     self

data/app/models/reader_session.rb

@@ -1,3 +1,3 @@
 class ReaderSession < Authlogic::Session::Base
-  find_by_login_method :find_by_login_or_email
+  find_by_login_method :find_by_nickname_or_email
 end

data/app/views/accounts/_controls.html.haml

@@ -2,7 +2,7 @@
   = t('reader_extension.navigation.welcome_please_log_in', :login_url => reader_login_url, :register_url => new_reader_url)
 - else
   %strong
-    = link_to t('reader_extension.navigation.greeting', :name => current_reader.name), reader_profile_url
+    = link_to t('reader_extension.navigation.greeting', :name => current_reader.preferred_name), reader_profile_url
   - if !current_reader.activated?
     = link_to t('reader_extension.navigation.activate'), reader_activation_url
   - else

data/app/views/accounts/_edit_names.html.haml

@@ -0,0 +1,21 @@
+%p
+  %span.semi
+    = f.label :forename, nil, :class => 'required'
+    %br
+    = f.text_field :forename, :class => 'standard'
+    %br
+    %span.formnote= t('reader_extension.form_notes.account.forename')
+
+  %span.semi
+    = f.label :surname, nil, :class => 'required'
+    %br
+    = f.text_field :surname, :class => 'standard'
+    %br
+    %span.formnote= t('reader_extension.form_notes.account.surname')
+
+%p.nickname.clear
+  = f.label :nickname, nil, :class => 'optional'
+  %br
+  = f.text_field :nickname, :class => 'standard'
+  %br
+  %span.formnote= t('reader_extension.form_notes.account.nickname')

data/app/views/accounts/_form.html.haml

@@ -4,12 +4,7 @@
 - form_for reader, :html => {:class => 'friendly'} do |f| 
   %input{:type => :hidden, :name => :authentication_type, :value => :user}
 
-  %p
-    = f.label :name, nil, :class => 'required'
-    %br
-    = f.text_field :name, :class => 'standard'
-    %br
-    %span.formnote= t('reader_extension.form_notes.account.name')
+  = render :partial => 'edit_names', :locals => {:f => f}
 
   - if reader.new_record?
     %p
@@ -34,13 +29,6 @@
       %br
       %span.formnote= t('reader_extension.form_notes.account.email')
 
-  %p
-    = f.label :login, nil, :class => 'optional'
-    %br
-    = f.text_field :login, :class => 'standard'
-    %br
-    %span.formnote= t('reader_extension.form_notes.account.login')
-
   - if reader.new_record?
     %p
       = f.label :password, nil, :class => 'required'
@@ -73,14 +61,6 @@
         %br
         = f.password_field :password_confirmation, :class => 'standard', :autocomplete => 'off'
 
-  - unless reader.new_record?
-    %p
-      = f.label :description, nil, :class => 'optional'
-      %br
-      = f.text_area :description, :class => 'standard'
-      %br
-      %span.formnote= t('reader_extension.form_notes.account.description')
-
   = render :partial => 'choose_memberships'
 
   %p

data/app/views/accounts/_profile_form.html.haml

@@ -4,19 +4,14 @@
 - form_for reader, :html => {:class => 'friendly'} do |f| 
   %input{:type => :hidden, :name => :authentication_type, :value => :user}
 
-  - if Radiant.config['reader.use_honorifics?']
+  - if Radiant.config['reader.show_honorifics?']
     %p
       = f.label :honorific, nil, :class => 'optional'
       %br
       = f.text_field :honorific, :class => 'standard'
       %span.formnote= t('reader_extension.form_notes.account.honorific')
 
-  %p
-    = f.label :email, nil, :class => 'required'
-    %br
-    = f.text_field :email, :class => 'standard'
-    %br
-    %span.formnote= t('reader_extension.form_notes.account.email')
+  = render :partial => 'edit_names', :locals => {:f => f}
 
   %p
     = f.label :phone, nil, :class => 'optional'
@@ -59,11 +54,12 @@
     = f.label :postcode, nil, :class => 'optional'
     = f.text_field :postcode, :class => 'standard'
 
-  %p
-    = f.label :description, nil, :class => 'optional'
-    %br
-    = f.text_area :description, :class => Radiant.config['forum.toolbar?'] ? 'rte' : 'standard'
-    %span.formnote= t('reader_extension.form_notes.account.description')
+  - if Radiant.config['reader.show_descriptions?']
+    %p
+      = f.label :description, nil, :class => 'optional'
+      %br
+      = f.text_area :description, :class => Radiant.config['forum.toolbar?'] ? 'rte' : 'standard'
+      %span.formnote= t('reader_extension.form_notes.account.description')
 
   %p
     = f.check_box :unshareable, :class => 'reversed'

data/app/views/accounts/edit.html.haml

@@ -1,7 +1,7 @@
 - content_for :introduction do
   %p
     = t("reader_extension.hello").titlecase
-    = link_to(@reader.name, reader_url(@reader)) + '.'
+    = link_to(@reader.preferred_name, reader_url(@reader)) + '.'
     = t('reader_extension.preferences_intro')
 
 - content_for :breadcrumbs do 

data/app/views/accounts/edit_profile.html.haml

@@ -1,7 +1,7 @@
 - content_for :introduction do
   %p
     = t("reader_extension.hello").titlecase
-    = link_to(@reader.name, reader_url(@reader)) + '.'
+    = link_to(@reader.preferred_name, reader_url(@reader)) + '.'
     = t("reader_extension.profile_intro_#{Radiant.config['reader.directory_visibility']}")
     
 - content_for :breadcrumbs do 

data/app/views/admin/group_invitations/new.html.haml

@@ -11,9 +11,9 @@
         %label{:for => "readerlist"}
           List of people
           %span.formnote
-            - if Radiant::Config['reader.use_honorifics?']
+            - if Radiant::Config['reader.show_honorifics?']
               title or rank, 
-            name, email, [login], [phone]
+            name, email, [phone]
         = text_area_tag "readerlist", params[:readerlist], :class => "textarea", :style => "width: 100%; height: 240px;"
 
       %p.buttons

data/app/views/admin/group_invitations/preview.html.haml

@@ -11,11 +11,10 @@
     %thead
       %tr
         %th
-        - if Radiant::Config['reader.use_honorifics?']
+        - if Radiant::Config['reader.show_honorifics?']
           %th= t('reader_extension.honorific')
         %th= t('reader_extension.full_name')
         %th= t('reader_extension.email')
-        %th= t('reader_extension.optional_login')
         %th= t('reader_extension.optional_phone')
     %tbody
       - i = 0
@@ -24,30 +23,26 @@
           %tr.import
             %td
               = check_box_tag "import_reader[]", i, reader.valid?
-            - if Radiant::Config['reader.use_honorifics?']
+            - if Radiant::Config['reader.show_honorifics?']
               %td 
                 = text_field_tag "reader_#{i}[honorific]", reader.honorific, :class => "preview#{ ' with_error' if reader.errors.on(:honorific)}", :title => reader.errors.on(:honorific)
             %td 
-              = text_field_tag "reader_#{i}[name]", reader.name, :class => "preview#{ ' with_error' if reader.errors.on(:name)}", :title => reader.errors.on(:name)
+              = text_field_tag "reader_#{i}[name]", reader.preferred_name, :class => "preview#{ ' with_error' if reader.errors.on(:name)}", :title => reader.errors.on(:name)
             %td 
               = text_field_tag "reader_#{i}[email]", reader.email, :class => "preview#{ ' with_error' if reader.errors.on(:email)}", :title => reader.errors.on(:email)
-            %td 
-              = text_field_tag "reader_#{i}[login]", reader.login, :class => "preview#{ ' with_error' if reader.errors.on(:login)}", :title => reader.errors.on(:login)
             %td 
               = text_field_tag "reader_#{i}[phone]", reader.phone, :class => "preview#{ ' with_error' if reader.errors.on(:phone)}", :title => reader.errors.on(:phone)
         - else
           %tr.invite
             %td
               = check_box_tag "invite_reader[]", reader.id, {:checked => true}
-            - if Radiant::Config['reader.use_honorifics?']
+            - if Radiant::Config['reader.show_honorifics?']
               %td
                 = text_field_tag "reader_#{i}[honorific]", reader.honorific, :class => "preview#{ ' with_error' if reader.errors.on(:honorific)}", :title => reader.errors.on(:honorific), :disabled => true
             %td 
-              = text_field_tag "reader_#{i}[name]", reader.name, :class => "preview#{ ' with_error' if reader.errors.on(:name)}", :title => reader.errors.on(:name), :disabled => true
+              = text_field_tag "reader_#{i}[name]", reader.preferred_name, :class => "preview#{ ' with_error' if reader.errors.on(:name)}", :title => reader.errors.on(:name), :disabled => true
             %td 
               = text_field_tag "reader_#{i}[email]", reader.email, :class => "preview#{ ' with_error' if reader.errors.on(:email)}", :title => reader.errors.on(:email), :disabled => true
-            %td 
-              = text_field_tag "reader_#{i}[login]", reader.login, :class => "preview#{ ' with_error' if reader.errors.on(:login)}", :title => reader.errors.on(:login), :disabled => true
             %td 
               = text_field_tag "reader_#{i}[phone]", reader.phone, :class => "preview#{ ' with_error' if reader.errors.on(:phone)}", :title => reader.errors.on(:phone), :disabled => true
         - i = i + 1

data/app/views/admin/memberships/_reader.html.haml

@@ -3,7 +3,7 @@
 - membership = reader.membership_of(group)
 - cssclass = membership ? "fake_checkbox checked" : "fake_checkbox unchecked"
 
-= link_to reader.name, toggle_admin_membership_url(:group_id => group.id, :reader_id => reader.id),  {:class => cssclass, :id => "toggle_reader_#{reader.id}"}
+= link_to reader.preferred_name, toggle_admin_membership_url(:group_id => group.id, :reader_id => reader.id),  {:class => cssclass, :id => "toggle_reader_#{reader.id}"}
 - if membership
   %span.role
     = render :partial => 'admin/memberships/role', :locals => {:membership => membership, :group => group}

data/app/views/admin/messages/_help.html.haml

@@ -37,5 +37,6 @@
   %li
     %code <r:recipient:activation_url />
     is the address that will activate a newly-created account
-  %li
-    %code <r:recipient:description />
+  - if Radiant.config['reader.show_descriptions?']
+    %li
+      %code <r:recipient:description />

data/app/views/admin/messages/show.html.haml

@@ -80,7 +80,7 @@
                 %li
                   = check_box_tag "recipients[]", reader.id, false, :id => "recipients_#{reader.id}", :class => 'toggled'
                   %label.checkbox
-                    = reader.name
+                    = reader.preferred_name
 
           %p.buttons
             = submit_tag t('reader_extension.send_message')

data/app/views/admin/reader_configuration/edit.html.haml

@@ -21,7 +21,9 @@
             %p
               = edit_config('reader.get_profile?')
             %p
-              = edit_config('reader.use_honorifics?')
+              = edit_config('reader.show_honorifics?')
+            %p
+              = edit_config('reader.show_descriptions?')
             %p
               = edit_config('reader.layout')
   

data/app/views/admin/reader_configuration/show.html.haml

@@ -17,7 +17,9 @@
       %p.ruled
         = show_config 'reader.get_profile?'
       %p.ruled
-        = show_config 'reader.use_honorifics?'
+        = show_config 'reader.show_honorifics?'
+      %p.ruled
+        = show_config 'reader.show_descriptions?'
       %p.ruled
         = show_config 'reader.layout'
       %p.ruled

data/app/views/admin/readers/_form.html.haml

@@ -5,33 +5,32 @@
   = render_region :form_top, :locals => {:f => f}
   
   - render_region :form, :locals => {:f => f} do |form|
-    - form.edit_name do
+    - form.name do
       %p
-        = f.label :name, t('reader_extension.name') 
-        = f.text_field :name, :class => "textbox activate", :size => 32, :maxlength => 100 
+        = f.label :forename
+        = f.text_field :forename, :class => "textbox activate", :size => 32, :maxlength => 100 
+      %p
+        = f.label :surname
+        = f.text_field :surname, :class => "textbox activate", :size => 32, :maxlength => 100 
     
     - form.edit_email do
       %p
-        = f.label :email, t('reader_extension.email_address') , :class => "optional"
+        = f.label :email
         = f.text_field "email", :class => 'textbox', :size => 32, :maxlength => 255
 
-    - form.edit_username do
+    - form.edit_nickname do
       %p
-        = f.label :login, t('reader_extension.username') , :class => "optional"
+        = f.label :nickname
         = f.text_field "login", :class => 'textbox', :size => 32, :maxlength => 255
-    
-    - form.edit_readername do
-      %p
-        = f.label :login, t('reader_extension.readername') 
-        = f.text_field "login", :class => "textbox", :size => 32, :maxlength => 40 
-    
+        
     - form.edit_password do
       = render "password_fields", :f => f
     
     - form.edit_description do
-      %p
-        = f.label :description, "Self-description", :class => "optional"
-        ~ f.text_area "description", :size => "53x8", :class => "textarea"
+      - if Radiant.config['reader.show_descriptions?']
+        %p
+          = f.label :description, "Self-description", :class => "optional"
+          ~ f.text_area "description", :size => "53x8", :class => "textarea"
 
     - form.edit_notes do
       %p

data/app/views/admin/readers/edit.html.haml

@@ -1,4 +1,4 @@
-- @page_title = @reader.name + ' ' + t('reader_extension.account') + ' - ' + default_page_title
+- @page_title = @reader.preferred_name + ' ' + t('reader_extension.account') + ' - ' + default_page_title
 - body_classes << 'edit_user'
 
 - render_region :main do |main|

data/app/views/admin/readers/index.html.haml

@@ -17,8 +17,9 @@
               %th.reader_groups
                 = t('reader_extension.groups')
             - thead.description_header do
-              %th.reader_description 
-                = t('reader_extension.self_description')
+              - if Radiant.config['reader.show_descriptions?']
+                %th.reader_description 
+                  = t('reader_extension.self_description')
             - thead.modify_header do
               %th.modify
                 = t('modify')
@@ -30,9 +31,9 @@
             - tbody.title_cell do
               %td{:class => reader.activated? ? 'name activated' : 'name inactive'}
                 = link_to gravatar_for(reader, {:size => 32}, {:class => 'avatar avatar_32x32'}), edit_admin_reader_url(reader)
-                = link_to reader.name, edit_admin_reader_url(reader), :class => reader.trusted? ? '' : 'untrusted'
+                = link_to reader.preferred_name, edit_admin_reader_url(reader), :class => reader.trusted? ? '' : 'untrusted'
                 %span.info
-                  = "#{reader.login}"
+                  = "#{reader.nickname}"
                 - unless reader.notes.blank?
                   %p.admin_notes
                     %strong
@@ -48,8 +49,9 @@
                 = reader.groups.collect{|g| link_to(g.name, admin_group_url(g)) }.join("\n")
 
             - tbody.description_cell do
-              %td.reader_description
-                = truncate_words(scrub_html(reader.description), 8)
+              - if Radiant.config['reader.show_descriptions?']
+                %td.reader_description
+                  = truncate_words(scrub_html(reader.description), 8)
 
             - tbody.modify_cell do
               %td.actions
@@ -57,7 +59,7 @@
                   - if reader.is_user?
                     %span.action.disabled= image('minus_disabled') + ' ' + t('remove')
                   - else
-                    = link_to(image('minus') + ' ' + t('remove'), admin_reader_url(reader), :method => :delete, :class => 'action', :confirm => t('reader_extension.really_delete_reader', :name => reader.name))
+                    = link_to(image('minus') + ' ' + t('remove'), admin_reader_url(reader), :method => :delete, :class => 'action', :confirm => t('reader_extension.really_delete_reader', :name => reader.preferred_name))
         
       
   - render_region :bottom do |bottom|

data/app/views/admin/readers/remove.html.haml

@@ -9,7 +9,7 @@
   %tbody
     %tr.node.level-1
       %td.reader
-        %span.title= @reader.name
+        %span.title= @reader.preferred_name
 
 - form_for [:admin, @reader], :html => { :method => :delete } do
   %p.buttons

data/app/views/dashboard/_welcome.html.haml

@@ -1,5 +1,5 @@
 %p
   - if current_reader.newly_activated?
-    = t("reader_extension.dashboard.welcome", :name => current_reader.name, :site => Radiant.config['site.title'])
+    = t("reader_extension.dashboard.welcome", :name => current_reader.preferred_name, :site => Radiant.config['site.title'])
   - else
-    = t("reader_extension.dashboard.introduction", :name => current_reader.name, :site => Radiant.config['site.title'])
+    = t("reader_extension.dashboard.introduction", :name => current_reader.preferred_name, :site => Radiant.config['site.title'])

data/app/views/groups/_group.html.haml

@@ -4,7 +4,7 @@
   %h3
     = link_to group.name, group_url(group)
       
-  %p.context
+  %span.context
     = t("reader_extension.member_count", :count => group.readers.count) + '.'
     
   - if group.description

data/app/views/memberships/_membership.html.haml

@@ -8,10 +8,10 @@
           = t("reader_extension.listing_denied")
       - else
         %td.gravatar
-          = link_to gravatar_for(reader, {:size => 18}, {:class => 'gravatar'}), reader_url(reader), :title => reader.name
+          = link_to gravatar_for(reader, {:size => 18}, {:class => 'gravatar'}), reader_url(reader), :title => reader.preferred_name
         %td.name
           %h3
-            = link_to reader.name, reader_url(reader)
+            = link_to reader.preferred_name, reader_url(reader)
         %td.role
           %p
             %span.role

data/app/views/password_resets/edit.html.haml

@@ -54,7 +54,7 @@
       %p
         %strong
           = t('reader_extension.hello').titlecase
-          = @reader.name + '!'
+          = @reader.preferred_name + '!'
         = t('reader_extension.new_password_instructions')
     - else
       %p.errornote

data/app/views/reader_activations/show.html.haml

@@ -26,7 +26,7 @@
 - content_for :title do
   - if current_reader && current_reader.activated?
     = t('reader_extension.hello').titlecase
-    = current_reader.name
+    = current_reader.preferred_name
   - else
     = t('reader_extension.activation_sent')
   

data/app/views/readers/_description.html.haml

@@ -1,3 +1,3 @@
 - reader ||= @reader
-- unless reader.description.blank?
+- if Radiant.config['reader.show_descriptions?'] && !reader.description.blank?
   = clean_html(reader.description)

data/app/views/readers/_directory.html.haml

@@ -4,6 +4,7 @@
       %h2
         = t('reader_extension.groups').titlecase
       = render :partial => 'groups/group', :collection => @groups
+
     - if @readers.any?
       %h2
         = t('reader_extension.people').titlecase
@@ -17,6 +18,11 @@
     - else
       = t('reader_extension.no_groups')
 
+    - if @readers.any?
+      %h2
+        = t('reader_extension.your_group_members')
+      = render :partial => 'readers/list', :locals => {:readers => @readers}
+
   - else
     = t('reader_extension.no_directory')
 

data/app/views/readers/_mugshot.html.haml

@@ -1,7 +1,7 @@
 .reader        
   %h2
-    = link_to gravatar_for(reader, :size => 128), reader_url(reader), :title => reader.name
-    = link_to reader.name, reader_url(reader)
+    = link_to gravatar_for(reader, :size => 128), reader_url(reader), :title => reader.preferred_name
+    = link_to reader.preferred_name, reader_url(reader)
     %span.headernote
       = link_to ' ', reader_url(reader, :format => :vcard), :class => 'vcard'
       

data/app/views/readers/_profile.html.haml

@@ -8,7 +8,7 @@
   - else
     %div.contact
       %h3
-        = link_to reader.name, reader_url(reader, :format => :vcard), :class => 'vcard', :title => t('reader_extension.directory.vcard_link')
+        = link_to reader.preferred_name, reader_url(reader, :format => :vcard), :class => 'vcard', :title => t('reader_extension.directory.vcard_link')
       %ul
         - if email = reader.email
           %li

data/app/views/readers/_reader.html.haml

@@ -4,10 +4,10 @@
       = t("reader_extension.listing_denied")
   - else
     %td.gravatar
-      = link_to gravatar_for(reader, {:size => 18}, {:class => 'gravatar'}), reader_url(reader), :title => reader.name
+      = link_to gravatar_for(reader, {:size => 18}, {:class => 'gravatar'}), reader_url(reader), :title => reader.preferred_name
     %td.name
       %h3
-        = link_to reader.name, reader_url(reader)
+        = link_to reader.preferred_name, reader_url(reader)
     %td.email
       %p
         = mail_to reader.email, nil, :encode => 'hex', :replace_at => " #{t('reader_extension.at')} "

data/app/views/readers/show.html.haml

@@ -3,12 +3,13 @@
   = t('reader_extension.separator')
 
 - content_for :title do
-  = @reader.name
+  = @reader.preferred_name
 
 - content_for :introduction do
-  = @reader.description
-  %p
-    = link_to t('reader_extension.edit_profile'), reader_edit_profile_url
+  - if Radiant.config['reader.show_descriptions?']
+    = @reader.description
+    %p
+      = link_to t('reader_extension.edit_profile'), reader_edit_profile_url
   
 
 - content_for :breadcrumbs do

data/config/initializers/radiant_config.rb

@@ -10,6 +10,8 @@ Radiant.config do |config|
     reader.define 'profiles_path', :default => "directory"
     reader.define 'preferences_path', :default => "account"
     reader.define 'login_to', :default => "dashboard"
+    reader.define 'show_honorifics?', :default => false
+    reader.define 'show_descriptions?', :default => false
   end
   config.namespace('email') do |email|
     email.define 'layout', :select_from => lambda { Layout.all.map(&:name) }, :allow_blank => true

data/config/locales/en.yml

@@ -10,13 +10,14 @@ en:
         role: "Role"
         admin: "admin?"
       reader:
-        description: "Explain yourself"
+        description: "A but of text about yourself"
         email: "Email address"
         forename: "Forename"
         honorific: "Title or rank"
         login: "Login username"
         mobile: "Mobile phone"
-        name: "Your name"
+        name: "Full name"
+        nickname: "Nickname"
         password: "Password"
         password_confirmation: "Confirm password"
         phone: "Home phone"
@@ -49,6 +50,8 @@ en:
             name:
               blank: "please enter a name"
               too_long: "this is too long: 100 characters max"
+            nickname: 
+              taken: "this name is already in use here"
             password:
               too_short: "this must have at least six characters"
               invalid: "this must include at least one non-letter"
@@ -60,7 +63,8 @@ en:
       layout: "Layout for forms"
       public?: "Readers list public"
       require_confirmation?: "Confirm email addresses"
-      use_honorifics?: "Use honorifics"
+      show_honorifics?: "Show honorifics"
+      show_descriptions?: "Show biography"
     email:
       address: "Message reply-to"
       layout: "Email layout"
@@ -202,14 +206,17 @@ en:
         description: "This appears at the top of your profile page."
         email: "we will send activation instructions to this address"
         existing_password: "leave blank to keep present password. If changing, at least four characters."
+        forename: "This is normally how we refer to you..."
         honorific: "this is prepended to your name but only in a formal setting"
         login: "you can always use your email address instead"
         mobile: "without country code"
-        name: "this is how you will be referred to on the site"
+        name: ""
+        nickname: "... but if you would rather we display a nickname, please enter it here. You can also log in with this name."
         new_password: "at least six characters, please, and with at least one non-letter character"
         phone: "with area code but no country code"
         post_country: "Please choose from the list"
         post_organisation: "You can omit this unless it's part of your postal address"
+        surname: ""
         unshareable: "To keep your contact information private and receive only administrative messages, check this box."
     form_problem: "there was a problem with the form"
     full_name: "full name"
@@ -413,6 +420,7 @@ en:
     your_description: "Your profile text"
     your_email: "Your email address"
     your_groups: "Your groups"
+    your_group_members: "All your group members"
     your_name: "Your name"
   readers: "Readers"
   settings: "Settings"

data/db/migrate/003_reader_honorifics.rb

@@ -2,7 +2,6 @@ class ReaderHonorifics < ActiveRecord::Migration
 
   def self.up
     add_column :readers, :honorific, :string
-    Radiant::Config['reader.use_honorifics?'] = false
   end
 
   def self.down

data/db/migrate/20111013134949_sort_out_names.rb

@@ -0,0 +1,13 @@
+class SortOutNames < ActiveRecord::Migration
+  def self.up
+    add_column :readers, :nickname, :string
+    Reader.all.each do |r|
+      r.send :combine_names
+      r.save if r.changed?
+    end
+  end
+
+  def self.down
+    remove_column :readers, :nickname
+  end
+end

data/db/migrate/20111013203306_remove_login.rb

@@ -0,0 +1,14 @@
+class RemoveLogin < ActiveRecord::Migration
+  def self.up
+    Reader.reset_column_information
+    Reader.all.each do |r|
+      r.nickname ||= r.login
+      r.save if r.changed?
+    end
+    remove_column :readers, :login
+  end
+
+  def self.down
+    add_column :readers, :login, :string
+  end
+end

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.20'
+  VERSION = '3.0.23'
   SUMMARY = %q{Reader/viewer/visitor registration, login and access-control for Radiant CMS}
   DESCRIPTION = %q{Provides reader/member/user registration and management functions including password-reminder, group-based page access control and administrative email.}
   URL = "http://radiant.spanner.org/reader"

data/lib/reader_admin_ui.rb

@@ -29,7 +29,7 @@ module ReaderAdminUI
         OpenStruct.new.tap do |reader|
           reader.edit = Radiant::AdminUI::RegionSet.new do |edit|
             edit.main.concat %w{edit_header edit_form}
-            edit.form.concat %w{edit_name edit_email edit_username edit_password reader_groups edit_description edit_notes}
+            edit.form.concat %w{edit_name edit_email edit_nickname edit_password reader_groups edit_description edit_notes}
             edit.form_bottom.concat %w{edit_timestamp edit_buttons}
           end
           reader.index = Radiant::AdminUI::RegionSet.new do |index|

data/lib/reader_tags.rb

@@ -76,7 +76,7 @@ module ReaderTags
     tag.expand if get_reader(tag)
   end
 
-  [:name, :forename, :email, :description, :login].each do |field|
+  [:name, :forename, :surname, :nickname, :preferred_name, :email, :description, :login].each do |field|
     desc %{
       Displays the #{field} field of the current reader.
       <pre><code><r:reader:#{field} /></code></pre>
@@ -111,7 +111,7 @@ module ReaderTags
       %{<div class="remote_controls"></div>}
     else
       if tag.locals.reader = Reader.current
-        welcome = %{<span class="greeting">#{I18n.t('reader_extension.navigation.greeting', :name => tag.locals.reader.name)}</span>. }
+        welcome = %{<span class="greeting">#{I18n.t('reader_extension.navigation.greeting', :name => tag.locals.reader.preferred_name)}</span>. }
         if tag.locals.reader.activated?
           welcome << %{
 #{I18n.t('reader_extension.not_you')} <a href="#{reader_logout_path}">#{I18n.t('reader_extension.navigation.log_out')}</a>.

data/lib/reader_user.rb

@@ -27,7 +27,6 @@ module ReaderUser
     def update_with(att)
       self.skip_reader_update = true
       self.confirm_password = false
-      p "updating user attributes with #{att.inspect}"
       self.update_attributes(att)
       self.skip_reader_update = false
     end

data/public/stylesheets/sass/reader.sass

@@ -75,6 +75,14 @@ form.friendly
   margin: 0 0 2em 0
   p
     margin: 1em 0 0 0
+    overflow: hidden
+    span.semi
+      display: block
+      float: left
+      width: 48%
+      margin-right: 1%
+    &.clear
+      clear: both
   input.login
     width: 95%
     font-size: 140%

data/spec/controllers/accounts_controller_spec.rb

@@ -180,7 +180,7 @@ describe AccountsController do
     describe "that does not validate" do
       before do
         login_as_reader(:normal)
-        put :update, {:id => reader_id(:normal), :reader => {:login => readers(:visible).login}}
+        put :update, {:id => reader_id(:normal), :reader => {:nickname => readers(:visible).nickname}}
       end
 
       it "should re-render the edit form" do 

data/spec/datasets/readers_dataset.rb

@@ -71,7 +71,7 @@ From <r:sender:name />
       create_model :reader, name.symbolize, { 
         :name => name,
         :email => "#{name}@spanner.org",
-        :login => name.downcase,
+        :nickname => name,
         :activated_at => Time.now - 1.week,
         :password_salt => "golly",
         :password => 'passw0rd',
@@ -108,9 +108,6 @@ From <r:sender:name />
       }.merge(attributes)
     end
 
-
-
-
     def login_as_reader(reader)
       activate_authlogic
       login_reader = reader.is_a?(Reader) ? reader : readers(reader)

data/spec/lib/reader_tags_spec.rb

@@ -22,7 +22,7 @@ describe "Reader Tags" do
       it { should render(%{<r:reader:name />}).as(person.name) }
       it { should render(%{<r:if_reader>hello</r:if_reader>}).as('hello') }
       it { should render(%{<r:unless_reader>hello</r:unless_reader>}).as('') }
-      [:name, :forename, :email, :description, :login].each { |field| it { should render(%{<r:reader:#{field} id="#{person.id}" />}).as(person.send(field)) } }
+      [:name, :nickname, :forename, :surname, :preferred_name, :email, :description].each { |field| it { should render(%{<r:reader:#{field} id="#{person.id}" />}).as(person.send(field)) } }
     end
 
     describe "on an uncached page" do
@@ -41,13 +41,13 @@ describe "Reader Tags" do
       it { should render(%{<r:reader:name />}).as('') }
       it { should render(%{<r:reader:welcome />}).as('') }
       it { should render(%{<r:reader_welcome />}).as(%{<div class="remote_controls"></div>}) }
-      [:name, :forename, :email, :description, :login].each { |field| it { should render(%{<r:reader id="#{another.id}"><r:#{field} /></r:reader>}).as(another.send(field)) } }
+      [:name, :nickname, :forename, :surname, :preferred_name, :email, :description].each { |field| it { should render(%{<r:reader id="#{another.id}"><r:#{field} /></r:reader>}).as(another.send(field)) } }
     end
   end
 
   describe "utility tags" do 
     subject { page }
-    it { should render(%{<r:truncated chars="50">All happy families are alike; each unhappy family is unhappy in its own way.</r:truncated>}).as(' All happy families are alike; each unhapp&hellip;') }
+    it { should render(%{<r:truncated chars="50">All happy families are alike; each unhappy family is unhappy in its own way.</r:truncated>}).as('All happy families are alike; each unhappy&hellip;') }
     it { should render(%{<r:truncated words="5" omission="">All happy families are alike; each unhappy family is unhappy in its own way.</r:truncated>}).as('All happy families are alike;') }
     it { should render(%{<r:truncated words="5" allow_html="true" omission=" (tbc)">All <em>happy families</em> are alike; each unhappy family is unhappy in its own way.</r:truncated>}).as('All <em>happy families</em> are alike; (tbc)') }
   end

data/spec/models/reader_spec.rb

@@ -15,14 +15,20 @@ describe Reader do
   
   describe "on validation" do
     before do
-      @reader = Reader.new :name => "Test Reader", :email => 'test@spanner.org', :login => 'test', :password => 'passw0rd', :password_confirmation => 'passw0rd'
+      @reader = Reader.new :name => "Test Reader", :email => 'test@spanner.org', :nickname => 'test', :password => 'passw0rd', :password_confirmation => 'passw0rd'
       @reader.should be_valid
     end
     
-    it "should require a name" do
+    it "should require (but derive) a name" do
       @reader.name = nil
+      @reader.should be_valid
+      @reader.forename = @reader.surname = @reader.name = nil
       @reader.should_not be_valid
       @reader.errors.on(:name).should_not be_empty
+      @reader.forename = "very"
+      @reader.surname = "testy"
+      @reader.should be_valid
+      @reader.name.should == "very testy"
     end
   
     it "should require a valid email address" do
@@ -42,16 +48,16 @@ describe Reader do
       @reader.should_not be_valid
     end
   
-    it "should require a unique login" do
-      @reader.login = @existing_reader.login
+    it "should require a unique nickname" do
+      @reader.nickname = @existing_reader.nickname
       @reader.should_not be_valid
-      @reader.errors.on(:login).should_not be_empty
+      @reader.errors.on(:nickname).should_not be_empty
     end
   end
   
   describe "on creation" do
     before do
-      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :login => 'test', :password => 'passw0rd', :password_confirmation => 'passw0rd'
+      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :nickname => 'test', :password => 'passw0rd', :password_confirmation => 'passw0rd'
     end
       
     it 'should await activation' do
@@ -75,11 +81,11 @@ describe Reader do
     it "should create a matching reader if necessary" do
       user = users(:admin)
       reader = Reader.for_user(user)
-      [:name, :email, :login, :created_at, :notes].each do |att|
+      [:name, :email, :created_at, :notes].each do |att|
         reader.send(att).should == user.send(att)
       end
       reader.crypted_password.should == user.password
-      ReaderSession.new(:login => 'admin', :password => 'password').should be_valid
+      ReaderSession.new(:email => user.email, :password => 'password').should be_valid
       reader.is_user?.should be_true
       reader.is_admin?.should be_true
     end
@@ -116,7 +122,7 @@ describe Reader do
   
   describe "on activation" do
     before do
-      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :login => 'another_login', :password => 'passw0rd', :password_confirmation => 'passw0rd', :trusted => 1
+      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :nickname => 'another_nickname', :password => 'passw0rd', :password_confirmation => 'passw0rd', :trusted => 1
     end
     
     it 'should be retrieved by id and activation code' do
@@ -137,20 +143,20 @@ describe Reader do
   
   describe "on login" do
     before do
-      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :login => 'test', :password => 'h00haa', :password_confirmation => 'h00haa'
+      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :nickname => 'test', :password => 'h00haa', :password_confirmation => 'h00haa'
       @reader.activate!
     end
     
     it 'should authenticate' do
-      ReaderSession.new(:login => 'test', :password => 'h00haa').should be_valid
+      ReaderSession.new(:email => 'test@spanner.org', :password => 'h00haa').should be_valid
     end
   
     it 'should not authenticate with bad password' do
-      ReaderSession.new(:login => 'test', :password => 'corcovado').should_not be_valid
+      ReaderSession.new(:email => 'test@spanner.org', :password => 'corcovado').should_not be_valid
     end
   
     it 'should not authenticate if it does not exist' do
-      ReaderSession.new(:login => 'loch ness monster', :password => 'blotto').should_not be_valid
+      ReaderSession.new(:email => 'loch ness monster', :password => 'blotto').should_not be_valid
     end
   end
 end

data/spec/spec.opts

@@ -1,4 +1,4 @@
 --colour
 --format specdoc
 --loadby mtime
---reverse
+--reverse

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 41
   prerelease: 
   segments: 
   - 3
   - 0
-  - 20
-  version: 3.0.20
+  - 23
+  version: 3.0.23
 platform: ruby
 authors: 
 - William Ross
@@ -182,6 +182,7 @@ files:
 - app/models/reader_session.rb
 - app/views/accounts/_choose_memberships.html.haml
 - app/views/accounts/_controls.html.haml
+- app/views/accounts/_edit_names.html.haml
 - app/views/accounts/_extra_controls.html.haml
 - app/views/accounts/_flasher.html.haml
 - app/views/accounts/_form.html.haml
@@ -301,6 +302,8 @@ files:
 - db/migrate/20110814070858_message_has_many_groups.rb
 - db/migrate/20110905194602_group_ancestry.rb
 - db/migrate/20110908194602_membership_attributes.rb
+- db/migrate/20111013134949_sort_out_names.rb
+- db/migrate/20111013203306_remove_login.rb
 - lib/controller_extensions.rb
 - lib/group_tags.rb
 - lib/grouped_model.rb
@@ -328,6 +331,7 @@ files:
 - public/stylesheets/sass/admin/reader.sass
 - public/stylesheets/sass/admin/reader_group.sass
 - public/stylesheets/sass/reader.sass
+- radiant-reader-extension-3.1.0.gem
 - radiant-reader-extension.gemspec
 - Rakefile
 - reader_extension.rb
@@ -356,7 +360,7 @@ files:
 homepage: http://radiant.spanner.org/reader
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with a line in your Gemfile:\n\n    gem 'radiant-reader-extension', '~> 3.0.20'\n\n  and if you haven't already, remember to enable ActionMailer in your\n  project's config/environment.rb.\n  "
+post_install_message: "\n  Add this to your radiant project with a line in your Gemfile:\n\n    gem 'radiant-reader-extension', '~> 3.0.23'\n\n  and if you haven't already, remember to enable ActionMailer in your\n  project's config/environment.rb.\n  "
 rdoc_options: []
 
 require_paths: