RubyGems - radiant-reader-extension - Versions diffs - 1.3.13 → 2.0.0.rc4 - Mend

radiant-reader-extension 1.3.13 → 2.0.0.rc4

Files changed (107) hide show

data/README.md +2 -2
data/Rakefile +0 -19
data/app/controllers/admin/group_invitations_controller.rb +78 -0
data/app/controllers/admin/groups_controller.rb +8 -0
data/app/controllers/admin/memberships_controller.rb +42 -0
data/app/controllers/admin/messages_controller.rb +8 -3
data/app/controllers/admin/permissions_controller.rb +42 -0
data/app/controllers/admin/reader_configuration_controller.rb +0 -1
data/app/controllers/admin/readers_controller.rb +1 -1
data/app/controllers/password_resets_controller.rb +5 -5
data/app/controllers/reader_action_controller.rb +13 -33
data/app/controllers/reader_activations_controller.rb +4 -8
data/app/controllers/reader_sessions_controller.rb +15 -26
data/app/controllers/readers_controller.rb +26 -9
data/app/helpers/reader_helper.rb +45 -17
data/app/models/group.rb +80 -0
data/app/models/membership.rb +13 -0
data/app/models/message.rb +10 -7
data/app/models/permission.rb +11 -0
data/app/models/reader.rb +79 -35
data/app/models/reader_notifier.rb +1 -0
data/app/views/admin/group_invitations/new.html.haml +31 -0
data/app/views/admin/group_invitations/preview.html.haml +58 -0
data/app/views/admin/groups/_add_readers.html.haml +0 -0
data/app/views/admin/groups/_form.html.haml +26 -0
data/app/views/admin/groups/_list_head.html.haml +12 -0
data/app/views/admin/groups/edit.html.haml +9 -0
data/app/views/admin/groups/index.html.haml +44 -0
data/app/views/admin/groups/new.html.haml +7 -0
data/app/views/admin/groups/remove.html.haml +31 -0
data/app/views/admin/groups/show.html.haml +74 -0
data/app/views/admin/memberships/_reader.html.haml +9 -0
data/app/views/admin/messages/_function.haml +31 -0
data/app/views/admin/messages/_list_function.haml +7 -3
data/app/views/admin/messages/_list_notes.html.haml +9 -0
data/app/views/admin/messages/_message_description.html.haml +5 -1
data/app/views/admin/messages/_message_group.html.haml +5 -0
data/app/views/admin/messages/index.haml +4 -4
data/app/views/admin/messages/show.html.haml +15 -15
data/app/views/admin/pages/_listed.html.haml +16 -0
data/app/views/admin/pages/_page_groups.html.haml +13 -0
data/app/views/admin/permissions/_page.html.haml +24 -0
data/app/views/admin/reader_configuration/edit.html.haml +3 -1
data/app/views/admin/reader_configuration/show.html.haml +4 -2
data/app/views/admin/readers/_form.html.haml +7 -7
data/app/views/admin/readers/_password_fields.html.haml +6 -6
data/app/views/admin/readers/_reader_groups.html.haml +7 -0
data/app/views/admin/readers/edit.html.haml +2 -1
data/app/views/admin/readers/index.html.haml +5 -2
data/app/views/password_resets/create.html.haml +13 -8
data/app/views/password_resets/edit.html.haml +26 -26
data/app/views/password_resets/new.html.haml +28 -25
data/app/views/reader_activations/_activation_required.haml +2 -2
data/app/views/reader_activations/show.html.haml +11 -13
data/app/views/reader_sessions/_login_form.html.haml +13 -12
data/app/views/reader_sessions/new.html.haml +6 -8
data/app/views/readers/_controls.html.haml +11 -9
data/app/views/readers/_form.html.haml +32 -33
data/app/views/readers/_memberships.html.haml +11 -0
data/app/views/readers/edit.html.haml +11 -11
data/app/views/readers/index.html.haml +9 -10
data/app/views/readers/login.html.haml +10 -12
data/app/views/readers/new.html.haml +11 -13
data/app/views/readers/permission_denied.html.haml +7 -7
data/app/views/readers/show.html.haml +7 -8
data/app/views/shared/_standard_reader_parts.html.haml +14 -0
data/app/views/site/not_allowed.html.haml +4 -0
data/config/initializers/authlogic_connect_config.rb +12 -0
data/config/initializers/radiant_config.rb +1 -0
data/config/locales/en.yml +217 -177
data/config/routes.rb +5 -0
data/db/migrate/20090921125654_group_messages.rb +35 -0
data/db/migrate/20091120083119_groups_public.rb +11 -0
data/db/migrate/20110214101339_multiple_ownership.rb +13 -0
data/lib/controller_extensions.rb +1 -1
data/lib/group_tags.rb +65 -0
data/lib/grouped_model.rb +125 -0
data/lib/grouped_page.rb +39 -0
data/lib/message_tags.rb +183 -0
data/lib/radiant-reader-extension.rb +8 -0
data/lib/reader_admin_ui.rb +29 -6
data/lib/reader_tags.rb +7 -183
data/lib/sanitize/config/generous.rb +49 -0
data/lib/site_controller_extensions.rb +35 -0
data/public/javascripts/reader.js +1 -1
data/public/stylesheets/sass/reader.sass +18 -8
data/radiant-reader-extension.gemspec +30 -176
data/reader_extension.rb +31 -23
data/spec/controllers/admin/messages_controller_spec.rb +1 -1
data/spec/controllers/admin/readers_controller_spec.rb +0 -1
data/spec/controllers/password_resets_controller_spec.rb +1 -1
data/spec/controllers/reader_activations_controller_spec.rb +1 -1
data/spec/controllers/readers_controller_spec.rb +67 -40
data/spec/controllers/site_controller_spec.rb +63 -0
data/spec/datasets/readers_dataset.rb +100 -11
data/spec/models/group_spec.rb +46 -0
data/spec/models/message_spec.rb +40 -15
data/spec/models/page_spec.rb +81 -0
data/spec/models/reader_notifier_spec.rb +1 -1
data/spec/models/reader_spec.rb +17 -12
metadata +99 -67
data/.gitignore +0 -2
data/VERSION +0 -1
data/app/views/readers/_standard_parts.html.haml +0 -23
data/spec/datasets/messages_dataset.rb +0 -49
data/spec/datasets/reader_layouts_dataset.rb +0 -26
data/spec/datasets/reader_sites_dataset.rb +0 -10

data/spec/controllers/site_controller_spec.rb ADDED Viewed

@@ -0,0 +1,63 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+describe SiteController do
+  dataset :readers
+  before do
+    controller.stub!(:request).and_return(request)
+    Page.current_site = sites(:test) if defined? Site
+    request.env["HTTP_REFERER"] = 'http://test.host/referer!'
+  end
+  describe "with no reader" do
+    before do
+      logout_reader
+    end
+    describe "getting an ungrouped page" do
+      it "should render the page" do
+        get :show_page, :url => ''
+        response.should be_success
+        response.body.should == 'Hello world!'
+      end
+    end
+    describe "getting a grouped page" do
+      it "should redirect to login" do
+        get :show_page, :url => 'parent/'
+        response.should be_redirect
+        response.should redirect_to(reader_login_url)
+      end
+    end
+  end
+  describe "with a reader" do
+    before do
+      login_as_reader(:normal)
+    end
+    describe "getting an ungrouped page" do
+      it "should render the page" do
+        get :show_page, :url => ''
+        response.should be_success
+        response.body.should == 'Hello world!'
+      end
+    end
+    describe "getting a grouped page to which she has access" do
+      it "should render the page" do
+        get :show_page, :url => 'parent/'
+        response.should be_success
+        response.body.should == 'Parent body.'
+      end
+    end
+    describe "getting a grouped page to which she doesn't have access" do
+      it "should redirect to the permission-denied page" do
+        get :show_page, :url => 'news/'
+        response.should be_redirect
+        response.should redirect_to(reader_permission_denied_url)
+      end
+    end
+  end
+end

data/spec/datasets/readers_dataset.rb CHANGED Viewed

@@ -1,25 +1,78 @@
 require "authlogic/test_case"
+require 'digest/sha1'
 class ReadersDataset < Dataset::Base
-  datasets = [:users]
-  datasets << :reader_sites if defined? Site
-  uses *datasets
+  uses :users, :pages
   def load
     create_reader "Normal"
+    create_reader "Another"
     create_reader "Visible"
+    create_reader "Ungrouped"
     create_reader "User", :user_id => user_id(:existing)
     create_reader "Inactive", :activated_at => nil
+    create_group "Normal"
+    create_group "Special"
+    create_group "Homed", :homepage_id => page_id(:parent)
+    create_group "Elsewhere", :site_id => site_id(:elsewhere) if defined? Site
+    create_message "Normal"
+    create_message "Grouped", :function_id => "group_welcome"
+    create_message "Filtered", :filter_id => 'Textile', :body => 'this is a *filtered* message'
+    create_message "Welcome", :filter_id => 'Textile', :body => 'Hi', :function_id => 'welcome'
+    create_message "Activation", :filter_id => 'Textile', :body => 'Hi?', :function_id => 'activation'
+    create_message "Invitation", :filter_id => 'Textile', :body => 'Hi!', :function_id => 'invitation'
+    create_message "Password", :filter_id => 'Textile', :body => 'Oh', :function_id => 'password_reset'
+    create_message "Taggy", :filter_id => 'Textile', :body => %{
+To <r:recipient:name />
+Ying Tong Iddle I Po.
+From <r:sender:name />
+    }
+    create_layout "Main"
+    create_layout "Other"
+    create_layout "email", :content => %{
+<html>
+  <head><title><r:title /></title></head>
+  <body>
+    <p>header</p>
+    <r:content />
+    <p>footer</p>
+  </body>
+<html>
+    }
+    admit_to_group :homed, [readers(:normal)]
+    admit_to_group :normal, [readers(:normal), readers(:inactive)]
+    admit_to_group :special, [readers(:another)]
+    restrict_to_group :homed, [pages(:parent), pages(:childless)]
+    restrict_to_group :special, [pages(:news)]
+    restrict_to_group :normal, [messages(:grouped)]
   end
   helpers do
     def create_reader(name, attributes={})
-      attributes = reader_attributes(attributes.update(:name => name))
-      reader = create_model Reader, name.symbolize, attributes
+      reader = create_model Reader, name.symbolize, default_reader_attributes(name).merge(attributes)
     end
-    def reader_attributes(attributes={})
-      name = attributes[:name] || "John Doe"
+    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 = {
         :name => name,
@@ -27,13 +80,31 @@ class ReadersDataset < Dataset::Base
         :login => "#{symbol}@spanner.org",
         :activated_at => Time.now - 1.week,
         :password_salt => "golly",
-        :password => 'password',
-        :password_confirmation => 'password'
-      }.merge(attributes)
+        :password => 'passw0rd',
+        :password_confirmation => 'passw0rd'
+      }
       attributes[:site] = sites(:test) if defined? Site
       attributes
     end
+    def default_group_attributes(name="Group")
+      attributes = {
+        :name => name,
+        :description => "#{name} group"
+      }
+      attributes[:site_id] ||= site_id(:test) if defined? Site
+      attributes
+    end
+    def default_message_attributes(subject="Message")
+      attributes = {
+        :subject => subject,
+        :body => "This is the #{subject} message"
+      }
+      attributes[:site] = sites(:test) if defined? Site
+      attributes
+    end
     def login_as_reader(reader)
       activate_authlogic
       login_reader = reader.is_a?(Reader) ? reader : readers(reader)
@@ -46,6 +117,24 @@ class ReadersDataset < Dataset::Base
         session.destroy
       end
     end
+    def restrict_to_group(g, these)
+      g = groups(g) unless g.is_a? Group
+      these.each {|thing| thing.permit(g) }
+    end
+    def admit_to_group(g, readers)
+      g = groups(g) unless g.is_a? Group
+      readers.each {|r| g.admit(r) }
+    end
+    def seem_to_send(message, reader)
+      message = messages(message) unless message.is_a?(Message)
+      reader = readers(reader) unless reader.is_a?(Reader)
+      sending = MessageReader.find_or_create_by_message_id_and_reader_id(message.id, reader.id)
+      sending.sent_at = 10.minutes.ago
+      sending.save
+    end
   end
 end

data/spec/models/group_spec.rb ADDED Viewed

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+describe Group do
+  dataset :readers
+  describe "on validation" do
+    before do
+      @group = Group.new :name => "Unique Test Group"
+      @group.should be_valid
+    end
+    it "should require a name" do
+      @group.name = nil
+      @group.should_not be_valid
+      @group.errors.on(:name).should_not be_empty
+    end
+    it "should require a unique name" do
+      duplicate = Group.new :name => "Normal"
+      duplicate.should_not be_valid
+      duplicate.errors.on(:name).should_not be_empty
+    end
+  end
+  it "should have a homepage association" do
+    Group.reflect_on_association(:homepage).should_not be_nil
+    group = groups(:homed)
+    group.homepage.should be_a(Page)
+    group.homepage = pages(:child)
+    group.homepage.should == pages(:child)
+  end
+  it "should have a group of readers" do
+    group = groups(:normal)
+    group.respond_to?(:readers).should be_true
+    group.readers.any?.should be_true
+    group.readers.size.should == 2
+  end
+  it "should have a group of pages" do
+    group = groups(:homed)
+    group.respond_to?(:pages).should be_true
+    group.pages.any?.should be_true
+    group.pages.size.should == 2
+  end
+end

data/spec/models/message_spec.rb CHANGED Viewed

@@ -1,12 +1,20 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 describe Message do
-  dataset :messages
+  dataset :readers
   before do
   end
+  it "should have a groups association" do
+    Message.reflect_on_association(:groups).should_not be_nil
+  end
+  it "should normally list only the ungrouped messages" do
+    Message.visible.count.should == 7
+  end
   describe "on validation" do
     before do
       @message = messages(:normal)
@@ -45,21 +53,18 @@ describe Message do
     end
   end
-  describe "with a reader association" do
+  describe "on delivery" do
     before do
       @message = messages(:normal)
-      @message.readers << readers(:normal)
     end
-    describe "but unsent" do
+    describe "previously unsent" do
       it "should know to whom it can belong" do
-        @message.possible_readers.count.should == Reader.active.count
+        @message.possible_readers.count.should == Reader.count
+        @message.active_readers.count.should == Reader.active.count
+        @message.inactive_readers.count.should == Reader.inactive.count
       end
-      it "should know to whom it does belong" do
-        @message.readers.include?(readers(:normal)).should be_true
-      end
       it "should report itself unsent to anyone" do
         @message.delivered?.should be_false
       end
@@ -76,7 +81,6 @@ describe Message do
     describe "already sent to one reader" do
       before do
         seem_to_send(messages(:normal), readers(:normal))
-        @message.readers << readers(:visible)
       end
       it "should report itself delivered" do
@@ -88,7 +92,7 @@ describe Message do
       end
       it "should know to whom it has yet to be sent" do
-        @message.undelivered_readers.should == Reader.active - @message.recipients
+        @message.undelivered_readers.should =~ Reader.all - @message.recipients
       end
       it "should report itself delivered to that reader" do
@@ -96,13 +100,34 @@ describe Message do
       end
       it "should report itself not yet sent to other readers" do
-        @message.readers.include?(readers(:visible)).should be_true
         @message.delivered_to?(readers(:visible)).should be_false
       end
+    end
+    describe "with a group" do
+      it "should report itself visible to a reader who is a group member" do
+        messages(:grouped).visible_to?(readers(:normal)).should be_true
+      end
+      it "should report itself invisible to a reader who is not a group member" do
+        messages(:grouped).visible_to?(readers(:ungrouped)).should be_false
+      end
+      it "should list only group members as possible readers" do
+        messages(:grouped).possible_readers.include?(readers(:normal)).should be_true
+        messages(:grouped).possible_readers.include?(readers(:ungrouped)).should be_false
+      end
+    end
+    describe "without a group" do
+      it "should report itself visible to everyone" do
+        messages(:normal).visible_to?(readers(:normal)).should be_true
+        messages(:normal).visible_to?(readers(:ungrouped)).should be_true
+      end
+      it "should list all readers as possible readers" do
+        messages(:normal).possible_readers.include?(readers(:normal)).should be_true
+        messages(:normal).possible_readers.include?(readers(:ungrouped)).should be_true
+      end
     end
   end
 end

data/spec/models/page_spec.rb ADDED Viewed

@@ -0,0 +1,81 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+describe Page do
+  dataset :readers
+  before do
+    @site = Page.current_site = sites(:test) if defined? Site
+  end
+  describe "listed" do
+    describe "for nobody in particular" do
+      it "should not include private pages" do
+        Page.visible.include?(pages(:news)).should be_false
+      end
+      it "should include non-private pages" do
+        Page.visible.include?(pages(:first)).should be_true
+      end
+    end
+    describe "for a reader without group memberships" do
+      it "should not include private pages" do
+        Page.visible_to(readers(:ungrouped)).include?(pages(:news)).should be_false
+      end
+      it "should include non-private pages" do
+        Page.visible_to(readers(:ungrouped)).include?(pages(:first)).should be_true
+      end
+    end
+    describe "for a reader with group memberships" do
+      it "should include private pages" do
+        Page.visible_to(readers(:another)).include?(pages(:news)).should be_true
+      end
+      it "should include non-private pages" do
+        Page.visible_to(readers(:another)).include?(pages(:first)).should be_true
+      end
+    end
+  end
+  describe "with groups" do
+    before do
+      @page = pages(:parent)
+    end
+    it "should have some groups" do
+      @page.groups.any?.should be_true
+      @page.groups.size.should == 1
+    end
+    it "should be visible to group members" do
+      @page.visible_to?(readers(:normal)).should be_true
+    end
+    it "should not be visible to non-members" do
+      @page.visible_to?(readers(:ungrouped)).should be_false
+    end
+  end
+  describe "with inherited groups" do
+    before do
+      @page = pages(:child)
+    end
+    it "should be visible to group members" do
+      @page.visible_to?(readers(:normal)).should be_true
+    end
+    it "should not be visible to non-members" do
+      @page.visible_to?(readers(:ungrouped)).should be_false
+    end
+  end
+  describe "without groups" do
+    before do
+      @page = pages(:home)
+    end
+    it "should be visible to everyone" do
+      @page.visible_to?(readers(:ungrouped)).should be_true
+    end
+  end
+end

data/spec/models/reader_notifier_spec.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 describe ReaderNotifier do
-  dataset :readers, :reader_layouts, :messages
+  dataset :readers
   before do
     Radiant::Config['email.layout'] = 'email'

data/spec/models/reader_spec.rb CHANGED Viewed

@@ -1,17 +1,22 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 describe Reader do
-  dataset :messages
-  dataset :reader_layouts
+  dataset :readers
   activate_authlogic
   before do
     @existing_reader = readers(:normal)
   end
+  it "should have some groups" do
+    reader = readers(:normal)
+    reader.groups.any?.should be_true
+    reader.groups.size.should == 2
+  end
   describe "on validation" do
     before do
-      @reader = Reader.new :name => "Test Reader", :email => 'test@spanner.org', :login => 'test', :password => 'password', :password_confirmation => 'password'
+      @reader = Reader.new :name => "Test Reader", :email => 'test@spanner.org', :login => 'test', :password => 'passw0rd', :password_confirmation => 'passw0rd'
       @reader.should be_valid
     end
@@ -47,7 +52,7 @@ describe Reader do
   describe "on creation" do
     before do
-      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :login => 'test', :password => 'password', :password_confirmation => 'password'
+      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :login => 'test', :password => 'passw0rd', :password_confirmation => 'passw0rd'
     end
     it 'should await activation' do
@@ -62,7 +67,7 @@ describe Reader do
   describe "on create_for_user" do
     it "should return the existing reader if there is one" do
-      reader = Reader.find_or_create_for_user(users(:existing))
+      reader = Reader.for_user(users(:existing))
       reader.should == readers(:user)
       reader.is_user?.should be_true
       reader.is_admin?.should be_false
@@ -70,7 +75,7 @@ describe Reader do
     it "should create a matching reader if necessary" do
       user = users(:admin)
-      reader = Reader.find_or_create_for_user(user)
+      reader = Reader.for_user(user)
       [:name, :email, :login, :created_at, :notes].each do |att|
         reader.send(att).should == user.send(att)
       end
@@ -106,16 +111,16 @@ describe Reader do
     it "should update the user's credentials" do
       reader = readers(:user)
-      reader.password = reader.password_confirmation = 'blotto'
+      reader.password = reader.password_confirmation = 'bl0tto'
       reader.save!
-      ReaderSession.new(:login => reader.login, :password => 'blotto').should be_valid
-      reader.user.authenticated?('blotto').should be_true
+      ReaderSession.new(:login => reader.login, :password => 'bl0tto').should be_valid
+      reader.user.authenticated?('bl0tto').should be_true
     end
   end
   describe "on activation" do
     before do
-      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :login => 'another_login', :password => 'password', :password_confirmation => 'password', :trusted => 1
+      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :login => 'another_login', :password => 'passw0rd', :password_confirmation => 'passw0rd', :trusted => 1
     end
     it 'should be retrieved by id and activation code' do
@@ -136,12 +141,12 @@ describe Reader do
   describe "on login" do
     before do
-      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :login => 'test', :password => 'hoohaa', :password_confirmation => 'hoohaa'
+      @reader = Reader.create :name => "Test Reader", :email => 'test@spanner.org', :login => 'test', :password => 'h00haa', :password_confirmation => 'h00haa'
       @reader.activate!
     end
     it 'should authenticate' do
-      ReaderSession.new(:login => 'test', :password => 'hoohaa').should be_valid
+      ReaderSession.new(:login => 'test', :password => 'h00haa').should be_valid
     end
     it 'should not authenticate with bad password' do