radiant-reader-extension 0.9.2

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

@@ -0,0 +1,6 @@
+- if flash[:notice]
+  .notice
+    %p= flash[:notice]
+- if flash[:error]
+  .error
+    %p= flash[:error]

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

@@ -0,0 +1,73 @@
+- with_error_report(@reader.errors.on(:name)) do
+  = f.label :name, 'Your name', :class => 'required'
+  %span.formnote as you would like it to appear
+  %br
+  = f.text_field :name, :class => 'standard'
+
+- if Radiant::Config['reader.use_honorifics?']
+  - with_error_report(@reader.errors.on(:honorific)) do
+    = f.label :honorific, 'Title or rank', :class => 'optional'
+    %span.formnote as you would like us to display it when you are credited
+    %br
+    = f.text_field :honorific, :class => 'standard'
+
+- if @reader.new_record? && @email_field
+
+  - with_error_report(@reader.errors.on(:email)) do
+    = f.label @email_field, 'Your email address', :class => 'required'
+    %span.formnote this has to work
+    %br
+    = text_field_tag @email_field, params[@email_field] || @reader.email, :id => "reader_#{@email_field}", :class => 'standard'
+
+  .innocuous
+    - with_error_report(@reader.errors.on(:trap)) do
+      %label{ :for => 'reader_email', :class => 'required' }
+        Don't fill this in!
+      %span.formnote
+        it's a spam trap and you weren't supposed to see it
+      %br
+      = text_field_tag 'reader_email', '', :name => 'reader[email]', :class => 'standard'
+
+- else
+
+  - with_error_report(@reader.errors.on(:email)) do
+    = f.label :email, 'Your email address', :class => 'required'
+    %br
+    = f.text_field :email, :class => 'standard'
+
+- with_error_report(@reader.errors.on(:description)) do
+  = f.label :description, 'A little about yourself', :class => 'optional'
+  %span.formnote 
+    you can fill this in later. 
+    Textile formatting 
+    is allowed.
+  %br
+  = f.text_area :description, :class => 'standard', :rows => 8
+
+- with_error_report(@reader.errors.on(:login)) do
+  = f.label :login, 'Login username', :class => 'optional'
+  %span.formnote leave blank to use your email address
+  %br
+  = f.text_field :login, :class => 'standard'
+
+- with_error_report(@reader.errors.on(:password)) do
+  - label = @reader.new_record? ? 'Password' : 'Change password?'
+  - cssclass = @reader.new_record? ? 'required' : 'optional'
+  - help = @reader.new_record? ? 'at least four characters, please' : 'leave blank to keep present password. If changing, at least four characters.'
+  
+  = f.label :password, label, :class => cssclass
+  %span.formnote
+    = help
+    %br
+  = f.password_field :password, :class => 'standard', :autocomplete => 'off'
+
+- with_error_report(@reader.errors.on(:password_confirmation)) do
+  = f.label :password_confirmation, "Confirm #{'new ' unless @reader.new_record?}password", :class => @reader.new_record? ? 'required' : 'optional'
+  - unless @reader.new_record?
+    %span.formnote
+      leave blank to keep present password
+      %br
+  = f.password_field :password_confirmation, :class => 'standard', :autocomplete => 'off'
+
+- @form_partials.each do |partial|
+  = render :partial => partial

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

@@ -0,0 +1,28 @@
+= render :partial => 'flasher'
+
+%div.reader_show
+  - if @reader == current_reader
+    %p
+      %strong
+        Hello 
+        = @reader.name + '.'
+      Thank you for joining us. An email has been sent to 
+      %strong
+        = @reader.email
+      with a reminder of your login and password and an activation link. 
+      Click on that link and the registration process will be complete.
+      
+    %p
+      We're sorry about the extra step: it's just to make sure that you are you. If the email hasn't come through yet, you can always go and
+      = link_to("give yourself a gravatar", "http://gravatar.com/signup") + '.'
+
+- content_for :breadcrumbs do
+  = link_to 'Home', '/'
+  >
+  = link_to 'Readers', '/readers'
+  >
+  = @reader.name
+
+- content_for :pagetitle do
+  Thank you. Please check your email
+

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

@@ -0,0 +1,47 @@
+= render :partial => 'flasher'
+
+%div.preferences_form
+  %p
+    Hello 
+    = link_to "#{@reader.name}.", reader_url(@reader)
+    You can use this form to change your preferences and enter a bit more information about yourself.
+    First, just to make sure you're you, please enter your current password:
+
+  - unless @reader.errors.empty?
+    %p.errornote
+      %strong Sorry: there were problems.
+      Please check the form. The affected fields will be highlighted.
+      
+  - form_for :reader, :url => reader_url(@reader), :html => { :method => "put", :class => 'friendly'} do |f| 
+    
+    - with_error_report(@reader.errors.on(:current_password)) do
+      = f.label :current_password, "Current password", :class => 'required'
+      %span.formnote
+        can't remember?
+        = link_to "Make a new one", new_password_reset_url
+      = f.password_field :current_password, :class => 'standard', :autocomplete => 'off'
+      
+    %p
+      Fields with bold headings are required and will cause grumbling if left blank:
+      
+    = render :partial => 'form', :locals => {:f => f}
+    %p
+      = submit_tag "Update your account"
+      or 
+      = link_to 'cancel', request.referer
+
+  %p
+    = link_to gravatar_for(@reader, {:size => 60}, {:class => 'gravatar'}), 'http://www.gravatar.com/signup', :target => '_blank'
+    If you would like a picture to appear next to your messages, give yourself a 
+    = link_to "gravatar.", "http://www.gravatar.com/signup", :target => '_blank'
+    This is what appears for you at the moment.
+
+- content_for :breadcrumbs do 
+  = link_to 'Home', '/'
+  >
+  = link_to 'You', '/readers/me'
+  >
+  Revise your account
+
+- content_for :pagetitle do 
+  Revise your account

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

@@ -0,0 +1,16 @@
+= render :partial => 'flasher'
+
+%div
+  #readers
+    - @readers.each do |reader|
+      = link_to gravatar_for(reader, {:size => 100}, {:class => 'big_gravatar'}), reader_url(reader), {:title => reader.name}
+  %div.stretcher
+    %p 
+
+- content_for :breadcrumbs do
+  = link_to 'Home', '/'
+  >
+  People
+
+- content_for :pagetitle do
+  People

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

@@ -0,0 +1,15 @@
+= render :partial => 'readers/flasher'
+
+%div.login_form
+  %h1 
+    Log in
+
+  = render :partial => 'reader_sessions/login_form', :locals => {:backto => @backto}
+
+- content_for :breadcrumbs do
+  = link_to 'Home', '/' 
+  > Log in
+
+- content_for :pagetitle do
+  Log in
+  

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

@@ -0,0 +1,41 @@
+= render :partial => 'flasher'
+
+%div.register_form
+  %p
+    If you've already done this, you should only need to
+    = link_to "log in.", reader_login_url
+    Otherwise, please take a moment to register an account. 
+    Only the fields labelled in bold are required: the rest you can fill in later if you prefer.
+
+  - unless @reader.errors.empty?
+    %p.errornote
+      %strong Sorry: there were problems.
+      Please check the form. The affected fields will be highlighted like this.
+      
+  - form_for :reader, :url => readers_url, :html => {:class => 'friendly'} do |f|
+    = render :partial => 'form', :locals => {:f => f}
+    %p
+      = submit_tag "Register"
+      or 
+      = link_to 'cancel', request.referer
+
+  %h3
+    notes
+
+  %ul.friendly
+    %li
+      When you press the 'register' button we will send a confirmation email to the address you enter above. 
+      Click on a link in that message, and you're in.
+    %li
+      If you would like a picture to appear next to your messages, give yourself a 
+      = link_to "gravatar.", "http://www.gravatar.com"
+    %li
+      Please make sure you're happy with our 
+      = link_to "terms and conditions", "/terms"
+
+- content_for :breadcrumbs do
+  = link_to 'Home', '/'
+  > Register
+
+- content_for :pagetitle do
+  Register here

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

@@ -0,0 +1,23 @@
+= render :partial => 'flasher'
+
+%div.apologetic
+  %p.haserror
+    You don't have permission to see the page you just requested. 
+    - if current_reader
+      Please talk to the site administrator about your account.
+    - else
+      Please log in.
+
+  - unless current_reader
+    = render :partial => 'reader_sessions/login_form'
+
+- content_for :breadcrumbs do
+  = link_to 'Home', '/'
+  >
+  = link_to 'Readers', '/readers'
+  >
+  Permission Denied
+
+- content_for :pagetitle do
+  = @title
+

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

@@ -0,0 +1,35 @@
+= render :partial => 'flasher'
+
+%div.reader_show
+  - if @reader == current_reader
+    %p.system_message
+      %strong
+        Hello 
+        = @reader.name + '.'
+      This is the page that other (logged-in) site visitors will see when they click on your name. You can change the text that appears here by 
+      = link_to "editing your preferences", edit_reader_url(@reader)
+      and you can change the picture by 
+      = link_to "giving yourself a gravatar.", "http://gravatar.com/signup"
+
+  = gravatar_for(@reader, {:size => 128}, {:class => 'big_gravatar'})
+
+  - if @reader.description.blank?
+    %p No description available.
+  - else
+    = clean_textilize @reader.description
+
+  = render :partial => 'contributions'
+      
+- content_for :breadhead do
+  = link_to 'People', '/readers'
+
+- content_for :breadcrumbs do
+  = link_to 'Home', '/'
+  >
+  = link_to 'People', '/readers'
+  >
+  = @reader.name
+
+- content_for :pagetitle do
+  = @reader.name
+

data/app/views/wrappers/_field_errors.html.haml

@@ -0,0 +1,5 @@
+%p{ :class => errors ? 'haserror' : '' }
+  = yield
+  - if errors
+    This
+    = errors.to_a.to_sentence

data/config/routes.rb

@@ -0,0 +1,22 @@
+ActionController::Routing::Routes.draw do |map|
+  map.namespace :admin do |admin|
+    admin.resources :readers, :except => [:show]
+  end
+
+  map.namespace :admin, :path_prefix => 'admin/readers' do |admin|
+    admin.resources :messages
+    admin.resources :reader_settings, :except => [:destroy]
+  end
+
+  map.resources :readers
+  map.resource :reader_session
+  map.resource :reader_activation, :only => [:show, :new]
+  map.resource :password_reset
+  
+  map.repassword '/password_reset/:id/:confirmation_code', :controller => 'password_resets', :action => 'edit'
+  map.activate_me '/activate/:id/:activation_code', :controller => 'reader_activations', :action => 'update'
+  map.reader_register '/register', :controller => 'readers', :action => 'new'
+  map.reader_login '/login', :controller => 'reader_sessions', :action => 'new'
+  map.reader_logout '/logout', :controller => 'reader_sessions', :action => 'destroy'
+  map.reader_permission_denied '/permission_denied', :controller => 'readers', :action => 'permission_denied'
+end

data/config/settings.rb

@@ -0,0 +1,9 @@
+Radiant::Configuration.add do |config|
+  config.namespace :reader do |reader|
+    reader.setting :allow_registration?, :label => 'Allow visitors to register'
+    reader.setting :require_confirmation?, :label => 'Require confirmation of email address'
+    reader.setting :layout, :integer, :options => lambda { Layout.all.collect {|l| [ l.id, l.name ] } }, :label => "Layout", :notes => "Radiant layout used to render reader-administration pages"
+    reader.setting :mail_from_name, :validate => :present, :label => "Email name", :notes => "Name of person from whom administrative email seems to come"
+    reader.setting :mail_from_address, :validate => :present, :label => "Email address", :notes => "Åddress of person from whom administrative email seems to come"
+  end
+end

data/db/migrate/001_create_readers.rb

@@ -0,0 +1,31 @@
+class CreateReaders < ActiveRecord::Migration
+  def self.up
+    create_table :readers, :force => true do |t|
+      t.column :site_id, :integer
+      t.column :name, :string, :limit => 100
+      t.column :email, :string
+      t.column :login, :string, :limit => 40, :default => "", :null => false
+      t.column :password, :string, :limit => 40
+      t.column :description, :text
+      t.column :notes, :text
+      t.column :trusted, :boolean, :default => true
+      t.column :receive_email, :boolean, :default => false
+      t.column :receive_essential_email, :boolean, :default => true
+      t.column :created_at, :datetime
+      t.column :updated_at, :datetime
+      t.column :created_by_id, :integer
+      t.column :updated_by_id, :integer
+      t.column :salt, :string
+      t.column :session_token, :string
+      t.column :activation_code, :string
+      t.column :provisional_password, :string
+      t.column :activated_at, :datetime
+      # t.column :lock_version, :integer, :default => 0
+    end
+    add_index :readers, ["session_token"], :name => "session_token"
+  end
+
+  def self.down
+    drop_table :readers
+  end
+end

data/db/migrate/002_extend_sites.rb

@@ -0,0 +1,17 @@
+class ExtendSites < ActiveRecord::Migration
+  def self.up
+    if defined? Site
+      add_column :sites, :reader_layout_id, :integer
+      add_column :sites, :mail_from_name, :string
+      add_column :sites, :mail_from_address, :string
+    end
+  end
+
+  def self.down
+    if defined? Site
+      remove_column :sites, :reader_layout_id
+      remove_column :sites, :mail_from_name
+      remove_column :sites, :mail_from_address
+    end
+  end
+end

data/db/migrate/003_reader_honorifics.rb

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

data/db/migrate/004_user_readers.rb

@@ -0,0 +1,11 @@
+class UserReaders < ActiveRecord::Migration
+
+  def self.up
+    add_column :readers, :user_id, :integer
+  end
+
+  def self.down
+    remove_column :readers, :user_id
+  end
+  
+end

data/db/migrate/005_last_login.rb

@@ -0,0 +1,15 @@
+class LastLogin < ActiveRecord::Migration
+
+  def self.up
+    add_column :readers, :last_seen, :datetime
+    add_column :readers, :last_login, :datetime
+    add_column :readers, :previous_login, :datetime
+  end
+
+  def self.down
+    remove_column :readers, :last_seen
+    remove_column :readers, :last_login
+    remove_column :readers, :previous_login
+  end
+  
+end

data/db/migrate/007_adapt_for_authlogic.rb

@@ -0,0 +1,27 @@
+class AdaptForAuthlogic < ActiveRecord::Migration
+  def self.up
+    add_column :readers, :persistence_token, :string, :null => false, :default => ""
+    add_column :readers, :single_access_token, :string, :null => false, :default => ""
+    add_column :readers, :perishable_token, :string, :null => false, :default => ""
+    add_column :readers, :login_count, :integer, :null => false, :default => 0
+    add_column :readers, :failed_login_count, :integer, :null => false, :default => 0
+    add_column :readers, :current_login_ip, :string
+    add_column :readers, :last_login_ip, :string
+    add_column :readers, :clear_password, :string
+
+    change_column :readers, :password, :string, :limit => 255
+    change_column :readers, :salt, :string, :limit => 255
+
+    rename_column :readers, :password, :crypted_password
+    rename_column :readers, :salt, :password_salt
+    rename_column :readers, :last_seen, :last_request_at
+    rename_column :readers, :last_login, :last_login_at
+    
+    remove_column :readers, :activation_code
+    remove_column :readers, :previous_login    
+  end
+  
+  def self.down
+
+  end
+end