groupify 0.2.1 → 0.3.0

data/README.md

@@ -35,6 +35,7 @@ class User
 	include Mongoid::Document
 	
 	acts_as_group_member
+	acts_as_named_group_member
 end
 ```
 
@@ -56,20 +57,22 @@ user.in_group?(group)	=> true
 Add to named groups:
 
 ```ruby
-user.groups << :admin
-user.in_group?(:admin)	=> true
+user.named_groups << :admin
+user.in_named_group?(:admin)	=> true
 ```
 
 Check if two group members share any of the same groups:
 
 ```ruby
 user1.shares_any_group?(user2)
+user2.shares_any_named_group?(user1)
 ```
 
 Query for groups & members:
 
 ```ruby
 User.in_group(group)	# Find all users in this group
+User.in_named_group(:admin)	# Find all users in this named group
 Group.with_member(user)	# Find all groups with this user
 
 User.shares_any_group(user)	# Find all users that share any groups with this user

data/lib/groupify.rb

@@ -1,10 +1,15 @@
 require 'active_support'
 require 'mongoid'
+require 'set'
 
 # Groups and members
 module Groupify
   extend ActiveSupport::Concern
   
+  included do
+    def none; where(:id => nil); end
+  end
+  
   module ClassMethods
     def acts_as_group(opts = {})
       include Groupify::Group
@@ -24,15 +29,20 @@ module Groupify
       class_eval { @group_class_name = opts[:class_name] || 'Group' }
       include Groupify::GroupMember
     end
+    
+    def acts_as_named_group_member(opts = {})
+      include Groupify::NamedGroupMember
+    end
   end
 
-  # Functionality related to groups.
   # Usage:
   #    class Group
   #        acts_as_group, :members => [:users]
   #        ...
   #    end
   #
+  #   group.add(member)
+  #
   module Group
     extend ActiveSupport::Concern
     
@@ -66,39 +76,24 @@ module Groupify
     end
   end
   
-  # Functionality related to group members.
   # Usage:
   #    class User
   #        acts_as_group_member
   #        ...
   #    end
   #
+  #    user.groups << group
+  #
   module GroupMember
     extend ActiveSupport::Concern
     
     included do
       group_class_name='Group' unless defined?(@group_class_name)
-      field :named_groups, :type => Array
-      has_and_belongs_to_many :groups, :autosave => true, :inverse_of => nil, :class_name => @group_class_name do
-        def <<(group)
-          case group
-          when self.metadata.klass
-            super
-          else
-            (self.base.named_groups ||= []) << group
-            self.base.save if self.metadata.autosave
-          end
-        end
-      end
+      has_and_belongs_to_many :groups, :autosave => true, :inverse_of => nil, :class_name => @group_class_name
     end
     
     def in_group?(group)
-      case group
-        when groups.metadata.klass
-          self.groups.include?(group)
-        else
-          self.named_groups ? self.named_groups.include?(group) : false
-        end
+      self.groups.include?(group)
     end
     
     def in_any_group?(*groups)
@@ -109,60 +104,86 @@ module Groupify
     end
     
     def in_all_groups?(*groups)
-      groups.flatten.each do |group|
-        return false unless in_group?(group)
-      end
-      return true
+      Set.new(groups.flatten) == Set.new(self.named_groups)
     end
     
     def shares_any_group?(other)
-      in_any_group?(other.groups + (other.named_groups || []))
+      in_any_group?(other.groups)
     end
     
     module ClassMethods
       def group_class_name; @group_class_name || 'Group'; end
       def group_class_name=(klass);  @group_class_name = klass; end
       
-      def none; where(:id => nil); end
-      
       def in_group(group)
-        return none unless group.present?
-        case group
-          when self.reflect_on_association(:groups).klass
-            where(:group_ids.in => [group.id])
-          else
-            in_named_group(group)
-        end
-      end
-      
-      def in_named_group(named_group)
-        named_group.present? ? where(:named_groups.in => [named_group]) : none
+        group.present? ? where(:group_ids.in => [group.id]) : none
       end
       
       def in_any_group(*groups)
         groups.present? ? where(:group_ids.in => groups.flatten.map{|g|g.id}) : none
       end
       
-      def in_any_named_group(*named_groups)
-        named_groups.present? ? where(:named_groups.in => named_groups.flatten) : none
-      end
-      
       def in_all_groups(*groups)
         groups.present? ? where(:group_ids => groups.flatten.map{|g|g.id}) : none
       end
       
-      def in_all_named_groups(*named_groups)
-        named_groups.present? ? where(:named_groups => named_groups.flatten) : none
-      end
-      
       def shares_any_group(other)
         in_any_group(other.groups)
       end
       
+    end
+  end
+  
+  # Usage:
+  #    class User
+  #        acts_as_named_group_member
+  #        ...
+  #    end
+  #
+  #    user.named_groups << :admin
+  #
+  module NamedGroupMember
+    extend ActiveSupport::Concern
+    
+    included do
+      field :named_groups, :type => Array, :default => []
+    end
+    
+    def in_named_group?(group)
+      self.named_groups.include?(group)
+    end
+    
+    def in_any_named_group?(*groups)
+      groups.flatten.each do |group|
+        return true if in_named_group?(group)
+      end
+      return false
+    end
+    
+    def in_all_named_groups?(*groups)
+      Set.new(groups.flatten) == Set.new(self.named_groups)
+    end
+    
+    def shares_any_named_group?(other)
+      in_any_named_group?(other.named_groups)
+    end
+    
+    module ClassMethods
+      def in_named_group(named_group)
+        named_group.present? ? where(:named_groups.in => [named_group]) : none
+      end
+      
+      def in_any_named_group(*named_groups)
+        named_groups.present? ? where(:named_groups.in => named_groups.flatten) : none
+      end
+      
+      def in_all_named_groups(*named_groups)
+        named_groups.present? ? where(:named_groups => named_groups.flatten) : none
+      end
+      
       def shares_any_named_group(other)
         in_any_named_group(other.named_groups)
       end
-      
     end
   end
 end

data/lib/groupify/version.rb

@@ -1,3 +1,3 @@
 module Groupify
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/groupify/mongoid_spec.rb

@@ -7,6 +7,7 @@ class MongoidUser
   include Mongoid::Document
   
   acts_as_group_member :class_name => 'MongoidGroup'
+  acts_as_named_group_member
 end
 
 class MongoidTask
@@ -89,16 +90,16 @@ describe "MongoidUser" do
   end
   
   it "can have named groups" do
-    user.groups << :admin
-    user.groups << :user
+    user.named_groups << :admin
+    user.named_groups << :user
+    user.save
     user.named_groups.should include(:admin)
     
-    user.in_group?(:admin).should be_true
-    user.in_any_group?(:admin, :user, :test).should be_true
-    user.in_all_groups?(:admin, :user).should be_true
-    user.in_all_groups?(:admin, :user, :test).should be_false
-    
-    MongoidUser.in_group(:admin).first.should eql(user)
+    user.in_named_group?(:admin).should be_true
+    user.in_any_named_group?(:admin, :user, :test).should be_true
+    user.in_all_named_groups?(:admin, :user).should be_true
+    user.in_all_named_groups?(:admin, :user, :test).should be_false
+
     MongoidUser.in_named_group(:admin).first.should eql(user)
     MongoidUser.in_any_named_group(:admin, :test).first.should eql(user)
     MongoidUser.in_all_named_groups(:admin, :user).first.should eql(user)
@@ -113,10 +114,10 @@ describe "MongoidUser" do
   end
   
   it "can check if named groups are shared" do
-    user.groups << :admin
+    user.named_groups << :admin
     user2 = MongoidUser.create(:named_groups => [:admin])
     
-    user.shares_any_group?(user2).should be_true
+    user.shares_any_named_group?(user2).should be_true
     MongoidUser.shares_any_named_group(user).to_a.should include(user2)
   end
 end

metadata

@@ -1,103 +1,107 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: groupify
-version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
-authors:
+authors: 
 - dwbutler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-06 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 2
+        version: "3.2"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mongoid
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: mongoid-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mongoid-rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 4
+        - 5
+        version: 1.4.5
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Adds group and membership functionality to Rails models
-email:
+email: 
 - dwbutler@ucla.edu
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -111,33 +115,42 @@ files:
 - spec/mongoid2.yml
 - spec/mongoid3.yml
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/dwbutler/groupify
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Group functionality for Rails
-test_files:
+test_files: 
 - spec/groupify/mongoid_spec.rb
 - spec/mongoid2.yml
 - spec/mongoid3.yml
 - spec/spec_helper.rb
-has_rdoc: