groupify 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f88acd3be5c8900aa35d7f0d7f1a86c2443dfcf
-  data.tar.gz: 5aa05e78a95816fe5c56673cb1dad8ead865090a
+  metadata.gz: 330d329200d0dda6ac489a0c099fd54655e2899d
+  data.tar.gz: 95a7c8c3d68c7e409818cd8fe816957325da8112
 SHA512:
-  metadata.gz: c9ed6a4b163849098b3b54f2347e22494521c4c2073cc0013e445503ff66e807eeca113d27247b83b9d9f0f1d8f745599e345dc36e6163950555a1453b4c51f2
-  data.tar.gz: b098c8c0cc68cbfa5e024b52422020f53b8a7c2639bf22987f8933cd2e9bb098e02bc567d1b922211d9074af7ee07f0762ce8f3f57aaf20b96cc70bf9030d764
+  metadata.gz: f256fc9f5d55ad7feb210c9af83ae7005f0c1921ad76af0f3f5287f8f0e71653a5a54e99f335460cada5dd11466ad96b70b862951e4eb8f52362f3175fa004f4
+  data.tar.gz: 2be5800f07ea8e8b32f13e349557ebfb6f795fe490433a7468e4f5606c349573728ce47e59a40894705967cc4599b38000b966ca10a37c4d5bf2e8993d0d40c3

data/.travis.yml

@@ -1,5 +1,10 @@
 language: ruby
 services: mongodb
+env:
+  - DATABASE=sqlite3
+  - DATABASE=sqlite3mem
+  - DATABASE=postgresql
+  - DATABASE=mysql
 rvm:
   - 1.9.3
   - 2.0.0

data/Gemfile

@@ -11,5 +11,15 @@ end
 # Specify your gem's dependencies in groupify.gemspec
 gemspec
 
-gem "jdbc-sqlite3", platform: :jruby
-gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter"
+  gem "jdbc-mysql"
+  gem "activerecord-jdbcpostgresql-adapter"
+end
+
+platforms :ruby do
+  gem "sqlite3"
+  gem "mysql2"
+  gem "pg"
+end

data/README.md

@@ -7,13 +7,19 @@ model? Use named groups instead to add members to named groups such as
 `:admin` or `"Team Rocketpants"`.
 
 The following ORMs are supported:
- * ActiveRecord 3.2, 4.x
- * Mongoid 3.1, 4.0, 
+ * ActiveRecord 3.2, 4.1.x, 4.2.x
+ * Mongoid 3.1, 4.0
 
 The following Rubies are supported:
- * MRI Ruby 1.9.3, 2.0.x, 2.1.x
+ * MRI Ruby 1.9.3, 2.0.x, 2.1.x, 2.2.x
  * JRuby (1.9 mode)
 
+The following databases are supported:
+ * MySQL
+ * PostgreSQL
+ * SQLite
+ * MongoDB
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/gemfiles/rails_3.2.gemfile

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "jdbc-sqlite3", :platform => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 gem "activerecord", "~> 3.2"
 gem "mongoid", ">= 3.0", "< 4"
 
@@ -15,4 +13,17 @@ group :test do
   gem "coveralls", :require => false
 end
 
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter"
+  gem "jdbc-mysql"
+  gem "activerecord-jdbcpostgresql-adapter"
+end
+
+platforms :ruby do
+  gem "sqlite3"
+  gem "mysql2"
+  gem "pg"
+end
+
 gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "jdbc-sqlite3", :platform => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 gem "activerecord", "~> 4.0.0"
 gem "mongoid", "~> 4.0"
 
@@ -15,4 +13,17 @@ group :test do
   gem "coveralls", :require => false
 end
 
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter"
+  gem "jdbc-mysql"
+  gem "activerecord-jdbcpostgresql-adapter"
+end
+
+platforms :ruby do
+  gem "sqlite3"
+  gem "mysql2"
+  gem "pg"
+end
+
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "jdbc-sqlite3", :platform => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 gem "activerecord", "~> 4.1.0"
 gem "mongoid", "~> 4.0"
 
@@ -15,4 +13,17 @@ group :test do
   gem "coveralls", :require => false
 end
 
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter"
+  gem "jdbc-mysql"
+  gem "activerecord-jdbcpostgresql-adapter"
+end
+
+platforms :ruby do
+  gem "sqlite3"
+  gem "mysql2"
+  gem "pg"
+end
+
 gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "jdbc-sqlite3", :platform => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
 gem "activerecord", "~> 4.2.0"
 gem "mongoid", "~> 4.0"
 
@@ -15,4 +13,17 @@ group :test do
   gem "coveralls", :require => false
 end
 
+platforms :jruby do
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter"
+  gem "jdbc-mysql"
+  gem "activerecord-jdbcpostgresql-adapter"
+end
+
+platforms :ruby do
+  gem "sqlite3"
+  gem "mysql2"
+  gem "pg"
+end
+
 gemspec :path => "../"

data/groupify.gemspec

@@ -16,15 +16,14 @@ Gem::Specification.new do |gem|
   gem.version       = Groupify::VERSION
   gem.license       = 'MIT'
 
-  gem.add_development_dependency "mongoid", ">= 3.1"
-  gem.add_development_dependency "activerecord", ">= 3.2"
+  gem.required_ruby_version = ">= 1.9.3"
 
-  unless defined?(JRUBY_VERSION)
-    gem.add_development_dependency "sqlite3"
-  end
+  gem.add_development_dependency "mongoid", ">= 3.1"
+  gem.add_development_dependency "activerecord", ">= 3.2", "< 5"
 
   gem.add_development_dependency "rspec", ">= 3"
 
   gem.add_development_dependency "database_cleaner", "~> 1.3.0"
+  gem.add_development_dependency 'combustion'
   gem.add_development_dependency "appraisal"
 end

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

@@ -117,7 +117,7 @@ module Groupify
           return none unless groups.present?
 
           joins(:group_memberships).
-              group(:"group_memberships.member_id").
+              group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
               where(:group_memberships => {:group_id => groups.map(&:id)}).
               having("COUNT(group_memberships.group_id) = #{groups.count}").
               uniq
@@ -128,7 +128,7 @@ module Groupify
           return none unless groups.present?
 
           joins(:group_memberships).
-              group(:"group_memberships.member_id").
+              group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
               having("COUNT(DISTINCT group_memberships.group_id) = #{groups.count}").
               uniq
         end

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

@@ -80,7 +80,7 @@ module Groupify
           return none unless named_groups.present?
 
           joins(:group_memberships).
-              group(:"group_memberships.member_id").
+              group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
               where(:group_memberships => {:group_name => named_groups}).
               having("COUNT(DISTINCT group_memberships.group_name) = #{named_groups.count}").
               uniq
@@ -91,7 +91,7 @@ module Groupify
           return none unless named_groups.present?
 
           joins(:group_memberships).
-              group("group_memberships.member_id").
+              group("#{quoted_table_name}.#{connection.quote_column_name('id')}").
               having("COUNT(DISTINCT group_memberships.group_name) = #{named_groups.count}").
               uniq
         end

data/lib/groupify/version.rb

@@ -1,3 +1,3 @@
 module Groupify
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/active_record_spec.rb

@@ -1,15 +1,18 @@
 require 'active_record'
 
-puts "ActiveRecord version #{ActiveSupport::VERSION::STRING}"
-
-# Load database config
-if JRUBY
-  require 'jdbc/sqlite3'
-  require 'active_record'
-  require 'active_record/connection_adapters/jdbcsqlite3_adapter'
-else
-  require 'sqlite3'
-end
+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
+
+require 'combustion/database'
+Combustion::Database.create_database(ActiveRecord::Base.configurations[DATABASE])
+load(File.join(File.dirname(__FILE__), "db", "schema.rb"))
 
 RSpec.configure do |config|
   config.before(:suite) do
@@ -23,45 +26,11 @@ RSpec.configure do |config|
   config.after(:each) do
     DatabaseCleaner[:active_record].clean
   end
-end
-
-ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" )
-
-ActiveRecord::Migration.verbose = false
-ActiveRecord::Schema.define(:version => 1) do
-
-  create_table :groups do |t|
-    t.string     :name
-    t.string     :type
-  end
-  
-  create_table :group_memberships do |t|
-    t.string     :member_type
-    t.integer    :member_id
-    t.integer    :group_id
-    t.string     :group_name
-    t.string     :membership_type
-  end
-
-  create_table :users do |t|
-    t.string   :name
-    t.string   :type
-  end
-
-  create_table :widgets do |t|
-    t.string     :name
-  end
 
-  create_table :projects do |t|
-    t.string     :name
-  end
-
-  create_table :organizations do |t|
-    t.string     :name
-  end
-
-  create_table :members do |t|
-    t.string :name
+  config.after(:suite) do
+    unless ENV['DB'] =~ /sqlite/
+      Combustion::Database.drop_database(ActiveRecord::Base.configurations[DATABASE])
+    end
   end
 end
 

data/spec/db/database.yml

@@ -0,0 +1,20 @@
+sqlite3:
+  adapter: <%= "jdbc" if defined? JRUBY_VERSION %>sqlite3
+  database: groupify.sqlite3.db
+sqlite3mem:
+  adapter: <%= "jdbc" if defined? JRUBY_VERSION %>sqlite3
+  database: ":memory:"
+postgresql:
+  adapter: postgresql
+  encoding: unicode
+  database: groupify_test
+  pool: 5
+  username: postgres
+  password: postgres
+  min_messages: warning
+mysql:
+  adapter: <%= defined?(JRUBY_VERSION) ? "jdbcmysql" : "mysql2" %>
+  host: localhost
+  username: root
+  password:
+  database: groupify_test

data/spec/db/schema.rb

@@ -0,0 +1,35 @@
+ActiveRecord::Schema.define(version: 0) do
+  create_table :groups do |t|
+    t.string     :name
+    t.string     :type
+  end
+
+  create_table :group_memberships do |t|
+    t.string     :member_type
+    t.integer    :member_id
+    t.integer    :group_id
+    t.string     :group_name
+    t.string     :membership_type
+  end
+
+  create_table :users do |t|
+    t.string   :name
+    t.string   :type
+  end
+
+  create_table :widgets do |t|
+    t.string     :name
+  end
+
+  create_table :projects do |t|
+    t.string     :name
+  end
+
+  create_table :organizations do |t|
+    t.string     :name
+  end
+
+  create_table :members do |t|
+    t.string :name
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupify
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - dwbutler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,20 +41,9 @@ dependencies:
     - - ">="
       - !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'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: combustion
+  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: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +139,8 @@ files:
 - lib/groupify/railtie.rb
 - lib/groupify/version.rb
 - spec/active_record_spec.rb
+- spec/db/database.yml
+- spec/db/schema.rb
 - spec/mongoid_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dwbutler/groupify
@@ -147,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -161,5 +169,7 @@ specification_version: 4
 summary: Group functionality for Rails
 test_files:
 - spec/active_record_spec.rb
+- spec/db/database.yml
+- spec/db/schema.rb
 - spec/mongoid_spec.rb
 - spec/spec_helper.rb