radiant-reader_group-extension 1.0.1 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/app/models/group.rb

@@ -1,6 +1,6 @@
 class Group < ActiveRecord::Base
 
-  is_site_scoped if defined? ActiveRecord::SiteNotFound
+  has_site if respond_to? :has_site
   default_scope :order => 'name'
 
   belongs_to :created_by, :class_name => 'User'

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

@@ -10,6 +10,8 @@
 - render_region :main do |main|
   - main.messages do
     #group_messages.box
+      .actions
+        = link_to image('plus') + ' ' + t("create_new_message"), new_admin_group_message_url(@group), :class => 'action create'
       %h3
         =t('admin_messages').titlecase
       - ['welcome', 'invitation'].each do |func|
@@ -31,8 +33,6 @@
             - if message.sent_at
               = t('last_sent')
               = l(message.sent_at, :format => :short)
-      %p.ruled
-        = link_to image('plus') + ' ' + t("create_new_message"), new_admin_group_message_url(@group), :class => 'action create'
         
   - main.pages do
     #group_pages.box
@@ -45,6 +45,8 @@
 
   - main.members do
     #group_people.box
+      .actions
+        = link_to image('plus') + ' ' + t('add_members'), new_admin_group_group_invitation_url(@group), :class => 'action'
       %h3
         =t('group_members').titlecase
       - readers = Reader.find(:all)

data/lib/grouped_message.rb

@@ -2,7 +2,7 @@ module GroupedMessage
 
   def self.included(base)
     base.class_eval {
-      is_grouped
+      has_group
 
       include InstanceMethods
       alias_method_chain :possible_readers, :group

data/lib/grouped_model.rb

@@ -4,25 +4,32 @@ module GroupedModel
   end
 
   module ClassMethods
-    def is_grouped?
+    def has_group?
       false
     end
     
-    def is_grouped(options={})
-      return if is_grouped?
+    def has_group(options={})
+      return if has_group?
       cattr_accessor :group_recipients, :group_donor
       
       class_eval {
         extend GroupedModel::GroupedClassMethods
         include GroupedModel::GroupedInstanceMethods
 
-        def visible_to?(reader)
-          return true unless group
+        unless instance_methods.include? 'visible_to?'
+          def visible_to?(reader)
+            return true
+          end
+        end
+
+        def visible_to_with_groups?(reader)
+          value_otherwise = visible_to_without_groups?(reader)
+          return value_otherwise unless group
           return false unless reader
-          return true if reader.is_user?
-          return true if reader.is_in?(group)
+          return value_otherwise if reader.is_in?(group)
           return false
         end
+        alias_method_chain :visible_to?, :groups
       }
       
       belongs_to :group
@@ -38,27 +45,29 @@ module GroupedModel
       before_create :get_group
       after_save :give_group
     end
+    alias :is_grouped :has_group
+    alias :is_grouped? :has_group?
   end
 
   module GroupedClassMethods
-    def visible
-      ungrouped
+    def has_group?
+      true
     end
     
-    def is_grouped?
-      true
+    def visible
+      ungrouped
     end
     
     def gets_group_from(association_name)
       association = reflect_on_association(association_name)
       raise StandardError "can't find group source '#{association_name}" unless association
-      raise StandardError "#{association.klass} is not grouped and cannot be a group donor" unless association.klass.is_grouped? 
+      raise StandardError "#{association.klass} is not grouped and cannot be a group donor" unless association.klass.has_group? 
       self.group_donor = association_name
     end
     
     def gives_group_to(associations)
       associations = [associations] unless associations.is_a?(Array)
-      # shall we force is_grouped here?
+      # shall we force has_group here?
       # shall we assume that gets_group_from follows? and find the association somehow?
       self.group_recipients ||= []
       self.group_recipients += associations

data/lib/readers_controller_extensions.rb

@@ -2,7 +2,7 @@ module ReadersControllerExtensions
   
   def self.included(base)
     base.class_eval { before_filter :ensure_groups_subscribable, :only => [:update, :create] }
-    base.add_form_partial 'readers/memberships'
+    base.add_edit_partial 'readers/memberships'
   end
 
   def ensure_groups_subscribable

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.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-10-20}
+  s.date = %q{2011-01-27}
   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,13 +10,13 @@ module ReaderGroup
 end
 
 class ReaderGroupExtension < Radiant::Extension
-  version "1.0.1"
+  version "1.1.0"
   description "Page (and other) access control for site readers and groups"
   url "http://spanner.org/radiant/reader_group"
 
   def activate
     Group
-    ActiveRecord::Base.send :include, GroupedModel                                    # is_grouped mechanism for any model that can belong_to a group
+    ActiveRecord::Base.send :include, GroupedModel                                    # has_group mechanism for any model that can belong_to a group
     
     Reader.send :include, GroupedReader                                               # defines group associations
     Page.send :include, GroupedPage                                                   # group associations and visibility decisions

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader_group-extension
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 +01:00
+date: 2011-01-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency