groupify 0.6.0.rc2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 105996dc9352662d0363b74124dbb8f936b0d81b
-  data.tar.gz: 81479cdb755adba4da248918fcb891313279e772
+  metadata.gz: 2c496eba538ed9d9f3998e6086132cd9df318a58
+  data.tar.gz: 2d2813af6aa7f156d1fc67587ca280751d3ec3a0
 SHA512:
-  metadata.gz: 8fdd61ea3448ef18e8249c8680019ed21288c34c33738b695d660a1efaca29c3d55bb71ff9345f869d7d0d4086084092537fe0a183f2e963fb8aa62a92060315
-  data.tar.gz: 3c858406df76fe3cb960602e889bdd95cfde1d46c0addf5bbd70b03507e958a7d7448e0f79d42b7d65dbbc5b8665769af5ac284bfce18df35aad76d27fd244fe
+  metadata.gz: 2c442e43c311e8da812874b504508d4d4a522ed586ed85aace281e78f5fb8930988b899ee8aca4f1e54fbb6747a10bd4c31255306647f36b2213c4248e92006c
+  data.tar.gz: 58acbb5637dc636a1ac5c051b65870c863bfea519af172f5c4b7220b841722aecccac46ab42ab0aa8700981393f6f831707ea71a98d46d3a9dda585a71c88176

data/Appraisals

@@ -13,3 +13,9 @@ appraise "rails-4.1" do
 
   gem "mongoid", "~> 4.0"
 end
+
+appraise "rails-4.2" do
+  gem 'activerecord', "~> 4.2.0.beta1"
+
+  gem "mongoid", "~> 4.0"
+end

data/README.md

@@ -7,7 +7,8 @@ model? Use named groups instead to add members to named groups such as
 `:admin` or `"Team Rocketpants"`.
 
 The following ORMs are supported:
-Mongoid 3.1 & 4.0, ActiveRecord 3.2 & 4.x
+ * ActiveRecord 3.2, 4.x
+ * Mongoid 3.1, 4.0, 
 
 The following Rubies are supported:
  * MRI Ruby 1.9.3, 2.0.x, 2.1.x
@@ -34,7 +35,7 @@ Add a migration similar to the following:
 class CreateGroups < ActiveRecord::Migration
   def change
     create_table :groups do |t|
-      t.string     :type      # Only needed if using single table inheritence
+      t.string     :type      # Only needed if using single table inheritance
     end
     
     create_table :group_memberships do |t|
@@ -56,7 +57,7 @@ In your group model:
 
 ```ruby
 class Group < ActiveRecord::Base  
-  acts_as_group :members => [:users, :assignments], :default_members => :users
+  groupify :group, members: [:users, :assignments], default_members: :users
 end
 ```
 
@@ -64,12 +65,12 @@ In your member models (i.e. `User`):
 
 ```ruby
 class User < ActiveRecord::Base
-  acts_as_group_member
-  acts_as_named_group_member
+  groupify :group_member
+  groupify :named_group_member
 end
 
 class Assignment < ActiveRecord::Base
-  acts_as_group_member
+  groupify :group_member
 end
 ```
 
@@ -77,7 +78,7 @@ You will also need to define a `GroupMembership` model to join groups to members
 
 ```ruby
 class GroupMembership < ActiveRecord::Base  
-  acts_as_group_membership
+  groupify :group_membership
 end
 ```
 
@@ -88,7 +89,7 @@ In your group model:
 class Group
   include Mongoid::Document
 
-  acts_as_group :members => [:users], :default_members => :users
+  groupify :group, members: [:users], default_members: :users
 end
 ```
 
@@ -98,8 +99,8 @@ In your member models (i.e. `User`):
 class User
   include Mongoid::Document
   
-  acts_as_group_member
-  acts_as_named_group_member
+  groupify :group_member
+  groupify :named_group_member
 end
 ```
 
@@ -267,12 +268,12 @@ end
 ```ruby
 # Whatever class represents a logged-in user in your app
 class User
-  acts_as_named_group_member
+  groupify :named_group_member
   include Authority::UserAbilities
 end
 
 class Widget
-  acts_as_named_group_member
+  groupify :named_group_member
   include Authority::Abilities
 end
 

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jdbc-sqlite3", :platform => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+gem "activerecord", "~> 4.2.0.beta1"
+gem "mongoid", "~> 4.0"
+
+group :development do
+  gem "pry"
+end
+
+group :test do
+  gem "coveralls", :require => false
+end
+
+gemspec :path => "../"

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

@@ -130,19 +130,23 @@ module Groupify
         end
 
         def associate_member_class(member_klass)
-          association_name = member_klass.name.to_s.pluralize.underscore.to_sym
-          source_type = member_klass.base_class
-
-          has_many association_name, through: :group_memberships, source: :member, source_type: source_type, extend: MemberAssociationExtensions
-          override_member_accessor(association_name)
+          define_member_association(member_klass)
 
           if member_klass == default_member_class
-            has_many :members, through: :group_memberships, source: :member, source_type: source_type, extend: MemberAssociationExtensions
-            override_member_accessor(:members)
+            define_member_association(member_klass, :members)
           end
         end
 
-        def override_member_accessor(association_name)
+        def define_member_association(member_klass, association_name = nil)
+          association_name ||= member_klass.name.to_s.pluralize.underscore.to_sym
+          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
+          else
+            has_many association_name, uniq: true, through: :group_memberships, source: :member, source_type: source_type, extend: MemberAssociationExtensions
+          end
+
           define_method(association_name) do |*args|
             opts = args.extract_options!
             membership_type = opts[:as]

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

@@ -14,35 +14,41 @@ 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
         end
 
-        has_many :groups, :through => :group_memberships, :class_name => @group_class_name do
-          def as(membership_type)
-            return self unless membership_type
-            where(group_memberships: {membership_type: membership_type})
-          end
+        if ActiveSupport::VERSION::MAJOR > 3
+          has_many :groups, ->{ uniq }, through: :group_memberships, class_name: @group_class_name, extend: GroupAssociationExtensions
+        else
+          has_many :groups, uniq: true, through: :group_memberships, class_name: @group_class_name, extend: GroupAssociationExtensions
+        end
+      end
 
-          def delete(*args)
-            opts = args.extract_options!
-            groups = args.flatten
+      module GroupAssociationExtensions
+        def as(membership_type)
+          return self unless membership_type
+          where(group_memberships: {membership_type: membership_type})
+        end
+
+        def delete(*args)
+          opts = args.extract_options!
+          groups = args.flatten
 
-            if opts[:as]
-              proxy_association.owner.group_memberships.where(group_id: groups.map(&:id)).as(opts[:as]).delete_all
-            else
-              super(*groups)
-            end
+          if opts[:as]
+            proxy_association.owner.group_memberships.where(group_id: groups.map(&:id)).as(opts[:as]).delete_all
+          else
+            super(*groups)
           end
+        end
 
-          def destroy(*args)
-            opts = args.extract_options!
-            groups = args.flatten
+        def destroy(*args)
+          opts = args.extract_options!
+          groups = args.flatten
 
-            if opts[:as]
-              proxy_association.owner.group_memberships.where(group_id: groups.map(&:id)).as(opts[:as]).destroy_all
-            else
-              super(*groups)
-            end
+          if opts[:as]
+            proxy_association.owner.group_memberships.where(group_id: groups.map(&:id)).as(opts[:as]).destroy_all
+          else
+            super(*groups)
           end
         end
       end

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

@@ -14,6 +14,10 @@ module Groupify
       end
 
       module ClassMethods
+        def groupify(type, opts = {})
+          send("acts_as_#{type}", opts)
+        end
+
         def acts_as_group(opts = {})
           include Groupify::ActiveRecord::Group
 

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

@@ -8,6 +8,10 @@ module Groupify
       end
 
       module ClassMethods
+        def groupify(type, opts = {})
+          send("acts_as_#{type}", opts)
+        end
+
         def acts_as_group(opts = {})
           include Groupify::Mongoid::Group
 

data/lib/groupify/version.rb

@@ -1,3 +1,3 @@
 module Groupify
-  VERSION = "0.6.0.rc2"
+  VERSION = "0.6.0"
 end

data/spec/active_record_spec.rb

@@ -64,23 +64,23 @@ end
 require 'groupify/adapter/active_record'
 
 class User < ActiveRecord::Base  
-  acts_as_group_member
-  acts_as_named_group_member
+  groupify :group_member
+  groupify :named_group_member
 end
 
 class Manager < User
 end
 
 class Widget < ActiveRecord::Base
-  acts_as_group_member
+  groupify :group_member
 end
 
 class Project < ActiveRecord::Base
-  acts_as_named_group_member
+  groupify :named_group_member
 end
 
 class Group < ActiveRecord::Base  
-  acts_as_group :members => [:users, :widgets], :default_members => :users
+  groupify :group, members: [:users, :widgets], default_members: :users
 end
 
 class Organization < Group
@@ -88,7 +88,7 @@ class Organization < Group
 end
 
 class GroupMembership < ActiveRecord::Base  
-  acts_as_group_membership
+  groupify :group_membership
 end
 
 describe Group do
@@ -242,7 +242,8 @@ describe Groupify::ActiveRecord do
       it "members can check if groups are shared" do
         user.groups << group
         widget.groups << group
-        user2 = User.create!(: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)
@@ -371,6 +372,13 @@ describe Groupify::ActiveRecord do
         expect(User.in_any_group(group, group2).as('employee').first).to eql(user)
       end
 
+      it "still returns a unique list of groups for the member" do
+        group.add user, as: 'manager'
+        expect(user.groups.size).to eq(1)
+        expect(group.users.size).to eq(1)
+        expect(group.members.size).to eq(1)
+      end
+
       it "checks if members belong to all groups with a certain membership type" do
         group2 = Group.create!
         group3 = Group.create!

data/spec/mongoid_spec.rb

@@ -35,8 +35,8 @@ require 'groupify/adapter/mongoid'
 class MongoidUser
   include Mongoid::Document
   
-  acts_as_group_member :class_name => 'MongoidGroup'
-  acts_as_named_group_member
+  groupify :group_member, class_name: 'MongoidGroup'
+  groupify :named_group_member
 end
 
 class MongoidManager < MongoidUser
@@ -44,32 +44,32 @@ end
 
 class MongoidWidget
   include Mongoid::Document
-  acts_as_group_member :class_name => 'MongoidGroup'
+  groupify :group_member, class_name: 'MongoidGroup'
 end
 
 class MongoidTask
   include Mongoid::Document
   
-  acts_as_group_member :class_name => 'MongoidGroup'
+  groupify :group_member, class_name: 'MongoidGroup'
 end
 
 class MongoidIssue
   include Mongoid::Document
 
-  acts_as_group_member :class_name => 'MongoidProject'
+  groupify :group_member, class_name: 'MongoidProject'
 end
 
 class MongoidGroup
   include Mongoid::Document
   
-  acts_as_group :members => [:mongoid_users, :mongoid_tasks, :mongoid_widgets], :default_members => :mongoid_users
+  groupify :group, members: [:mongoid_users, :mongoid_tasks, :mongoid_widgets], default_members: :mongoid_users
   alias_method :users, :mongoid_users
   alias_method :tasks, :mongoid_tasks
   alias_method :widgets, :mongoid_widgets
 end
 
 class MongoidProject < MongoidGroup
-  acts_as_named_group_member
+  groupify :named_group_member
 
   has_members :mongoid_issues
   has_members :mongoid_managers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupify
 version: !ruby/object:Gem::Version
-  version: 0.6.0.rc2
+  version: 0.6.0
 platform: ruby
 authors:
 - dwbutler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -127,6 +127,7 @@ files:
 - gemfiles/rails_3.2.gemfile
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
 - groupify.gemspec
 - lib/groupify.rb
 - lib/groupify/adapter/active_record.rb
@@ -163,9 +164,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2