radiant-reader-extension 3.0.8 → 3.0.9

data/app/models/reader.rb

@@ -290,9 +290,9 @@ private
     reader = Reader.find_by_email(self.email)
     user = User.find_by_email(self.email)
     if user && user != self.user
-      errors.add :value, :taken_by_author
+      errors.add :email, :taken_by_author
     elsif reader && reader != self
-      errors.add :value, :taken
+      errors.add :email, :taken
     else
       return true
     end

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.8'
+  VERSION = '3.0.9'
   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_user.rb

@@ -0,0 +1,18 @@
+module ReaderUser
+
+  def self.included(base)
+    base.class_eval do
+      has_one :reader
+      before_update :update_reader
+    end
+  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_confirmation if password_changed?
+      self.reader.save! if self.reader.changed?
+    end
+  end
+
+end

data/reader_extension.rb

@@ -12,8 +12,9 @@ class ReaderExtension < Radiant::Extension
     ActiveRecord::Base.send :include, GroupedModel                                # has_group mechanism for any model that can belong_to a group
     ApplicationController.send :include, ControllerExtensions                     # hooks up reader authentication and layout-chooser
     SiteController.send :include, SiteControllerExtensions                        # access control based on group membership
+    User.send :include, ReaderUser                                                # update linked reader when user account values change
     Page.send :include, GroupedPage                                               # group associations and visibility decisions
-    Site.send :include, ReaderSite if defined? Site                               # adds site scope and site-based layout-chooser
+    # 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
     UserActionObserver.instance.send :add_observer!, Reader 
     UserActionObserver.instance.send :add_observer!, Message
@@ -38,10 +39,6 @@ class ReaderExtension < Radiant::Extension
       add_item("Readers", "/admin/readers/reader_configuration")
     end
   end
-  
-  def deactivate
-
-  end
 end
 
 module ReaderError

data/spec/lib/reader_user_spec.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe User do
+  dataset :readers
+  # activate_authlogic
+  
+  let(:user) { users(:existing) }
+  let(:reader) { readers(:user) }
+  
+  it "should have an associated reader" do
+    user.reader.should == reader
+    reader.user.should == user
+  end
+  
+  describe "on update" do
+    it "should update the attributes of an associated reader" 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.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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 3
   - 0
-  - 8
-  version: 3.0.8
+  - 9
+  version: 3.0.9
 platform: ruby
 authors: 
 - William Ross
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 +01:00
-default_executable: 
+date: 2011-10-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: radiant-layouts-extension
@@ -311,6 +310,7 @@ files:
 - lib/reader_admin_ui.rb
 - lib/reader_site.rb
 - lib/reader_tags.rb
+- lib/reader_user.rb
 - lib/rfc822.rb
 - lib/sanitize/config/generous.rb
 - lib/site_controller_extensions.rb
@@ -329,6 +329,7 @@ files:
 - public/stylesheets/sass/admin/reader_group.sass
 - public/stylesheets/sass/reader.sass
 - radiant-reader-extension-3.0.7.gem
+- radiant-reader-extension-3.0.8.gem
 - radiant-reader-extension.gemspec
 - Rakefile
 - reader_extension.rb
@@ -344,6 +345,7 @@ files:
 - spec/lib/reader_admin_ui_spec.rb
 - spec/lib/reader_site_spec.rb
 - spec/lib/reader_tags_spec.rb
+- spec/lib/reader_user_spec.rb
 - spec/matchers/reader_login_system_matcher.rb
 - spec/models/group_spec.rb
 - spec/models/message_spec.rb
@@ -353,11 +355,10 @@ files:
 - spec/models/reader_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-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.8'\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.9'\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: 
@@ -383,7 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Reader/viewer/visitor registration, login and access-control for Radiant CMS
@@ -399,6 +400,7 @@ test_files:
 - spec/lib/reader_admin_ui_spec.rb
 - spec/lib/reader_site_spec.rb
 - spec/lib/reader_tags_spec.rb
+- spec/lib/reader_user_spec.rb
 - spec/matchers/reader_login_system_matcher.rb
 - spec/models/group_spec.rb
 - spec/models/message_spec.rb