radiant-reader-extension 3.0.0.rc4 → 3.0.0

data/spec/lib/reader_tags_spec.rb

@@ -47,7 +47,7 @@ describe "Reader Tags" do
 
   describe "utility tags" do 
     subject { page }
-    it { should render(%{<r:truncated chars="50">All happy families are alike; each unhappy family is unhappy in its own way.</r:truncated>}).as(' All happy families are alike; each unhapp&hellip;') }
+    it { should render(%{<r:truncated chars="50">All happy families are alike; each unhappy family is unhappy in its own way.</r:truncated>}).as('All happy families are alike; each unhappy&hellip;') }
     it { should render(%{<r:truncated words="5" omission="">All happy families are alike; each unhappy family is unhappy in its own way.</r:truncated>}).as('All happy families are alike;') }
     it { should render(%{<r:truncated words="5" allow_html="true" omission=" (tbc)">All <em>happy families</em> are alike; each unhappy family is unhappy in its own way.</r:truncated>}).as('All <em>happy families</em> are alike; (tbc)') }
   end

data/spec/models/group_spec.rb

@@ -2,6 +2,28 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Group do
   dataset :readers
+
+  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
   
   describe "on validation" do
     before do
@@ -20,33 +42,78 @@ describe Group do
       duplicate.should_not be_valid
       duplicate.errors.on(:name).should_not be_empty
     end
+    
+    it "should give itself a slug if none is present" do
+      g = Group.new(:name => 'testy group')
+      g.valid?.should be_true
+      g.slug.should == 'testy-group'
+    end
   end
+  
+  describe "in a hierarchy" do
+    it "should have parent and children relations" do
+      group = groups(:subgroup)
+      group.respond_to?(:parent).should be_true
+      group.respond_to?(:children).should be_true
+      group.children.should =~ [groups(:subsubgroup), groups(:anothersubsubgroup)]
+      group.parent.should == groups(:supergroup)
+    end
+    
+    it "should have descendants and ancestors" do
+      groups(:subsubgroup).path.should == [groups(:supergroup), groups(:subgroup), groups(:subsubgroup)]
+      groups(:subsubgroup).root.should == groups(:supergroup)
+      groups(:supergroup).subtree.should =~ [groups(:supergroup), groups(:subgroup), groups(:subsubgroup), groups(:anothersubsubgroup)]
+    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 root group" do
+      [:supergroup, :subgroup, :subsubgroup].each do |g|
+        groups(g).root.should == groups(:supergroup)
+      end
+    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 inherit memberships from descendants" do
+      groups(:supergroup).members.should =~ [readers(:normal), readers(:another)]
+    end
+    
+    it "should not inherit memberships from ancestors" do
+      groups(:subsubgroup).members.should be_empty
+    end
+    
+    it "should inherit permissions from ancestors" do
+      groups(:subsubgroup).pages.should =~ [pages(:child), pages(:child_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
+    it "should not inherit permissions from descendants" do
+      groups(:supergroup).pages.should be_empty
+    end
   end
   
-  it "should give itself a slug if none is present" do
-    g = Group.new(:name => 'testy group')
-    g.valid?.should be_true
-    g.slug.should == 'testy-group'
+  describe "directory visibility" do
+    describe "when directory is grouped" do
+      before do
+        Radiant.config['reader.directory_visibility'] = 'grouped'
+      end
+      
+      it "should be visible to members" do
+        groups(:subgroup).visible_to?(readers(:normal)).should be_true
+      end
+      
+      it "should be visible to members of ancestor groups" do
+        groups(:supergroup).visible_to?(readers(:normal)).should be_true
+      end
+      
+      it "should be visible to members of descendant groups" do
+        groups(:subsubgroup).visible_to?(readers(:normal)).should be_true
+      end
+      
+      it "should not be visible to members of groups outside the family" do
+        groups(:subgroup).visible_to?(readers(:inactive)).should be_false
+      end
+      
+      it "should not be visible to readers without groups" do
+        groups(:subgroup).visible_to?(readers(:ungrouped)).should be_false
+      end
+    end
+
   end
 end

data/spec/models/message_spec.rb

@@ -48,7 +48,7 @@ describe Message do
 
     it "should render a fake sending" do
       @preview.should be_kind_of(TMail::Mail)
-      @preview.from.should == ["admin@www.example.com"]
+      @preview.from.should == ["existing@example.com"]
       @preview.subject.should == messages(:taggy).subject
     end
   end

data/spec/models/reader_notifier_spec.rb

@@ -14,7 +14,7 @@ describe ReaderNotifier do
   it "should render a supplied message" do
     message = ReaderNotifier.create_message(readers(:normal), messages(:normal))
     message.to.should == [readers(:normal).email]
-    message.from.should == ["admin@www.example.com"]
+    message.from.should == [messages(:normal).created_by.email]
     message.body.should =~ /#{messages(:normal).filtered_body}/
     message.content_type.should == 'text/html'
   end

data/spec/models/reader_page_spec.rb

@@ -15,7 +15,7 @@ describe ReaderPage do
   
   describe "reading parameters" do
     before do
-      Radiant.config['readers.public?'] = true
+      Radiant.config['reader.directory_visibility'] = 'public'
     end
 
     it "should interrupt the find_by_path cascade" do
@@ -50,7 +50,7 @@ describe ReaderPage do
   
   describe "when the readership is private" do
     before do
-      Radiant.config['readers.public?'] = false
+      Radiant.config['reader.directory_visibility'] = 'private'
     end
     
     describe "and no reader is logged in" do
@@ -81,24 +81,40 @@ describe ReaderPage do
       it "should allow access to a reader" do
         lambda { Page.find_by_path("/directory/#{reader_id(:normal)}").reader.should == readers(:normal) }.should_not raise_error
       end
+    end
+  end
+  
+  describe "when the readership is group-limited" do
+    before do
+      Radiant.config['reader.directory_visibility'] = 'grouped'
+    end
+    
+    describe "and no reader is logged in" do
+      before do
+        logout_reader
+        Reader.current = nil
+      end
+      
+      it "should deny access completely" do
+        lambda { Page.find_by_path("/directory") }.should raise_error(ReaderError::AccessDenied)
+        lambda { Page.find_by_path("/directory/normal") }.should raise_error(ReaderError::AccessDenied)
+      end
+    end
+    
+    describe "and a reader is logged in" do
+      before do
+        Reader.current = login_as_reader(readers(:normal))
+      end
 
-      describe "but confined to his groups" do
-        before do
-          Radiant.config['readers.confine_to_groups?'] = true
-          Reader.current = login_as_reader(readers(:normal))
-        end
-
-        it "should allow access only to readers with group overlap" do
-          lambda { Page.find_by_path("/directory/#{reader_id(:inactive)}").reader.should == readers(:inactive) }.should_not raise_error
-          lambda { Page.find_by_path("/directory/#{reader_id(:another)}") }.should raise_error
-        end
+      it "should allow access only to readers with group overlap" do
+        lambda { Page.find_by_path("/directory/#{reader_id(:inactive)}").reader.should == readers(:inactive) }.should_not raise_error
+        lambda { Page.find_by_path("/directory/#{reader_id(:ungrouped)}") }.should raise_error
+      end
 
-        it "should allow access only to groups to which the reader belongs" do
-          lambda { Page.find_by_path("/directory/normal") }.should_not raise_error
-          lambda { Page.find_by_path("/directory/special") }.should raise_error(ReaderError::AccessDenied)
-          Page.find_by_path("/directory").groups.should =~ [groups(:normal), groups(:homed)]
-          Page.find_by_path("/directory").readers.should =~ (groups(:normal).readers + groups(:homed).readers).uniq
-        end
+      it "should allow access only to groups to which the reader belongs" do
+        lambda { Page.find_by_path("/directory/normal") }.should_not raise_error
+        lambda { Page.find_by_path("/directory/special") }.should raise_error(ReaderError::AccessDenied)
+        Page.find_by_path("/directory").groups.should =~ readers(:normal).all_visible_groups
       end
 
     end

data/spec/models/reader_spec.rb

@@ -11,7 +11,6 @@ describe Reader do
   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

data/spec/spec.opts

@@ -1,5 +1,6 @@
 --colour
---format progress
---format html:spec/spec_report.html
---loadby mtime
+--format
+profile
+--loadby
+mtime
 --reverse

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 15424125
-  prerelease: 6
+  hash: 7
+  prerelease: 
   segments: 
   - 3
   - 0
   - 0
-  - rc
-  - 4
-  version: 3.0.0.rc4
+  version: 3.0.0
 platform: ruby
 authors: 
 - William Ross
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 +01:00
+date: 2011-09-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,6 +130,22 @@ dependencies:
         version: 1.5.4
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: ancestry
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 2
+        - 4
+        version: 1.2.4
+  type: :runtime
+  version_requirements: *id008
 description: Provides reader/member/user registration and management functions including password-reminder, group-based page access control and administrative email.
 email: 
 - radiant@spanner.org
@@ -167,32 +181,26 @@ files:
 - app/models/reader_notifier.rb
 - app/models/reader_page.rb
 - app/models/reader_session.rb
-- app/views/accounts/_contributions.html.haml
+- app/views/accounts/_choose_memberships.html.haml
 - app/views/accounts/_controls.html.haml
-- app/views/accounts/_description.html.haml
 - app/views/accounts/_extra_controls.html.haml
 - app/views/accounts/_flasher.html.haml
 - app/views/accounts/_form.html.haml
 - app/views/accounts/_gravatar.html.haml
-- app/views/accounts/_groups.html.haml
-- app/views/accounts/_links.html.haml
-- app/views/accounts/_list.html.haml
-- app/views/accounts/_memberships.html.haml
-- app/views/accounts/_profile.html.haml
+- app/views/accounts/_preamble.html.haml
 - app/views/accounts/_profile_form.html.haml
-- app/views/accounts/_reader.html.haml
 - app/views/accounts/dashboard.html.haml
 - app/views/accounts/edit.html.haml
 - app/views/accounts/edit_profile.html.haml
-- app/views/accounts/index.html.haml
 - app/views/accounts/login.html.haml
 - app/views/accounts/new.html.haml
 - app/views/accounts/permission_denied.html.haml
-- app/views/accounts/show.html.haml
 - app/views/admin/group_invitations/new.html.haml
 - 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/_form.html.haml
+- app/views/admin/groups/_group.html.haml
 - app/views/admin/groups/_list_head.html.haml
 - app/views/admin/groups/edit.html.haml
 - app/views/admin/groups/index.html.haml
@@ -205,7 +213,7 @@ files:
 - app/views/admin/messages/_list_function.haml
 - app/views/admin/messages/_list_notes.html.haml
 - app/views/admin/messages/edit.html.haml
-- app/views/admin/messages/index.haml
+- app/views/admin/messages/index.html.haml
 - app/views/admin/messages/new.html.haml
 - app/views/admin/messages/preview.html.haml
 - app/views/admin/messages/show.html.haml
@@ -229,7 +237,7 @@ files:
 - app/views/dashboard/_messages.html.haml
 - app/views/dashboard/_profile.html.haml
 - app/views/dashboard/_welcome.html.haml
-- app/views/groups/_all.html.haml
+- app/views/groups/_group.html.haml
 - app/views/groups/index.html.haml
 - app/views/groups/show.html.haml
 - app/views/messages/preview.html.haml
@@ -242,8 +250,19 @@ files:
 - app/views/reader_notifier/message.html.haml
 - app/views/reader_sessions/_login_form.html.haml
 - app/views/reader_sessions/new.html.haml
+- app/views/readers/_description.html.haml
+- app/views/readers/_groups.html.haml
+- app/views/readers/_links.html.haml
+- app/views/readers/_list.html.haml
+- app/views/readers/_memberships.html.haml
+- app/views/readers/_mugshot.html.haml
+- app/views/readers/_people.html.haml
+- app/views/readers/_profile.html.haml
+- app/views/readers/_reader.html.haml
+- app/views/readers/index.html.haml
+- app/views/readers/show.html.haml
 - app/views/shared/_standard_reader_parts.html.haml
-- app/views/site/not_allowed.html.haml
+- app/views/shared/not_allowed.html.haml
 - config/initializers/authlogic_connect_config.rb
 - config/initializers/formats.rb
 - config/initializers/radiant_config.rb
@@ -267,8 +286,6 @@ files:
 - db/migrate/20091111090819_ensure_functional_messages_visible.rb
 - db/migrate/20091119092936_messages_have_layout.rb
 - db/migrate/20091120083119_groups_public.rb
-- db/migrate/20100922152338_lock_versions.rb
-- db/migrate/20101004074945_unlock_version.rb
 - db/migrate/20101019094714_message_sent_date.rb
 - db/migrate/20110214101339_multiple_ownership.rb
 - db/migrate/20110707101339_group_slugs.rb
@@ -276,6 +293,9 @@ files:
 - db/migrate/20110712081159_directory_permissions.rb
 - db/migrate/20110712141134_name_parts.rb
 - db/migrate/20110728112254_current_login_at.rb
+- db/migrate/20110812111934_groups_nested_set.rb
+- db/migrate/20110814070858_message_has_many_groups.rb
+- db/migrate/20110905194602_group_ancestry.rb
 - lib/controller_extensions.rb
 - lib/group_tags.rb
 - lib/grouped_model.rb
@@ -292,12 +312,17 @@ files:
 - public/images/admin/chk_off.png
 - public/images/admin/chk_on.png
 - public/images/admin/delta.png
+- public/images/furniture/csv.png
+- public/images/furniture/csv_tiny.png
 - public/images/furniture/no_gravatar.png
+- public/images/furniture/vcard.png
+- public/images/furniture/vcard_tiny.png
 - public/javascripts/admin/reader.js
 - public/javascripts/reader.js
 - public/stylesheets/sass/admin/reader.sass
 - public/stylesheets/sass/admin/reader_group.sass
 - public/stylesheets/sass/reader.sass
+- radiant-reader-extension-3.0.0.gem
 - radiant-reader-extension.gemspec
 - Rakefile
 - reader_extension.rb
@@ -326,7 +351,7 @@ 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.0.rc4'\n\n  and please remember to enable ActionMailer in your 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.0'\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: 
@@ -343,14 +368,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 

data/app/views/accounts/_contributions.html.haml

@@ -1,2 +0,0 @@
-// this page will be overridden in other extensions
-// if there are ever more than a couple, a list of partials may be required

data/app/views/accounts/_description.html.haml

@@ -1,2 +0,0 @@
-- reader ||= @reader
-= clean_html(reader.description)