radiant-reader-extension 3.0.11 → 3.0.13

data/app/helpers/reader_helper.rb

@@ -143,15 +143,30 @@ EOM
   end
   
   def group_options_for_select
-    nested_set_options(Group) {|g| "#{'-' * g.level} #{g.name}" }.unshift([t("reader_extension.any_option"), nil])
+    options_from_tree(Group.arrange).unshift([t("reader_extension.any_option"), nil])
   end
   
   def parent_group_options_for_select(group=nil)
-    nested_set_options(Group, group) {|g| "#{'-' * g.level} #{g.name}" }.unshift([t("reader_extension.none_option"), nil])
+    options_from_tree(Group.arrange, :except => group).unshift([t("reader_extension.none_option"), nil])
   end
   
   def email_link(address)
     mail_to address, nil, :encode => :hex, :replace_at => ' at ', :class => 'mailto'
   end
 
+  # Takes a hash of hashes in the format returned by Ancestry#arrange, returns an indented option set.
+  #
+  def options_from_tree(tree, options={})
+    option_list = []
+    depth = options[:depth] || 0
+    exception = options[:except]
+    tree.each_pair do |key, values|
+      unless key == exception
+        option_list << [". " * depth + key.name, key.id]
+        option_list << options_from_tree(values, :depth => depth + 1, :except => exception) if values.any?
+      end
+    end
+    option_list.compact
+  end
 end
+

data/app/models/group.rb

@@ -24,10 +24,20 @@ class Group < ActiveRecord::Base
   named_scope :unsubscribable, { :conditions => "public = 0" }
   
   named_scope :find_these, lambda { |ids|
-    ids = ['NULL'] unless ids && ids.any?
+    ids = [ids].flatten.compact
+    ids = ['NULL'] unless ids.any?
     { :conditions => ["groups.id IN (#{ids.map{"?"}.join(',')})", *ids] }
   }
 
+  named_scope :except, lambda { |groups|
+    groups = [groups].flatten.compact
+    if groups.any?
+      { :conditions => ["NOT groups.id IN (#{groups.map{"?"}.join(',')})", *groups.map(&:id)] }
+    else
+      { }
+    end
+  }
+
   named_scope :containing, lambda { |reader|
     {
       :joins => "INNER JOIN memberships as mb on mb.group_id = groups.id", 

data/app/models/message.rb

@@ -21,6 +21,12 @@ class Message < ActiveRecord::Base
   named_scope :ordinary, { :conditions => "function_id = '' OR function_id IS NULL" }
   named_scope :published, { :conditions => "status_id >= 100" }
 
+  named_scope :except, lambda { |ids|
+    ids = [ids].flatten.compact
+    ids = ['NULL'] unless ids.any?
+    { :conditions => ["groups.id NOT IN (#{ids.map{"?"}.join(',')})", *ids] }
+  }
+
   def filtered_body
     filter.filter(body)
   end

data/app/models/reader.rb

@@ -5,10 +5,10 @@ require 'vcard'
 require "fastercsv"
 
 class Reader < ActiveRecord::Base
-  @@user_columns = [:name, :email, :login, :created_at, :password, :notes]
+  @@user_columns = %w{name email login created_at password password_confirmation notes}
   cattr_accessor :user_columns
   cattr_accessor :current
-  attr_accessor :email_field, :newly_activated
+  attr_accessor :email_field, :newly_activated, :skip_user_update
 
   acts_as_authentic do |config|
     config.validations_scope = :site_id if defined? Site
@@ -31,7 +31,7 @@ class Reader < ActiveRecord::Base
 
   validates_presence_of :name, :email
   validates_length_of :name, :maximum => 100, :allow_nil => true
-  validates_length_of :password, :minimum => 6, :allow_nil => false, :unless => :existing_reader_keeping_password?
+  validates_length_of :password, :minimum => 5, :allow_nil => false, :unless => :existing_reader_keeping_password?
   # validates_format_of :password, :with => /[^A-Za-z]/, :unless => :existing_reader_keeping_password?  # we have to match radiant so that users can log in both ways
   validates_confirmation_of :password, :unless => :existing_reader_keeping_password?
   validates_uniqueness_of :login, :allow_blank => true
@@ -46,8 +46,9 @@ class Reader < ActiveRecord::Base
   named_scope :active, :conditions => "activated_at IS NOT NULL"
   named_scope :inactive, :conditions => "activated_at IS NULL"
   named_scope :imported, :conditions => "old_id IS NOT NULL"
+
   named_scope :except, lambda { |readers|
-    readers = [readers].flatten
+    readers = [readers].flatten.compact
     if readers.any?
       { :conditions => ["NOT readers.id IN (#{readers.map{"?"}.join(',')})", *readers.map(&:id)] }
     else
@@ -304,11 +305,23 @@ private
   end
 
   def update_user
-    if self.user
-      user_columns.each { |att| self.user.send("#{att.to_s}=", send(att)) if send("#{att.to_s}_changed?") }
-      self.user.password_confirmation = password if password_changed?
-      self.user.save! if self.user.changed?
+    if self.user && !self.skip_user_update
+      changed_columns = Reader.user_columns & self.changed
+      att = self.attributes.slice(*changed_columns)
+      att['password'] = self.password if self.crypted_password_changed?
+      self.user.send :update_with, att if att.any?
+    end
+    true
+  end
+  
+  def update_with(att)
+    self.skip_user_update = true
+    if att['password']
+      att["clear_password"] = att["password_confirmation"] = att["password"]
     end
+    p "updating reader attributes with #{att.inspect}"
+    self.update_attributes(att)
+    self.skip_user_update = false
   end
   
   def send_group_welcomes

data/app/views/admin/{pages/_page_groups.html.haml → groups/_edit_access.html.haml}

@@ -1,15 +1,16 @@
 - include_stylesheet 'admin/reader_group'
 - include_javascript 'admin/reader'
+- groupee ||= @page
 
 - groups = Group.find(:all)
 - if groups.any?
   %p.access
     %label
       = t('reader_extension.access')
-    - if @page.visible?
+    - if groupee.visible?
       = link_to t('reader_extension.access_open'), '#groups_popup', :class => 'popup unrestricted', :id => 'group_status_flag'
     - else
       = link_to t('reader_extension.access_restricted'), '#groups_popup', :class => 'popup restricted', :id => 'group_status_flag'
-  - fields_for @page do |f|
+  - fields_for groupee do |f|
     = f.hidden_field :group_ids
     

data/app/views/admin/{pages/_groups_popup.html.haml → groups/_popup.html.haml}

@@ -1,3 +1,5 @@
+- groupee ||= @page
+
 #groups_popup.popup{:style => "display: none"}
   #groups_busy.busy{:style => "display: none"}= image('spinner.gif', :alt => "")
   .popup_title
@@ -5,7 +7,7 @@
   %p
     = t('reader_extension.page_access_explanation')
   %form.group_selection
-    = render :partial => 'admin/groups/chooser', :object => @page
+    = render :partial => 'admin/groups/chooser', :object => groupee
     .buttons
       = submit_tag t('reader_extension.set_access'), :class=>'button', :id=>'add_page_field_button'
       = t('or')

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

@@ -16,21 +16,18 @@
           = form.label :body
           = form.text_area :body, :class => 'textarea', :style => 'width: 100%'
 
-    - formpart.edit_function do
-      #message_function.set
+    #message_roles.set
+      - formpart.edit_function do
         - if admin?
           %p
             = form.label :function_id
             = form.select :function_id, MessageFunction.find_all.map { |mf| [t("message_functions.#{mf.name}"), mf.name] }, :include_blank => true
-          %p
-            = form.label :group_ids
-            = render :partial => 'admin/groups/chooser', :locals => {:f => form}
-
         - elsif @message.new_record?
           - if @message.function
             = f.hidden_field :function_id
-          - if @message.group_ids
-            = f.hidden_field :group_ids
+
+      - formpart.edit_groups do
+        = render :partial => "admin/groups/edit_access", :locals => {:groupee => @message}
 
 - render_region :form_bottom do |form_bottom|
   - form_bottom.edit_timestamp do
@@ -41,3 +38,6 @@
       = save_model_and_continue_editing_button(@message)
       = t('or')
       = link_to t("cancel"), @message.new_record? ? admin_messages_url : admin_message_url(@message)
+
+  - form_bottom.edit_popups do
+    = render :partial => 'admin/groups/popup', :locals => {:groupee => @message}

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

@@ -5,7 +5,7 @@
     %h1 Reader configuration
 
   - main.edit_form do
-    - form_for :config, :url => admin_reader_configuration_url, :html => {"data-onsubmit_status"=>"Saving changes…", :method => :put} do |f|
+    - form_for :config, :url => admin_reader_settings_url, :html => {"data-onsubmit_status"=>"Saving changes…", :method => :put} do |f|
       = render_region :form_top
       - render_region :form do |form|
         - form.edit_registration do
@@ -42,4 +42,4 @@
           %p.buttons
             %input.button{:type=>"submit", :value=>"Save Changes"}/
             or
-            = link_to "Cancel", admin_reader_configuration_url
+            = link_to "Cancel", admin_reader_settings_url

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

@@ -6,7 +6,7 @@
     #reader_settings.box
       %h3
         .actions
-          = button_to t("edit"), edit_admin_reader_configuration_url, :method => :get
+          = button_to t("edit"), edit_admin_reader_settings_url, :method => :get
         =t("reader_extension.reader_admin")
       %p.ruled
         = show_config 'reader.allow_registration?'
@@ -40,7 +40,7 @@
         %p.ruled
           %label= func.description
           - if message
-            = link_to message.subject, admin_message_url(message)
+            = link_to message.subject, edit_admin_reader_settings_url(message)
           - else
             = link_to image('plus') + " create message", new_admin_message_url(:function => func), :class => 'create'
 

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

@@ -2,10 +2,6 @@
   - if @message
     %p
       = @message
-  - else
-    %p
-      = t('reader_extension.log_in_or_register')
-  
   = render :partial => 'login_form', :locals => {:no_title => true}
 
 - content_for :breadcrumbs do

data/config/routes.rb

@@ -1,6 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
   map.namespace :admin do |admin|
     admin.resources :readers, :except => [:show]
+    admin.resource :reader_settings, :controller => 'reader_configuration'
   end
 
   map.namespace :admin, :path_prefix => 'admin/readers' do |admin|
@@ -8,7 +9,6 @@ ActionController::Routing::Routes.draw do |map|
     admin.resources :groups, :has_many => [:memberships, :permissions, :group_invitations, :messages]
     admin.resources :memberships, :only => [:edit, :update], :member => [:toggle]
     admin.resources :permissions, :only => [], :member => [:toggle]
-    admin.resource :reader_configuration, :controller => 'reader_configuration'
   end
 
   readers_prefix = Radiant.config['reader.profiles_path'] || "directory"

data/lib/radiant-reader-extension.rb

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

data/lib/reader_admin_ui.rb

@@ -59,9 +59,9 @@ module ReaderAdminUI
       def load_default_message_regions
         OpenStruct.new.tap do |message|
           message.edit = Radiant::AdminUI::RegionSet.new do |edit|
-            edit.main.concat %w{edit_header edit_form edit_footer}
-            edit.form.concat %w{edit_subject edit_body edit_function}
-            edit.form_bottom.concat %w{edit_timestamp edit_buttons}
+            edit.main.concat %w{edit_header edit_form}
+            edit.form.concat %w{edit_subject edit_body edit_function edit_groups}
+            edit.form_bottom.concat %w{edit_timestamp edit_buttons edit_popups}
           end
           message.index = Radiant::AdminUI::RegionSet.new do |index|
             index.thead.concat %w{subject_header function_header groups_header sent_header modify_header}

data/lib/reader_user.rb

@@ -1,18 +1,35 @@
 module ReaderUser
 
   def self.included(base)
+    extend ClassMethods
     base.class_eval do
-      has_one :reader
-      before_update :update_reader
+      has_one :reader, :dependent => :nullify
+      attr_accessor :skip_reader_update
+      include InstanceMethods
+      before_save :update_reader    # there is already a before_update call that hashes the password, so we need to come in before that
     end
   end
+
+  module ClassMethods
+
+  end
   
-  def update_reader
-    if self.reader
-      Reader.user_columns.each { |att| self.reader.send("#{att.to_s}=", send(att)) if send("#{att.to_s}_changed?") }
-      self.reader.password_confirmation = password if password_changed?
-      self.reader.save! if self.reader.changed?
+  module InstanceMethods
+    def update_reader
+      if !new_record? && self.reader && !self.skip_reader_update
+        changed_columns = Reader.user_columns & self.changed
+        att = self.attributes.slice(*changed_columns)
+        self.reader.send :update_with, att if att.any?
+      end
+      true
+    end
+  
+    def update_with(att)
+      self.skip_reader_update = true
+      self.confirm_password = false
+      p "updating user attributes with #{att.inspect}"
+      self.update_attributes(att)
+      self.skip_reader_update = false
     end
   end
-
 end

data/lib/site_controller_extensions.rb

@@ -8,9 +8,9 @@ module SiteControllerExtensions
       def find_page_with_group_check(url)
         page = find_page_without_group_check(url)
         if page
-          raise ReaderError::LoginRequired, t("reader_extension.page_is_private_please_log_in") if page.restricted? && !current_reader
-          raise ReaderError::ActivationRequired, t("reader_extension.page_is_private_please_log_in") if page.restricted? && !current_reader.activated?
-          raise ReaderError::AccessDenied, t("reader_extension.page_access_not_given")  unless page.visible_to?(current_reader)
+          raise ReaderError::LoginRequired, t("reader_extension.page_not_public") if page.restricted? && !current_reader
+          raise ReaderError::ActivationRequired, t("reader_extension.page_not_public") if page.restricted? && !current_reader.activated?
+          raise ReaderError::AccessDenied, t("reader_extension.page_permission_denied")  unless page.visible_to?(current_reader)
         end
         page
       end

data/radiant-reader-extension.gemspec

@@ -32,9 +32,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.post_install_message = %{
-  Add this to your radiant project with:
+  Add this to your radiant project with a line in your Gemfile:
 
-    config.gem 'radiant-reader-extension', :version => '~> #{RadiantReaderExtension::VERSION}'
+    gem 'radiant-reader-extension', '~> #{RadiantReaderExtension::VERSION}'
 
   and if you haven't already, remember to enable ActionMailer in your
   project's config/environment.rb.

data/reader_extension.rb

@@ -24,8 +24,8 @@ class ReaderExtension < Radiant::Extension
       Radiant::AdminUI.load_reader_extension_regions
     end
     
-    admin.page.edit.add :layout, "page_groups"
-    admin.page.edit.add :main, "groups_popup", :after => 'edit_popups'
+    admin.page.edit.add :layout, "admin/groups/edit_access"
+    admin.page.edit.add :main, "admin/groups/popup", :after => 'edit_popups'
     admin.page.index.add :sitemap_head, "groups_column_header", :after => 'status_column_header'
     admin.page.index.add :node, "groups_column", :after => 'status_column'
     
@@ -33,10 +33,10 @@ class ReaderExtension < Radiant::Extension
       add_item("Readers", "/admin/readers")
       add_item("Groups", "/admin/readers/groups")
       add_item("Messages", "/admin/readers/messages")
-      add_item("Settings", "/admin/readers/reader_configuration")
+      add_item("Settings", "/admin/reader_settings")
     end
     tab("Settings") do
-      add_item("Readers", "/admin/readers/reader_configuration")
+      add_item("Readers", "/admin/reader_settings")
     end
   end
 end

data/spec/controllers/reader_activations_controller_spec.rb

@@ -23,7 +23,7 @@ describe ReaderActivationsController do
 
     it "should redirect to the dashboard" do
       response.should be_redirect
-      response.should redirect_to(dashboard_url)
+      response.should redirect_to(reader_dashboard_url)
     end
   end
 

data/spec/lib/reader_user_spec.rb

@@ -17,15 +17,14 @@ describe User do
       user.name = "Cardinal Fang"
       user.save!
       user.reader.name.should == "Cardinal Fang"
-      Reader.find_by_name("Cardinal Fang").should == readers(:user)
     end
     
     it "should update the associated reader's credentials" do
-      user.password = user.password_confirmation = 'bl0tto'
+      user.password = 'bl0tto'
+      user.password_confirmation = 'bl0tto'
       user.save!
       user.authenticated?('bl0tto').should be_true
       user.reader.valid_password?('bl0tto').should be_true
-      # ReaderSession.new(:login => reader.login, :password => 'bl0tto').should be_valid
     end
   end
 end

data/spec/models/reader_spec.rb

@@ -99,20 +99,17 @@ describe Reader do
   end
   
   describe "on update if really a user" do
-    
     it "should update the user's attributes" do
       reader = readers(:user)
       reader.name = "Cardinal Fang"
       reader.save!
-      
-      User.find_by_name("Cardinal Fang").should == users(:existing)
+      reader.user.name.should == "Cardinal Fang"
     end
     
     it "should update the user's credentials" do
       reader = readers(:user)
       reader.password = reader.password_confirmation = 'bl0tto'
       reader.save!
-      ReaderSession.new(:login => reader.login, :password => 'bl0tto').should be_valid
       reader.user.authenticated?('bl0tto').should be_true
     end
   end

data/spec/spec.opts

@@ -1,6 +1,4 @@
 --colour
---format
-profile
---loadby
-mtime
+--format specdoc
+--loadby mtime
 --reverse

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 29
   prerelease: 
   segments: 
   - 3
   - 0
-  - 11
-  version: 3.0.11
+  - 13
+  version: 3.0.13
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 Z
+date: 2011-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: radiant-layouts-extension
@@ -198,9 +198,11 @@ files:
 - app/views/admin/group_invitations/preview.html.haml
 - app/views/admin/groups/_add_readers.html.haml
 - app/views/admin/groups/_chooser.html.haml
+- app/views/admin/groups/_edit_access.html.haml
 - app/views/admin/groups/_form.html.haml
 - app/views/admin/groups/_group.html.haml
 - app/views/admin/groups/_list_head.html.haml
+- app/views/admin/groups/_popup.html.haml
 - app/views/admin/groups/edit.html.haml
 - app/views/admin/groups/index.html.haml
 - app/views/admin/groups/new.html.haml
@@ -220,9 +222,7 @@ files:
 - app/views/admin/messages/show.html.haml
 - app/views/admin/pages/_groups_column.html.haml
 - app/views/admin/pages/_groups_column_header.html.haml
-- app/views/admin/pages/_groups_popup.html.haml
 - app/views/admin/pages/_listed.html.haml
-- app/views/admin/pages/_page_groups.html.haml
 - app/views/admin/permissions/_page.html.haml
 - app/views/admin/reader_configuration/edit.html.haml
 - app/views/admin/reader_configuration/show.html.haml
@@ -328,10 +328,7 @@ files:
 - public/stylesheets/sass/admin/reader.sass
 - public/stylesheets/sass/admin/reader_group.sass
 - public/stylesheets/sass/reader.sass
-- radiant-reader-extension-3.0.10.gem
-- radiant-reader-extension-3.0.7.gem
-- radiant-reader-extension-3.0.8.gem
-- radiant-reader-extension-3.0.9.gem
+- radiant-reader-extension-3.0.13.gem
 - radiant-reader-extension.gemspec
 - Rakefile
 - reader_extension.rb
@@ -360,7 +357,7 @@ files:
 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.11'\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 a line in your Gemfile:\n\n    gem 'radiant-reader-extension', '~> 3.0.13'\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: