groupify 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f67a4e4fc525ccf5ec5d481bad9faef6a49e9c0e
-  data.tar.gz: 452badaf83a0fd0e5e1eecd39d7e3341c00ad8e5
+  metadata.gz: 14495b01edcc63635a6d0b077f5fb0227d7d6022
+  data.tar.gz: 4adb33988bdc07fbe2d4a64d4d59c806b51274a9
 SHA512:
-  metadata.gz: fc58d2e804fd86761855d4a85154f7cfeddc714be60c009484e6f3ca316ee3980ca1b8fe244bb15f27e2b21dfcfb916e6aa60cc0e829cdc3d90500b04c5c8778
-  data.tar.gz: 857bbc22e823eed129a2b281e611b1f1903424af03c62e2cdea36e9e063ac9b323563bf3541148978a5af147fcaeb68d6967aa247c0a40771a656075ec4928b3
+  metadata.gz: df8017bb4f1e2b123b1bcad6c209f744c03b06161d70fa1a7153f89d34f36bdc4ec79a4cfbda27b665263aecf03bad850fc0ada10fb67570b8b73bda03aedb2b
+  data.tar.gz: 010dd7484806af265d6e869dd98de25ff07e51c527dc80231ebde7928913ee73c77df5b7607c580a5fa6fb3afe7311f224f28145ab9eb2eef8def37d175099a7

data/.travis.yml

@@ -3,8 +3,10 @@ services: mongodb
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode
+  - 2.1.0
+  - 2.1.1
+  - jruby-19mode
+  #- rbx
 gemfile:
   - gemfiles/activesupport3.gemfile
   - gemfiles/activesupport4.gemfile

data/Gemfile

@@ -1,5 +1,9 @@
 source 'https://rubygems.org'
 
+group :development do
+  gem 'pry'
+end
+
 # Specify your gem's dependencies in groupify.gemspec
 gemspec
 

data/README.md

@@ -1,11 +1,13 @@
-# Groupify [![Build Status](https://secure.travis-ci.org/dwbutler/groupify.png)](http://travis-ci.org/dwbutler/groupify) [![Dependency Status](https://gemnasium.com/dwbutler/groupify.png)](https://gemnasium.com/dwbutler/groupify)
+# Groupify [![Build Status](https://secure.travis-ci.org/dwbutler/groupify.png)](http://travis-ci.org/dwbutler/groupify) [![Dependency Status](https://gemnasium.com/dwbutler/groupify.png)](https://gemnasium.com/dwbutler/groupify) [![Code Climate](https://codeclimate.com/github/dwbutler/groupify.png)](https://codeclimate.com/github/dwbutler/groupify)
+
 Adds group and membership functionality to Rails models.
 
 The following ORMs are supported:
-Mongoid 3.1 & 4.0, ActiveRecord 3.2 & 4.0
+Mongoid 3.1 & 4.0, ActiveRecord 3.2 & 4.x
 
 The following Rubies are supported:
-Ruby 1.9.3, 2.0.0 (MRI, REE, JRuby, and Rubinius).
+ * MRI Ruby 1.9.3, 2.0.x, 2.1.x
+ * JRuby (1.9 mode)
 
 ## Installation
 
@@ -21,8 +23,6 @@ Or install it yourself as:
 
     $ gem install groupify
 
-## Getting Started
-
 ### Active Record
 Add a migration similar to the following:
 
@@ -68,6 +68,14 @@ class Assignment < ActiveRecord::Base
 end
 ```
 
+You will also need to define a `GroupMembership` model to join groups to members:
+
+```ruby
+class GroupMembership < ActiveRecord::Base  
+  acts_as_group_membership
+end
+```
+
 ### Mongoid
 In your group model:
 
@@ -104,6 +112,9 @@ group.add user
 
 user.in_group?(group)
 # => true
+
+# Add multiple members at once
+group.add(user, widget, task)
 ```
 
 Add to named groups:

data/gemfiles/activesupport4.gemfile

@@ -5,7 +5,8 @@ gem 'activerecord', "~> 4"
 # TODO: Enable once Mongoid 4 is released
 #gem "mongoid", ">= 4.0"
 
-gem "mongoid", :github => "mongoid/mongoid"
+#gem "mongoid", :github => "mongoid/mongoid"
+gem "mongoid", "4.0.0.beta1"
 gem 'mongoid-rspec'
 
 gem 'database_cleaner'
@@ -20,4 +21,4 @@ platform :jruby do
   gem "jdbc-sqlite3"
   # See https://github.com/jruby/activerecord-jdbc-adapter/issues/253
   gem "activerecord-jdbcsqlite3-adapter", :github => 'jruby/activerecord-jdbc-adapter', :branch => 'v1.3.0.beta2'
-end
+end

data/groupify.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "groupify"
   gem.require_paths = ["lib"]
   gem.version       = Groupify::VERSION
+  gem.license       = 'MIT'
 
   gem.add_development_dependency "mongoid", ">= 3.1"
   gem.add_development_dependency "activerecord", ">= 3.2"

data/lib/groupify/adapter/active_record.rb

@@ -61,17 +61,17 @@ module Groupify
         @member_klasses ||= Set.new
         has_many :group_memberships, :dependent => :destroy
       end
-      
-      def members
-        self.class.default_member_class.joins(:group_memberships).where(:group_memberships => {:member_type => self.class.default_member_class.to_s}).uniq
-      end
 
       def member_classes
         self.class.member_classes
       end
       
-      def add(member)
-        member.groups << self
+      def add(*members)
+        clear_association_cache
+        
+        members.flatten.each do |member|
+          member.groups << self
+        end
       end
 
       # Merge a source group into this group.
@@ -86,7 +86,7 @@ module Groupify
         end
         
         def default_member_class
-          @default_member_class ||= register(User)
+          @default_member_class ||= (User rescue false)
         end
 
         def default_member_class=(klass)
@@ -102,11 +102,6 @@ module Groupify
         def has_members(name)
           klass = name.to_s.classify.constantize
           register(klass)
-
-          # Define specific members accessor, i.e. group.users
-          define_method name.to_s.pluralize.underscore do
-            klass.joins(:group_memberships).where(:group_memberships => {:group_id => self.id}).uniq
-          end
         end
 
         # Merge two groups. The members of the source become members of the destination, and the source is destroyed.
@@ -129,8 +124,21 @@ module Groupify
 
         def register(member_klass)
           (@member_klasses ||= Set.new) << member_klass
+
+          associate_member_class(member_klass)
+
           member_klass
         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
+
+          if member_klass == default_member_class
+            has_many :members, :through => :group_memberships, :source => :member, :source_type => source_type
+          end
+        end
       end
     end
 

data/lib/groupify/adapter/mongoid.rb

@@ -52,7 +52,7 @@ module Groupify
         @default_member_class = nil
         @member_klasses ||= Set.new
       end
-      
+
       def members
         self.class.default_member_class.any_in(:group_ids => [self.id])
       end
@@ -61,8 +61,10 @@ module Groupify
         self.class.member_classes
       end
       
-      def add(member)
-        member.groups << self
+      def add(*members)
+        members.flatten.each do |member|
+          member.groups << self
+        end
       end
 
       # Merge a source group into this group.
@@ -110,9 +112,10 @@ module Groupify
           end
 
           source_group.member_classes.each do |klass|
-            klass.any_in(:group_ids => [source_group.id]).update(:$set => {:"group_ids.$" => destination_group.id})
+            klass.any_in(:group_ids => [source_group.id]).update_all(:$set => {:"group_ids.$" => destination_group.id})
           end
-          source_group.destroy
+
+          source_group.delete
         end
 
         protected

data/lib/groupify/version.rb

@@ -1,3 +1,3 @@
 module Groupify
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spec/groupify/active_record_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 require 'active_record'
 
+puts "ActiveRecord version #{ActiveSupport::VERSION::STRING}"
+
 # Load database config
 if JRUBY
   require 'jdbc/sqlite3'
@@ -63,6 +65,9 @@ class User < ActiveRecord::Base
   acts_as_named_group_member
 end
 
+class Manager < User
+end
+
 class Widget < ActiveRecord::Base
   acts_as_group_member
 end
@@ -71,9 +76,6 @@ class Group < ActiveRecord::Base
   acts_as_group :members => [:users, :widgets], :default_members => :users
 end
 
-class Manager < User
-end
-
 class Organization < Group
   has_members :managers
 end
@@ -95,10 +97,20 @@ describe User do
   it { should respond_to :shares_any_group?}
 end
 
+#ActiveRecord::Base.logger = Logger.new(STDOUT)
+
 describe Groupify::ActiveRecord do
   let(:user) { User.create! }
   let(:group) { Group.create! }
   let(:widget) { Widget.create! }
+
+  it "members and groups are empty when initialized" do
+    user.groups.should be_empty
+    User.new.groups.should be_empty
+
+    Group.new.members.should be_empty
+    group.members.should be_empty
+  end
   
   it "adds a group to a member" do
     user.groups << group
@@ -113,6 +125,16 @@ describe Groupify::ActiveRecord do
     group.members.should include(user)
   end
 
+  it "adds multiple members to a group" do
+    group.add(user, widget)
+    group.users.should include(user)
+    group.widgets.should include(widget)
+
+    users = [User.create!, User.create!]
+    group.add(users)
+    group.users.should include(*users)
+  end
+
   it 'lists which member classes can belong to this group' do
     group.class.member_classes.should include(User, Widget)
     group.member_classes.should include(User, Widget)
@@ -234,8 +256,13 @@ describe Groupify::ActiveRecord do
   
   it "members can check if groups are shared" do
     user.groups << group
+    widget.groups << group
     user2 = User.create!(:groups => [group])
     
+    user.shares_any_group?(widget).should be_true
+    Widget.shares_any_group(user).to_a.should include(widget)
+    User.shares_any_group(widget).to_a.should include(user, user2)
+
     user.shares_any_group?(user2).should be_true
     User.shares_any_group(user).to_a.should include(user2)
   end

data/spec/groupify/mongoid_spec.rb

@@ -17,11 +17,14 @@ RSpec.configure do |config|
 end
 
 require 'mongoid'
+puts "Mongoid version #{Mongoid::VERSION}"
+
 require 'mongoid-rspec'
 include Mongoid::Matchers
 
 # Load mongoid config
 Mongoid.load!('./spec/groupify/mongoid.yml', :test)
+#Moped.logger = Logger.new(STDOUT)
 
 require 'groupify'
 require 'groupify/adapter/mongoid'
@@ -33,6 +36,9 @@ class MongoidUser
   acts_as_named_group_member
 end
 
+class MongoidManager < MongoidUser
+end
+
 class MongoidTask
   include Mongoid::Document
   
@@ -55,7 +61,9 @@ end
 
 class MongoidProject < MongoidGroup
   has_members :mongoid_issues
+  has_members :mongoid_managers
   alias_method :issues, :mongoid_issues
+  alias_method :managers, :mongoid_managers
 end
 
 describe MongoidGroup do
@@ -79,6 +87,15 @@ describe Groupify::Mongoid do
   let!(:group) { MongoidGroup.create! }
   let(:task) { MongoidTask.create! }
   let(:issue) { MongoidIssue.create! }
+  let(:manager) { MongoidManager.create! }
+
+  it "members and groups are empty when initialized" do
+    user.groups.should be_empty
+    MongoidUser.new.groups.should be_empty
+
+    MongoidGroup.new.members.should be_empty
+    group.members.should be_empty
+  end
   
   it "adds a group to a member" do
     user.groups << group
@@ -93,6 +110,16 @@ describe Groupify::Mongoid do
     group.members.should include(user)
   end
 
+  it "adds multiple members to a group" do
+    group.add(user, task)
+    group.users.should include(user)
+    group.tasks.should include(task)
+
+    users = [MongoidUser.create!, MongoidUser.create!]
+    group.add(users)
+    group.users.should include(*users)
+  end
+
   it 'lists which member classes can belong to this group' do
     group.class.member_classes.should include(MongoidUser, MongoidTask)
     group.member_classes.should include(MongoidUser, MongoidTask)
@@ -137,12 +164,14 @@ describe Groupify::Mongoid do
       destination = MongoidProject.create!
 
       source.add(user)
+      source.add(manager)
       destination.add(task)
 
       destination.merge!(source)
       source.destroyed?.should be_true
       
       destination.users.to_a.should include(user)
+      destination.managers.to_a.should include(manager)
       destination.tasks.to_a.should include(task)
     end
 

data/spec/spec_helper.rb

@@ -3,8 +3,10 @@ require 'bundler/setup'
 
 Bundler.require(:default, :test, :development)
 
+#require 'pry'
+
 JRUBY = defined?(JRUBY_VERSION)
 
 RSpec.configure do |config|
   config.order = "random"
-end
+end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: groupify
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - dwbutler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: mongoid-rspec
   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'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   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
@@ -115,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -134,7 +134,8 @@ files:
 - spec/groupify/mongoid_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dwbutler/groupify
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -142,17 +143,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Group functionality for Rails