radiant-group_forum-extension 0.5.2 → 0.6.0

data/Rakefile

@@ -8,8 +8,8 @@ begin
     gem.homepage = "http://github.com/spanner/radiant-group_forum-extension"
     gem.authors = ["spanner"]
     gem.add_dependency "radiant", ">= 0.9.0"
-    gem.add_dependency 'radiant-forum-extension'
-    gem.add_dependency 'radiant-reader_group-extension'
+    gem.add_dependency 'radiant-forum-extension', ">= 2.0.0"
+    gem.add_dependency 'radiant-reader_group-extension', ">= 1.2.0"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. This is only required if you plan to package group_forum as a gem."

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/group_forum_extension.rb

@@ -1,10 +1,12 @@
 class GroupForumExtension < Radiant::Extension
-  version "0.5.2"
+  version "0.6.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 :has_groups
+    Topic.send :include, GroupedTopic           # scopes and retrieval methods that check forum group permissions
+    Post.send :include, GroupedPost             # (giving Post and Topic the same visibility calls as Forum even though they don't have direct group links)
     Page.send :include, GroupForumTags          # a few tags for listing forums and latest topics on group pages
     ForumBaseController.send :include, GroupedControllerExtensions
 

data/lib/grouped_post.rb

@@ -0,0 +1,28 @@
+module GroupedPost
+  
+  def self.included(base)
+    base.class_eval {
+      # this overwrites the similarly named stub method in Topic
+      named_scope :visible_to, lambda { |reader|
+        if reader.nil? || reader.groups.empty?
+          conditions = "pp.group_id IS NULL"
+        else
+          ids = reader.group_ids
+          conditions = reader.nil? ? "pp.group_id IS NULL" : ["pp.group_id IS NULL OR pp.group_id IN(#{ids.map{"?"}.join(',')})", *ids]
+        end
+        {
+          :joins => "INNER JOIN topics on posts.topic_id = topics.id INNER JOIN forums on topics.forum_id = forums.id LEFT OUTER JOIN permissions as pp on pp.permitted_id = forums.id AND pp.permitted_type = 'Forum'", 
+          :group => column_names.map { |n| self.table_name + '.' + n }.join(','),
+          :conditions => conditions
+        } 
+      } do
+        def count
+          length
+        end
+      end
+    }
+  end
+end
+
+
+

data/lib/grouped_topic.rb

@@ -0,0 +1,28 @@
+module GroupedTopic
+  
+  def self.included(base)
+    base.class_eval {
+      # this overwrites the similarly named stub method in Topic
+      named_scope :visible_to, lambda { |reader| 
+        if reader.nil? || reader.groups.empty?
+          conditions = "pp.group_id IS NULL"
+        else
+          ids = reader.group_ids
+          conditions = reader.nil? ? "pp.group_id IS NULL" : ["pp.group_id IS NULL OR pp.group_id IN(#{ids.map{"?"}.join(',')})", *ids]
+        end
+        {
+          :joins => "INNER JOIN forums on topics.forum_id = forums.id LEFT OUTER JOIN permissions as pp on pp.permitted_id = forums.id AND pp.permitted_type = 'Forum'",
+          :group => column_names.map { |n| self.table_name + '.' + n }.join(','),
+          :conditions => conditions
+        } 
+      } do
+        def count
+          length
+        end
+      end
+    }
+  end
+end
+
+
+

data/radiant-group_forum-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-group_forum-extension}
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2011-02-15}
+  s.date = %q{2011-02-16}
   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 = [
@@ -27,6 +27,8 @@ Gem::Specification.new do |s|
      "group_forum_extension.rb",
      "lib/group_forum_tags.rb",
      "lib/grouped_controller_extensions.rb",
+     "lib/grouped_post.rb",
+     "lib/grouped_topic.rb",
      "lib/tasks/group_forum_extension_tasks.rake",
      "radiant-group_forum-extension.gemspec",
      "spec/datasets/group_forum_forums_dataset.rb",
@@ -59,17 +61,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<radiant>, [">= 0.9.0"])
-      s.add_runtime_dependency(%q<radiant-forum-extension>, [">= 0"])
-      s.add_runtime_dependency(%q<radiant-reader_group-extension>, [">= 0"])
+      s.add_runtime_dependency(%q<radiant-forum-extension>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<radiant-reader_group-extension>, [">= 1.2.0"])
     else
       s.add_dependency(%q<radiant>, [">= 0.9.0"])
-      s.add_dependency(%q<radiant-forum-extension>, [">= 0"])
-      s.add_dependency(%q<radiant-reader_group-extension>, [">= 0"])
+      s.add_dependency(%q<radiant-forum-extension>, [">= 2.0.0"])
+      s.add_dependency(%q<radiant-reader_group-extension>, [">= 1.2.0"])
     end
   else
     s.add_dependency(%q<radiant>, [">= 0.9.0"])
-    s.add_dependency(%q<radiant-forum-extension>, [">= 0"])
-    s.add_dependency(%q<radiant-reader_group-extension>, [">= 0"])
+    s.add_dependency(%q<radiant-forum-extension>, [">= 2.0.0"])
+    s.add_dependency(%q<radiant-reader_group-extension>, [">= 1.2.0"])
   end
 end
 

data/spec/models/forum_spec.rb

@@ -11,8 +11,17 @@ describe Forum do
     Forum.reflect_on_association(:groups).should_not be_nil
   end
   
-  it "should normally list only the ungrouped forums" do
-    Forum.visible.count.should == 1
+  describe "without a grouped reader" do
+    it "should list only the ungrouped forums" do
+      Forum.visible.count.should == 1
+      Forum.visible_to(readers(:ungrouped)).count.should == 1
+    end
+  end
+  
+  describe "to a grouped reader" do
+    it "should list also the forums of that group" do
+      Forum.visible_to(readers(:normal)).count.should == 3
+    end
   end
 
   describe "with a group" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-group_forum-extension
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +00:00
+date: 2011-02-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,10 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 2
+        - 0
         - 0
-        version: "0"
+        version: 2.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,10 +58,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
+        - 1
+        - 2
         - 0
-        version: "0"
+        version: 1.2.0
   type: :runtime
   version_requirements: *id003
 description: A bit of glue to add group-based access control to the radiant forum.
@@ -82,6 +86,8 @@ files:
 - group_forum_extension.rb
 - lib/group_forum_tags.rb
 - lib/grouped_controller_extensions.rb
+- lib/grouped_post.rb
+- lib/grouped_topic.rb
 - lib/tasks/group_forum_extension_tasks.rake
 - radiant-group_forum-extension.gemspec
 - spec/datasets/group_forum_forums_dataset.rb