radiant-reader-extension 3.0.0 → 3.0.1

data/app/controllers/accounts_controller.rb

@@ -17,10 +17,10 @@ class AccountsController < ReaderActionController
         render :template => 'readers/index'
       }
       format.csv {
-        send_data generate_csv(@readers), :type => 'text/csv; charset=utf-8; header=present', :filename => "everyone.csv"
+        send_data Reader.csv_for(@readers), :type => 'text/csv; charset=utf-8; header=present', :filename => "everyone.csv"
       }
       format.vcard {
-        send_data @readers.map(&:vcard).join("\n"), :filename => "everyone.vcf"
+        send_data Reader.vcards_for(@readers), :filename => "everyone.vcf"
       }
     end
   end

data/app/controllers/groups_controller.rb

@@ -13,10 +13,10 @@ class GroupsController < ReaderActionController
     respond_to do |format|
       format.html
       format.csv {
-        send_data generate_csv(@readers), :type => 'text/csv; charset=utf-8; header=present', :filename => "#{@group.filename}.csv"
+        send_data Reader.csv_for(@readers), :type => 'text/csv; charset=utf-8; header=present', :filename => "#{@group.filename}.csv"
       }
       format.vcard {
-        send_data generate_vcard(@readers), :filename => "#{@group.filename}.vcf"	
+        send_data Reader.vcards_for(@readers), :filename => "everyone.vcf"
       }
     end
   end
@@ -34,4 +34,16 @@ private
      end
   end
   
+  def generate_csv(readers=[])
+    columns = %w{forename surname email phone mobile postal_address}
+    table = FasterCSV.generate do |csv|
+      csv << columns.map { |f| t("activerecord.attributes.reader.#{f}") }
+      readers.each { |r| csv << columns.map{ |f| r.send(f.to_sym) } }
+    end
+  end
+
+  def generate_vcard(readers=[])
+    readers.map(&:vcard).join("\n")
+  end
+  
 end

data/app/helpers/reader_helper.rb

@@ -1,6 +1,5 @@
 require 'sanitize'
 require "sanitize/config/generous"
-require "fastercsv"
 require "snail_helpers"
 
 module ReaderHelper
@@ -155,15 +154,4 @@ EOM
     mail_to address, nil, :encode => :hex, :replace_at => ' at ', :class => 'mailto'
   end
 
-  def generate_csv(readers=[])
-    columns = %w{forename surname email phone mobile postal_address}
-    table = FasterCSV.generate do |csv|
-      csv << columns.map { |f| t("activerecord.attributes.reader.#{f}") }
-      readers.each { |r| csv << columns.map{ |f| r.send(f.to_sym) } }
-    end
-  end
-
-  def generate_vcard(readers=[])
-    readers.map(&:vcard).join("\n")
-  end
 end

data/app/models/reader.rb

@@ -2,6 +2,7 @@ require 'authlogic'
 require 'digest/sha1'
 require 'snail'
 require 'vcard'
+require "fastercsv"
 
 class Reader < ActiveRecord::Base
   @@user_columns = [:name, :email, :login, :created_at, :password, :notes]
@@ -261,6 +262,24 @@ class Reader < ActiveRecord::Base
     end
   end
   
+  # Generates a csv file listing the supplied group of readers.
+  # No access checks are performed here.
+  #
+  def self.csv_for(readers=[])
+    columns = %w{forename surname email phone mobile postal_address}
+    FasterCSV.generate do |csv|
+      csv << columns.map { |f| I18n.t("activerecord.attributes.reader.#{f}") }
+      readers.each { |r| csv << columns.map{ |f| r.send(f.to_sym) } }
+    end
+  end
+
+  # Generates a vcard file containing the supplied group of readers.
+  # No access checks are performed here.
+  #
+  def self.vcards_for(readers=[])
+    readers.map(&:vcard).join("\n")
+  end
+  
 private
 
   def email_must_not_be_in_use

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

@@ -4,7 +4,7 @@
 - form_for reader, :html => {:class => 'friendly'} do |f| 
   %input{:type => :hidden, :name => :authentication_type, :value => :user}
 
-  - if 1 || Radiant::Config['reader.use_honorifics?']
+  - if Radiant.config['reader.use_honorifics?']
     %p
       = f.label :honorific, nil, :class => 'optional'
       %br
@@ -29,7 +29,7 @@
     %br
     %span.formnote= t('reader_extension.form_notes.account.post_country')
 
-  - if Radiant::Config['reader.postal.use_organisation?']
+  - if Radiant.config['reader.postal.use_organisation?']
     %p
       = f.label :post_organisation, nil, :class => 'optional'
       = f.text_field :post_organisation, :class => 'standard'
@@ -55,7 +55,7 @@
   %p
     = f.label :description, nil, :class => 'optional'
     %br
-    = f.text_area :description, :class => Radiant::Config['forum.toolbar?'] ? 'rte' : 'standard'
+    = f.text_area :description, :class => Radiant.config['forum.toolbar?'] ? 'rte' : 'standard'
     %span.formnote= t('reader_extension.form_notes.account.description')
 
   %p

data/config/initializers/formats.rb

@@ -1 +1 @@
-Mime::Type.register "text/x-vcard", :vcard unless Mime::Type.lookup(:vcard)
+Mime::Type.register "text/x-vcard", :vcard

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
   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"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 +01:00
+date: 2011-09-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -322,7 +322,6 @@ files:
 - public/stylesheets/sass/admin/reader.sass
 - public/stylesheets/sass/admin/reader_group.sass
 - public/stylesheets/sass/reader.sass
-- radiant-reader-extension-3.0.0.gem
 - radiant-reader-extension.gemspec
 - Rakefile
 - reader_extension.rb
@@ -351,7 +350,7 @@ has_rdoc: true
 homepage: http://radiant.spanner.org/reader
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n\n    config.gem 'radiant-reader-extension', :version => '~> 3.0.0'\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:\n\n    config.gem 'radiant-reader-extension', :version => '~> 3.0.1'\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: