radiant-reader_group-extension 1.2.2 → 1.2.3

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/lib/grouped_message.rb

@@ -28,7 +28,7 @@ module GroupedMessage
     def functional_with_groups(function, group=nil)
       messages = for_function(function)
       if group
-        messages.for_group(group).first
+        messages.belonging_to(group).first
       else
         messages.ungrouped.first
       end

data/lib/grouped_model.rb

@@ -13,9 +13,16 @@ module GroupedModel
       return if has_groups?
       
       class_eval {
-        extend GroupedModel::GroupedClassMethods
         include GroupedModel::GroupedInstanceMethods
 
+        def self.has_groups?
+          true
+        end
+        
+        def self.visible
+          visible_to(nil)
+        end
+        
         unless instance_methods.include? 'visible_to?'
           def visible_to?(reader)
             return true
@@ -28,6 +35,20 @@ module GroupedModel
       has_many :groups, :through => :permissions
       Group.define_retrieval_methods(self.to_s)
 
+      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 => "LEFT OUTER JOIN permissions as pp on pp.permitted_id = #{self.table_name}.id AND pp.permitted_type = '#{self.to_s}'",
+          :group => column_names.map { |n| self.table_name + '.' + n }.join(','),
+          :conditions => conditions
+        } 
+      }
+
       named_scope :ungrouped, {
         :select => "#{self.table_name}.*, count(pp.id) as group_count",
         :joins => "LEFT OUTER JOIN permissions as pp on pp.permitted_id = #{self.table_name}.id AND pp.permitted_type = '#{self.to_s}'", 
@@ -52,33 +73,19 @@ module GroupedModel
         end
       end
       
-      named_scope :for_group, lambda { |group| 
+      named_scope :belonging_to, lambda { |group| 
         {
           :joins => "INNER JOIN permissions as pp on pp.permitted_id = #{self.table_name}.id AND pp.permitted_type = '#{self.to_s}'", 
-          :conditions => ["pp.group_id = ?)", group.id],
           :group => column_names.map { |n| self.table_name + '.' + n }.join(','),
+          :conditions => ["pp.group_id = ?)", group.id],
           :readonly => false
         }
       }
             
-      named_scope :visible_to, lambda { |reader| 
-        groups = reader.nil? ? [] : reader.groups
-        {:conditions => ["group_id IS NULL OR group_id IN(?)", groups.map(&:id).join(',')]} 
-      }
     end
     alias :has_group :has_groups
   end
 
-  module GroupedClassMethods
-    def has_groups?
-      true
-    end
-    
-    def visible
-      ungrouped
-    end
-  end
-
   module GroupedInstanceMethods
 
     # in GroupedPage this is chained to include inherited groups

data/radiant-reader_group-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader_group-extension}
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   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{Adds group-based page access control to radiant.}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [

data/reader_group_extension.rb

@@ -10,7 +10,7 @@ module ReaderGroup
 end
 
 class ReaderGroupExtension < Radiant::Extension
-  version "1.2.2"
+  version "1.2.3"
   description "Page (and other) access control for site readers and groups"
   url "http://spanner.org/radiant/reader_group"
 

data/spec/models/page_spec.rb

@@ -8,6 +8,35 @@ describe Page do
     @site = Page.current_site = sites(:test) if defined? Site
   end
   
+  describe "listed" do
+    describe "for nobody in particular" do
+      it "should not include private pages" do
+        Page.visible.include?(pages(:news)).should be_false
+      end
+      it "should include non-private pages" do
+        Page.visible.include?(pages(:first)).should be_true
+      end
+    end
+
+    describe "for a reader without group memberships" do
+      it "should not include private pages" do
+        Page.visible_to(readers(:ungrouped)).include?(pages(:news)).should be_false
+      end
+      it "should include non-private pages" do
+        Page.visible_to(readers(:ungrouped)).include?(pages(:first)).should be_true
+      end
+    end
+
+    describe "for a reader with group memberships" do
+      it "should include private pages" do
+        Page.visible_to(readers(:another)).include?(pages(:news)).should be_true
+      end
+      it "should include non-private pages" do
+        Page.visible_to(readers(:another)).include?(pages(:first)).should be_true
+      end
+    end
+  end
+  
   describe "with groups" do
     before do
       @page = pages(:parent)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader_group-extension
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 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