groupify 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 330d329200d0dda6ac489a0c099fd54655e2899d
-  data.tar.gz: 95a7c8c3d68c7e409818cd8fe816957325da8112
+  metadata.gz: 2d570dee72597e96ba6684917ba35f43d4d90809
+  data.tar.gz: eae9072357349dae48d23634ecda81e6a95d0447
 SHA512:
-  metadata.gz: f256fc9f5d55ad7feb210c9af83ae7005f0c1921ad76af0f3f5287f8f0e71653a5a54e99f335460cada5dd11466ad96b70b862951e4eb8f52362f3175fa004f4
-  data.tar.gz: 2be5800f07ea8e8b32f13e349557ebfb6f795fe490433a7468e4f5606c349573728ce47e59a40894705967cc4599b38000b966ca10a37c4d5bf2e8993d0d40c3
+  metadata.gz: 62eb907fb6744685f4d799b8d51611fdf91539e1cce0d5207d05a7f3470a485d8fe443520e11c507b40548c05e7af5a585577275660fbe13c087eb26a0d87f0f
+  data.tar.gz: 3f16c4a4941e7d86eeed9ab62b764be8cb236eb4dd390a0a3e6c745b29914e22ef210f016e66a8169f730150b339279e84d3ab31bdb991dbed2808d7a7b0e30c

data/.rspec

@@ -1,4 +1,3 @@
 --color
 --format progress
 --require spec_helper
---pattern "spec/**/*_spec.rb"

data/.travis.yml

@@ -23,3 +23,4 @@ matrix:
       gemfile: gemfiles/rails_3.2.gemfile
   allow_failures:
     - rvm: rbx-2
+sudo: false

data/CHANGELOG.md

@@ -0,0 +1,90 @@
+# Change Log
+
+## [v0.6.3](https://github.com/dwbutler/groupify/tree/v0.6.3) (2015-08-24)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.6.2...v0.6.3)
+
+**Fixed bugs:**
+
+- ActiveRecord Statement Invalid for Group queries [\#30](https://github.com/dwbutler/groupify/issues/30)
+
+**Merged pull requests:**
+
+- Test against mysql and postgresql [\#31](https://github.com/dwbutler/groupify/pull/31) ([dwbutler](https://github.com/dwbutler))
+
+## [v0.6.2](https://github.com/dwbutler/groupify/tree/v0.6.2) (2015-05-28)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.6.1...v0.6.2)
+
+**Closed issues:**
+
+- can't complete migration [\#27](https://github.com/dwbutler/groupify/issues/27)
+- NameError: uninitialized constant User::GroupMembership [\#25](https://github.com/dwbutler/groupify/issues/25)
+
+**Merged pull requests:**
+
+- fix association name in mongoid adapter [\#29](https://github.com/dwbutler/groupify/pull/29) ([samuelebistoletti](https://github.com/samuelebistoletti))
+
+## [v0.6.1](https://github.com/dwbutler/groupify/tree/v0.6.1) (2015-01-16)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.6.0...v0.6.1)
+
+**Closed issues:**
+
+- Groupify support unique groups scoped to user? [\#18](https://github.com/dwbutler/groupify/issues/18)
+- Double Membership [\#14](https://github.com/dwbutler/groupify/issues/14)
+- Getting uninitialized constant Assignment [\#8](https://github.com/dwbutler/groupify/issues/8)
+
+**Merged pull requests:**
+
+- Fixed bug that occurs when using namespaced Models [\#24](https://github.com/dwbutler/groupify/pull/24) ([byronduenas](https://github.com/byronduenas))
+
+## [v0.6.0](https://github.com/dwbutler/groupify/tree/v0.6.0) (2014-08-27)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.6.0.rc2...v0.6.0)
+
+## [v0.6.0.rc2](https://github.com/dwbutler/groupify/tree/v0.6.0.rc2) (2014-08-21)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.6.0.rc1...v0.6.0.rc2)
+
+**Closed issues:**
+
+- NoMethodError: undefined method `groups' for {:as=\>"manager"}:Hash [\#12](https://github.com/dwbutler/groupify/issues/12)
+- Count functions [\#10](https://github.com/dwbutler/groupify/issues/10)
+- Named Groups to be a Group [\#7](https://github.com/dwbutler/groupify/issues/7)
+
+**Merged pull requests:**
+
+- Active Record adapter typo fix [\#13](https://github.com/dwbutler/groupify/pull/13) ([fourfour](https://github.com/fourfour))
+
+## [v0.6.0.rc1](https://github.com/dwbutler/groupify/tree/v0.6.0.rc1) (2014-06-18)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.5.1...v0.6.0.rc1)
+
+**Closed issues:**
+
+- Change the name of the group\_membership [\#9](https://github.com/dwbutler/groupify/issues/9)
+- Extend to deal with group managers/leaders? [\#3](https://github.com/dwbutler/groupify/issues/3)
+
+**Merged pull requests:**
+
+- Membership types [\#6](https://github.com/dwbutler/groupify/pull/6) ([dwbutler](https://github.com/dwbutler))
+
+## [v0.5.1](https://github.com/dwbutler/groupify/tree/v0.5.1) (2014-03-28)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.5.0...v0.5.1)
+
+**Merged pull requests:**
+
+- Allow model instances to access other models with names matching Groupify modules [\#5](https://github.com/dwbutler/groupify/pull/5) ([reed](https://github.com/reed))
+
+## [v0.5.0](https://github.com/dwbutler/groupify/tree/v0.5.0) (2014-03-24)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.4.2...v0.5.0)
+
+**Closed issues:**
+
+- New Group \(Unsaved\) has members somehow [\#2](https://github.com/dwbutler/groupify/issues/2)
+
+## [v0.4.2](https://github.com/dwbutler/groupify/tree/v0.4.2) (2013-07-02)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.4.1...v0.4.2)
+
+## [v0.4.1](https://github.com/dwbutler/groupify/tree/v0.4.1) (2013-07-02)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.4.0...v0.4.1)
+
+## [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)*

data/Gemfile

@@ -20,6 +20,6 @@ end
 
 platforms :ruby do
   gem "sqlite3"
-  gem "mysql2"
+  gem "mysql2", "~> 0.3.11"
   gem "pg"
 end

data/README.md

@@ -1,11 +1,13 @@
 # Groupify
-[![Build Status](https://secure.travis-ci.org/dwbutler/groupify.png)](http://travis-ci.org/dwbutler/groupify) [![Coverage Status](https://coveralls.io/repos/dwbutler/groupify/badge.png?branch=master)](https://coveralls.io/r/dwbutler/groupify?branch=master) [![Code Climate](https://codeclimate.com/github/dwbutler/groupify.png)](https://codeclimate.com/github/dwbutler/groupify) [![Inline docs](http://inch-ci.org/github/dwbutler/groupify.svg?branch=master)](http://inch-ci.org/github/dwbutler/groupify)
+[![Build Status](https://travis-ci.org/dwbutler/groupify.svg?branch=master)](https://travis-ci.org/dwbutler/groupify) [![Coverage Status](https://coveralls.io/repos/dwbutler/groupify/badge.svg?branch=master&service=github)](https://coveralls.io/github/dwbutler/groupify?branch=master) [![Code Climate](https://codeclimate.com/github/dwbutler/groupify/badges/gpa.svg)](https://codeclimate.com/github/dwbutler/groupify) [![Inline docs](http://inch-ci.org/github/dwbutler/groupify.svg?branch=master)](http://inch-ci.org/github/dwbutler/groupify)
 
 Adds group and membership functionality to Rails models. Defines a polymorphic
 relationship between a Group model and any member model. Don't need a Group
 model? Use named groups instead to add members to named groups such as
 `:admin` or `"Team Rocketpants"`.
 
+## Compatibility
+
 The following ORMs are supported:
  * ActiveRecord 3.2, 4.1.x, 4.2.x
  * Mongoid 3.1, 4.0
@@ -34,40 +36,21 @@ Or install it yourself as:
 
     $ gem install groupify
 
-### Active Record
-Add a migration similar to the following:
+### Setup
 
-```ruby
-class CreateGroups < ActiveRecord::Migration
-  def change
-    create_table :groups do |t|
-      t.string     :type      # Only needed if using single table inheritance
-    end
-    
-    create_table :group_memberships do |t|
-      t.string     :member_type     # Necessary to make polymorphic members work
-      t.integer    :member_id       # The id of the member that belongs to this group
-      t.integer    :group_id        # The group to which the member belongs
-      t.string     :group_name      # The named group to which a member belongs (if using)
-      t.string     :membership_type # The type of membership the member belongs with
-    end
+#### Active Record
 
-    add_index :group_memberships, [:member_id, :member_type]
-    add_index :group_memberships, :group_id
-    add_index :group_memberships, :group_name
-  end
-end
-```
+Execute:
 
-In your group model:
+    $ rails generate groupify:active_record:install
 
-```ruby
-class Group < ActiveRecord::Base  
-  groupify :group, members: [:users, :assignments], default_members: :users
-end
-```
+This will generate an initializer, `Group` model, `GroupMembership` model, and migrations.
+
+Modify the models and migrations as needed, then run the migration:
+
+    $ rake db:migrate
 
-In your member models (i.e. `User`):
+Set up your member models:
 
 ```ruby
 class User < ActiveRecord::Base
@@ -80,37 +63,79 @@ class Assignment < ActiveRecord::Base
 end
 ```
 
-You will also need to define a `GroupMembership` model to join groups to members:
+#### Mongoid
+
+Execute:
+
+    $ rails generate groupify:mongoid:install
+
+Set up your member models:
 
 ```ruby
-class GroupMembership < ActiveRecord::Base  
-  groupify :group_membership
+class User
+  include Mongoid::Document
+  
+  groupify :group_member
+  groupify :named_group_member
 end
 ```
 
-### Mongoid
-In your group model:
+#### Advanced Configuration
+
+##### Groupify Model Names
+
+The default model names for groups and group memberships are configurable. Add the following
+configuration in `config/initializers/groupify.rb` to change the model names for all classes:
 
 ```ruby
-class Group
-  include Mongoid::Document
+Groupify.configure do |config|
+  config.group_class_name = 'MyCustomGroup'
+  # ActiveRecord only
+  config.group_membership_class_name = 'MyCustomGroupMembership'
+end
+```
 
-  groupify :group, members: [:users], default_members: :users
+The group name can also be set on a model-by-model basis for each group member by passing
+the `group_class_name` option:
+
+```ruby
+class Member < ActiveRecord::Base
+  groupify :group_member, group_class_name: 'MyOtherCustomGroup'
 end
 ```
 
-In your member models (i.e. `User`):
+Note that each member model can only belong to a single type of group (or child classes
+of that group).
+
+##### Member Associations on Group
+
+Your group class can be configured to create associations for each expected member type.
+For example, let's say that your group class will have users and assignments as members.
+The following configuration adds `users` and `assignments` associations on the group model:
 
 ```ruby
-class User
-  include Mongoid::Document
-  
-  groupify :group_member
-  groupify :named_group_member
+class Group < ActiveRecord::Base
+  groupify :group, members: [:users, :assignments], default_members: :users
+end
+```
+
+The `default_members` option sets the model type when accessing the `members` association.
+In the example above, `group.members` would return the users who are members of this group.
+
+If you are using single table inheritance, child classes inherit the member associations
+of the parent. If your child class needs to add more members, use the `has_members` method.
+
+Example:
+
+```ruby
+class Organization < Group
+  has_members [:offices, :equipment]
 end
 ```
 
-## Basic Usage
+Mongoid works the same way by creating Mongoid relations. 
+
+## Usage
 
 ### Create groups and add members
 
@@ -245,10 +270,6 @@ employee.in_group?(group)                   # => false
 employee.in_group?(group, as: 'employee')   # => false
 ```
 
-## But wait, there's more!
-
-Check the specs for a complete list of methods and scopes provided by Groupify.
-
 ## Using for Authorization
 Groupify was originally created to help implement user authorization, although it can be used
 generically for much more than that. Here are some examples of how to do it.
@@ -336,6 +357,23 @@ class PostPolicy < Struct.new(:user, :post)
 end
 ```
 
+## Upgrading
+
+### 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.
+Upgrading requires adding a new `group_type` column to the `group_memberships` table and
+populating that column with the class name of the group. Create the migration by executing:
+
+    $ rails generate groupify:active_record:upgrade
+
+And then run the migration:
+
+    $ rake db:migrate
+
+Please note that this migration may block writes in MySQL if your `group_memberships`
+table is large.
+
 ## Contributing
 
 1. Fork it

data/gemfiles/rails_3.2.gemfile

@@ -22,7 +22,7 @@ end
 
 platforms :ruby do
   gem "sqlite3"
-  gem "mysql2"
+  gem "mysql2", "~> 0.3.11"
   gem "pg"
 end
 

data/gemfiles/rails_4.0.gemfile

@@ -22,7 +22,7 @@ end
 
 platforms :ruby do
   gem "sqlite3"
-  gem "mysql2"
+  gem "mysql2", "~> 0.3.11"
   gem "pg"
 end
 

data/gemfiles/rails_4.1.gemfile

@@ -22,7 +22,7 @@ end
 
 platforms :ruby do
   gem "sqlite3"
-  gem "mysql2"
+  gem "mysql2", "~> 0.3.11"
   gem "pg"
 end
 

data/gemfiles/rails_4.2.gemfile

@@ -22,7 +22,7 @@ end
 
 platforms :ruby do
   gem "sqlite3"
-  gem "mysql2"
+  gem "mysql2", "~> 0.3.11"
   gem "pg"
 end
 

data/groupify.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec", ">= 3"
 
   gem.add_development_dependency "database_cleaner", "~> 1.3.0"
-  gem.add_development_dependency 'combustion'
+  gem.add_development_dependency "combustion"
   gem.add_development_dependency "appraisal"
+
+  gem.add_development_dependency "github_changelog_generator"
 end

data/lib/generators/groupify/active_record/initializer/initializer_generator.rb

@@ -0,0 +1,11 @@
+module Groupify
+  module ActiveRecord
+    class InitializerGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_initializer
+        copy_file "initializer.rb", "config/initializers/groupify.rb"
+      end
+    end
+  end
+end

data/lib/generators/groupify/active_record/initializer/templates/initializer.rb

@@ -0,0 +1,9 @@
+Groupify.configure do |config|
+  # Configure the default group class name.
+  # Defaults to 'Group'
+  # config.group_class_name = 'Group'
+
+  # Configure the default group membership class name.
+  # Defaults to 'GroupMembership'
+  # config.group_membership_class_name = 'GroupMembership'
+end

data/lib/generators/groupify/active_record/install/install_generator.rb

@@ -0,0 +1,12 @@
+module Groupify
+  module ActiveRecord
+    class InstallGenerator < Rails::Generators::Base
+      def invoke_generators
+        %w{ model migration initializer }.each do |name|
+          generate "groupify:active_record:#{name}"
+        end
+      end
+    end
+  end
+end
+

data/lib/generators/groupify/active_record/migration/migration_generator.rb

@@ -0,0 +1,22 @@
+require "rails/generators/migration"
+require "rails/generators/active_record"
+require "generators/groupify/active_record/next_migration_version"
+
+module Groupify
+  module ActiveRecord
+    class MigrationGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+      extend NextMigrationVersion
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      def create_migration_file
+        migration_template "migration.rb", "db/migrate/groupify_migration.rb"
+      end
+
+      def self.next_migration_number(dirname)
+        ::ActiveRecord::Generators::Base.next_migration_number dirname
+      end
+    end
+  end
+end

data/lib/generators/groupify/active_record/migration/templates/migration.rb

@@ -0,0 +1,20 @@
+class GroupifyMigration < ActiveRecord::Migration
+  def change
+    create_table :groups do |t|
+      t.string     :type
+    end
+
+    create_table :group_memberships do |t|
+      t.references :member, polymorphic: true, index: true
+      t.references :group, polymorphic: true, index: true
+
+      # The named group to which a member belongs (if using)
+      t.string     :group_name, index: true
+
+      # The membership type the member belongs with
+      t.string     :membership_type
+
+      t.timestamps
+    end
+  end
+end

data/lib/generators/groupify/active_record/model/model_generator.rb

@@ -0,0 +1,15 @@
+module Groupify
+  module ActiveRecord
+    class ModelGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_group_model_file
+        copy_file "group.rb", "app/models/group.rb"
+      end
+
+      def copy_group_membership_model_file
+        copy_file "group_membership.rb", "app/models/group_membership.rb"
+      end
+    end
+  end
+end

data/lib/generators/groupify/active_record/model/templates/group.rb

@@ -0,0 +1,3 @@
+class Group < ActiveRecord::Base
+  groupify :group
+end

data/lib/generators/groupify/active_record/model/templates/group_membership.rb

@@ -0,0 +1,3 @@
+class GroupMembership < ActiveRecord::Base
+  groupify :group_membership
+end

data/lib/generators/groupify/active_record/next_migration_version.rb

@@ -0,0 +1,16 @@
+module Groupify
+  module ActiveRecord
+    module NextMigrationVersion
+      # while methods have moved around this has been the implementation
+      # since ActiveRecord 3.0
+      def next_migration_number(dirname)
+        next_migration_number = current_migration_number(dirname) + 1
+        if ActiveRecord::Base.timestamped_migrations
+          [Time.now.utc.strftime("%Y%m%d%H%M%S"), format("%.14d", next_migration_number)].max
+        else
+          format("%.3d", next_migration_number)
+        end
+      end
+    end
+  end
+end

data/lib/generators/groupify/active_record/upgrade/templates/upgrade_migration.rb

@@ -0,0 +1,7 @@
+class AddGroupTypeToGroupMemberships < ActiveRecord::Migration
+  def change
+    add_column :group_memberships, :group_type, :string
+    GroupMembership.reset_column_information
+    GroupMembership.update_all(group_type: 'Group')
+  end
+end

data/lib/generators/groupify/active_record/upgrade/upgrade_generator.rb

@@ -0,0 +1,22 @@
+require "rails/generators/migration"
+require "rails/generators/active_record"
+require "generators/groupify/active_record/next_migration_version"
+
+module Groupify
+  module ActiveRecord
+    class UpgradeGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+      extend NextMigrationVersion
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      def create_migration_file
+        migration_template "upgrade_migration.rb", "db/migrate/add_group_type_to_group_memberships.rb"
+      end
+
+      def self.next_migration_number(dirname)
+        ::ActiveRecord::Generators::Base.next_migration_number dirname
+      end
+    end
+  end
+end

data/lib/generators/groupify/mongoid/initializer/initializer_generator.rb

@@ -0,0 +1,11 @@
+module Groupify
+  module Mongoid
+    class InitializerGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_initializer
+        copy_file "initializer.rb", "config/initializers/groupify.rb"
+      end
+    end
+  end
+end

data/lib/generators/groupify/mongoid/initializer/templates/initializer.rb

@@ -0,0 +1,5 @@
+Groupify.configure do |config|
+  # Configure the default group class name.
+  # Defaults to 'Group'
+  # config.group_class_name = 'Group'
+end

data/lib/generators/groupify/mongoid/install/install_generator.rb

@@ -0,0 +1,12 @@
+module Groupify
+  module Mongoid
+    class InstallGenerator < Rails::Generators::Base
+      def invoke_generators
+        %w{ initializer model }.each do |name|
+          generate "groupify:mongoid:#{name}"
+        end
+      end
+    end
+  end
+end
+

data/lib/generators/groupify/mongoid/model/model_generator.rb

@@ -0,0 +1,11 @@
+module Groupify
+  module Mongoid
+    class ModelGenerator < Rails::Generators::Base
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_group_model_file
+        copy_file "group.rb", "app/models/group.rb"
+      end
+    end
+  end
+end

data/lib/generators/groupify/mongoid/model/templates/group.rb

@@ -0,0 +1,5 @@
+class Group
+  include Mongoid::Document
+
+  groupify :group
+end

data/lib/groupify.rb

@@ -1,3 +1,15 @@
 require 'active_support'
 
-require 'groupify/railtie' if defined?(Rails)
+module Groupify
+  mattr_accessor :group_membership_class_name,
+                 :group_class_name
+
+  self.group_class_name = 'Group'
+  self.group_membership_class_name = 'GroupMembership'
+
+  def self.configure
+    yield self
+  end
+end
+
+require 'groupify/railtie' if defined?(Rails)

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

@@ -3,7 +3,7 @@ module Groupify
 
     # Usage:
     #    class Group < ActiveRecord::Base
-    #        acts_as_group, :members => [:users]
+    #        groupify :group, members: [:users]
     #        ...
     #    end
     #
@@ -15,7 +15,10 @@ module Groupify
       included do
         @default_member_class = nil
         @member_klasses ||= Set.new
-        has_many :group_memberships, :dependent => :destroy
+        has_many :group_memberships,
+                 dependent: :destroy,
+                 class_name: Groupify.group_membership_class_name
+
       end
 
       def member_classes
@@ -31,9 +34,9 @@ module Groupify
         clear_association_cache
 
         members.each do |member|
-          member.group_memberships.where(group_id: self.id).first_or_create!
+          member.groups << self unless member.groups.include?(self)
           if membership_type
-            member.group_memberships.where(group_id: self.id, membership_type: membership_type).first_or_create!
+            member.group_memberships.where(group_id: id, group_type: self.class.model_name.to_s, membership_type: membership_type).first_or_create!
           end
           member.clear_association_cache
         end
@@ -142,9 +145,19 @@ module Groupify
           source_type = member_klass.base_class
 
           if ActiveSupport::VERSION::MAJOR > 3
-            has_many association_name, ->{ uniq }, through: :group_memberships, source: :member, source_type: source_type, extend: MemberAssociationExtensions
+            has_many association_name,
+                     ->{ uniq },
+                     through: :group_memberships,
+                     source: :member,
+                     source_type: source_type,
+                     extend: MemberAssociationExtensions
           else
-            has_many association_name, uniq: true, through: :group_memberships, source: :member, source_type: source_type, extend: MemberAssociationExtensions
+            has_many association_name,
+                     uniq: true,
+                     through: :group_memberships,
+                     source: :member,
+                     source_type: source_type,
+                     extend: MemberAssociationExtensions
           end
 
           define_method(association_name) do |*args|

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

@@ -3,7 +3,7 @@ module Groupify
 
     # Usage:
     #    class User < ActiveRecord::Base
-    #        acts_as_group_member
+    #        groupify :group_member
     #        ...
     #    end
     #
@@ -14,13 +14,26 @@ module Groupify
 
       included do
         unless respond_to?(:group_memberships)
-          has_many :group_memberships, as: :member, autosave: true, dependent: :destroy
+          has_many :group_memberships,
+                   as: :member,
+                   autosave: true,
+                   dependent: :destroy,
+                   class_name: Groupify.group_membership_class_name
         end
 
         if ActiveSupport::VERSION::MAJOR > 3
-          has_many :groups, ->{ uniq }, through: :group_memberships, class_name: @group_class_name, extend: GroupAssociationExtensions
+          has_many :groups, ->{ uniq },
+                   through: :group_memberships,
+                   as: :group,
+                   source_type: @group_class_name,
+                   extend: GroupAssociationExtensions
         else
-          has_many :groups, uniq: true, through: :group_memberships, class_name: @group_class_name, extend: GroupAssociationExtensions
+          has_many :groups,
+                   uniq: true,
+                   through: :group_memberships,
+                   as: :group,
+                   source_type: @group_class_name,
+                   extend: GroupAssociationExtensions
         end
       end
 
@@ -92,9 +105,6 @@ module Groupify
       end
 
       module ClassMethods
-        def group_class_name; @group_class_name ||= 'Group'; end
-        def group_class_name=(klass);  @group_class_name = klass; end
-
         def as(membership_type)
           joins(:group_memberships).where(group_memberships: { membership_type: membership_type })
         end
@@ -118,8 +128,8 @@ module Groupify
 
           joins(:group_memberships).
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
-              where(:group_memberships => {:group_id => groups.map(&:id)}).
-              having("COUNT(group_memberships.group_id) = #{groups.count}").
+              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).
               uniq
         end
 
@@ -129,7 +139,7 @@ module Groupify
 
           joins(:group_memberships).
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
-              having("COUNT(DISTINCT group_memberships.group_id) = #{groups.count}").
+              having("COUNT(DISTINCT #{reflect_on_association(:group_memberships).klass.quoted_table_name}.#{connection.quote_column_name('group_id')}) = ?", groups.count).
               uniq
         end
 

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

@@ -5,7 +5,7 @@ module Groupify
     #
     # Usage:
     #    class GroupMembership < ActiveRecord::Base
-    #        acts_as_group_membership
+    #        groupify :group_membership
     #        ...
     #    end
     #
@@ -15,8 +15,8 @@ module Groupify
       included do
         attr_accessible(:member, :group, :group_name, :membership_type, :as) if ActiveSupport::VERSION::MAJOR < 4
 
-        belongs_to :member, :polymorphic => true
-        belongs_to :group
+        belongs_to :member, polymorphic: true
+        belongs_to :group, polymorphic: true
       end
 
       def membership_type=(membership_type)

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

@@ -33,7 +33,7 @@ module Groupify
         end
 
         def acts_as_group_member(opts = {})
-          @group_class_name = opts[:class_name] || 'Group'
+          @group_class_name = opts[:group_class_name] || Groupify.group_class_name
           include Groupify::ActiveRecord::GroupMember
         end
 

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

@@ -14,7 +14,11 @@ module Groupify
 
       included do
         unless respond_to?(:group_memberships)
-          has_many :group_memberships, :as => :member, :autosave => true, :dependent => :destroy
+          has_many :group_memberships,
+                   as: :member,
+                   autosave: true,
+                   dependent: :destroy,
+                   class_name: Groupify.group_membership_class_name
         end
       end
 
@@ -82,7 +86,7 @@ module Groupify
           joins(:group_memberships).
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
               where(:group_memberships => {:group_name => named_groups}).
-              having("COUNT(DISTINCT group_memberships.group_name) = #{named_groups.count}").
+              having("COUNT(DISTINCT #{reflect_on_association(:group_memberships).klass.quoted_table_name}.#{connection.quote_column_name('group_name')}) = ?", named_groups.count).
               uniq
         end
 
@@ -92,7 +96,7 @@ module Groupify
 
           joins(:group_memberships).
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
-              having("COUNT(DISTINCT group_memberships.group_name) = #{named_groups.count}").
+              having("COUNT(DISTINCT #{reflect_on_association(:group_memberships).klass.quoted_table_name}.#{connection.quote_column_name('group_name')}) = ?", named_groups.count).
               uniq
         end
 

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

@@ -5,7 +5,7 @@ module Groupify
     #    class Group
     #      include Mongoid::Document
     #
-    #      acts_as_group, :members => [:users]
+    #      groupify :group, members: [:users]
     #      ...
     #    end
     #
@@ -136,7 +136,7 @@ module Groupify
         end
 
         def associate_member_class(member_klass)
-	  association_name ||= member_klass.model_name.plural.to_sym
+          association_name ||= member_klass.model_name.plural.to_sym
 
           has_many association_name, class_name: member_klass.to_s, dependent: :nullify, foreign_key: 'group_ids', extend: MemberAssociationExtensions
 

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

@@ -103,9 +103,6 @@ module Groupify
       end
 
       module ClassMethods
-        def group_class_name; @group_class_name ||= 'Group'; end
-        def group_class_name=(klass);  @group_class_name = klass; end
-
         def in_group(group)
           group.present? ? self.in(group_ids: group.id) : none
         end

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

@@ -27,7 +27,7 @@ module Groupify
         end
 
         def acts_as_group_member(opts = {})
-          @group_class_name = opts[:class_name] || 'Group'
+          @group_class_name = opts[:group_class_name] || Groupify.group_class_name
           include Groupify::Mongoid::GroupMember
         end
 

data/lib/groupify/version.rb

@@ -1,3 +1,3 @@
 module Groupify
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

data/spec/active_record_spec.rb

@@ -70,6 +70,10 @@ class GroupMembership < ActiveRecord::Base
   groupify :group_membership
 end
 
+class Classroom < ActiveRecord::Base
+  groupify :group
+end
+
 describe Group do
   it { should respond_to :members}
   it { should respond_to :add }
@@ -88,11 +92,63 @@ if DEBUG
 end
 
 describe Groupify::ActiveRecord do
-  let!(:user) { User.create! }
-  let!(:group) { Group.create! }
+  let(:user) { User.create! }
+  let(:group) { Group.create! }
   let(:widget) { Widget.create! }
   let(:namespaced_member) { Namespaced::Member.create! }
 
+  describe "configuration" do
+    context "globally configured group and group membership models" do
+      before do
+        Groupify.configure do |config|
+          config.group_class_name = 'CustomGroup'
+          config.group_membership_class_name = 'CustomGroupMembership'
+        end
+
+        class CustomGroupMembership < ActiveRecord::Base
+          groupify :group_membership
+        end
+
+        class CustomUser < ActiveRecord::Base
+          groupify :group_member
+        end
+
+        class CustomGroup < ActiveRecord::Base
+          groupify :group
+        end
+      end
+
+      after do
+        Groupify.configure do |config|
+          config.group_class_name = 'Group'
+          config.group_membership_class_name = 'GroupMembership'
+        end
+      end
+
+      it "uses the custom models to store groups and group memberships" do
+        custom_user = CustomUser.create!
+        custom_group = CustomGroup.create!
+        custom_user.groups << custom_group
+        expect(GroupMembership.count).to eq(0)
+        expect(CustomGroupMembership.count).to eq(1)
+      end
+    end
+
+    context "member with custom group model" do
+      before do
+        class ProjectMember < ActiveRecord::Base
+          groupify :group_member, group_class_name: 'Project'
+        end
+      end
+
+      it "overrides the default group name on a per-model basis" do
+        member = ProjectMember.create!
+        member.groups.create!
+        expect(member.groups.first).to be_a Project
+      end
+    end
+  end
+
   context 'when using groups' do
     it "members and groups are empty when initialized" do
       expect(user.groups).to be_empty
@@ -101,37 +157,51 @@ describe Groupify::ActiveRecord do
       expect(Group.new.members).to be_empty
       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
 
-    it "adds a namespaced member to a group" do
-      group.add(namespaced_member)
-      expect(group.namespaced_members).to include(namespaced_member)
-    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, widget)
-      expect(group.users).to include(user)
-      expect(group.widgets).to include(widget)
+      it "only adds a member to a group once" do
+        group.add user
+        group.add user
+        expect(user.group_memberships.count).to eq(1)
+      end
+
+      it "adds a namespaced member to a group" do
+        group.add(namespaced_member)
+        expect(group.namespaced_members).to include(namespaced_member)
+      end
 
-      users = [User.create!, User.create!]
-      group.add(users)
-      expect(group.users).to include(*users)
+      it "adds multiple members to a group" do
+        group.add(user, widget)
+        expect(group.users).to include(user)
+        expect(group.widgets).to include(widget)
+
+        users = [User.create!, User.create!]
+        group.add(users)
+        expect(group.users).to include(*users)
+      end
+
+      it "only allows members to be added to their configured group type" do
+        classroom = Classroom.create!
+        expect { classroom.add(user) }.to raise_error(ActiveRecord::AssociationTypeMismatch)
+        expect { user.groups << classroom }.to raise_error(ActiveRecord::AssociationTypeMismatch)
+      end
     end
 
-    it 'lists which member classes can belong to this group' do
+    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)
       
@@ -590,6 +660,4 @@ describe Groupify::ActiveRecord do
       end
     end
   end
-
-   
 end

data/spec/db/schema.rb

@@ -5,10 +5,9 @@ ActiveRecord::Schema.define(version: 0) do
   end
 
   create_table :group_memberships do |t|
-    t.string     :member_type
-    t.integer    :member_id
-    t.integer    :group_id
-    t.string     :group_name
+    t.references :member, polymorphic: true, index: true
+    t.references :group, polymorphic: true, index: true
+    t.string     :group_name, index: true
     t.string     :membership_type
   end
 
@@ -32,4 +31,29 @@ ActiveRecord::Schema.define(version: 0) do
   create_table :members do |t|
     t.string :name
   end
+
+  create_table :classrooms do |t|
+    t.string :name
+  end
+
+  create_table :custom_group_memberships do |t|
+    t.references :member, polymorphic: true, index: true
+    t.references :group, polymorphic: true, index: true
+    t.string     :group_name, index: true
+    t.string     :membership_type
+  end
+
+  create_table :custom_groups do |t|
+    t.string     :name
+    t.string     :type
+  end
+
+  create_table :custom_users do |t|
+    t.string   :name
+    t.string   :type
+  end
+
+  create_table :project_members do |t|
+    t.string :name
+  end
 end

data/spec/mongoid_spec.rb

@@ -35,7 +35,7 @@ require 'groupify/adapter/mongoid'
 class MongoidUser
   include Mongoid::Document
   
-  groupify :group_member, class_name: 'MongoidGroup'
+  groupify :group_member, group_class_name: 'MongoidGroup'
   groupify :named_group_member
 end
 
@@ -44,19 +44,19 @@ end
 
 class MongoidWidget
   include Mongoid::Document
-  groupify :group_member, class_name: 'MongoidGroup'
+  groupify :group_member, group_class_name: 'MongoidGroup'
 end
 
 class MongoidTask
   include Mongoid::Document
   
-  groupify :group_member, class_name: 'MongoidGroup'
+  groupify :group_member, group_class_name: 'MongoidGroup'
 end
 
 class MongoidIssue
   include Mongoid::Document
 
-  groupify :group_member, class_name: 'MongoidProject'
+  groupify :group_member, group_class_name: 'MongoidProject'
 end
 
 class MongoidGroup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupify
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - dwbutler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -100,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds group and membership functionality to Rails models
 email:
 - dwbutler@ucla.edu
@@ -112,6 +126,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -121,6 +136,22 @@ files:
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
 - groupify.gemspec
+- lib/generators/groupify/active_record/initializer/initializer_generator.rb
+- lib/generators/groupify/active_record/initializer/templates/initializer.rb
+- lib/generators/groupify/active_record/install/install_generator.rb
+- lib/generators/groupify/active_record/migration/migration_generator.rb
+- lib/generators/groupify/active_record/migration/templates/migration.rb
+- lib/generators/groupify/active_record/model/model_generator.rb
+- lib/generators/groupify/active_record/model/templates/group.rb
+- lib/generators/groupify/active_record/model/templates/group_membership.rb
+- lib/generators/groupify/active_record/next_migration_version.rb
+- lib/generators/groupify/active_record/upgrade/templates/upgrade_migration.rb
+- lib/generators/groupify/active_record/upgrade/upgrade_generator.rb
+- lib/generators/groupify/mongoid/initializer/initializer_generator.rb
+- lib/generators/groupify/mongoid/initializer/templates/initializer.rb
+- lib/generators/groupify/mongoid/install/install_generator.rb
+- lib/generators/groupify/mongoid/model/model_generator.rb
+- lib/generators/groupify/mongoid/model/templates/group.rb
 - lib/groupify.rb
 - lib/groupify/adapter/active_record.rb
 - lib/groupify/adapter/active_record/group.rb