stripping inline js

Rakefile

@@ -16,11 +16,11 @@ unless defined? RADIANT_ROOT
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
-rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')
-$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
+# rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')
+# $LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
 require 'spec/rake/spectask'
 require 'cucumber'
 require 'cucumber/rake/task'
@@ -101,7 +101,7 @@ namespace :spec do
 end
 
 desc 'Generate documentation for the reader extension.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'ReaderExtension'
   rdoc.options << '--line-numbers' << '--inline-source'

app/controllers/admin/memberships_controller.rb

@@ -1,14 +1,12 @@
 class Admin::MembershipsController < ApplicationController
 
-  before_filter :find_group
+  before_filter :find_reader_and_group
 
   def index
     redirect_to admin_group_url(@group)
   end
 
   def create
-    @reader = Reader.find(params[:reader_id])
-    raise ActiveRecord::RecordNotFound unless @reader
     @membership = Membership.find_or_create_by_reader_id_and_group_id(@reader.id, @group.id)
     respond_to do |format|
       format.html { 
@@ -20,7 +18,7 @@ def create
   end
 
   def destroy
-    @membership = @group.memberships.find(params[:id])
+    @membership ||= @group.memberships.find(params[:id])
     @reader = @membership.reader
     @membership.delete if @membership
     respond_to do |format|
@@ -32,11 +30,19 @@ def destroy
     end
   end
 
+  def toggle
+    if @membership = Membership.find_by_reader_id_and_group_id(@reader.id, @group.id)
+      destroy
+    else
+      create
+    end
+  end
+
 protected
 
-  def find_group
+  def find_reader_and_group
     @group = Group.find(params[:group_id])
-    raise ActiveRecord::RecordNotFound unless @group
+    @reader = Reader.find(params[:reader_id]) if params[:reader_id]
   end
-    
+
 end

app/views/admin/groups/show.html.haml

@@ -1,3 +1,4 @@
+- include_javascript 'admin/reader'
 - include_stylesheet 'admin/reader_group'
 - body_classes << "reversed"
 
@@ -40,7 +41,7 @@
         =t('reader_extension.private_pages').titlecase
       %ul
         - page = Page.respond_to?(:homepage) ? Page.homepage : Page.find_by_parent_id(nil)
-        %div{:id => "page_holder_#{page.id}"}
+        %li{:id => "page_holder_#{page.id}"}
           = render :partial => 'admin/permissions/page', :object => page
 
   - main.members do
@@ -56,7 +57,7 @@
       - columns.each do |column|
         %ul.column
           - column.each do |reader|
-            %div{:id => "reader_holder_#{reader.id}"}
+            %li{:id => "reader_holder_#{reader.id}"}
               = render :partial => 'admin/memberships/reader', :object => reader
 
 - render_region :footer do |footer|

app/views/admin/memberships/_reader.html.haml

@@ -1,9 +1,5 @@
 - reader ||= @reader
 - group ||= @group
+- cssclass = reader.has_group?(group) ? "fake_checkbox checked" : "fake_checkbox unchecked"
 
-- if membership = group.membership_for(reader)
-  %li{:class => "fake_checkbox checked", :id => "reader_#{reader.id}"}
-    = link_to_remote reader.name, :url => admin_group_membership_url(group, membership), :method => 'delete', :loading => "$('reader_#{reader.id}').addClassName('waiting')", :update => "reader_holder_#{reader.id}"
-- else
-  %li{:class => "fake_checkbox unchecked", :id => "reader_#{reader.id}"}
-    = link_to_remote reader.name, :url => admin_group_memberships_url(group, :reader_id => reader.id), :loading => "$('reader_#{reader.id}').addClassName('waiting')", :update => "reader_holder_#{reader.id}"
+= link_to reader.name, admin_toggle_group_membership_url(:group_id => group.id, :reader_id => reader.id),  {:class => cssclass, :id => "toggle_reader_#{reader.id}"}

app/views/admin/permissions/_page.html.haml

@@ -1,24 +1,18 @@
 - page ||= @page
 - group ||= @group
 
-- liclass = 'loose'
-- liclass = 'attached' if page.has_group?(group)
-- liclass = 'inherited' if page.group_is_inherited?(group)
 
-- if permission = group.permission_for(page)
-  %li{:class => "fake_checkbox checked", :id => "page_#{page.id}"}
-    = link_to_remote page.title, :url => admin_group_permission_url(group, permission), :method => 'delete', :loading => "$('page_#{page.id}').addClassName('waiting')", :update => "page_holder_#{page.id}"
-
-- elsif page.has_inherited_group?(group)
-  %li{:class => "fake_checkbox inherited", :id => "page_#{page.id}"}
-    = page.title
+- if page.has_inherited_group?(group)
+  %span{:class => "fake_checkbox inherited"}
+  = page.title
 
 - else
-  %li{:class => "fake_checkbox unchecked", :id => "page_#{page.id}"}
-    = link_to_remote page.title, :url => admin_group_permissions_url(group, :page_id => page.id), :loading => "$('page_#{page.id}').addClassName('waiting')", :update => "page_holder_#{page.id}"
+  - cssclass = "fake_checkbox"
+  - cssclass << ' checked' if page.has_group?(group)
+  = link_to page.title, admin_toggle_group_permission_url(:group_id => group.id, :page_id => page.id),  {:class => cssclass, :id => "toggle_page_#{page.id}"}
 
 - if page.children.any?
   %ul
     - page.children.each do |child|
-      %div{:id => "page_holder_#{child.id}"}
+      %li{:id => "page_holder_#{child.id}"}
         = render :partial => 'admin/permissions/page', :object => child

config/routes.rb

@@ -3,6 +3,8 @@
     admin.resources :messages, :member => [:preview, :deliver]
     admin.resources :groups, :has_many => [:memberships, :permissions, :group_invitations, :messages]
     admin.resource :reader_configuration, :controller => 'reader_configuration'
+    admin.toggle_group_membership "memberships/toggle", :controller => 'memberships', :action => 'toggle'
+    admin.toggle_group_permission "permissions/toggle", :controller => 'permissions', :action => 'toggle'
   end
 
   map.namespace :admin do |admin|

lib/grouped_model.rb

@@ -104,7 +104,11 @@ def count
       }
 
       named_scope :find_these, lambda { |ids|
-        { :conditions => ["#{self.table_name}.id IN (#{ids.map{"?"}.join(',')})", *ids] }
+        if ids.any?
+          { :conditions => ["#{self.table_name}.id IN (#{ids.map{"?"}.join(',')})", *ids] }
+        else
+          {}
+        end
       }
 
     end

lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.0.rc4'
+  VERSION = '3.0.0'
   SUMMARY = %q{Reader/viewer/visitor registration, login and access-control for Radiant CMS}
   DESCRIPTION = %q{Provides reader/member/user registration and management functions including password-reminder, group-based page access control and administrative email.}
   URL = "http://radiant.spanner.org/reader"

radiant-reader-extension.gemspec

@@ -35,7 +35,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

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