radiant-group_forum-extension 0.4.1 → 0.5.0

data/.gitignore

@@ -0,0 +1 @@
+pkg/*

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/app/views/admin/forums/_forum_group.html.haml

@@ -1,14 +1,14 @@
 - include_stylesheet('admin/group')
 
-- groups = Group.find(:all)
 - if @group && @forum.new_record?
-  - @forum.group = @group
+  - @forum.groups = [@group]
 
 - fields_for @forum do |f|
-  .row
-    %p.group
-      = f.label :group_id, "Restrict to group:"
-      = f.select :group_id, groups.map { |g| [g.name, g.id] }, {:include_blank => true}
-      %br
-      %span.formnote
-        Leave blank for open access.
+  .set
+    %p
+      = t('allowed_groups')
+      - Group.find(:all).each do |group|
+        = check_box_tag "forum[group_ids][]", group.id, @forum.has_group?(group), :id => "forum_group_#{group.id}"
+        %label.checkbox{:for => "forum_group_#{group.id}"}
+          = group.name
+

data/group_forum_extension.rb

@@ -1,17 +1,12 @@
 class GroupForumExtension < Radiant::Extension
-  version "0.4.1"
+  version "0.5.0"
   description "Just a bit of access-control glue joining reader_groups to forum"
   url "http://spanner.org/radiant/group_forums"
   
   def activate
-    Forum.send :include, GroupedForum
-    Topic.send :include, GroupedTopic
-    Post.send :include, GroupedPost
+    Forum.send :has_groups
     Page.send :include, GroupForumTags          # a few tags for listing forums and latest topics on group pages
-
-    ForumsController.send :include, ForumsControllerExtensions
-    TopicsController.send :include, TopicsControllerExtensions
-    PostsController.send :include, PostsControllerExtensions
+    ForumBaseController.send :include, GroupedControllerExtensions
 
     unless admin.forum.edit.form && admin.forum.edit.form.include?("forum_group")
       admin.forum.edit.add :form, "forum_group"

data/radiant-group_forum-extension.gemspec

@@ -5,18 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-group_forum-extension}
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-02-15}
   s.description = %q{A bit of glue to add group-based access control to the radiant forum.}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
-    "README.markdown",
+    ".gitignore",
+     "README.markdown",
      "Rakefile",
      "VERSION",
      "app/views/admin/forums/_forum_group.html.haml",
@@ -24,14 +25,8 @@ Gem::Specification.new do |s|
      "db/migrate/001_forums_groups.rb",
      "db/migrate/20091008101339_simple_ownership.rb",
      "group_forum_extension.rb",
-     "lib/forums_controller_extensions.rb",
      "lib/group_forum_tags.rb",
-     "lib/grouped_forum.rb",
-     "lib/grouped_post.rb",
-     "lib/grouped_topic.rb",
-     "lib/posts_controller_extensions.rb",
      "lib/tasks/group_forum_extension_tasks.rake",
-     "lib/topics_controller_extensions.rb",
      "radiant-group_forum-extension.gemspec",
      "spec/datasets/group_forum_forums_dataset.rb",
      "spec/datasets/group_forum_groups_dataset.rb",

data/spec/models/forum_spec.rb

@@ -7,8 +7,8 @@ describe Forum do
     @site = Page.current_site = sites(:test) if defined? Site
   end
   
-  it "should have a group association" do
-    Forum.reflect_on_association(:group).should_not be_nil
+  it "should have a groups association" do
+    Forum.reflect_on_association(:groups).should_not be_nil
   end
   
   it "should normally list only the ungrouped forums" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-group_forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +00:00
+date: 2011-02-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- .gitignore
 - README.markdown
 - Rakefile
 - VERSION
@@ -79,14 +80,8 @@ files:
 - db/migrate/001_forums_groups.rb
 - db/migrate/20091008101339_simple_ownership.rb
 - group_forum_extension.rb
-- lib/forums_controller_extensions.rb
 - lib/group_forum_tags.rb
-- lib/grouped_forum.rb
-- lib/grouped_post.rb
-- lib/grouped_topic.rb
-- lib/posts_controller_extensions.rb
 - lib/tasks/group_forum_extension_tasks.rake
-- lib/topics_controller_extensions.rb
 - radiant-group_forum-extension.gemspec
 - spec/datasets/group_forum_forums_dataset.rb
 - spec/datasets/group_forum_groups_dataset.rb

data/lib/forums_controller_extensions.rb

@@ -1,22 +0,0 @@
-module ForumsControllerExtensions
-  
-  def self.included(base)
-    base.class_eval {
-      before_filter :require_visibility_of_forum
-
-      def index
-        @forums = Forum.visible_to(current_reader).paginate(:all, :order => "position", :page => params[:page] || 1, :per_page => params[:per_page])    #nb. visible_to is a named_scope defined in GroupedModel (in reader_group)
-      end
-
-    protected
-      
-      def require_visibility_of_forum
-        if @forum && !@forum.visible_to?(current_reader)
-          flash[:error] = "Sorry: you don't have permission to see that discussion category."
-          redirect_to reader_permission_denied_url
-          return false
-        end
-      end
-    }
-  end
-end

data/lib/grouped_forum.rb

@@ -1,10 +0,0 @@
-module GroupedForum
-
-  def self.included(base)
-    base.class_eval {
-      has_group
-      gives_group_to :topics  # which in turn give it to posts
-    }
-  end
-
-end

data/lib/grouped_post.rb

@@ -1,10 +0,0 @@
-module GroupedPost
-
-  def self.included(base)
-    base.class_eval {
-      has_group
-      gets_group_from :topic
-    }
-  end
-
-end

data/lib/grouped_topic.rb

@@ -1,11 +0,0 @@
-module GroupedTopic
-
-  def self.included(base)
-    base.class_eval {
-      has_group
-      gets_group_from :forum
-      gives_group_to :posts
-    }
-  end
-
-end

data/lib/posts_controller_extensions.rb

@@ -1,26 +0,0 @@
-module PostsControllerExtensions
-  
-  def self.included(base)
-    base.class_eval {
-      before_filter :require_visibility_of_topic_and_page
-
-    protected
-      
-      def require_visibility_of_topic_and_page
-        if @page && !@page.visible_to?(current_reader)
-          flash[:error] = "Sorry: you don't have permission to see that page."
-          redirect_to reader_permission_denied_url
-          return false
-        end
-        if @topic && !@topic.visible_to?(current_reader)
-          flash[:error] = "Sorry: you don't have permission to see that discussion."
-          redirect_to reader_permission_denied_url
-          return false
-        end
-      end
-    }
-  end
-end
-
-
-

data/lib/topics_controller_extensions.rb

@@ -1,26 +0,0 @@
-module TopicsControllerExtensions
-  
-  def self.included(base)
-    base.class_eval {
-      before_filter :require_visibility_of_forum_and_page
-
-    protected
-      
-      def require_visibility_of_forum_and_page
-        if @page && !@page.visible_to?(current_reader)
-          flash[:error] = "Sorry: you don't have permission to see that page."
-          redirect_to reader_permission_denied_url
-          return false
-        end
-        if @forum && !@forum.visible_to?(current_reader)
-          flash[:error] = "Sorry: you don't have permission to see that discussion."
-          redirect_to reader_permission_denied_url
-          return false
-        end
-      end
-    }
-  end
-end
-
-
-