radiant-reader-extension 3.0.0.rc4 → 3.0.0

data/lib/site_controller_extensions.rb

@@ -3,30 +3,19 @@ module SiteControllerExtensions
   def self.included(base)
     base.class_eval {
       # NB. to control access without disabling the cache we have overridden Page.cache? 
-      # to return false for any page that has a group association. 
+      # to return false for any page that has a group association.
       
       def find_page_with_group_check(url)
         page = find_page_without_group_check(url)
-        raise ReaderError::AccessDenied if page && !page.visible_to?(current_reader)
-        page
-      end
-        
-      def show_page_with_group_check
-        show_page_without_group_check
-      rescue ReaderError::AccessDenied
-        if current_reader
-          flash[:error] = t("reader_extension.access_denied")
-          redirect_to reader_permission_denied_url
-        else
-          flash[:explanation] = t("reader_extension.page_not_public")
-          flash[:error] = t("reader_extension.please_log_in")
-          store_location
-          redirect_to reader_login_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)
         end
+        page
       end
-        
       alias_method_chain :find_page, :group_check
-      alias_method_chain :show_page, :group_check
+        
     }
   end
 end

data/public/javascripts/admin/reader.js

@@ -1,3 +1,5 @@
+// This is your 'select all' checkbox: its state is applied to all siblings with 'toggled' class.
+//
 Toggle.SelectAllBehavior = Behavior.create(Toggle.CheckboxBehavior, {
   toggle: function() {
     var state = this.element.checked;
@@ -5,7 +7,26 @@ Toggle.SelectAllBehavior = Behavior.create(Toggle.CheckboxBehavior, {
   }
 });
 
+// This is a normal remote link that replaces itself with the response.
+//
+Remote.UpdatingLink = Behavior.create(Remote.Base, {
+  onclick : function() {
+    var self = this;
+    var options = Object.extend({ 
+      url : this.element.href, 
+      method : 'get',
+      update: this.element.up(),
+      onLoading: function () { self.element.addClassName('waiting'); },
+      onComplete: function () { self.element.removeClassName('waiting'); },
+      onSuccess: function () { Event.addBehavior.reload(); },
+      onFailure: function () { self.element.addClassName('failed'); }
+    }, self.options);
+    return self._makeRequest(options);
+  }
+});
+
 Event.addBehavior({ 
   'div.radio_group': Toggle.RadioGroupBehavior(),
-  'input.select_all': Toggle.SelectAllBehavior()
+  'input.select_all': Toggle.SelectAllBehavior(),
+  'a.fake_checkbox': Remote.UpdatingLink()
 });

data/public/stylesheets/sass/admin/reader_group.sass

@@ -5,14 +5,25 @@
     &#groups
       td.name
         width: 35%
-        a
-          font-size: 160%
         span.notes
           font-size: 80%
           color: #929488
           font-weight: lighter
           line-height: 1.2
           margin-top: 0.25em
+      tr.level_0
+        td.name
+          a
+            font-size: 120%
+      tr.level_1
+        td.name
+          a
+            font-size: 100%
+      tr.level_2
+        td.name
+          a
+            font-size: 85%
+        
     &#import
       th
         text-align: left
@@ -113,39 +124,29 @@
  *}
 
 .fake_checkbox
+  display: block
   padding-left: 20px
   cursor: pointer
   background-repeat: no-repeat
   background-position: 0 3px
+  text-decoration: none
+  color: #ccc
+  font-weight: normal
+  background-image: url(/images/admin/chk_off.png)
   input
     position: absolute
     left: -9999px
-  a
-    text-decoration: none
   &.checked
+    color: #5da454
     background-image: url(/images/admin/chk_on.png)
-  &.unchecked
-    background-image: url(/images/admin/chk_off.png)
   &.inherited
+    color: #bfe4b9
     background-image: url(/images/admin/chk_auto.png)
   &.waiting
+    color: #8c8d8e
     background-image: url(/images/admin/spinner.gif)
-
-.checked a, .selected a
-  color: #5da454
-
-.unchecked a, .unselected a
-  color: #ccc
-  font-weight: normal
-
-.waiting a
-  color: #8c8d8e
-
-.failed a
-  color: #c00
-
-.inherited
-  color: #bfe4b9
+  &.failed
+    color: #c00
 
 span.group_actions
   img

data/public/stylesheets/sass/reader.sass

@@ -88,6 +88,7 @@ form.friendly
   input.standard
     width: 95%
   span.formnote
+    clear: left
     +small
     color: $mid
   label
@@ -132,21 +133,44 @@ form.friendly
   h3:first-child
     margin-top: 0
 
-address
-  width: 75%
-  border: 1px solid $paler
-  padding: 1em
-  margin: 1em -1em
-  +border-radius(5px)
+#marginalia
+  div.contact
+    border: 1px solid $paler
+    +box-shadow
+    padding: 1em
+    margin: 1em -1em
+    h3
+      margin-bottom: 1em
+    ul
+      margin-bottom: 0
+      li
+        margin-bottom: 0
+        span.indent
+          float: left
+          margin-right: 0.5em
+        address
+          overflow: hidden
   
-a.vcard
-  padding-left: 25px
-  background: transparent url(/images/furniture/vcard_tiny.png) no-repeat 0 3px
-  
-h3.vcard
-  padding-left: 40px
-  background: transparent url(/images/furniture/vcard.png) no-repeat 0 3px
+a.vcard, a.csv
+  padding-left: 12px
+  background: transparent url(/images/furniture/vcard_tiny.png) no-repeat 0 0
+  &:hover
+    background-position: 0 -19px
+
+a.csv
+  background-image: url(/images/furniture/csv_tiny.png)
 
+h2
+  span.headernote
+    font-size: 70%
+  a.vcard, a.csv
+    display: inline-block
+    height: 14px
+    width: 20px
+    text-indent: -100px
+    padding-left: 0
+    margin-right: 4px
+  
 a.mailto
   color: $mid
   
@@ -159,9 +183,18 @@ a.mailto
   
 .column
   float: left
-  width: 45%
-  margin-right: 3%
-  
+  width: 30%
+  margin-right: 2%
+  .reader
+    margin-bottom: 1em
+    overflow: hidden
+  .speaker
+    margin-left: 0
+  h2
+    font-size: 125%
+    a.title
+      padding-top: 0.5em
+      
 ul.groups
   padding: 0
   margin: 0 0 1em 0
@@ -170,4 +203,35 @@ ul.groups
     display: inline
 
 .cleared
-  clear: left
+  clear: left
+  
+.message_head
+  
+div#preview
+  float: left
+  width: 80%
+  +box-shadow
+  background-color: white
+  .message_header
+    padding: 10px
+    overflow: hidden
+    background-color: #eee
+    color: #333
+    font-size: 80%
+    line-height: 1.5
+    ul
+      margin: 0
+      padding: 6px 14px
+      list-style-type: none
+      li.subject
+        font-size: 1.6em
+        margin-top: 6px
+      li.mime-version, li.content-type
+        display: none
+  .message_body
+    iframe
+      width: 99%
+      height: 520px
+      margin: 0
+      border: 0
+      overflow: auto

data/radiant-reader-extension.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'snail', "~> 0.5.5"
   s.add_dependency 'vcard', "~> 0.1.1"
   s.add_dependency 'fastercsv', "~> 1.5.4"
+  s.add_dependency 'ancestry', "~> 1.2.4"
 
   ignores = if File.exist?('.gitignore')
     File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
@@ -35,7 +36,8 @@ Gem::Specification.new do |s|
 
     config.gem 'radiant-reader-extension', :version => '~> #{RadiantReaderExtension::VERSION}'
 
-  and please remember to enable ActionMailer in your project's config/environment.rb.
+  and if you haven't already, remember to enable ActionMailer in your
+  project's config/environment.rb.
   }
 
 end

data/reader_extension.rb

@@ -6,14 +6,6 @@ class ReaderExtension < Radiant::Extension
   description RadiantReaderExtension::DESCRIPTION
   url RadiantReaderExtension::URL
   
-  extension_config do |config|
-    config.gem 'authlogic', :version => "~> 2.1.6"
-    config.gem 'sanitize', :version => "~> 2.0.1"
-    config.gem 'snail', :version => "~> 0.5.5"
-    config.gem 'vcard', :version => "~> 0.1.1"
-    config.gem 'fastercsv', :version => "~> 1.5.4"
-  end
-  
   migrate_from 'Reader Group', 20110214101339
   
   def activate
@@ -50,7 +42,13 @@ class ReaderExtension < Radiant::Extension
 end
 
 module ReaderError
+  class LoginRequired < StandardError
+    def initialize(message = "Login Required"); super end
+  end
+  class ActivationRequired < StandardError
+    def initialize(message = "Activation Required"); super end
+  end
   class AccessDenied < StandardError
-    def initialize(message = "Sorry: you have to log in to see that"); super end
+    def initialize(message = "Access Denied"); super end
   end
 end

data/spec/controllers/accounts_controller_spec.rb

@@ -117,14 +117,6 @@ describe AccountsController do
         rsession = ReaderSession.create!(readers(:normal))
         # controller.stub!(:current_reader_session).and_return(rsession)
       end
-  
-      it "should route '/account' to my account" do
-        params_from(:get, '/account').should == {:controller => 'accounts', :action => 'edit'}
-      end
-
-      it "should route '/profile' to my account" do
-        params_from(:get, '/profile').should == {:controller => 'accounts', :action => 'show'}
-      end
 
       it "should consent to show another reader page" do 
         get :show, :id => reader_id(:visible)
@@ -166,35 +158,29 @@ describe AccountsController do
   end
     
   describe "with an update request" do
-    before do
-      login_as_reader(:normal)
-    end
-
     describe "that is valid" do
       before do
-        put :update, {:id => reader_id(:normal), :reader => {:name => "New Name"}}
+        login_as_reader(:normal)
+        put :update, {:id => reader_id(:normal), :reader => {:name => "Abnormal"}}
         @reader = readers(:normal)
       end
       
       it "should update the reader" do 
-        @reader.name.should == 'New Name'
+        @reader.name.should == 'Abnormal'
+        @reader.changed?.should be_false
       end
 
-      it "should redirect to the reader page" do 
+      it "should redirect to the reader-dashboard page" do 
         response.should be_redirect
-        response.should redirect_to(dashboard_url)
+        response.should redirect_to(reader_dashboard_url)
       end
       
     end
 
     describe "that does not validate" do
       before do
-        put :update, {:id => reader_id(:normal), :reader => {:login => "visible@spanner.org"}, :current_password => 'password'}
-        @reader = readers(:normal)
-      end
-
-      it "should not update the reader" do 
-        @reader.name.should == 'Normal'
+        login_as_reader(:normal)
+        put :update, {:id => reader_id(:normal), :reader => {:login => readers(:visible).login}}
       end
 
       it "should re-render the edit form" do 

data/spec/controllers/admin/messages_controller_spec.rb

@@ -39,17 +39,5 @@ describe Admin::MessagesController do
       response.should redirect_to(admin_message_url(messages(:taggy)))
     end
   end
-  
-  describe "on update (and create)" do
-    before do
-      login_as :existing
-    end
     
-    it "should redirect to show the updated object" do
-      put :update, :id => message_id(:normal), :subject => 'testing'
-      response.should be_redirect
-      response.should redirect_to(admin_message_path(message_id(:normal)))
-    end
-  end
-  
 end

data/spec/datasets/readers_dataset.rb

@@ -19,6 +19,13 @@ class ReadersDataset < Dataset::Base
     create_group "Homed", :homepage_id => page_id(:parent)
     create_group "Elsewhere", :site_id => site_id(:elsewhere) if defined? Site
 
+    create_group "Supergroup" do
+      create_group "Subgroup" do
+        create_group "Subsubgroup"
+        create_group "Anothersubsubgroup"
+      end
+    end
+
     create_message "Normal"
     create_message "Grouped", :function_id => "group_welcome"
     create_message "Filtered", :filter_id => 'Textile', :body => 'this is a *filtered* message'
@@ -50,64 +57,60 @@ From <r:sender:name />
     admit_to_group :homed, [readers(:normal)] 
     admit_to_group :normal, [readers(:normal), readers(:inactive)] 
     admit_to_group :special, [readers(:another)] 
+    admit_to_group :subgroup, [readers(:normal), readers(:another)] 
+
     restrict_to_group :homed, [pages(:parent), pages(:childless)]
     restrict_to_group :special, [pages(:news)]
     restrict_to_group :normal, [messages(:grouped)]
+    restrict_to_group :subgroup, [pages(:child)] 
+    restrict_to_group :subsubgroup, [pages(:child_2)] 
   end
   
   helpers do
     def create_reader(name, attributes={})
-      reader = create_model Reader, name.symbolize, default_reader_attributes(name).merge(attributes)
-    end
-    
-    def create_group(name, attributes={})
-      group = create_record Group, name.symbolize, default_group_attributes(name).merge(attributes)
-    end
-
-    def create_message(subject, attributes={})
-      message = create_model Message, subject.symbolize, default_message_attributes(subject).merge(attributes)
-      message.update_attribute(:created_by, users(:existing)) # otherwise this is blanked by the absence of a current_user, and we need it for preview rendering
-    end
-
-    def create_layout(name, attributes={})
-      attributes[:site] ||= sites(:test) if Layout.reflect_on_association(:site)
-      create_model :layout, name.symbolize, attributes.update(:name => name)
-    end
-
-    def default_reader_attributes(name="John Doe")
-      symbol = name.symbolize
-      attributes = { 
+      create_model :reader, name.symbolize, { 
         :name => name,
-        :email => "#{symbol}@spanner.org", 
-        :login => "#{symbol}@spanner.org",
+        :email => "#{name}@spanner.org",
+        :login => name.downcase,
         :activated_at => Time.now - 1.week,
         :password_salt => "golly",
         :password => 'passw0rd',
         :password_confirmation => 'passw0rd'
-      }
-      attributes[:site] = sites(:test) if defined? Site
-      attributes
+      }.merge(attributes)
     end
-        
-    def default_group_attributes(name="Group")
-      attributes = { 
+    
+    def create_group(name, attributes={})
+      symbol = name.symbolize
+      create_model :group, symbol, { 
         :name => name,
         :slug => name.downcase,
-        :description => "#{name} group"
-      }
-      attributes[:site_id] ||= site_id(:test) if defined? Site
-      attributes
+        :description => "#{name} group",
+        :parent_id => @group_id
+      }.merge(attributes)
+      if block_given?
+        @group_id = group_id(symbol)
+        yield
+        @group_id = nil
+      end
     end
 
-    def default_message_attributes(subject="Message")
-      attributes = { 
+    def create_message(subject, attributes={})
+      create_record :message, subject.symbolize, { 
         :subject => subject,
-        :body => "This is the #{subject} message"
-      }
-      attributes[:site] = sites(:test) if defined? Site
-      attributes
+        :body => "This is the #{subject} message",
+        :created_by_id => user_id(:existing)
+      }.merge(attributes)
     end
 
+    def create_layout(name, attributes={})
+      create_model :layout, name.symbolize, {
+        :name => name
+      }.merge(attributes)
+    end
+
+
+
+
     def login_as_reader(reader)
       activate_authlogic
       login_reader = reader.is_a?(Reader) ? reader : readers(reader)