radiant-reader-extension 1.2.2 → 1.2.3

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/app/models/message.rb

@@ -1,6 +1,6 @@
 class Message < ActiveRecord::Base
 
-  is_site_scoped if defined? ActiveRecord::SiteNotFound
+  has_site if respond_to? :has_site
 
   belongs_to :layout
   belongs_to :created_by, :class_name => 'User'
@@ -33,7 +33,7 @@ class Message < ActiveRecord::Base
   end
 
   def undelivered_readers
-    possible_readers - recipients
+    possible_readers.except(recipients)
   end
 
   def inactive_readers

data/app/models/reader.rb

@@ -7,7 +7,7 @@ class Reader < ActiveRecord::Base
   cattr_accessor :current
   default_scope :order => 'name ASC'
 
-  is_site_scoped if respond_to? :is_site_scoped
+  has_site if respond_to? :has_site
 
   acts_as_authentic do |config|
     config.validations_scope = :site_id if defined? Site
@@ -39,6 +39,10 @@ class Reader < ActiveRecord::Base
   named_scope :any
   named_scope :active, :conditions => "activated_at IS NOT NULL"
   named_scope :inactive, :conditions => "activated_at IS NULL"
+  named_scope :except, lambda { |readers|
+    readers = [readers].flatten
+    { :conditions => ["NOT readers.id IN (#{readers.map{"?"}.join(',')})", readers.map(&:id)] }
+  }
 
   def forename
     read_attribute(:forename) || name.split(/\s/).first

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

@@ -38,10 +38,7 @@
           %li
             = link_to t('edit_message').titlecase, edit_admin_message_url(@message)
           %li
-            - if @message.group
-              = link_to @message.group.name + ' ' + t('group_page'), admin_group_url(@message.group)
-            - else
-              = link_to t('reader_configuration_page').titlecase, admin_reader_configuration_url
+            = link_to t('reader_configuration_page').titlecase, admin_reader_configuration_url
  
     - delivery.options do
       - unless @message.administrative?
@@ -67,6 +64,6 @@
           %p.buttons
             = submit_tag t('send_message')
             = t('or')
-            = link_to t('cancel'), @message.group ? admin_group_url(@message.group) : admin_messages_url
+            = link_to t('cancel'), admin_messages_url
             
     

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

@@ -6,7 +6,7 @@
 
   - if session[:return_to]
     %p 
-      = link_to (t("return_to_page"), session[:return_to]) + '?'
+      = link_to t("return_to_page"), session[:return_to]
     
   - content_for :title do
     = t('hello').titlecase

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

@@ -20,15 +20,13 @@
     = 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' }
-        = t("dont_fill")
+    %p
+      =f.label :email, t("dont_fill"), :class => 'required' }
       %span.formnote= t('spam_trap')
       %br
-      = text_field_tag 'reader_email', '', :name => 'reader[email]', :class => 'standard'
+      = f.text_field :email, '', :class => 'standard'
 
 - else
-
   %p
     = f.label :email, t('your_email'), :class => 'required'
     %span.formnote= t('email_notes')

data/lib/controller_extensions.rb

@@ -58,14 +58,6 @@ module ControllerExtensions    # for inclusion into ApplicationController
       redirect_to address + ".#{format}"    # nasty! but necessary for inline login.
     end
 
-    def render_page_or_feed(template_name = action_name)
-      respond_to do |format|
-        format.html { render :action => template_name }
-        format.rss  { render :action => template_name, :layout => 'feed' }
-        format.js  { render :action => template_name, :layout => false }
-      end
-    end
-
   end
 end
 

data/radiant-reader-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-12-20}
+  s.date = %q{2011-01-13}
   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 = [

data/reader_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ReaderExtension < Radiant::Extension
-  version "1.2.2"
+  version "1.2.3"
   description "Provides reader/member/user registration and management functions"
   url "http://spanner.org/radiant/reader"
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +00:00
+date: 2011-01-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency