radiant-reader_group-extension 0.9.0 → 1.0.0

data/radiant-reader_group-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader_group-extension}
-  s.version = "0.9.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-10-04}
+  s.date = %q{2010-10-19}
   s.description = %q{Adds group-based page access control to radiant.}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [
@@ -33,25 +33,24 @@ Gem::Specification.new do |s|
      "app/views/admin/groups/_add_readers.html.haml",
      "app/views/admin/groups/_form.html.haml",
      "app/views/admin/groups/_list_head.html.haml",
-     "app/views/admin/groups/_listed.html.haml",
      "app/views/admin/groups/edit.html.haml",
      "app/views/admin/groups/index.html.haml",
      "app/views/admin/groups/new.html.haml",
      "app/views/admin/groups/remove.html.haml",
      "app/views/admin/groups/show.html.haml",
      "app/views/admin/memberships/_reader.html.haml",
+     "app/views/admin/messages/_function.haml",
+     "app/views/admin/messages/_list_function.haml",
      "app/views/admin/messages/_list_notes.html.haml",
      "app/views/admin/messages/_message_description.html.haml",
      "app/views/admin/messages/_message_group.html.haml",
      "app/views/admin/pages/_listed.html.haml",
      "app/views/admin/pages/_page_groups.html.haml",
      "app/views/admin/permissions/_page.html.haml",
-     "app/views/admin/reader_settings/_group_welcomes.html.haml",
      "app/views/admin/readers/_reader_groups.html.haml",
-     "app/views/messages/show.html.haml",
-     "app/views/reader_activations/_on_activation.html.haml",
      "app/views/readers/_memberships.html.haml",
      "app/views/site/not_allowed.html.haml",
+     "config/locales/en.yml",
      "config/routes.rb",
      "db/migrate/001_create_groups.rb",
      "db/migrate/20090921125654_group_messages.rb",
@@ -69,7 +68,6 @@ Gem::Specification.new do |s|
      "lib/readers_controller_extensions.rb",
      "lib/site_controller_extensions.rb",
      "lib/tasks/reader_group_extension_tasks.rake",
-     "pkg/radiant-reader_group-extension-0.9.0.gem",
      "public/images/admin/chk_auto.png",
      "public/images/admin/chk_off.png",
      "public/images/admin/chk_on.png",
@@ -80,10 +78,9 @@ Gem::Specification.new do |s|
      "public/images/admin/populate.png",
      "public/images/admin/rdo_off.png",
      "public/images/admin/rdo_on.png",
-     "public/stylesheets/sass/admin/group.sass",
+     "public/stylesheets/sass/admin/reader_group.sass",
      "radiant-reader_group-extension.gemspec",
      "reader_group_extension.rb",
-     "spec/controllers/readers_controller_spec.rb",
      "spec/controllers/site_controller_spec.rb",
      "spec/datasets/group_messages_dataset.rb",
      "spec/datasets/group_readers_dataset.rb",
@@ -102,8 +99,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Group-based access control for the radiant CMS}
   s.test_files = [
-    "spec/controllers/readers_controller_spec.rb",
-     "spec/controllers/site_controller_spec.rb",
+    "spec/controllers/site_controller_spec.rb",
      "spec/datasets/group_messages_dataset.rb",
      "spec/datasets/group_readers_dataset.rb",
      "spec/datasets/group_sites_dataset.rb",

data/reader_group_extension.rb

@@ -10,7 +10,7 @@ module ReaderGroup
 end
 
 class ReaderGroupExtension < Radiant::Extension
-  version "0.9.0"
+  version "1.0.0"
   description "Page (and other) access control for site readers and groups"
   url "http://spanner.org/radiant/reader_group"
 
@@ -25,22 +25,21 @@ class ReaderGroupExtension < Radiant::Extension
     ReaderNotifier.send :include, ReaderNotifierExtensions                            # a couple of new message types
     SiteController.send :include, SiteControllerExtensions                            # access control based on group membership
     ReadersController.send :include, ReadersControllerExtensions                      # offer subscription to public groups
-    Admin::MessagesController.send :include, AdminMessagesControllerExtensions        # supports specification of group on newing of message
+    Admin::MessagesController.send :include, AdminMessagesControllerExtensions        # preview and delivery
     ReaderSessionsController.send :include, ReaderSessionsControllerExtensions        # sends newly logged-in readers to a group home page if one can be found
     ReaderActivationsController.send :include, ReaderActivationsControllerExtensions  # sends newly activated readers to a group home page if one can be found
     UserActionObserver.instance.send :add_observer!, Group                            # the usual date-stamping and ownership
     Page.send :include, GroupMessageTags                                              # extra tags for talking about groups in mailouts
 
-
     unless defined? admin.group                                                       # to avoid duplicate partials
       Radiant::AdminUI.send :include, GroupUI
-      admin.group = Radiant::AdminUI.load_default_group_regions
-      admin.page.edit.add :parts_bottom, "page_groups", :before => "edit_timestamp"
-      admin.reader.edit.add :form, "reader_groups", :before => "edit_password"
-      admin.message.edit.add :form, "message_group", :before => "edit_subject"
-      admin.reader_setting.index.add :messages, "group_welcomes", :after => "administration"
+      Radiant::AdminUI.load_reader_group_extension_regions
     end
-    
+
+    admin.page.edit.add :parts_bottom, "page_groups"
+    admin.reader.edit.add :form, "reader_groups", :before => :edit_description
+    admin.message.edit.add :body_bottom, "message_group"
+
     tab("Readers") do
       add_item 'Groups', '/admin/readers/groups', :before => 'Settings'
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader_group-extension
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 9
   - 0
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +01:00
+date: 2010-10-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,25 +74,24 @@ files:
 - app/views/admin/groups/_add_readers.html.haml
 - app/views/admin/groups/_form.html.haml
 - app/views/admin/groups/_list_head.html.haml
-- app/views/admin/groups/_listed.html.haml
 - app/views/admin/groups/edit.html.haml
 - app/views/admin/groups/index.html.haml
 - app/views/admin/groups/new.html.haml
 - app/views/admin/groups/remove.html.haml
 - app/views/admin/groups/show.html.haml
 - app/views/admin/memberships/_reader.html.haml
+- app/views/admin/messages/_function.haml
+- app/views/admin/messages/_list_function.haml
 - app/views/admin/messages/_list_notes.html.haml
 - app/views/admin/messages/_message_description.html.haml
 - app/views/admin/messages/_message_group.html.haml
 - app/views/admin/pages/_listed.html.haml
 - app/views/admin/pages/_page_groups.html.haml
 - app/views/admin/permissions/_page.html.haml
-- app/views/admin/reader_settings/_group_welcomes.html.haml
 - app/views/admin/readers/_reader_groups.html.haml
-- app/views/messages/show.html.haml
-- app/views/reader_activations/_on_activation.html.haml
 - app/views/readers/_memberships.html.haml
 - app/views/site/not_allowed.html.haml
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/001_create_groups.rb
 - db/migrate/20090921125654_group_messages.rb
@@ -110,7 +109,6 @@ files:
 - lib/readers_controller_extensions.rb
 - lib/site_controller_extensions.rb
 - lib/tasks/reader_group_extension_tasks.rake
-- pkg/radiant-reader_group-extension-0.9.0.gem
 - public/images/admin/chk_auto.png
 - public/images/admin/chk_off.png
 - public/images/admin/chk_on.png
@@ -121,10 +119,9 @@ files:
 - public/images/admin/populate.png
 - public/images/admin/rdo_off.png
 - public/images/admin/rdo_on.png
-- public/stylesheets/sass/admin/group.sass
+- public/stylesheets/sass/admin/reader_group.sass
 - radiant-reader_group-extension.gemspec
 - reader_group_extension.rb
-- spec/controllers/readers_controller_spec.rb
 - spec/controllers/site_controller_spec.rb
 - spec/datasets/group_messages_dataset.rb
 - spec/datasets/group_readers_dataset.rb
@@ -171,7 +168,6 @@ signing_key:
 specification_version: 3
 summary: Group-based access control for the radiant CMS
 test_files: 
-- spec/controllers/readers_controller_spec.rb
 - spec/controllers/site_controller_spec.rb
 - spec/datasets/group_messages_dataset.rb
 - spec/datasets/group_readers_dataset.rb

data/app/views/admin/groups/_listed.html.haml

@@ -1,25 +0,0 @@
-%tr.node.level-1
-  - render_region :tbody do |tbody|
-    - tbody.name_cell do
-      %td.name
-        %p
-          = link_to group.name, admin_group_url(group)
-          %br
-          = truncate_words(group.description, 40)
-    - tbody.home_cell do
-      %td.home
-        - if group.homepage
-          = link_to group.homepage.title, edit_admin_page_url(group.homepage)
-        - else
-          none
-    - tbody.members_cell do
-      %td.members
-        = link_to group.readers.count, admin_group_url(group)
-    - tbody.pages_cell do
-      %td.pages
-        = link_to group.pages.count, admin_group_url(group)
-    - tbody.modify_cell do
-      %td.actions
-        = link_to_unless_current image('plus') + ' send invitations', new_admin_group_group_invitation_url(group), :class => 'action'
-        = link_to_unless_current image('minus') + ' remove group', admin_group_url(group, :method => 'delete', :confirm => "are you sure you want to completely remove the #{group.name} group?"), :class => 'action'
-        

data/app/views/admin/reader_settings/_group_welcomes.html.haml

@@ -1,11 +0,0 @@
-- Group.all.each do |group|
-  - [:invitation, :welcome].each do |func|
-    - message = Message.functional(:invitation, group)
-    %p.ruled
-      %label
-        = group.name
-        = func
-      - if message
-        = link_to message.subject, edit_admin_message_url(message)
-      - else
-        = link_to image('plus') + " create message", new_admin_group_message_url(group, :function => func), :class => 'create'

data/app/views/messages/show.html.haml

@@ -1,11 +0,0 @@
-.message
-  %iframe.message_body{:src => preview_group_message_url(@group, @message)}
-
-- content_for :pagetitle do
-  = @message.subject
-  
-- content_for :marginalia do
-  margin?
-  
-- content_for :breadhead do
-  = link_to @group.name, @group.homepage.url

data/app/views/reader_activations/_on_activation.html.haml

@@ -1,10 +0,0 @@
-- if homepage = current_reader.find_homepage
-  %p
-    Would you like to go straight to the 
-    = link_to homepage.title, homepage.url
-    page?
-
-- elsif session[:return_to]
-  %p 
-    Would you like to 
-    = link_to ("return to the page you were looking at before you started registering", session[:return_to]) + '?'

data/public/stylesheets/sass/admin/group.sass

@@ -1,66 +0,0 @@
-@import compass
-
-body.reversed 
-  #content 
-    form 
-      p.homepage
-        margin: 0
-        label
-          display: inline
-
-  #group_pages, #group_people
-    position: relative
-    float: left
-    overflow: hidden
-    ul
-      li.fake_checkbox
-        margin: 10px 0
-        padding-left: 30px
-        background:
-          image: none
-          repeat: no-repeat
-          position: 4px center
-        a
-          text-decoration: none
-        &.checked                                          
-          background-image: url(/images/admin/chk_on.png) 
-          a
-            color: #5da454
-            font-weight: bold
-        &.unchecked                                        
-          background-image: url(/images/admin/chk_off.png)
-          a
-            color: #999
-            font-weight: normal
-        &.waiting                                          
-          background-image: url(/images/admin/spinner.gif)
-          a
-            color: #8c8d8e
-        &.failed                                           
-          background-image: url(/images/admin/error.png)
-          a
-            color: #c00
-        &.inherited                                        
-          background-image: url(/images/admin/chk_auto.png)
-          color: #80aa79
-      input
-        position: absolute
-        left: -999px
-
-  #group_pages
-    width: 30%
-    float: left
-    margin-right: 2%
-    ul
-      ul
-        padding-left: 20px
-  
-  #group_people
-    float: right
-    width: 62%
-    ul
-      float: left
-      width: 49%
-  
-  #footnotes
-    clear: both

data/spec/controllers/readers_controller_spec.rb

@@ -1,44 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe ReadersController do
-  dataset :groups
-  dataset :pages
-  
-  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
-  
-  # all we're really testing here is the chaining of Reader.homepage
-  # but from a reader pov it's the login behaviour that matters
-  
-  describe "a logged-in reader requesting a login form" do
-    before do
-    end
-    
-    describe "who has a homed group" do
-      before do
-        login_as_reader(:normal)
-        get :login
-      end
-      
-      it "should be redirected to the group's home page" do
-        response.should be_redirect
-        response.should redirect_to(groups(:homed).homepage.url)
-      end
-    end
-
-    describe "who doesn't have a homed group" do
-      before do
-        login_as_reader(:another)
-        get :login
-      end
-      it "should be redirected to that reader's page" do
-        response.should be_redirect
-        response.should redirect_to(reader_url(readers(:another)))
-      end
-    end
-  end
-  
-end