groupify 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcc33f0b1cc986893a05a5fdc5e916bd7e3b9837
-  data.tar.gz: bbe9793b57fe7c7256193694aed87e7d1de7adf7
+  metadata.gz: f4862a4c859c23e06244fdbcb6e4136605c2eaba
+  data.tar.gz: fe23526681fcf01e8f927174ee4a1aec4eccd4a7
 SHA512:
-  metadata.gz: bfa5473767c6bf658020a14ba3f480d0b04ace3997c34377b4dca702dbeab9c4ef3c11354da9264ea453986b20af09472ea513c7ca807e0bc8d3e7f0111935bd
-  data.tar.gz: e12229d766b2f5abead3b6d7d6848fb6f7c3b40a7889fe03734e589c35a5b4d017efb0628d902755d51f355264b5b049b160ded876a1fbbfbcd3d0b0f168d1c1
+  metadata.gz: c4054d1ae7e9772702820d77ff62636a558c09cf2c8b2518df8f8c9748194995ca54e9033918a4e75f726a6785cca31eb2b14d17c041ccc7f866994f8e00e264
+  data.tar.gz: c21e26ab9bd68f1cd1b96c02fdfa29f86ae64a553c42f91869c69c85285f4b968855bda0214c804c4d48048040e8e3529ac803c05124f0f4494e35f6e3d508e3

data/.gitignore

@@ -18,3 +18,5 @@ tmp
 /**/*.lock
 .idea/
 .ruby-version
+*.sqlite
+*.log

data/.travis.yml

@@ -1,42 +1,39 @@
 language: ruby
 services: mongodb
+bundler_args: --without development
+before_script:
+  - sh -c "if [ '$DATABASE' = 'postgresql' ]; then psql -c 'create database groupify_test;' -U postgres; fi"
+  - sh -c "if [ '$DATABASE' = 'mysql' ]; then mysql -e 'create database groupify_test;'; fi"
+after_success:
+  bundle exec codeclimate-test-reporter
 env:
   - DATABASE=sqlite3
   - DATABASE=sqlite3mem
   - DATABASE=postgresql
   - DATABASE=mysql
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
-  - jruby-19mode
-  - jruby-9.0.5.0
+  - 2.2.6
+  - 2.3.4
+  - 2.4.1
+  - jruby-9.1.5.0
   - rbx-2
 gemfile:
-  - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
 matrix:
-  exclude:
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: jruby-19mode
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.1.9
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.2.5
-      gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.3.1
-      gemfile: gemfiles/rails_3.2.gemfile
   allow_failures:
+    - rvm: 2.4.1
     - rvm: rbx-2
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.5.0
       gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: jruby-9.1.5.0
+      gemfile: gemfiles/rails_5.1.gemfile
+
 sudo: false
 cache: bundler
+addons:
+  code_climate:
+    repo_token: 9ba385a9a2a4ccd816cf6768fcde3e9cc163a76b67838e3572be70850ffb5dc9

data/Appraisals

@@ -1,8 +1,3 @@
-appraise "rails-3.2" do
-  gem 'activerecord', "~> 3.2"
-  gem "mongoid", ">= 3.0", "< 4"
-end
-
 appraise "rails-4.0" do
   gem 'activerecord', "~> 4.0.0"
   gem "mongoid", "~> 4.0"
@@ -21,11 +16,11 @@ appraise "rails-4.2" do
 end
 
 appraise "rails-5.0" do
-  gem 'activerecord', "~> 5.0.0.rc1"
-  gem 'activesupport', "~> 5.0.0.rc1"
-  gem 'railties', "~> 5.0.0.rc1"
-
-  gem 'combustion', '0.5.4'
+  gem 'activerecord', "~> 5.0.0"
+  gem 'mongoid', '~> 6.0.0'
+end
 
-  gem 'mongoid', github: 'mongodb/mongoid', ref: '7c2ff52a0c5292b8e6bf3a9a29bbb19abae3dd5f'
+appraise "rails-5.1" do
+  gem 'activerecord', "~> 5.1.0"
+  gem 'mongoid', '~> 6.1.0'
 end

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 
-## [v0.8.0](https://github.com/dwbutler/groupify/tree/v0.8.0) (2016-06-10)
+## [v0.9.0](https://github.com/dwbutler/groupify/tree/v0.9.0) (2017-05-09)
+[Full Changelog](https://github.com/dwbutler/groupify/compare/v0.8.0...v0.9.0)
+
+**Merged pull requests:**
+
+- Switch .uniq to .distinct while dropping rails 3.2 Support [\#53](https://github.com/dwbutler/groupify/pull/53) ([rposborne](https://github.com/rposborne))
+- Add timestamps to groups table in migration generator template [\#51](https://github.com/dwbutler/groupify/pull/51) ([juhazi](https://github.com/juhazi))
+
+## [v0.8.0](https://github.com/dwbutler/groupify/tree/v0.8.0) (2016-06-11)
 [Full Changelog](https://github.com/dwbutler/groupify/compare/v0.7.2...v0.8.0)
 
 **Fixed bugs:**

data/Gemfile

@@ -2,10 +2,17 @@ source 'https://rubygems.org'
 
 group :development do
   gem 'pry'
+  gem "github_changelog_generator"
 end
 
 group :test do
+  gem "rspec", ">= 3"
+
+  gem "database_cleaner", "~> 1.5.3"
+  gem "combustion", "0.5.5"
+  gem "appraisal"
   gem 'coveralls', require: false
+  gem "codeclimate-test-reporter", require: nil
 end
 
 # Specify your gem's dependencies in groupify.gemspec

data/README.md

@@ -9,12 +9,12 @@ model? Use named groups instead to add members to named groups such as
 ## Compatibility
 
 The following ORMs are supported:
- * ActiveRecord 3.2, 4.1, 4.2, 5.0
- * Mongoid 3.1, 4.0+, 5.0+, 6
+ * ActiveRecord 4.x, 5.x
+ * Mongoid 4.x, 5.x, 6.x
 
 The following Rubies are supported:
- * MRI Ruby 1.9.3, 2.0, 2.1, 2.2, 2.3
- * JRuby 1.7, 9000
+ * MRI Ruby 2.2, 2.3, 2.4
+ * JRuby 9000
 
 The following databases are supported:
  * MySQL
@@ -154,18 +154,19 @@ user.in_group?(group)
 group.add(user, widget, task)
 ```
 
-### Add to named groups
+### Remove from groups
 
 ```ruby
-user.named_groups << :admin
-user.in_named_group?(:admin)        # => true
+users.groups.destroy(group)          # Destroys this user's group membership for this group
+group.users.delete(user)             # Deletes this group's group membership for this user
 ```
 
-### Remove from groups
+### Named groups
 
 ```ruby
-users.groups.destroy(group)          # Destroys this user's group membership for this group
-group.users.delete(user)             # Deletes this group's group membership for this user
+user.named_groups << :admin
+user.in_named_group?(:admin)        # => true
+user.named_groups.destroy(:admin)
 ```
 
 ### Check if two members share any of the same groups:
@@ -222,7 +223,7 @@ within a larger group (say, an organization).
 group.add(user, as: 'manager')
 
 # Works with named groups too
-user.named_groups.add user, as: 'manager'
+user.named_groups.add 'Company', as: 'manager'
 
 # Query for the groups that a user belongs to with a certain role
 user.groups.as(:manager)
@@ -357,11 +358,20 @@ class PostPolicy < Struct.new(:user, :post)
 end
 ```
 
-## Upgrading
+## Backwards-Incompatible Releases
+
+### 0.9+ - Dropped support for Rails 3.2 and Ruby 1.9 - 2.1
+
+Groupify 0.9 added support for Rails 5.1, and dropped support for EOL'ed versions of Ruby,
+Rails, ActiveRecord, and Mongoid.
+
+ActiveRecord 5.1 no longer supports passing arguments to collection
+associations. Because of this, the undocumented syntax `groups.as(:membership_type)`
+is no longer supported.
 
 ### 0.8+ - Name Change for `group_memberships` Associations (ActiveRecord only)
 
-Groupify 0.8+ changed the ActiveRecord adapter to support configuring the same
+Groupify 0.8 changed the ActiveRecord adapter to support configuring the same
 model as both a group and a group member. To accomplish this, the internal `group_memberships`
 association was renamed to be different for groups and members. If you were
 using it, please be aware that you will need to change your code. This
@@ -369,6 +379,7 @@ association is considered to be an internal implementation details and not part
 of the public API, so please don't rely on it if you can avoid it.
 
 ### 0.7+ - Polymorphic Groups (ActiveRecord only)
+
 Groupify < 0.7 required a single `Group` model used for all group memberships.
 Groupify 0.7+ supports using multiple models as groups by implementing polymorphic associations.
 Upgrading requires adding a new `group_type` column to the `group_memberships` table and

data/Rakefile

@@ -9,10 +9,13 @@ RSpec::Core::RakeTask.new do |t|
   t.verbose = false
 end
 
-require 'github_changelog_generator/task'
-desc "Regenerate changelog"
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.future_release = 'v0.8.0'
+begin
+  require 'github_changelog_generator/task'
+  desc "Regenerate changelog"
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.future_release = 'v0.9.0'
+  end
+rescue LoadError
 end
 
 task :default => :spec

data/config.ru

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application

data/gemfiles/rails_4.0.gemfile

@@ -7,10 +7,16 @@ gem "mongoid", "~> 4.0"
 
 group :development do
   gem "pry"
+  gem "github_changelog_generator"
 end
 
 group :test do
-  gem "coveralls", :require => false
+  gem "rspec", ">= 3"
+  gem "database_cleaner", "~> 1.5.3"
+  gem "combustion", "0.5.5"
+  gem "appraisal"
+  gem "coveralls", require: false
+  gem "codeclimate-test-reporter", require: nil
 end
 
 platforms :jruby do
@@ -26,4 +32,4 @@ platforms :ruby do
   gem "pg"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.1.gemfile

@@ -7,10 +7,16 @@ gem "mongoid", "~> 4.0"
 
 group :development do
   gem "pry"
+  gem "github_changelog_generator"
 end
 
 group :test do
-  gem "coveralls", :require => false
+  gem "rspec", ">= 3"
+  gem "database_cleaner", "~> 1.5.3"
+  gem "combustion", "0.5.5"
+  gem "appraisal"
+  gem "coveralls", require: false
+  gem "codeclimate-test-reporter", require: nil
 end
 
 platforms :jruby do
@@ -26,4 +32,4 @@ platforms :ruby do
   gem "pg"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -7,10 +7,16 @@ gem "mongoid", "~> 4.0"
 
 group :development do
   gem "pry"
+  gem "github_changelog_generator"
 end
 
 group :test do
-  gem "coveralls", :require => false
+  gem "rspec", ">= 3"
+  gem "database_cleaner", "~> 1.5.3"
+  gem "combustion", "0.5.5"
+  gem "appraisal"
+  gem "coveralls", require: false
+  gem "codeclimate-test-reporter", require: nil
 end
 
 platforms :jruby do
@@ -26,4 +32,4 @@ platforms :ruby do
   gem "pg"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -2,18 +2,21 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0.rc1"
-gem "activesupport", "~> 5.0.0.rc1"
-gem "railties", "~> 5.0.0.rc1"
-gem "combustion", "0.5.4"
-gem "mongoid", :github => "mongodb/mongoid", :ref => "7c2ff52a0c5292b8e6bf3a9a29bbb19abae3dd5f"
+gem "activerecord", "~> 5.0.0"
+gem "mongoid", "~> 6.0.0"
 
 group :development do
   gem "pry"
+  gem "github_changelog_generator"
 end
 
 group :test do
-  gem "coveralls", :require => false
+  gem "rspec", ">= 3"
+  gem "database_cleaner", "~> 1.5.3"
+  gem "combustion", "0.5.5"
+  gem "appraisal"
+  gem "coveralls", require: false
+  gem "codeclimate-test-reporter", require: nil
 end
 
 platforms :jruby do
@@ -29,4 +32,4 @@ platforms :ruby do
   gem "pg"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/{rails_3.2.gemfile → rails_5.1.gemfile}

@@ -2,15 +2,21 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.2"
-gem "mongoid", ">= 3.0", "< 4"
+gem "activerecord", "~> 5.1.0"
+gem "mongoid", "~> 6.1.0"
 
 group :development do
   gem "pry"
+  gem "github_changelog_generator"
 end
 
 group :test do
-  gem "coveralls", :require => false
+  gem "rspec", ">= 3"
+  gem "database_cleaner", "~> 1.5.3"
+  gem "combustion", "0.5.5"
+  gem "appraisal"
+  gem "coveralls", require: false
+  gem "codeclimate-test-reporter", require: nil
 end
 
 platforms :jruby do
@@ -26,4 +32,4 @@ platforms :ruby do
   gem "pg"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/groupify.gemspec

@@ -19,13 +19,5 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 1.9.3"
 
   gem.add_development_dependency "mongoid", ">= 3.1"
-  gem.add_development_dependency "activerecord", ">= 3.2", "< 5.1"
-
-  gem.add_development_dependency "rspec", ">= 3"
-
-  gem.add_development_dependency "database_cleaner", "~> 1.5.3"
-  gem.add_development_dependency "combustion", ">= 0.5.4"
-  gem.add_development_dependency "appraisal"
-
-  gem.add_development_dependency "github_changelog_generator"
+  gem.add_development_dependency "activerecord", ">= 3.2", "< 5.2"
 end

data/lib/generators/groupify/active_record/migration/templates/migration.rb

@@ -2,6 +2,8 @@ class GroupifyMigration < ActiveRecord::Migration
   def change
     create_table :groups do |t|
       t.string     :type
+
+      t.timestamps
     end
 
     create_table :group_memberships do |t|

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

@@ -147,31 +147,12 @@ module Groupify
           association_name ||= member_klass.model_name.plural.to_sym
           source_type = member_klass.base_class
 
-          if ActiveSupport::VERSION::MAJOR > 3
-            has_many association_name,
-                     ->{ uniq },
-                     through: :group_memberships_as_group,
-                     source: :member,
-                     source_type: source_type,
-                     extend: MemberAssociationExtensions
-          else
-            has_many association_name,
-                     uniq: true,
-                     through: :group_memberships_as_group,
-                     source: :member,
-                     source_type: source_type,
-                     extend: MemberAssociationExtensions
-          end
-
-          define_method(association_name) do |*args|
-            opts = args.extract_options!
-            membership_type = opts[:as]
-            if membership_type.present?
-              super().as(membership_type)
-            else
-              super()
-            end
-          end
+          has_many association_name,
+                   ->{ distinct },
+                   through: :group_memberships_as_group,
+                   source: :member,
+                   source_type: source_type.to_s,
+                   extend: MemberAssociationExtensions
         end
       end
     end

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

@@ -21,20 +21,11 @@ module Groupify
                    class_name: Groupify.group_membership_class_name
         end
 
-        if ActiveSupport::VERSION::MAJOR > 3
-          has_many :groups, ->{ uniq },
-                   through: :group_memberships_as_member,
-                   as: :group,
-                   source_type: @group_class_name,
-                   extend: GroupAssociationExtensions
-        else
-          has_many :groups,
-                   uniq: true,
-                   through: :group_memberships_as_member,
-                   as: :group,
-                   source_type: @group_class_name,
-                   extend: GroupAssociationExtensions
-        end
+        has_many :groups, ->{ distinct },
+                 through: :group_memberships_as_member,
+                 as: :group,
+                 source_type: @group_class_name,
+                 extend: GroupAssociationExtensions
       end
 
       module GroupAssociationExtensions
@@ -112,14 +103,14 @@ module Groupify
         def in_group(group)
           return none unless group.present?
 
-          joins(:group_memberships_as_member).where(group_memberships: { group_id: group.id }).uniq
+          joins(:group_memberships_as_member).where(group_memberships: { group_id: group.id }).distinct
         end
 
         def in_any_group(*groups)
           groups = groups.flatten
           return none unless groups.present?
 
-          joins(:group_memberships_as_member).where(group_memberships: { group_id: groups.map(&:id) }).uniq
+          joins(:group_memberships_as_member).where(group_memberships: { group_id: groups.map(&:id) }).distinct
         end
 
         def in_all_groups(*groups)
@@ -130,7 +121,7 @@ module Groupify
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
               where(group_memberships: {group_id: groups.map(&:id)}).
               having("COUNT(#{reflect_on_association(:group_memberships_as_member).klass.quoted_table_name}.#{connection.quote_column_name('group_id')}) = ?", groups.count).
-              uniq
+              distinct
         end
 
         def in_only_groups(*groups)
@@ -140,7 +131,7 @@ module Groupify
           joins(:group_memberships_as_member).
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
               having("COUNT(DISTINCT #{reflect_on_association(:group_memberships_as_member).klass.quoted_table_name}.#{connection.quote_column_name('group_id')}) = ?", groups.count).
-              uniq
+              distinct
         end
 
         def shares_any_group(other)

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

@@ -13,8 +13,6 @@ module Groupify
       extend ActiveSupport::Concern
 
       included do
-        attr_accessible(:member, :group, :group_name, :membership_type, :as) if ActiveSupport::VERSION::MAJOR < 4
-
         belongs_to :member, polymorphic: true
         belongs_to :group, polymorphic: true
       end

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

@@ -69,14 +69,14 @@ module Groupify
         def in_named_group(named_group)
           return none unless named_group.present?
 
-          joins(:group_memberships_as_member).where(group_memberships: {group_name: named_group}).uniq
+          joins(:group_memberships_as_member).where(group_memberships: {group_name: named_group}).distinct
         end
 
         def in_any_named_group(*named_groups)
           named_groups.flatten!
           return none unless named_groups.present?
 
-          joins(:group_memberships_as_member).where(group_memberships: {group_name: named_groups.flatten}).uniq
+          joins(:group_memberships_as_member).where(group_memberships: {group_name: named_groups.flatten}).distinct
         end
 
         def in_all_named_groups(*named_groups)
@@ -87,7 +87,7 @@ module Groupify
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
               where(:group_memberships => {:group_name => named_groups}).
               having("COUNT(DISTINCT #{reflect_on_association(:group_memberships_as_member).klass.quoted_table_name}.#{connection.quote_column_name('group_name')}) = ?", named_groups.count).
-              uniq
+              distinct
         end
 
         def in_only_named_groups(*named_groups)
@@ -97,7 +97,7 @@ module Groupify
           joins(:group_memberships_as_member).
               group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
               having("COUNT(DISTINCT #{reflect_on_association(:group_memberships_as_member).klass.quoted_table_name}.#{connection.quote_column_name('group_name')}) = ?", named_groups.count).
-              uniq
+              distinct
         end
 
         def shares_any_named_group(other)

data/lib/groupify/version.rb

@@ -1,3 +1,3 @@
 module Groupify
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/spec/active_record_spec.rb

@@ -1,18 +1,11 @@
 require 'active_record'
+require 'combustion'
 
-DATABASE = ENV.fetch('DATABASE', 'sqlite3mem')
-
-puts "ActiveRecord Version: #{ActiveSupport::VERSION::STRING}, Database: #{DATABASE}"
-
-require 'yaml'
-require 'erb'
-ActiveRecord::Base.configurations = YAML::load(ERB.new(IO.read("#{File.dirname(__FILE__)}/db/database.yml")).result)
-ActiveRecord::Base.establish_connection(DATABASE.to_sym)
 ActiveRecord::Migration.verbose = false
+ActiveRecord::Base.logger = Logger.new(STDOUT) if DEBUG
 
-require 'combustion/database'
-Combustion::Database.create_database(ActiveRecord::Base.configurations[DATABASE])
-load(File.join(File.dirname(__FILE__), "db", "schema.rb"))
+Combustion.initialize! :active_record
+puts "ActiveRecord Version: #{ActiveSupport::VERSION::STRING}, Adapter: #{ActiveRecord::Base.connection.adapter_name}"
 
 RSpec.configure do |config|
   config.before(:suite) do
@@ -26,12 +19,6 @@ RSpec.configure do |config|
   config.after(:each) do
     DatabaseCleaner[:active_record].clean
   end
-
-  config.after(:suite) do
-    unless ENV['DB'] =~ /sqlite/
-      Combustion::Database.drop_database(ActiveRecord::Base.configurations[DATABASE])
-    end
-  end
 end
 
 require 'groupify/adapter/active_record'
@@ -89,10 +76,6 @@ describe User do
   it { should respond_to :shares_any_group?}
 end
 
-if DEBUG
-  ActiveRecord::Base.logger = Logger.new(STDOUT)
-end
-
 describe Groupify::ActiveRecord do
   let(:user) { User.create! }
   let(:group) { Group.create! }
@@ -383,7 +366,6 @@ describe Groupify::ActiveRecord do
         expect(group.members).to include(user)
         expect(group.users).to include(user)
 
-        expect(user.groups(:as => :admin)).to include(group)
         expect(user.groups.as(:admin)).to include(group)
         expect(group.members).to include(user)
         expect(group.users).to include(user)
@@ -398,7 +380,6 @@ describe Groupify::ActiveRecord do
         expect(group.members.as(:manager)).to include(user)
         expect(group.users).to include(user)
 
-        expect(user.groups(:as => :manager)).to include(group)
         expect(group.members).to include(user)
         expect(group.users).to include(user)
       end
@@ -408,7 +389,6 @@ describe Groupify::ActiveRecord do
         group.add(user, manager, as: :manager)
 
         expect(group.users.as(:manager)).to include(user, manager)
-        expect(group.users(as: :manager)).to include(user, manager)
       end
 
       it "finds members by membership type" do
@@ -423,10 +403,10 @@ describe Groupify::ActiveRecord do
       end
 
       it "finds the group a member belongs to with a membership type" do
-        group.add user, as: Manager
+        group.add user, as: :manager
         user.groups.create!
 
-        expect(Group.with_member(user).as(Manager)).to eq([group])
+        expect(Group.with_member(user).as(:manager)).to eq([group])
       end
 
       it "checks if members belong to any groups with a certain membership type" do

data/spec/{db → internal/config}/database.yml

@@ -1,10 +1,14 @@
-sqlite3:
+test:
+<%
+case ENV.fetch('DATABASE', 'sqlite3mem')
+when 'sqlite3'
+%>
   adapter: <%= "jdbc" if defined? JRUBY_VERSION %>sqlite3
-  database: groupify.sqlite3.db
-sqlite3mem:
+  database: db/combustion_test.sqlite
+<% when 'sqlite3mem' %>
   adapter: <%= "jdbc" if defined? JRUBY_VERSION %>sqlite3
   database: ":memory:"
-postgresql:
+<% when 'postgresql' %>
   adapter: postgresql
   encoding: unicode
   database: groupify_test
@@ -12,9 +16,10 @@ postgresql:
   username: postgres
   password: postgres
   min_messages: warning
-mysql:
+<% when 'mysql' %>
   adapter: <%= defined?(JRUBY_VERSION) ? "jdbcmysql" : "mysql2" %>
   host: localhost
   username: root
   password:
   database: groupify_test
+<% end %>

data/spec/internal/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  #
+end

data/spec/mongoid_spec.rb

@@ -29,7 +29,13 @@ if Mongoid::VERSION < "5"
   Mongoid::Config.sessions = client_configuration
   Moped.logger = Logger.new(STDOUT) if DEBUG
 else
-  Mongoid::Config.log_level = :debug if DEBUG
+  if DEBUG
+    Mongoid::Config.log_level = :debug
+    Mongoid.logger.level = ::Logger::DEBUG
+  else
+    Mongoid::Config.log_level = :warn
+    Mongoid.logger.level = ::Logger::WARN
+  end
   Mongoid::Config.load_configuration(clients: client_configuration)
 end
 

data/spec/spec_helper.rb

@@ -3,10 +3,11 @@ require 'bundler/setup'
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new [
     SimpleCov::Formatter::HTMLFormatter,
     Coveralls::SimpleCov::Formatter
 ]
+
 SimpleCov.start
 
 require 'active_support'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupify
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - dwbutler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-11 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -33,7 +33,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,77 +43,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-- !ruby/object:Gem::Dependency
-  name: combustion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  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: github_changelog_generator
-  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'
+        version: '5.2'
 description: Adds group and membership functionality to Rails models
 email:
 - dwbutler@ucla.edu
@@ -132,12 +62,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_3.2.gemfile
+- config.ru
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.0.gemfile.lock
+- gemfiles/rails_5.1.gemfile
 - groupify.gemspec
 - lib/generators/groupify/active_record/initializer/initializer_generator.rb
 - lib/generators/groupify/active_record/initializer/templates/initializer.rb
@@ -173,8 +103,10 @@ files:
 - lib/groupify/railtie.rb
 - lib/groupify/version.rb
 - spec/active_record_spec.rb
-- spec/db/database.yml
-- spec/db/schema.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/public/favicon.ico
 - spec/mongoid_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dwbutler/groupify
@@ -197,13 +129,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Group functionality for Rails
 test_files:
 - spec/active_record_spec.rb
-- spec/db/database.yml
-- spec/db/schema.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/public/favicon.ico
 - spec/mongoid_spec.rb
 - spec/spec_helper.rb