groupify 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a51b9eb2f098c12c38c0931f70239b4c6dcc69a4
-  data.tar.gz: 583b5b0cd264c7d9a47c61d15fd471510b83d6e0
+  metadata.gz: dcc33f0b1cc986893a05a5fdc5e916bd7e3b9837
+  data.tar.gz: bbe9793b57fe7c7256193694aed87e7d1de7adf7
 SHA512:
-  metadata.gz: 9b170ecd8d041eace85389589d8f12cf817aa2ce09c484350661285e1b690f8e679380e484a4a44855a1de9d994c3e1ecee71e20b5577a53b0ba7dc10d09206d
-  data.tar.gz: 97e75482a3628024737b26f452febd88f109472b94c8c2e55884f7b6614a789b34cb2ba1da37e3a6cc4f5d1d01438ac71a33cf5e8cbc9c3937c12544bbeebd2e
+  metadata.gz: bfa5473767c6bf658020a14ba3f480d0b04ace3997c34377b4dca702dbeab9c4ef3c11354da9264ea453986b20af09472ea513c7ca807e0bc8d3e7f0111935bd
+  data.tar.gz: e12229d766b2f5abead3b6d7d6848fb6f7c3b40a7889fe03734e589c35a5b4d017efb0628d902755d51f355264b5b049b160ded876a1fbbfbcd3d0b0f168d1c1

data/.ruby-gemset

@@ -0,0 +1 @@
+gem_groupify

data/CHANGELOG.md

@@ -1,7 +1,23 @@
 # Change Log
 
-## [0.7.1](https://github.com/dwbutler/groupify/tree/0.7.1) (2015-11-19)
-[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.7.0...0.7.1)
+## [v0.8.0](https://github.com/dwbutler/groupify/tree/v0.8.0) (2016-06-10)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.7.2...v0.8.0)
+
+**Fixed bugs:**
+
+- Setting a group as a group member breaks has\_members associations on that group [\#45](https://github.com/dwbutler/groupify/issues/45)
+- Error on add user a team on Rails 5 Beta [\#39](https://github.com/dwbutler/groupify/issues/39)
+- Split group memberships [\#46](https://github.com/dwbutler/groupify/pull/46) ([juhazi](https://github.com/juhazi))
+
+## [v0.7.2](https://github.com/dwbutler/groupify/tree/v0.7.2) (2016-05-21)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.7.1...v0.7.2)
+
+**Merged pull requests:**
+
+-  Some fixes to prep for rails5 [\#44](https://github.com/dwbutler/groupify/pull/44) ([wadestuart](https://github.com/wadestuart))
+
+## [v0.7.1](https://github.com/dwbutler/groupify/tree/v0.7.1) (2015-11-19)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.7.0...v0.7.1)
 
 **Fixed bugs:**
 
@@ -107,4 +123,4 @@
 ## [v0.4.0](https://github.com/dwbutler/groupify/tree/v0.4.0) (2013-07-01)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -129,11 +129,11 @@ Example:
 
 ```ruby
 class Organization < Group
-  has_members [:offices, :equipment]
+  has_members :offices, :equipment
 end
 ```
 
-Mongoid works the same way by creating Mongoid relations. 
+Mongoid works the same way by creating Mongoid relations.
 
 ## Usage
 
@@ -359,6 +359,15 @@ end
 
 ## Upgrading
 
+### 0.8+ - Name Change for `group_memberships` Associations (ActiveRecord only)
+
+Groupify 0.8+ changed the ActiveRecord adapter to support configuring the same
+model as both a group and a group member. To accomplish this, the internal `group_memberships`
+association was renamed to be different for groups and members. If you were
+using it, please be aware that you will need to change your code. This
+association is considered to be an internal implementation details and not part
+of the public API, so please don't rely on it if you can avoid it.
+
 ### 0.7+ - Polymorphic Groups (ActiveRecord only)
 Groupify < 0.7 required a single `Group` model used for all group memberships.
 Groupify 0.7+ supports using multiple models as groups by implementing polymorphic associations.
@@ -381,3 +390,7 @@ table is large.
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Contributors
+
+See a list of contributors [here](https://github.com/dwbutler/groupify/graphs/contributors).

data/Rakefile

@@ -12,7 +12,7 @@ end
 require 'github_changelog_generator/task'
 desc "Regenerate changelog"
 GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.future_release = '0.7.1'
+  config.future_release = 'v0.8.0'
 end
 
 task :default => :spec

data/lib/groupify/adapter/active_record/group.rb

@@ -15,7 +15,7 @@ module Groupify
       included do
         @default_member_class = nil
         @member_klasses ||= Set.new
-        has_many :group_memberships,
+        has_many :group_memberships_as_group,
                  dependent: :destroy,
                  as: :group,
                  class_name: Groupify.group_membership_class_name
@@ -37,7 +37,7 @@ module Groupify
         members.each do |member|
           member.groups << self unless member.groups.include?(self)
           if membership_type
-            member.group_memberships.where(group_id: id, group_type: self.class.model_name.to_s, membership_type: membership_type).first_or_create!
+            member.group_memberships_as_member.where(group_id: id, group_type: self.class.model_name.to_s, membership_type: membership_type).first_or_create!
           end
           member.__send__(:clear_association_cache)
         end
@@ -68,9 +68,11 @@ module Groupify
         end
 
         # Define which classes are members of this group
-        def has_members(name)
-          klass = name.to_s.classify.constantize
-          register(klass)
+        def has_members(*names)
+          Array.wrap(names.flatten).each do |name|
+            klass = name.to_s.classify.constantize
+            register(klass)
+          end
         end
 
         # Merge two groups. The members of the source become members of the destination, and the source is destroyed.
@@ -78,13 +80,13 @@ module Groupify
           # Ensure that all the members of the source can be members of the destination
           invalid_member_classes = (source_group.member_classes - destination_group.member_classes)
           invalid_member_classes.each do |klass|
-            if klass.joins(:group_memberships).where(:group_memberships => {:group_id => source_group.id}).count > 0
+            if klass.joins(:group_memberships_as_member).where(:group_memberships => {:group_id => source_group.id}).count > 0
               raise ArgumentError.new("#{source_group.class} has members that cannot belong to #{destination_group.class}")
             end
           end
 
           source_group.transaction do
-            source_group.group_memberships.update_all(:group_id => destination_group.id)
+            source_group.group_memberships_as_group.update_all(:group_id => destination_group.id)
             source_group.destroy
           end
         end
@@ -109,7 +111,7 @@ module Groupify
             members = args
 
             if opts[:as]
-              proxy_association.owner.group_memberships.
+              proxy_association.owner.group_memberships_as_group.
                   where(member_id: members.map(&:id), member_type: proxy_association.reflection.options[:source_type]).
                   as(opts[:as]).
                   delete_all
@@ -123,7 +125,7 @@ module Groupify
             members = args
 
             if opts[:as]
-              proxy_association.owner.group_memberships.
+              proxy_association.owner.group_memberships_as_group.
                   where(member_id: members.map(&:id), member_type: proxy_association.reflection.options[:source_type]).
                   as(opts[:as]).
                   destroy_all
@@ -148,14 +150,14 @@ module Groupify
           if ActiveSupport::VERSION::MAJOR > 3
             has_many association_name,
                      ->{ uniq },
-                     through: :group_memberships,
+                     through: :group_memberships_as_group,
                      source: :member,
                      source_type: source_type,
                      extend: MemberAssociationExtensions
           else
             has_many association_name,
                      uniq: true,
-                     through: :group_memberships,
+                     through: :group_memberships_as_group,
                      source: :member,
                      source_type: source_type,
                      extend: MemberAssociationExtensions

data/lib/groupify/adapter/active_record/group_member.rb

@@ -13,8 +13,8 @@ module Groupify
       extend ActiveSupport::Concern
 
       included do
-        unless respond_to?(:group_memberships)
-          has_many :group_memberships,
+        unless respond_to?(:group_memberships_as_member)
+          has_many :group_memberships_as_member,
                    as: :member,
                    autosave: true,
                    dependent: :destroy,
@@ -23,14 +23,14 @@ module Groupify
 
         if ActiveSupport::VERSION::MAJOR > 3
           has_many :groups, ->{ uniq },
-                   through: :group_memberships,
+                   through: :group_memberships_as_member,
                    as: :group,
                    source_type: @group_class_name,
                    extend: GroupAssociationExtensions
         else
           has_many :groups,
                    uniq: true,
-                   through: :group_memberships,
+                   through: :group_memberships_as_member,
                    as: :group,
                    source_type: @group_class_name,
                    extend: GroupAssociationExtensions
@@ -48,7 +48,7 @@ module Groupify
           groups = args.flatten
 
           if opts[:as]
-            proxy_association.owner.group_memberships.where(group_id: groups.map(&:id)).as(opts[:as]).delete_all
+            proxy_association.owner.group_memberships_as_member.where(group_id: groups.map(&:id)).as(opts[:as]).delete_all
           else
             super(*groups)
           end
@@ -59,7 +59,7 @@ module Groupify
           groups = args.flatten
 
           if opts[:as]
-            proxy_association.owner.group_memberships.where(group_id: groups.map(&:id)).as(opts[:as]).destroy_all
+            proxy_association.owner.group_memberships_as_member.where(group_id: groups.map(&:id)).as(opts[:as]).destroy_all
           else
             super(*groups)
           end
@@ -73,7 +73,7 @@ module Groupify
           criteria.merge!(membership_type: opts[:as])
         end
 
-        group_memberships.exists?(criteria)
+        group_memberships_as_member.exists?(criteria)
       end
 
       def in_any_group?(*args)
@@ -106,30 +106,30 @@ module Groupify
 
       module ClassMethods
         def as(membership_type)
-          joins(:group_memberships).where(group_memberships: { membership_type: membership_type })
+          joins(:group_memberships_as_member).where(group_memberships: { membership_type: membership_type })
         end
 
         def in_group(group)
           return none unless group.present?
 
-          joins(:group_memberships).where(group_memberships: { group_id: group.id }).uniq
+          joins(:group_memberships_as_member).where(group_memberships: { group_id: group.id }).uniq
         end
 
         def in_any_group(*groups)
           groups = groups.flatten
           return none unless groups.present?
 
-          joins(:group_memberships).where(group_memberships: { group_id: groups.map(&:id) }).uniq
+          joins(:group_memberships_as_member).where(group_memberships: { group_id: groups.map(&:id) }).uniq
         end
 
         def in_all_groups(*groups)
           groups = groups.flatten
           return none unless groups.present?
 
-          joins(:group_memberships).
+          joins(:group_memberships_as_member).
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
               where(group_memberships: {group_id: groups.map(&:id)}).
-              having("COUNT(#{reflect_on_association(:group_memberships).klass.quoted_table_name}.#{connection.quote_column_name('group_id')}) = ?", groups.count).
+              having("COUNT(#{reflect_on_association(:group_memberships_as_member).klass.quoted_table_name}.#{connection.quote_column_name('group_id')}) = ?", groups.count).
               uniq
         end
 
@@ -137,9 +137,9 @@ module Groupify
           groups = groups.flatten
           return none unless groups.present?
 
-          joins(:group_memberships).
+          joins(:group_memberships_as_member).
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
-              having("COUNT(DISTINCT #{reflect_on_association(:group_memberships).klass.quoted_table_name}.#{connection.quote_column_name('group_id')}) = ?", groups.count).
+              having("COUNT(DISTINCT #{reflect_on_association(:group_memberships_as_member).klass.quoted_table_name}.#{connection.quote_column_name('group_id')}) = ?", groups.count).
               uniq
         end
 

data/lib/groupify/adapter/active_record/model.rb

@@ -26,9 +26,7 @@ module Groupify
           end
 
           if (member_klasses = opts.delete :members)
-            member_klasses.each do |member_klass|
-              has_members(member_klass)
-            end
+            has_members(member_klasses)
           end
         end
 

data/lib/groupify/adapter/active_record/named_group_collection.rb

@@ -4,7 +4,7 @@ module Groupify
     class NamedGroupCollection < Set
       def initialize(member)
         @member = member
-        @named_group_memberships = member.group_memberships.named
+        @named_group_memberships = member.group_memberships_as_member.named
         @group_names = @named_group_memberships.pluck(:group_name).map(&:to_sym)
         super(@group_names)
       end
@@ -14,18 +14,18 @@ module Groupify
         membership_type = opts[:as]
 
         if @member.new_record?
-          @member.group_memberships.build(group_name: named_group, membership_type: nil)
+          @member.group_memberships_as_member.build(group_name: named_group, membership_type: nil)
         else
           @member.transaction do
-            @member.group_memberships.where(group_name: named_group, membership_type: nil).first_or_create!
+            @member.group_memberships_as_member.where(group_name: named_group, membership_type: nil).first_or_create!
           end
         end
 
         if membership_type
           if @member.new_record?
-            @member.group_memberships.build(group_name: named_group, membership_type: membership_type)
+            @member.group_memberships_as_member.build(group_name: named_group, membership_type: membership_type)
           else
-            @member.group_memberships.where(group_name: named_group, membership_type: membership_type).first_or_create!
+            @member.group_memberships_as_member.where(group_name: named_group, membership_type: membership_type).first_or_create!
           end
         end
 

data/lib/groupify/adapter/active_record/named_group_member.rb

@@ -13,8 +13,8 @@ module Groupify
       extend ActiveSupport::Concern
 
       included do
-        unless respond_to?(:group_memberships)
-          has_many :group_memberships,
+        unless respond_to?(:group_memberships_as_member)
+          has_many :group_memberships_as_member,
                    as: :member,
                    autosave: true,
                    dependent: :destroy,
@@ -63,30 +63,30 @@ module Groupify
 
       module ClassMethods
         def as(membership_type)
-          joins(:group_memberships).where(group_memberships: {membership_type: membership_type})
+          joins(:group_memberships_as_member).where(group_memberships: {membership_type: membership_type})
         end
 
         def in_named_group(named_group)
           return none unless named_group.present?
 
-          joins(:group_memberships).where(group_memberships: {group_name: named_group}).uniq
+          joins(:group_memberships_as_member).where(group_memberships: {group_name: named_group}).uniq
         end
 
         def in_any_named_group(*named_groups)
           named_groups.flatten!
           return none unless named_groups.present?
 
-          joins(:group_memberships).where(group_memberships: {group_name: named_groups.flatten}).uniq
+          joins(:group_memberships_as_member).where(group_memberships: {group_name: named_groups.flatten}).uniq
         end
 
         def in_all_named_groups(*named_groups)
           named_groups.flatten!
           return none unless named_groups.present?
 
-          joins(:group_memberships).
+          joins(:group_memberships_as_member).
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
               where(:group_memberships => {:group_name => named_groups}).
-              having("COUNT(DISTINCT #{reflect_on_association(:group_memberships).klass.quoted_table_name}.#{connection.quote_column_name('group_name')}) = ?", named_groups.count).
+              having("COUNT(DISTINCT #{reflect_on_association(:group_memberships_as_member).klass.quoted_table_name}.#{connection.quote_column_name('group_name')}) = ?", named_groups.count).
               uniq
         end
 
@@ -94,9 +94,9 @@ module Groupify
           named_groups.flatten!
           return none unless named_groups.present?
 
-          joins(:group_memberships).
+          joins(:group_memberships_as_member).
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
-              having("COUNT(DISTINCT #{reflect_on_association(:group_memberships).klass.quoted_table_name}.#{connection.quote_column_name('group_name')}) = ?", named_groups.count).
+              having("COUNT(DISTINCT #{reflect_on_association(:group_memberships_as_member).klass.quoted_table_name}.#{connection.quote_column_name('group_name')}) = ?", named_groups.count).
               uniq
         end
 

data/lib/groupify/adapter/mongoid/group.rb

@@ -65,9 +65,11 @@ module Groupify
         end
 
         # Define which classes are members of this group
-        def has_members(name)
-          klass = name.to_s.classify.constantize
-          register(klass)
+        def has_members(*names)
+          Array.wrap(names.flatten).each do |name|
+            klass = name.to_s.classify.constantize
+            register(klass)
+          end
         end
 
         # Merge two groups. The members of the source become members of the destination, and the source is destroyed.

data/lib/groupify/adapter/mongoid/model.rb

@@ -20,9 +20,7 @@ module Groupify
           end
 
           if (member_klasses = opts.delete :members)
-            member_klasses.each do |member_klass|
-              has_members(member_klass)
-            end
+            has_members(member_klasses)
           end
         end
 

data/lib/groupify/version.rb

@@ -1,3 +1,3 @@
 module Groupify
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/spec/active_record_spec.rb

@@ -36,7 +36,7 @@ end
 
 require 'groupify/adapter/active_record'
 
-class User < ActiveRecord::Base  
+class User < ActiveRecord::Base
   groupify :group_member
   groupify :named_group_member
 end
@@ -58,15 +58,17 @@ class Project < ActiveRecord::Base
   groupify :named_group_member
 end
 
-class Group < ActiveRecord::Base  
+class Group < ActiveRecord::Base
   groupify :group, members: [:users, :widgets, "namespaced/members"], default_members: :users
 end
 
 class Organization < Group
-  has_members :managers
+  groupify :group_member
+
+  has_members :managers, :organizations
 end
 
-class GroupMembership < ActiveRecord::Base  
+class GroupMembership < ActiveRecord::Base
   groupify :group_membership
 end
 
@@ -176,7 +178,7 @@ describe Groupify::ActiveRecord do
       it "only adds a member to a group once" do
         group.add user
         group.add user
-        expect(user.group_memberships.count).to eq(1)
+        expect(user.group_memberships_as_member.count).to eq(1)
       end
 
       it "adds a namespaced member to a group" do
@@ -199,24 +201,31 @@ describe Groupify::ActiveRecord do
         expect { classroom.add(user) }.to raise_error(ActiveRecord::AssociationTypeMismatch)
         expect { user.groups << classroom }.to raise_error(ActiveRecord::AssociationTypeMismatch)
       end
+
+      it "allows a group to also act as a member" do
+        parent_org = Organization.create!
+        child_org = Organization.create!
+        parent_org.add(child_org)
+        expect(parent_org.organizations).to include(child_org)
+      end
     end
 
     it "lists which member classes can belong to this group" do
       expect(group.class.member_classes).to include(User, Widget)
       expect(group.member_classes).to include(User, Widget)
-      
+
       expect(Organization.member_classes).to include(User, Widget, Manager)
     end
-    
+
     it "finds members by group" do
       group.add user
-      
+
       expect(User.in_group(group).first).to eql(user)
     end
 
     it "finds the group a member belongs to" do
       group.add user
-      
+
       expect(Group.with_member(user).first).to eq(group)
     end
 
@@ -275,14 +284,14 @@ describe Groupify::ActiveRecord do
         group2 = Group.create!
         user.groups << group2
         group3 = Group.create!
-        
+
         expect(user.groups).to include(group)
         expect(user.groups).to include(group2)
-        
+
         expect(User.in_group(group).first).to eql(user)
         expect(User.in_group(group2).first).to eql(user)
         expect(user.in_group?(group)).to be true
-        
+
         expect(User.in_any_group(group).first).to eql(user)
         expect(User.in_any_group(group3)).to be_empty
         expect(user.in_any_group?(group2, group3)).to be true
@@ -299,7 +308,7 @@ describe Groupify::ActiveRecord do
         widget.groups << group
         user2 = User.create!
         user2.groups << group
-        
+
         expect(user.shares_any_group?(widget)).to be true
         expect(Widget.shares_any_group(user).to_a).to include(widget)
         expect(User.shares_any_group(widget).to_a).to include(user, user2)
@@ -322,7 +331,7 @@ describe Groupify::ActiveRecord do
 
         destination.merge!(source)
         expect(source.destroyed?).to be true
-        
+
         expect(destination.users).to include(user, manager)
         expect(destination.managers).to include(manager)
       end
@@ -368,8 +377,8 @@ describe Groupify::ActiveRecord do
 
     context "when using membership types with groups" do
       it 'adds groups to a member with a specific membership type' do
-        user.group_memberships.create!(group: group, as: :admin)
-        
+        user.group_memberships_as_member.create!(group: group, as: :admin)
+
         expect(user.groups).to include(group)
         expect(group.members).to include(user)
         expect(group.users).to include(user)
@@ -416,13 +425,13 @@ describe Groupify::ActiveRecord do
       it "finds the group a member belongs to with a membership type" do
         group.add user, as: Manager
         user.groups.create!
-        
+
         expect(Group.with_member(user).as(Manager)).to eq([group])
       end
 
       it "checks if members belong to any groups with a certain membership type" do
         group2 = Group.create!
-        user.group_memberships.create!([{group: group, as: 'employee'}, {group: group2}])
+        user.group_memberships_as_member.create!([{group: group, as: 'employee'}, {group: group2}])
 
         expect(User.in_any_group(group, group2).as('employee').first).to eql(user)
       end
@@ -437,8 +446,8 @@ describe Groupify::ActiveRecord do
       it "checks if members belong to all groups with a certain membership type" do
         group2 = Group.create!
         group3 = Group.create!
-        user.group_memberships.create!([{group: group, as: 'employee'}, {group: group2, as: 'employee'}, {group: group3, as: 'contractor'}])
-        
+        user.group_memberships_as_member.create!([{group: group, as: 'employee'}, {group: group2, as: 'employee'}, {group: group3, as: 'contractor'}])
+
         expect(User.in_all_groups(group, group2).as('employee').first).to eql(user)
         expect(User.in_all_groups([group, group2]).as('employee').first).to eql(user)
         expect(User.in_all_groups(group, group3).as('employee')).to be_empty
@@ -452,7 +461,7 @@ describe Groupify::ActiveRecord do
         group2 = Group.create!
         group3 = Group.create!
         group4 = Group.create!
-        user.group_memberships.create!([{group: group, as: 'employee'}, {group: group2, as: 'employee'}, {group: group3, as: 'contractor'}, {group: group4, as: 'employee'}])
+        user.group_memberships_as_member.create!([{group: group, as: 'employee'}, {group: group2, as: 'employee'}, {group: group3, as: 'contractor'}, {group: group4, as: 'employee'}])
 
         expect(User.in_only_groups(group, group2, group4).as('employee').first).to eql(user)
         expect(User.in_only_groups([group, group2]).as('employee')).to be_empty
@@ -467,7 +476,7 @@ describe Groupify::ActiveRecord do
       it "members can check if groups are shared with the same membership type" do
         user2 = User.create!
         group.add(user, user2, widget, as: "Sub Group #1")
-        
+
         expect(user.shares_any_group?(widget, as: "Sub Group #1")).to be true
         expect(Widget.shares_any_group(user).as("Sub Group #1").to_a).to include(widget)
         expect(User.shares_any_group(widget).as("Sub Group #1").to_a).to include(user, user2)
@@ -515,7 +524,7 @@ describe Groupify::ActiveRecord do
       end
     end
   end
-  
+
   context 'when using named groups' do
     before(:each) do
       user.named_groups.concat :admin, :user, :poster
@@ -543,7 +552,7 @@ describe Groupify::ActiveRecord do
       user.named_groups.destroy_all
       expect(user.named_groups).to be_empty
     end
-     
+
     it "checks if a member belongs to one named group" do
       expect(user.in_named_group?(:admin)).to be true
       expect(User.in_named_group(:admin).first).to eql(user)
@@ -576,7 +585,7 @@ describe Groupify::ActiveRecord do
 
     it "checks if named groups are shared" do
       user2 = User.create!(:named_groups => [:admin])
-      
+
       expect(user.shares_any_named_group?(user2)).to be true
       expect(User.shares_any_named_group(user).to_a).to include(user2)
     end
@@ -596,15 +605,15 @@ describe Groupify::ActiveRecord do
       it "enforces uniqueness of named groups" do
         user.named_groups << :team1
         expect(user.named_groups.count{|g| g == :team1}).to eq(1)
-        expect(user.group_memberships.where(group_name: :team1, membership_type: nil).count).to eq(1)
-        expect(user.group_memberships.where(group_name: :team1, membership_type: 'employee').count).to eq(1)
+        expect(user.group_memberships_as_member.where(group_name: :team1, membership_type: nil).count).to eq(1)
+        expect(user.group_memberships_as_member.where(group_name: :team1, membership_type: 'employee').count).to eq(1)
         expect(user.named_groups.as('employee').count{|g| g == :team1}).to eq(1)
       end
 
       it "enforces uniqueness of group name and membership type for group memberships" do
         user.named_groups.push :team1, as: 'employee'
-        expect(user.group_memberships.where(group_name: :team1, membership_type: nil).count).to eq(1)
-        expect(user.group_memberships.where(group_name: :team1, membership_type: 'employee').count).to eq(1)
+        expect(user.group_memberships_as_member.where(group_name: :team1, membership_type: nil).count).to eq(1)
+        expect(user.group_memberships_as_member.where(group_name: :team1, membership_type: 'employee').count).to eq(1)
         expect(user.named_groups.count{|g| g == :team1}).to eq(1)
         expect(user.named_groups.as('employee').count{|g| g == :team1}).to eq(1)
       end

data/spec/mongoid_spec.rb

@@ -65,7 +65,9 @@ end
 class MongoidGroup
   include Mongoid::Document
   
-  groupify :group, members: [:mongoid_users, :mongoid_tasks, :mongoid_widgets], default_members: :mongoid_users
+  groupify :group, members: [:mongoid_users, :mongoid_tasks, :mongoid_widgets, :mongoid_groups], default_members: :mongoid_users
+  groupify :group_member, group_class_name: "MongoidGroup"
+
   alias_method :users, :mongoid_users
   alias_method :tasks, :mongoid_tasks
   alias_method :widgets, :mongoid_widgets
@@ -97,28 +99,37 @@ describe Groupify::Mongoid do
       expect(group.members).to be_empty
     end
     
-    it "adds a group to a member" do
-      user.groups << group
-      expect(user.groups).to include(group)
-      expect(group.members).to include(user)
-      expect(group.users).to include(user)
-    end
-    
-    it "adds a member to a group" do
-      expect(user.groups).to be_empty
-      group.add user
-      expect(user.groups).to include(group)
-      expect(group.members).to include(user)
-    end
+    context "when adding" do
+      it "adds a group to a member" do
+        user.groups << group
+        expect(user.groups).to include(group)
+        expect(group.members).to include(user)
+        expect(group.users).to include(user)
+      end
+      
+      it "adds a member to a group" do
+        expect(user.groups).to be_empty
+        group.add user
+        expect(user.groups).to include(group)
+        expect(group.members).to include(user)
+      end
 
-    it "adds multiple members to a group" do
-      group.add(user, task)
-      expect(group.users).to include(user)
-      expect(group.tasks).to include(task)
+      it "adds multiple members to a group" do
+        group.add(user, task)
+        expect(group.users).to include(user)
+        expect(group.tasks).to include(task)
 
-      users = [MongoidUser.create!, MongoidUser.create!]
-      group.add(users)
-      expect(group.users).to include(*users)
+        users = [MongoidUser.create!, MongoidUser.create!]
+        group.add(users)
+        expect(group.users).to include(*users)
+      end
+
+      it "allows a group to also act as a member" do
+        parent_group = MongoidGroup.create!
+        child_group = MongoidGroup.create!
+        parent_group.add(child_group)
+        expect(parent_group.mongoid_groups).to include(child_group)
+      end
     end
 
     it 'lists which member classes can belong to this group' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupify
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - dwbutler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -124,6 +124,7 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-gemset"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md