radiant-reader-extension 1.3.13 → 2.0.0.rc4

data/config/locales/en.yml

@@ -1,192 +1,232 @@
 en:
-  access_denied: "Access denied"
-  account_settings: "Account settings"
-  account_updated: "Your account has been updated"
-  activate_account: "Activate your account"
-  activation_complete: "Thank you very much for persevering with the registration process. Your account is now active."
-  activation_message_sent: "Account activation instructions have been emailed to you."
-  activation_required: "Please check your email for an activation message"
-  activation_required_header: "Please check your email"
-  activation_required_explanation: "You should have received a confirmation message containing a link that will activate your account."
-  activation_sent: "Activation message sent"
-  affected_fields_highlighted: "The affected fields are highlighted below."
-  all_deliveries_failed: "All deliveries failed"
-  already_active: "Your account is already active."
-  already_logged_in: "You're already logged in!"
-  already_registered: "If you've already registered, you should only need to"
-  and_try_again: "and try again."
-  bold_required: "Fields with bold headings are required and will cause grumbling if left blank:"
-  but_not_active: 'but your account is not yet activated. Please check your email for our activation message.'
-  cancel: "cancel"
-  cannot_delete_readers: "To delete readers, please log in as an administrator"
-  cannot_edit_others: "You are not allowed to edit other people's accounts."
-  change_gravatar: "change gravatar image"
-  change_password: "Change your password"
-  check_email: "Please check your email for an activation message"
+  activerecord:
+    attributes:
+      reader:
+        description: "Text for your profile page"
+        email: "Email address"
+        honorific: "Title or rank"
+        login: "Login username (optional)"
+        name: "Your name"
+        password: "Password"
+        password_confirmation: "Confirm password"
+    errors:
+      models:
+        reader:
+          attributes:
+            name:
+              blank: "please enter a name"
+              too_long: "this is too long: 100 characters max"
+            email:
+              blank: "please enter your email address"
+              invalid: "this doesn't look like an email address"
+              taken: "this address is already registered here"
+              taken_by_author: "this address belongs to an author here. You don't need to register here: just log in to admin."
+            login:
+              taken: "this login is already in use here"
+            password:
+              too_short: "this must have at least six characters"
+              invalid: "this must include at least one non-letter"
+            password_confirmation:
+              
+          
   config:
     reader:
       allow_registration?: "Allow registration"
       require_confirmation?: "Confirm email addresses"
       use_honorifics?: "Use honorifics"
       layout: "Layout for forms"
+      get_profile?: "As for profile text"
     email:
       name: "Message sender"
       address: "Message reply-to"
       prefix: "Subject prefix"
       layout: "Email layout"
-  confirm_new_password: "Confirm new password"
-  confirm_password: "Confirm password"
-  confirmation_code: "Confirmation code"
-  confirming_email: "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."
-  continue: "Continue"
-  create_message: "create message"
-  dont_fill: "Don't fill this in!"
-  edit_profile: "edit your profile"
-  email_unknown: "Sorry. That email address is not known here."
-  enter_code: "Please enter confirmation code"
-  enter_email_for_reminder: "enter your email address and we will send the message again"
-  enter_own_password: "First, just to make sure you're you, please enter your current password:"
-  everyone_in_group: "Everyone in the group"
-  forgotten_password: "Forgotten your password?"
-  form_notes:
-    description: "you can fill this in later. Textile formatting is allowed."
-    email: "we will send activation instructions to this address"
-    existing_password: "leave blank to keep present password. If changing, at least four characters."
-    login: "you can always use your email address instead"
-    name: "this is how you will be credited on the site"
-    new_password: "at least four characters, please"
-    honorific: "this is prepended to your name when you are credited"
-  form_problem: "there was a problem with the form"
-  getting_gravatar: "If you would like a picture to appear next to your messages, give yourself a gravatar at"
-  hello: "hello"
-  honorific: "Title or rank"
-  invitation_message: "Invitation message"
-  invite_description: '<a href="%{url}">Edit your preferences to put some text about yourself here.'
-  if_cant_find: "If you can't find the message, we can"
-  if_mistake_see_admin: "If this is a mistake, please talk to the site administrator about your account."
-  if_not_you: "If that's not you, please"
-  is_free_and_quick: " is free and only takes a moment"
-  joined_on: "Joined on"
-  label:
-    reader:
-      name: "Your name"
-      honorific: "Title"
-      login: "Login username"
-      email: "Email address"
-      password: "Password"
-      repeat_password: "Confirm password"
-      current_password: "Current password"
-  log_in: 'log in'
-  log_in_or_register: "To use this part of the site you need to be logged in. It's easy to get an account: if you have received an invitation, please follow the instructions in that message. Otherwise, please <a href='/register'>register here</a>. It only takes a moment."
-  log_out: "log out"
-  login_name: "Login name"
-  login_or_email: "Login name or email address"
-  login_unknown: "Sorry: we don't recognise that combination of username and password."
-  logout_message: "You are logged out. Bye!"
-  message_delivered: "Message delivered"
-  must_be_empty: "must be empty"
-  navigation:
-    account: "Your account"
-    activate: "Activate account"
-    admin: "Admin"
-    readers: "People"
-    preferences: "Preferences"
-    profile: "Profile"
-    log_in: "Log in"
-    log_out: "Log out"
-    loading: "Loading..."
-    register: "Register"
-    your_account: "Your account"
-  new_account: "Create an account"
-  new_password: "New password"
-  new_password_instructions: "Please enter and confirm the new password you would like to use. It must be at least four characters long, nothing obvious or typical and ideally a mixture of numbers and letters."
-  'no': "no"
-  no_description: "No description available"
-  notes: "notes"
-  page_permission_denied: "You don't have permission to see the page that you have requested."
-  password: "password"
-  password_incorrect: "Sorry. Wrong password."
-  password_mismatch: "Passwords don't match! Please try again."
-  password_not_yet_changed: "Your password hasn't changed yet, so if you've just remembered it please <a href='%{url}'>log in as usual</a>."
-  password_reset_instructions: "Please enter your email address below. If we recognise it, we'll send you a message with a confirmation link (or if your account is not yet active, we'll send the activation message again)."
-  password_reset_reassurance: "Your password will not change until you fill in that form, so only you can complete this process."
-  password_updated_notice: "Thank you. Your password has been updated and you are now logged in."
-  people: "people"
-  permission_denied: "Permission denied"
-  please: "please"
-  please_avoid_spam_trap: "Please don't fill in the spam trap field"
-  please_check_message: "Sorry: something was wrong in that link. Please check your email message and make sure it is giving you the whole address."
-  please_log_in: "Please log in"
-  please_log_out: "Please log out"
-  please_read_our: "Please read our"
-  please_register: "Please take a moment to register an account."
-  please_use_form: "Please use the registration form"
-  preferences_intro: "You can use this form to change your preferences and enter a bit more information about yourself."
-  reader_admin: "Reader administration"
-  reader_emails: "Administrative messages"
-  reader: 'Reader'
-  reader_logged_in_as: "You are logged in as %{name}."
-  reader_saved: "Reader saved"
-  readers: 'People'
-  register: "register"
-  registration: "registration"
-  registration_disallowed: "Sorry. This site does not allow visitors to register"
-  remember_me: "remember me"
-  resend_activation: "Resend activation message"
-  reset_message_instructions: "Thank you. A message has been sent containing the instructions for setting a new password. Remember it hasn't changed yet and won't until you follow the instructions in the message. If you remember your old password, you can just carry on using it and ignore the reset message."
-  reset_message_sent: "Password-reset instructions have been emailed to you"
-  reset_not_found: "Password-reset code not found"
-  sorry_reset_not_found: "Sorry: the system can't find you. That link must have been garbled somewhere along the line. Please paste the 20-character confirmation code into the box below and we'll try again."
-  reset_password: "Reset your password"
-  restart_password_change: "Send another password-reset message"
-  return_to_page: "return to the page you were looking at before you started registering"
-  send_it_again: "send it again"
-  send_reset_button: "send me instructions"
-  set_new_password: "set new password"
-  some_deliveries_failed: "Some deliveries failed"
-  sorry: "sorry"
-  sorry_access_denied: "Sorry: access denied"
-  spam_trap: "it's a spam trap and shouldn't be visible"
-  status_check: "Please wait: loading controls"
-  terms_and_conditions: "terms and conditions"
-  thanks_activated: "Thank you! Your account has been activated."
-  thanks_and_activation_instructions: "Thank you for registering. Now please check your email. We have sent a message containing a link that will automatically activate your account and log you in."
-  this_is_your_page: "This is the page that other (logged-in) site visitors will see when they click on your name."
+  reader: "reader"
+  readers: "Readers"
+  groups: "Groups"
+  messages: "Messages"
+  settings: "Settings"
+  reader_extension:
+    access_denied: "Access denied"
+    account_settings: "Account settings"
+    account_updated: "Your account has been updated"
+    activate_account: "Activate your account"
+    activation_complete: "Thank you very much for persevering with the registration process. Your account is now active."
+    activation_message_sent: "Account activation instructions have been emailed to you."
+    activation_required: "Please check your email for an activation message"
+    activation_required_header: "Please check your email"
+    activation_required_explanation: "You should have received a confirmation message containing a link that will activate your account."
+    activation_sent: "Activation message sent"
+    affected_fields_highlighted: "The affected fields are highlighted below."
+    all_deliveries_failed: "All deliveries failed"
+    already_active: "Your account is already active."
+    already_logged_in: "You're already logged in!"
+    already_registered: "If you've already registered, you should only need to"
+    and_try_again: "and try again."
+    bold_required: "Fields with bold headings are required and will cause grumbling if left blank."
+    but_not_active: 'but your account is not yet activated. Please check your email for our activation message.'
+    cancel: "cancel"
+    cannot_delete_readers: "To delete readers, please log in as an administrator"
+    cannot_edit_others: "You are not allowed to edit other people's accounts."
+    change_gravatar: "change gravatar image"
+    change_password: "Change your password"
+    check_email: "Please check your email for an activation message"
+    confirm_new_password: "Confirm new password"
+    confirm_password: "Confirm password"
+    confirmation_code: "Confirmation code"
+    confirming_email: "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."
+    continue: "Continue"
+    create_message: "create message"
+    dont_fill: "Don't fill this in!"
+    edit_profile: "edit your profile"
+    email_unknown: "Sorry. That email address is not known here."
+    enter_code: "Please enter confirmation code"
+    enter_email_for_reminder: "enter your email address and we will send the message again"
+    everyone_in_group: "Everyone in the group"
+    forgotten_password: "Forgotten your password?"
+    form_notes:
+      description: "you can fill this in later. Textile formatting is allowed."
+      email: "we will send activation instructions to this address"
+      existing_password: "leave blank to keep present password. If changing, at least four characters."
+      login: "you can always use your email address instead"
+      name: "this is how you will be credited on the site"
+      new_password: "at least six characters, please, and with at least one non-letter character"
+      honorific: "this is prepended to your name when you are credited"
+    form_problem: "there was a problem with the form"
+    getting_gravatar: "If you would like a picture to appear next to your messages, give yourself a gravatar at"
+    hello: "hello"
+    honorific: "Title or rank"
+    invitation_message: "Invitation message"
+    invite_description: '<a href="%{url}">Edit your preferences to put some text about yourself here.'
+    if_cant_find: "If you can't find the message, we can"
+    if_mistake_see_admin: "If this is a mistake, please talk to the site administrator about your account."
+    if_not_you: "If that's not you, please"
+    is_free_and_quick: " is free and only takes a moment"
+    joined_on: "Joined on"
+    label:
+      reader:
+        name: "Your name"
+        honorific: "Title"
+        login: "Login username"
+        email: "Email address"
+        password: "Password"
+        repeat_password: "Confirm password"
+        current_password: "Current password"
+    log_in: 'log in'
+    log_in_or_register: "Please log in here. If you haven't already, you will need to <a href='/register'>register</a> first."
+    log_out: "log out"
+    login_name: "Login name"
+    login_or_email: "Login name or email address"
+    login_unknown: "Sorry: we don't recognise that combination of username and password."
+    logout_message: "You are logged out. Bye!"
+    message_delivered: "Message delivered"
+    must_be_empty: "must be empty"
+    navigation:
+      account: "Your account"
+      activate: "Activate account"
+      admin: "Admin"
+      greeting: "Hello %{name}"
+      readers: "Readers"
+      preferences: "Preferences"
+      profile: "Profile"
+      log_in: "Log in"
+      log_out: "Log out"
+      loading: "Loading..."
+      register: "Register"
+      your_account: "Preferences"
+    new_account: "Register here"
+    new_password: "New password"
+    new_password_instructions: "Please enter and confirm the new password you would like to use. It must be at least four characters long, nothing obvious or typical and ideally a mixture of numbers and letters."
+    'no': "no"
+    no_description: "No description available"
+    notes: "notes"
+    page_permission_denied: "You don't have permission to see the page that you have requested."
+    password: "Password"
+    password_incorrect: "Sorry. Wrong password."
+    password_mismatch: "Passwords don't match! Please try again."
+    password_not_yet_changed: "Your password hasn't changed yet, so if you've just remembered it please <a href='%{url}'>log in as usual</a>."
+    password_reset_instructions: "Please enter your email address below. If we recognise it, we'll send you a message with a confirmation link (or if your account is not yet active, we'll send the activation message again)."
+    password_reset_reassurance: "Your password will not change until you fill in that form, so only you can complete this process."
+    password_updated_notice: "Thank you. Your password has been updated and you are now logged in."
+    people: "people"
+    permission_denied: "Permission denied"
+    permitted_groups: "Permitted groups"
+    please: "please"
+    please_avoid_spam_trap: "Please don't fill in the spam trap field"
+    please_check_message: "Sorry: something was wrong in that link. Please check your email message and make sure it is giving you the whole address."
+    please_log_in: "Please log in"
+    please_log_out: "Please log out"
+    please_read_our: "Please read our"
+    please_register: "Please take a moment to register an account."
+    please_use_form: "Please use the registration form"
+    preferences_intro: "You can use this form to change your preferences and enter a bit more information about yourself."
+    reader_admin: "Reader administration"
+    reader_emails: "Administrative messages"
+    reader: 'Reader'
+    reader_logged_in_as: "You are logged in as %{name}."
+    reader_saved: "Reader saved"
+    readers: 'People'
+    readers_introduction: "This is a list of everyone who has joined the site. It's only visible to logged-in users."
+    register: "register"
+    registration: "registration"
+    registration_disallowed: "Sorry. This site does not allow visitors to register"
+    remember_me: "remember me"
+    resend_activation: "Resend activation message"
+    reset_message_instructions: "Thank you. A message has been sent containing the instructions for setting a new password. Remember it hasn't changed yet and won't until you follow the instructions in the message. If you remember your old password, you can just carry on using it and ignore the reset message."
+    reset_message_sent: "Password-reset instructions have been emailed to you"
+    reset_not_found: "Password-reset code not found"
+    sorry_reset_not_found: "Sorry: the system can't find you. That link must have been garbled somewhere along the line. Please paste the 20-character confirmation code into the box below and we'll try again."
+    reset_password: "Reset your password"
+    restart_password_change: "Send another password-reset message"
+    return_to_page: "return to the page you were looking at before you started registering"
+    send_it_again: "send it again"
+    send_reset_button: "send me instructions"
+    set_new_password: "set new password"
+    some_deliveries_failed: "Some deliveries failed"
+    sorry: "sorry"
+    sorry_access_denied: "Sorry: access denied"
+    spam_trap: "it's a spam trap and shouldn't be visible"
+    status_check: "Please wait: loading controls"
+    terms_and_conditions: "terms and conditions"
+    thanks_activated: "Thank you! Your account has been activated."
+    thanks_and_activation_instructions: "Thank you for registering. Now please check your email. We have sent a message containing a link that will automatically activate your account and log you in."
+    this_is_your_page: "This is the page that other (logged-in) site visitors will see when they click on your name."
+    username: "username"
+    welcome_back: "Welcome back"
+    welcome_message: "Welcome message"
+    wrong_email: "you think you might have put the wrong email address in,"
+    'yes': "yes"
+    your_description: "Some text for your profile page"
+    your_email: "Your email address"
+    your_name: "Your name"
+    count_people: 
+      zero: "(nobody)"
+      one: "(one person)"
+      other: "(%{count} people)"
+    send_to: "Send to"
+    reader_configuration_page: "reader settings"
+    welcome_sent_automatically: "This message is sent automatically when someone completes the registration and email-confirmation process."
+    password_reset_sent_automatically: "This message is sent automatically when someone asks to reset their password."
+    activation_sent_automatically: "This message is sent automatically when someone begins to register."
+    invitation_sent_automatically: "This message is sent automatically when someone is invited to the site."
+    everyone_unsent: "anyone who has not received this message"
+    everyone_inactive: "anyone who has not activated their account"
+    everyone: "Everyone"
+    send_message: "Send Message"
+    edit_message: "edit message"
+    delete_message: "delete message"
+    this_message_functional: "This is the %{function} message."
+    preview_and_send_message: "Preview and send message"
+    really_delete_message: "Are you sure you want to delete the message '%{title}'? This cannot be undone."
+    delete_reader: "delete reader"
+    really_delete_reader: "Are you sure you want to remove the reader %{name}? This cannot be undone."
+    never_sent: 'never sent'
+    for: 'for'
+    home: 'home'
+    reader_required: "Sorry: this part of the site requires an account."
+    update_account: "Save changes"
+    create_account: "Register"
+    separator: " &raquo; "
   time:
     formats:
       date: "%B %e, %Y"
-  username: "username"
-  welcome_back: "Welcome back"
-  welcome_message: "Welcome message"
-  wrong_email: "you think you might have put the wrong email address in,"
-  'yes': "yes"
-  your_description: "A little about yourself"
-  your_email: "Your email address"
-  your_name: "Your name"
-  count_people: 
-    zero: "(nobody)"
-    one: "(one person)"
-    other: "(%{count} people)"
-  send_to: "Send to"
-  reader_configuration_page: "reader settings"
-  welcome_sent_automatically: "This message is sent automatically when someone completes the registration and email-confirmation process."
-  password_reset_sent_automatically: "This message is sent automatically when someone asks to reset their password."
-  activation_sent_automatically: "This message is sent automatically when someone begins to register."
-  invitation_sent_automatically: "This message is sent automatically when someone is invited to the site."
-  everyone_unsent: "anyone who has not received this message"
-  everyone_inactive: "anyone who has not activated their account"
-  everyone: "Everyone"
-  send_message: "Send Message"
-  edit_message: "edit message"
-  delete_message: "delete message"
-  this_message_functional: "This is the %{function} message."
-  preview_and_send_message: "Preview and send message"
-  really_delete_message: "Are you sure you want to delete the message '%{title}'? This cannot be undone."
-  delete_reader: "delete reader"
-  really_delete_reader: "Are you sure you want to remove the reader %{name}? This cannot be undone."
-  never_sent: 'never sent'
-  for: 'for'
-  home: 'home'
-  reader_required: "Sorry: this part of the site requires an account."
-  update_account: "Save changes"
-  create_account: "Register"

data/config/routes.rb

@@ -1,6 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
   map.namespace :admin, :path_prefix => 'admin/readers' do |admin|
     admin.resources :messages, :member => [:preview, :deliver]
+    admin.resources :groups, :has_many => [:memberships, :permissions, :group_invitations, :messages]
     admin.resource :reader_configuration, :controller => 'reader_configuration'
   end
 
@@ -10,6 +11,10 @@ ActionController::Routing::Routes.draw do |map|
 
   map.resources :readers
   map.resources :messages, :only => [:index, :show], :member => [:preview]
+  map.resources :groups, :only => [] do |group|
+    group.resources :messages, :only => [:index, :show], :member => [:preview]
+  end
+
   map.resource :reader_session
   map.resource :reader_activation, :only => [:show, :new]
   map.resource :password_reset

data/db/migrate/20090921125654_group_messages.rb

@@ -0,0 +1,35 @@
+class GroupMessages < ActiveRecord::Migration
+  create_table :groups do |t|
+    t.column :name, :string
+    t.column :description, :text
+    t.column :notes, :text
+    t.column :created_at, :datetime
+    t.column :updated_at, :datetime
+    t.column :created_by_id, :integer
+    t.column :updated_by_id, :integer
+    t.column :homepage_id, :integer
+    t.column :site_id, :integer
+    t.column :lock_version, :integer
+  end
+
+  create_table :memberships do |t|
+    t.column :group_id, :integer
+    t.column :reader_id, :integer
+  end
+
+  create_table :permissions do |t|
+    t.column :group_id, :integer
+    t.column :page_id, :integer
+  end
+
+  def self.up
+    add_column :messages, :group_id, :integer
+  end
+
+  def self.down
+    drop_table :groups
+    drop_table :memberships
+    drop_table :permissions
+    remove_column :messages, :group_id
+  end
+end

data/db/migrate/20091120083119_groups_public.rb

@@ -0,0 +1,11 @@
+class GroupsPublic < ActiveRecord::Migration
+  def self.up
+    add_column :groups, :public, :boolean
+    add_column :groups, :invitation, :text
+  end
+
+  def self.down
+    remove_column :groups, :public
+    remove_column :groups, :invitation
+  end
+end

data/db/migrate/20110214101339_multiple_ownership.rb

@@ -0,0 +1,13 @@
+class MultipleOwnership < ActiveRecord::Migration
+  def self.up
+    rename_column :permissions, :page_id, :permitted_id
+    add_column :permissions, :permitted_type, :string
+    Permission.reset_column_information
+    Permission.all.each {|p| p.update_attributes(:permitted_type => 'Page') }
+  end
+
+  def self.down
+    rename_column :permissions, :permitted_id, :page_id
+    remove_column :permissions, :permitted_type
+  end
+end

data/lib/controller_extensions.rb

@@ -35,7 +35,7 @@ module ControllerExtensions    # for inclusion into ApplicationController
     
     def set_reader_for_user
       if current_user
-        current_reader_session = ReaderSession.create!(Reader.find_or_create_for_user(current_user))
+        current_reader_session = ReaderSession.create!(Reader.for_user(current_user))
       end
     end
 

data/lib/group_tags.rb

@@ -0,0 +1,65 @@
+module GroupTags
+  include Radiant::Taggable
+  include ReaderHelper
+  
+  class TagError < StandardError; end
+  desc %{
+    The root 'group' tag is not meant to be called directly. 
+    All it does is summon a group object so that its fields can be displayed with eg.
+    <pre><code><r:group:name /></code></pre>
+  
+    This tag will not throw an exception if there is no group; it will just disappear.
+  }
+  tag 'group' do |tag|
+    tag.locals.group = @mailer_vars ? @mailer_vars[:@group] : tag.locals.page.group
+    tag.expand if tag.locals.group
+  end
+
+  [:name, :description, :url].each do |field|
+    desc %{
+      Displays the #{field} field of the currently relevant group. Works in email messages too.
+    
+      <pre><code><r:group:#{field} /></code></pre>
+    }
+    tag "group:#{field}" do |tag|
+      tag.locals.group.send(field)
+    end
+  end
+
+  desc %{
+    Expands if this group has messages.
+  
+    <pre><code><r:group:if_messages>...</r:group:if_messages /></code></pre>
+  }
+  tag "group:if_messages" do |tag|
+    tag.expand if tag.locals.group.messages.ordinary.published.any?
+  end
+
+  desc %{
+    Expands if this group does not have messages.
+  
+    <pre><code><r:group:unless_messages>...</r:group:unless_messages /></code></pre>
+  }
+  tag "group:unless_messages" do |tag|
+    tag.expand unless tag.locals.group.messages.ordinary.published.any?
+  end
+
+  desc %{
+    Loops through the non-functional messages (ie not welcomes and reminders) that belong to this group 
+    and that have been sent, though not necessarily to the present reader (which is the point, really).
+  
+    <pre><code><r:group:messages:each>...</r:group:messages:each /></code></pre>
+  }
+  tag "group:messages" do |tag|
+    tag.locals.messages = tag.locals.group.messages.ordinary.published
+    tag.expand
+  end
+  tag "group:messages:each" do |tag|
+    result = []
+    tag.locals.messages.each do |message|
+      tag.locals.message = message
+      result << tag.expand
+    end
+    result
+  end
+end