radiant-reader_group-extension 1.2.0 → 1.2.1

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/app/models/group.rb

@@ -20,6 +20,10 @@ class Group < ActiveRecord::Base
   named_scope :subscribable, { :conditions => "public = 1" }
   named_scope :unsubscribable, { :conditions => "public = 0" }
 
+  named_scope :from_list, lambda { |ids|
+    { :conditions => ["groups.id IN (#{ids.map{"?"}.join(',')})", *ids] }
+  }
+
   named_scope :attached_to, lambda { |objects|
     conditions = objects.map{|o| "(pp.permitted_type = ? AND pp.permitted_id = ?)" }.join(" OR ")
     binds = objects.map{|o| [o.class.to_s, o.id]}.flatten

data/lib/grouped_model.rb

@@ -26,7 +26,6 @@ module GroupedModel
       
       has_many :permissions, :as => :permitted
       has_many :groups, :through => :permissions
-      accepts_nested_attributes_for :permissions
       Group.define_retrieval_methods(self.to_s)
 
       named_scope :ungrouped, {
@@ -103,15 +102,16 @@ module GroupedModel
       permitted_groups.any? ? Reader.in_groups(permitted_groups) : Reader.all
     end
     
-    # GroupedPage also defines a separate has_inherited_group? method
-    # so here we don't call permitted_groups
     def has_group?(group)
-      return self.groups.include?(group)
+      return self.permitted_groups.include?(group)
     end
     
     def permit(group)
       self.groups << group unless self.has_group?(group)
     end
 
+    def group_ids=(ids)
+      self.groups = Group.from_list(ids)
+    end
   end
 end

data/lib/grouped_page.rb

@@ -11,26 +11,15 @@ module GroupedPage
   
   module InstanceMethods
     
-    # this is all very inefficient recursive stuff
-    # but the ancestor pages should be in memory already
-    # and the groups check is now a single query
-
+    attr_reader :inherited_groups
     def inherited_groups
-      lineage = self.ancestors
-      if lineage.any?
-        Group.attached_to(lineage)
-      else
-        []
-      end
+      @inherited_groups ||= self.parent ? Group.attached_to(self.ancestors) : []
     end
 
     def permitted_groups_with_inheritance
       permitted_groups_without_inheritance + inherited_groups
     end
 
-    # any page with a group-marker is never cached
-    # so that we can return cache hits with confidence
-    # this call is regrettably expensive
     def cache?
       self.permitted_groups.empty?
     end        

data/radiant-reader_group-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader_group-extension}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]

data/reader_group_extension.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader_group-extension
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - spanner