radiant-reader-extension 1.1.1 → 1.2.0

data/README.md

@@ -10,10 +10,10 @@ The purpose of this extension is to provide a common core that supports other vi
 
 ## Latest
 
-* **currently requires the `preconfiguration` branch of radiant**
-* public interface internationalized
-* New configuration interface
-* Messaging much simplified: now intended to be purely administrative.
+* everything updated for 0.9.x
+* public interface internationalized;
+* Uses the new configuration interface;
+* Messaging much simplified and now intended to be purely administrative.
 
 ## Status
 
@@ -21,7 +21,7 @@ Compatible with radiant 0.9.2, which isn't out yet. You can use the preconfigura
 
 ## Requirements
 
-Radiant 0.9.2. The [layouts](http://github.com/squaretalent/radiant-layouts-extension) and [mailer_layouts](http://github.com/spanner/radiant-mailer_layouts-extension) extensions.
+Radiant 0.9.2 (or currently, edge). The [layouts](http://github.com/squaretalent/radiant-layouts-extension) and [mailer_layouts](http://github.com/spanner/radiant-mailer_layouts-extension) extensions.
 
 You also need three gems (in addition to those that radiant requires): authlogic, gravtastic and sanitize. They're declared in the extension so you should be able just to run
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/app/controllers/admin/messages_controller.rb

@@ -1,4 +1,5 @@
 class Admin::MessagesController < Admin::ResourceController
+  helper :reader
   skip_before_filter :load_model
   before_filter :load_model, :except => :index    # we want the filter to run before :show too
   before_filter :set_function, :only => :new

data/app/controllers/admin/reader_configuration_controller.rb

@@ -1,3 +1,4 @@
 class Admin::ReaderConfigurationController < Admin::ConfigurationController
+  helper :reader
 
 end

data/app/controllers/admin/readers_controller.rb

@@ -1,4 +1,5 @@
 class Admin::ReadersController < Admin::ResourceController
+  helper :reader
   paginate_models
   before_filter :redirect_to_user, :only => :edit
 

data/app/controllers/messages_controller.rb

@@ -1,4 +1,5 @@
 class MessagesController < ReaderActionController
+  helper :reader
 
   before_filter :require_reader
   before_filter :get_messages, :only => [:index]

data/app/controllers/password_resets_controller.rb

@@ -1,4 +1,5 @@
 class PasswordResetsController < ApplicationController
+  helper :reader
 
   # rest gone mad! but it works, and keeps the processes well-defined.
 

data/app/controllers/reader_action_controller.rb

@@ -1,4 +1,5 @@
 class ReaderActionController < ApplicationController
+  helper :reader
   helper_method :current_site, :current_site=, :logged_in?, :logged_in_user?, :logged_in_admin?
   
   no_login_required

data/app/controllers/reader_activations_controller.rb

@@ -1,4 +1,5 @@
 class ReaderActivationsController < ReaderActionController
+  helper :reader
 
   no_login_required
   skip_before_filter :require_reader

data/app/controllers/reader_sessions_controller.rb

@@ -1,4 +1,5 @@
 class ReaderSessionsController < ReaderActionController
+  helper :reader
 
   before_filter :require_reader, :only => :destroy
   radiant_layout { |controller| Radiant::Config['reader.layout'] }

data/app/controllers/readers_controller.rb

@@ -1,4 +1,6 @@
 class ReadersController < ReaderActionController
+  helper :reader
+  
   @@extended_form_partials = []
   cattr_accessor :extended_form_partials
   
@@ -51,7 +53,7 @@ class ReadersController < ReaderActionController
     unless @reader.email.blank?
       flash[:error] = t('please_avoid_spam_trap')
       @reader.email = ''
-      @reader.errors.add(:trap, "must_be_empty")
+      @reader.errors.add(:trap, t("must_be_empty"))
       render :action => 'new' and return
     end
 
@@ -75,7 +77,7 @@ class ReadersController < ReaderActionController
     @reader.attributes = params[:reader]
     @reader.clear_password = params[:reader][:password] if params[:reader][:password]
     if @reader.save
-      flash[:notice] = 'account_updated'
+      flash[:notice] = t('account_updated')
       redirect_to url_for(@reader)
     else
       render :action => 'edit'
@@ -89,7 +91,7 @@ protected
   end
 
   def restrict_to_self
-    flash[:error] = "cannot_edit_others" if params[:id] && params[:id] != current_reader.id
+    flash[:error] = t("cannot_edit_others") if params[:id] && params[:id] != current_reader.id
     @reader = current_reader
   end
   
@@ -100,19 +102,19 @@ protected
     @reader.attributes = params[:reader]
     @reader.valid?
     
-    flash[:error] = 'password_incorrect'
+    flash[:error] = t('password_incorrect')
     @reader.errors.add(:current_password, "not_correct")
     render :action => 'edit' and return false
   end
   
   def no_removing
-    flash[:error] = 'cannot_delete_readers'
+    flash[:error] = t('cannot_delete_readers')
     redirect_to admin_readers_url
   end
   
   def check_registration_allowed
     unless Radiant::Config['reader.allow_registration?']
-      flash[:error] = "registration_disallowed"
+      flash[:error] = t("registration_disallowed")
       redirect_to reader_login_url
       false
     end

data/app/models/reader.rb

@@ -1,6 +1,5 @@
 require 'authlogic'
 require 'digest/sha1'
-require 'gravtastic'
 
 class Reader < ActiveRecord::Base
   @@user_columns = [:name, :email, :login, :created_at, :password, :notes]
@@ -10,7 +9,6 @@ class Reader < ActiveRecord::Base
 
   is_site_scoped if respond_to? :is_site_scoped
 
-  is_gravtastic :with => :email, :rating => 'PG', :size => 48
   acts_as_authentic do |config|
     config.validations_scope = :site_id if defined? Site
     config.transition_from_restful_authentication = true

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

@@ -1,14 +1,13 @@
 - body_classes << "reversed"
 - include_stylesheet('admin/reader')
 
-#reader_settings.box
-  %h3
-    .actions
-      = button_to t("edit"), edit_admin_reader_configuration_url, :method => :get
-    =t("reader_admin")
-  
-  - render_region :settings do |settings|
-    - settings.registration do
+- render_region :settings do |settings|
+  - settings.administration do
+    #reader_settings.box
+      %h3
+        .actions
+          = button_to t("edit"), edit_admin_reader_configuration_url, :method => :get
+        =t("reader_admin")
       %p.ruled
         = show_config 'reader.allow_registration?'
       %p.ruled
@@ -17,8 +16,6 @@
         = show_config 'reader.use_honorifics?'
       %p.ruled
         = show_config 'reader.layout'
-
-    - settings.sender do
       %p.ruled
         = show_config 'email.name'
       %p.ruled
@@ -28,12 +25,12 @@
       %p.ruled
         = show_config 'email.layout'
 
-#message_settings.box
-  %h4
-    =t("reader_emails")
+- render_region :messages do |messages|
+  - messages.administration do
+    #message_settings.box
+      %h3
+        =t("reader_emails")
   
-  - render_region :messages do |messages|
-    - messages.administration do
       - MessageFunction.find_all.each do |func|
         - message = Message.functional(func)
         %p.ruled

data/app/views/reader_activations/_activation_required.haml

@@ -0,0 +1,4 @@
+%h2
+  = t('activation_required_header')
+%p
+  = t('activation_required_explanation')

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

@@ -16,7 +16,7 @@
   %div.activation
     - if @error
       %p.errornotice
-        = t(@error)
+        = @error
     %p
       = t('thanks_and_activation_instructions')
       = link_to("resend_activation", new_reader_activation_url) + '.'

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

@@ -3,7 +3,7 @@
 
 - if current_reader
   %p
-    = t('logged_in_as')
+    = t('reader_logged_in_as')
     %strong
       = current_reader.name
     - unless current_reader.activated?

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

@@ -35,11 +35,12 @@
     %br
     = f.text_field :email, :class => 'standard'
 
-%p
-  = f.label :description, t('your_description'), :class => 'optional'
-  %span.formnote= t('description_notes')
-  %br
-  = f.text_area :description, :class => 'standard', :rows => 8
+- if Radiant::Config['reader.use_description?']
+  %p
+    = f.label :description, t('your_description'), :class => 'optional'
+    %span.formnote= t('description_notes')
+    %br
+    = f.text_area :description, :class => 'standard', :rows => 8
 
 %p
   = f.label :login, t('login_name'), :class => 'optional'

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

@@ -42,4 +42,4 @@
   = t('account_settings')
 
 - content_for :title do 
-  = t('account_settings')
+  = t('account')

data/config/locales/en.yml

@@ -5,6 +5,8 @@ en:
   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_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"
   already_active: "Your account is already active."
   already_logged_in: "You're already logged in!"
@@ -50,6 +52,7 @@ en:
   honorific: "Title or rank"
   honorific_notes: ""
   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."
   is_free_and_quick: " is free and only takes a moment"
@@ -64,7 +67,7 @@ en:
   new_account: "Register"
   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': "no"
   no_description: "No description available"
   notes: "notes"
   page_permission_denied: "You don't have permission to see the page that you have requested."
@@ -90,6 +93,7 @@ en:
   reader_admin: "Reader administration"
   reader_emails: "Administrative messages"
   reader: 'Reader'
+  reader_logged_in_as: "You are logged in as %{name}."
   readers: 'Readers'
   register: "register"
   registration: "registration"
@@ -116,7 +120,7 @@ en:
   welcome_back: "Welcome back"
   welcome_message: "Welcome message"
   wrong_email: "you think you might have put the wrong email address in,"
-  yes: "yes"
+  'yes': "yes"
   your_description: "A little about yourself"
   your_email: "Your email address"
   your_name: "Your name"

data/lib/reader_admin_ui.rb

@@ -41,7 +41,7 @@ module ReaderAdminUI
       def load_default_reader_configuration_regions
         returning OpenStruct.new do |reader_configuration|
           reader_configuration.show = Radiant::AdminUI::RegionSet.new do |show|
-            show.settings.concat %w{registration sender}
+            show.settings.concat %w{administration}
             show.messages.concat %w{administration}
           end
           reader_configuration.edit = Radiant::AdminUI::RegionSet.new do |edit|

data/radiant-reader-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-11-01}
+  s.date = %q{2010-11-15}
   s.description = %q{Centralises reader/member/user registration and management tasks for the benefit of other extensions}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
      "app/views/password_resets/create.html.haml",
      "app/views/password_resets/edit.html.haml",
      "app/views/password_resets/new.html.haml",
+     "app/views/reader_activations/_activation_required.haml",
      "app/views/reader_activations/show.html.haml",
      "app/views/reader_notifier/message.html.haml",
      "app/views/reader_sessions/_login_form.html.haml",
@@ -94,13 +95,10 @@ Gem::Specification.new do |s|
      "db/migrate/20091111090819_ensure_functional_messages_visible.rb",
      "db/migrate/20091119092936_messages_have_layout.rb",
      "db/migrate/20100922152338_lock_versions.rb",
-     "db/migrate/20100927095703_default_settings.rb",
      "db/migrate/20101004074945_unlock_version.rb",
      "db/migrate/20101019094714_message_sent_date.rb",
-     "lib/config_extensions.rb",
      "lib/controller_extensions.rb",
      "lib/reader_admin_ui.rb",
-     "lib/reader_helper.rb",
      "lib/reader_site.rb",
      "lib/reader_tags.rb",
      "lib/rfc822.rb",

data/reader_extension.rb

@@ -1,32 +1,27 @@
 require_dependency 'application_controller'
 
 class ReaderExtension < Radiant::Extension
-  version "1.1.1"
+  version "1.2.0"
   description "Provides reader/member/user registration and management functions"
   url "http://spanner.org/radiant/reader"
   
   extension_config do |config|
     config.gem 'authlogic'
     config.gem 'sanitize'
-    config.gem 'will_paginate'
   end
   
   def activate
     Reader
     ApplicationController.send :include, ControllerExtensions                     # hooks up reader authentication and layout-chooser
-    ApplicationHelper.send :include, ReaderHelper                                 # display usefulness including error-wrapper
+    ApplicationHelper.send :include, ReaderHelper                                 # display usefulness included generally so as to bavailable in sitecontroller
     Site.send :include, ReaderSite if defined? Site                               # adds site scope and site-based layout-chooser
     Page.send :include, ReaderTags                                                # a few mailmerge-like radius tags for use in messages, or for greeting readers on (uncached) pages
-    Radiant::Config.send :include, ConfigExtensions                                # .boolean?
     UserActionObserver.instance.send :add_observer!, Reader 
     UserActionObserver.instance.send :add_observer!, Message
     
     unless defined? admin.reader
       Radiant::AdminUI.send :include, ReaderAdminUI
       Radiant::AdminUI.load_reader_extension_regions
-      if defined? admin.sites
-        admin.sites.edit.add :form, "admin/sites/choose_reader_layout", :after => "edit_homepage"
-      end
     end
         
     if respond_to?(:tab)

data/spec/controllers/readers_controller_spec.rb

@@ -91,7 +91,7 @@ describe ReadersController do
       it "should not show the edit page for another reader" do 
         get :edit, :id => reader_id(:visible)
         response.should be_success        
-        flash[:error].should =~ /cannot_edit_others/
+        flash[:error].should =~ /other people's accounts/
       end
 
       it "should not remove this reader" do 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 +00:00
+date: 2010-11-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,6 +142,7 @@ files:
 - app/views/password_resets/create.html.haml
 - app/views/password_resets/edit.html.haml
 - app/views/password_resets/new.html.haml
+- app/views/reader_activations/_activation_required.haml
 - app/views/reader_activations/show.html.haml
 - app/views/reader_notifier/message.html.haml
 - app/views/reader_sessions/_login_form.html.haml
@@ -177,13 +178,10 @@ files:
 - db/migrate/20091111090819_ensure_functional_messages_visible.rb
 - db/migrate/20091119092936_messages_have_layout.rb
 - db/migrate/20100922152338_lock_versions.rb
-- db/migrate/20100927095703_default_settings.rb
 - db/migrate/20101004074945_unlock_version.rb
 - db/migrate/20101019094714_message_sent_date.rb
-- lib/config_extensions.rb
 - lib/controller_extensions.rb
 - lib/reader_admin_ui.rb
-- lib/reader_helper.rb
 - lib/reader_site.rb
 - lib/reader_tags.rb
 - lib/rfc822.rb

data/db/migrate/20100927095703_default_settings.rb

@@ -1,14 +0,0 @@
-class DefaultSettings < ActiveRecord::Migration
-  def self.up
-    Radiant::Config['reader.allow_registration?'] ||= true
-    Radiant::Config['reader.require_confirmation?'] ||= true
-    Radiant::Config['site.url'] ||= 'www.example.com'
-    Radiant::Config['site.title'] ||= 'Your site name here'
-    Radiant::Config['reader.mail_from_name'] ||= "Administrator"
-    Radiant::Config['reader.mail_from_address'] ||= "admin@example.com"
-    Radiant::Config['reader.layout'] ||= 'undefined'
-  end
-
-  def self.down
-  end
-end

data/lib/config_extensions.rb

@@ -1,5 +0,0 @@
-module ConfigExtensions    # for inclusion into Radiant::Config
-  def boolean?
-    key.ends_with? "?"
-  end
-end

data/lib/reader_helper.rb

@@ -1,35 +0,0 @@
-require 'sanitize'
-module ReaderHelper
-  def self.included(base)
-
-    base.module_eval do
-      def gravatar_for(reader, gravatar_options={}, img_options ={})
-        size = gravatar_options[:size]
-        img_options[:size] = "#{size}x#{size}" if size
-        image_tag reader.gravatar_url(gravatar_options), img_options
-      end
-
-      def clean_textilize(text)
-        Sanitize.clean(textilize(text), Sanitize::Config::RELAXED)
-      end
-
-      def clean_textilize_without_paragraph(text)
-        textiled = clean_textilize(text)
-        if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
-        if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
-        return textiled
-      end
-  
-      def truncate_words(text='', length=64, omission="...")
-        return '' if text.blank?
-        words = text.split
-        omission = '' unless words.size > length
-        words[0..(length-1)].join(" ") + omission
-      end 
-      
-      def truncate_and_textilize(text, length=64)
-        clean_textilize( truncate_words(text, length) )
-      end
-    end
-  end
-end