radiant-reader-extension 1.3.10 → 1.3.11

data/VERSION

@@ -1 +1 @@
-1.3.10
+1.3.11

data/app/controllers/reader_activations_controller.rb

@@ -31,14 +31,11 @@ class ReaderActivationsController < ReaderActionController
     if @reader
       @reader.activate!
       self.current_reader = @reader
-      flash[:notice] = t("thanks_activated")
-      redirect_back_or_to default_activated_url
     else
       @error = t("please_check_message")
-      flash[:error] = t("activation_failed")
-      expires_now
-      render :action => 'show'
     end
+    expires_now
+    render :action => 'show'
   end
 
 protected

data/config/locales/en.yml

@@ -10,6 +10,7 @@ en:
   activation_required_explanation: "You should have received a confirmation message containing a link that will activate your account."
   activation_sent: "Activation message sent"
   affected_fields_highlighted: "The affected fields are highlighted below."
+  all_deliveries_failed: "All deliveries failed"
   already_active: "Your account is already active."
   already_logged_in: "You're already logged in!"
   already_registered: "If you've already registered, you should only need to"
@@ -82,6 +83,7 @@ en:
   login_or_email: "Login name or email address"
   login_unknown: "Sorry: we don't recognise that combination of username and password."
   logout_message: "You are logged out. Bye!"
+  message_delivered: "Message delivered"
   must_be_empty: "must be empty"
   navigation:
     account: "Your account"
@@ -141,6 +143,7 @@ en:
   send_it_again: "send it again"
   send_reset_button: "send me instructions"
   set_new_password: "set new password"
+  some_deliveries_failed: "Some deliveries failed"
   sorry: "sorry"
   sorry_access_denied: "Sorry: access denied"
   spam_trap: "it's a spam trap and shouldn't be visible"

data/lib/controller_extensions.rb

@@ -47,9 +47,18 @@ module ControllerExtensions    # for inclusion into ApplicationController
       session[:return_to] = location
     end
 
+    def redirect_back
+      if session[:return_to]
+        redirect_to session[:return_to]
+        session[:return_to] = nil
+        true
+      else
+        false
+      end
+    end
+
     def redirect_back_or_to(default)
-      redirect_to(session[:return_to] || default)
-      session[:return_to] = nil
+      redirect_back or redirect_to(default)
     end
 
     def redirect_back_with_format(format = 'html')

data/radiant-reader-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "1.3.10"
+  s.version = "1.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]

data/reader_extension.rb

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

data/spec/controllers/reader_activations_controller_spec.rb

@@ -21,8 +21,9 @@ describe ReaderActivationsController do
       @reader.activated_at.should be_close((Time.now).utc, 1.minute)
     end
 
-    it "should redirect to a confirmation page" do
-      response.should be_redirect
+    it "should show the show page" do
+      response.should be_success
+      response.should render_template("show")
     end
   end
 
@@ -32,13 +33,13 @@ describe ReaderActivationsController do
       put :update, :id => @newreader.id, :activation_code => 'down perishcope'
     end
     
-    it "should render the please-activate page" do
+    it "should render the show page" do
       response.should be_success
       response.should render_template("show")
     end
 
-    it "should flash an error" do
-      flash[:error].should_not be_nil
+    it "should not flash an error" do
+      flash[:error].should be_nil
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 3
-  - 10
-  version: 1.3.10
+  - 11
+  version: 1.3.11
 platform: ruby
 authors: 
 - spanner