groupify 0.1.1 → 0.2.0

data/README.md

@@ -20,28 +20,61 @@ Or install it yourself as:
 ## Getting Started
 In your group model:
 
-	class Group
-		include Mongoid::Document
-		
-		acts_as_group
-	end
+```ruby
+class Group
+	include Mongoid::Document
+
+	acts_as_group
+end
+```
 
 In your user model:
 
-	class User
-		include Mongoid::Document
-		
-		acts_as_group_member
-	end
+```ruby
+class User
+	include Mongoid::Document
+	
+	acts_as_group_member
+end
+```
+
+## Usage
 
 Create groups and add members:
 
-	group = Group.new
-	user = User.new
-	
-	user.groups << group
-	or
-	group.add user
+```ruby
+group = Group.new
+user = User.new
+
+user.groups << group
+or
+group.add user
+
+user.in_group?(group)	=> true
+```
+
+Add to named groups:
+
+```ruby
+user.groups << :admin
+user.in_group?(:admin)	=> true
+```
+
+Check if two group members share any of the same groups:
+
+```ruby
+user1.shares_any_group?(user2)
+```
+
+Query for groups & members:
+
+```ruby
+User.in_group(group)	# Find all users in this 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
+User.shares_any_named_group(user)	# Find all users that share any named groups with this user
+```
 
 Check the specs for more details.
 

data/groupify.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency "mongoid", "~> 3.0"
     gem.add_development_dependency 'mongoid-rspec', '~> 1.5.1'
   end
+  gem.add_development_dependency 'database_cleaner'
 end

data/lib/groupify/version.rb

@@ -1,3 +1,3 @@
 module Groupify
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/groupify.rb

@@ -1,4 +1,3 @@
-require "groupify/version"
 require 'active_support'
 require 'mongoid'
 
@@ -79,14 +78,45 @@ module Groupify
     
     included do
       group_class_name='Group' unless defined?(@group_class_name)
-      has_and_belongs_to_many :groups, :autosave => true, :inverse_of => nil, :class_name => @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.to_s
+            self.base.save if self.metadata.autosave
+          end
+        end
+      end
+    end
+    
+    def in_group?(group)
+      case group
+        when groups.metadata.klass
+          self.groups.include?(group)
+        else
+          self.named_groups ? self.named_groups.include?(group.to_s) : false
+        end
+    end
+    
+    def in_any_group?(*groups)
+      groups.flatten.each do |group|
+        return true if in_group?(group)
+      end
+      return false
+    end
+    
+    def in_all_groups?(*groups)
+      groups.flatten.each do |group|
+        return false unless in_group?(group)
+      end
+      return true
     end
     
-    def in_group?(group); self.groups.include? group; end
-    def in_any_group?(*groups); (self.groups & groups.flatten).present?; end
-    def in_all_groups?(*groups); self.groups == groups.flatten; end
     def shares_any_group?(other)
-      in_any_group?(other.groups)
+      in_any_group?(other.groups + (other.named_groups || []))
     end
     
     module ClassMethods
@@ -94,10 +124,45 @@ module Groupify
       def group_class_name=(klass);  @group_class_name = klass; end
       
       def none; where(:id => nil); end
-      def in_group(group); 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_all_groups(*groups); groups.present? ? where(:group_ids => groups.flatten.map{|g|g.id}) : none; end
-      def shares_any_group(other); in_any_group(other.groups); 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.to_s]) : 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.map{|g|g.to_s}) : 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.map{|g|g.to_s}) : none
+      end
+      
+      def shares_any_group(other)
+        in_any_group(other.groups)
+      end
+      
+      def shares_any_named_group(other)
+        in_any_named_group(other.named_groups)
+      end
+      
     end
   end
 end

data/spec/groupify/mongoid_spec.rb

@@ -22,6 +22,11 @@ class MongoidGroup
   alias_method :users, :mongoid_users
 end
 
+class MongoidProject < MongoidGroup
+  
+  alias_method :tasks, :mongoid_tasks
+end
+
 describe MongoidGroup do
   it { should respond_to :members}
   it { should respond_to :add }
@@ -82,4 +87,36 @@ describe "MongoidUser" do
     MongoidUser.in_all_groups(group, group2).first.should eql(user)
     MongoidUser.in_all_groups([group, group2]).first.should eql(user)
   end
+  
+  it "can have named groups" do
+    user.groups << :admin
+    user.groups << :user
+    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)
+    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)
+  end
+  
+  it "can check if groups are shared" do
+    user.groups << group
+    user2 = MongoidUser.create(:groups => [group])
+    
+    user.shares_any_group?(user2).should be_true
+    MongoidUser.shares_any_group(user).to_a.should include(user2)
+  end
+  
+  it "can check if named groups are shared" do
+    user.groups << :admin
+    user2 = MongoidUser.create(:named_groups => [:admin])
+    
+    user.shares_any_group?(user2).should be_true
+    MongoidUser.shares_any_named_group(user).to_a.should include(user2)
+  end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 
-Bundler.require(:default)
+Bundler.require(:default, :test, :development)
 
 require 'active_support'
 require 'active_support/all'
@@ -15,4 +15,20 @@ if Mongoid::VERSION < '3'
 else
   Mongoid.load!('./spec/mongoid3.yml', :test)
 end
-#Mongoid.logger.level = :info
+#Mongoid.logger.level = :info
+
+RSpec.configure do |config|
+  config.order = "random"
+  
+  config.before(:suite) do
+    DatabaseCleaner[:mongoid].strategy = :truncation
+  end
+
+  config.before(:each) do
+    DatabaseCleaner[:mongoid].start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner[:mongoid].clean
+  end
+end

metadata

@@ -1,64 +1,100 @@
 --- !ruby/object:Gem::Specification 
 name: groupify
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.1
+  hash: 23
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
-  - dwbutler
+- dwbutler
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-08-30 00:00:00 Z
+date: 2012-09-05 00:00:00 -07:00
+default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rails
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "3.2"
-    type: :development
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: mongoid
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "2.0"
-    type: :development
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: mongoid-rspec
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.4.5
-    type: :development
-    version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !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
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !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
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    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
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    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: 
-  - dwbutler@ucla.edu
+- dwbutler@ucla.edu
 executables: []
 
 extensions: []
@@ -66,19 +102,20 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - .gitignore
-  - .travis.yml
-  - Gemfile
-  - LICENSE
-  - README.md
-  - Rakefile
-  - groupify.gemspec
-  - lib/groupify.rb
-  - lib/groupify/version.rb
-  - spec/groupify/mongoid_spec.rb
-  - spec/mongoid2.yml
-  - spec/mongoid3.yml
-  - spec/spec_helper.rb
+- .gitignore
+- .travis.yml
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- groupify.gemspec
+- lib/groupify.rb
+- lib/groupify/version.rb
+- spec/groupify/mongoid_spec.rb
+- spec/mongoid2.yml
+- spec/mongoid3.yml
+- spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/dwbutler/groupify
 licenses: []
 
@@ -86,28 +123,34 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !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"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Group functionality for Rails
 test_files: 
-  - spec/groupify/mongoid_spec.rb
-  - spec/mongoid2.yml
-  - spec/mongoid3.yml
-  - spec/spec_helper.rb
+- spec/groupify/mongoid_spec.rb
+- spec/mongoid2.yml
+- spec/mongoid3.yml
+- spec/spec_helper.rb