groupify 0.3.0 → 0.3.1

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/**/*.lock

data/.travis.yml

@@ -1,9 +1,27 @@
 language: ruby
+services: mongodb
 rvm:
   - ree
   - 1.8.7
   - 1.9.3
+  - 2.0.0
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode
   - rbx-19mode
+gemfile:
+  - gemfiles/mongoid2.gemfile
+  - gemfiles/mongoid3.gemfile
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: gemfiles/mongoid3.gemfile
+    - rvm: ree
+      gemfile: gemfiles/mongoid3.gemfile
+    - rvm: jruby-18mode
+      gemfile: gemfiles/mongoid3.gemfile
+    - rvm: rbx-18mode
+      gemfile: gemfiles/mongoid3.gemfile
+  allow_failures:
+    - rvm: rbx-18mode
+

data/Gemfile

@@ -2,7 +2,3 @@ source :rubygems
 
 # Specify your gem's dependencies in groupify.gemspec
 gemspec
-
-platform :ruby, :mswin, :mingw do
-  gem "bson_ext", "~> 1.6.4"
-end

data/README.md

@@ -1,7 +1,8 @@
 # Groupify [![Build Status](https://secure.travis-ci.org/dwbutler/groupify.png)](http://travis-ci.org/dwbutler/groupify)
 Adds group and membership functionality to Rails models.
 
-Currently only Mongoid is supported. Tested in Ruby 1.8.7 and 1.9.3.
+Currently only Mongoid 2 and 3 are supported. Tested in Ruby 1.8.7 and 1.9.3 (MRI, REE, JRuby, and Rubinius).
+It shouldn't be difficult to adapt to ActiveRecord.
 
 ## Installation
 

data/gemfiles/mongoid2.gemfile

@@ -0,0 +1,10 @@
+source :rubygems
+
+gem "mongoid", "~> 2.0"
+gem 'mongoid-rspec', '1.4.5'
+
+gem "bson_ext", :platforms => [:ruby]
+
+gem 'database_cleaner'
+gem "rspec"
+gem "rake"

data/gemfiles/mongoid3.gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+
+gem "mongoid", ">= 3.0", "< 4"
+gem 'mongoid-rspec', '>= 1.5.1'
+
+gem 'database_cleaner'
+gem "rspec"
+gem "rake"

data/groupify.gemspec

@@ -15,15 +15,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Groupify::VERSION
   
-  gem.add_development_dependency "rails", "~> 3.2"
+  gem.add_dependency "mongoid", '>= 2'
+  
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   
-  if RUBY_VERSION < '1.9'
-    gem.add_development_dependency "mongoid", "~> 2.0"
-    gem.add_development_dependency 'mongoid-rspec', '1.4.5'
-  else
-    gem.add_development_dependency "mongoid", "~> 3.0"
-    gem.add_development_dependency 'mongoid-rspec', '~> 1.5.1'
-  end
+  gem.add_development_dependency 'mongoid-rspec'
   gem.add_development_dependency 'database_cleaner'
 end

data/lib/groupify.rb

@@ -147,6 +147,12 @@ module Groupify
     
     included do
       field :named_groups, :type => Array, :default => []
+      
+      before_save :uniq_named_groups
+      protected
+      def uniq_named_groups
+        named_groups.uniq!
+      end
     end
     
     def in_named_group?(group)

data/lib/groupify/version.rb

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

data/spec/groupify/mongoid_spec.rb

@@ -3,6 +3,17 @@ require 'mongoid'
 require 'mongoid-rspec'
 include Mongoid::Matchers
 
+# Load mongoid config
+if Mongoid::VERSION < '3'
+  ENV["MONGOID_ENV"] = "test"
+  Mongoid.load!('./spec/groupify/mongoid2.yml')
+  Mongoid.logger.level = Logger::INFO
+else
+  Mongoid.load!('./spec/groupify/mongoid3.yml', :test)
+end
+
+require 'groupify'
+
 class MongoidUser
   include Mongoid::Document
   
@@ -44,7 +55,7 @@ describe MongoidUser do
   it { should have_and_belong_to_many(:groups).of_type(MongoidGroup) }
 end
 
-describe "MongoidUser" do
+describe "Mongoid Model" do
   let!(:user) { MongoidUser.create }
   let!(:group) { MongoidGroup.create }
   
@@ -103,6 +114,11 @@ describe "MongoidUser" do
     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)
+    
+    # Uniqueness
+    user.named_groups << :admin
+    user.save
+    user.named_groups.count{|g| g == :admin}.should == 1
   end
   
   it "can check if groups are shared" do

data/spec/spec_helper.rb

@@ -3,20 +3,6 @@ require 'bundler/setup'
 
 Bundler.require(:default, :test, :development)
 
-require 'active_support'
-require 'active_support/all'
-require 'rails'
-require 'active_record'
-
-# Load mongoid config
-if Mongoid::VERSION < '3'
-  ENV["MONGOID_ENV"] = "test"
-  Mongoid.load!('./spec/mongoid2.yml')
-else
-  Mongoid.load!('./spec/mongoid3.yml', :test)
-end
-#Mongoid.logger.level = :info
-
 RSpec.configure do |config|
   config.order = "random"
   

metadata

@@ -1,156 +1,156 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: groupify
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - dwbutler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-09-06 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rails
+date: 2013-01-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          Mg==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          Mg==
+    none: false
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 2
-        version: "3.2"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    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 
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+  prerelease: false
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: mongoid-rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 4
-        - 5
-        version: 1.4.5
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: database_cleaner
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
   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: 
-- .gitignore
-- .travis.yml
+files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/mongoid2.gemfile
+- gemfiles/mongoid3.gemfile
 - groupify.gemspec
 - lib/groupify.rb
 - lib/groupify/version.rb
+- spec/groupify/mongoid2.yml
+- spec/groupify/mongoid3.yml
 - 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: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Group functionality for Rails
-test_files: 
+test_files:
+- spec/groupify/mongoid2.yml
+- spec/groupify/mongoid3.yml
 - spec/groupify/mongoid_spec.rb
-- spec/mongoid2.yml
-- spec/mongoid3.yml
 - spec/spec_helper.rb