tenancy 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe538f2809f42fdca981b88b3bbf9bb5ca19bc24
-  data.tar.gz: e65ce5cffe075fe7be07dd8d3525194d791e0199
+  metadata.gz: 0ef48b93df821bf2413626e56eb09d5f2d361c57
+  data.tar.gz: 6f306b0e6aed689b63dcb7e443f0902954b58bb2
 SHA512:
-  metadata.gz: a8d0631db5f4f03b05e219d32f46e4b0f5eb57f60a5603331bff2eeba7c22590bb02967c65042bcbbcd40d819fd152f52a9e0b033ce1c6291e068f50d1156e59
-  data.tar.gz: d1425e735c6d9c125a749d8e41b52acd6f0b96351c7ee3bd668d5d393bb0842f05b10603d4b189dc3f2290253e0687955d127fc40b4fbdeca7898e3e02ec01d7
+  metadata.gz: 48e903000a84dcae9fb7ab6e168d006decd9ecc5beb40719800f660a7454d6dfaf610a02efc5568b3c64449f11097aa3f034749a9826e12f20f3a81802b988d0
+  data.tar.gz: b14758e30137dbd75adf79d532098ac922a390d433a446039988863350e60810fbb4f9d8f9f426f356cd860e1c17f0e22be636323e12f836568238c901f06141

data/.ruby-gemset

@@ -0,0 +1 @@
+tenancy

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.1.1

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
 env:
   - CODECLIMATE_REPO_TOKEN=891d362268d07d6ff0f5534f92252b6195f6be8795054d3627643eb6314a8c9e
 gemfile:

data/Rakefile

@@ -10,7 +10,7 @@ end
 task :default => "spec:all"
 
 namespace :spec do
-  %w(active_record_40 active_record_32 mongoid_4 mongoid_3).each do |gemfile|
+  %w(active_record_41 active_record_40 active_record_32 mongoid_4 mongoid_3).each do |gemfile|
     desc "Run Tests against #{gemfile}"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
@@ -20,7 +20,7 @@ namespace :spec do
 
   desc "Run Tests against active_record versions"
   task :all do
-    %w(active_record_40 active_record_32 mongoid_4 mongoid_3).each do |gemfile|
+    %w(active_record_41 active_record_40 active_record_32 mongoid_4 mongoid_3).each do |gemfile|
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rspec"
     end

data/gemfiles/active_record_41.gemfile

@@ -0,0 +1,13 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.1.0.rc2", :require => "active_record"
+gem "coveralls", require: false
+gem "codeclimate-test-reporter", group: :test, require: nil
+gem "rspec"
+gem "database_cleaner"
+gem "shoulda-matchers"
+gem "pry"
+gem "sqlite3"
+gem "rake"
+
+gemspec :path => "../"

data/gemfiles/mongoid_4.gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4.0.0.beta1"
+gem "mongoid", ">= 4.0.0.beta2"
 gem "coveralls", require: false
 gem "codeclimate-test-reporter", group: :test, require: nil
 gem "rspec"

data/lib/tenancy/scoping/active_record.rb

@@ -27,7 +27,7 @@ module Tenancy
     end
 
     def tenant_scope(tenant_names)
-      scope = klass.where(nil).with_default_scope
+      scope = default_scoped
       tenants.each do |tenant|
         next if tenant_names.include?(tenant.name.to_sym)
 
@@ -38,6 +38,14 @@ module Tenancy
       scope
     end
 
+    def default_scoped
+      if ::ActiveRecord::VERSION::MAJOR >= 4 && ::ActiveRecord::VERSION::MINOR >= 1
+        klass.where(nil).default_scoped
+      else
+        klass.where(nil).with_default_scope
+      end
+    end
+
     def validates_uniqueness_in_scope(fields, args={})
       foreign_keys = tenants.map(&:foreign_key)
       if args[:scope]

data/lib/tenancy/version.rb

@@ -1,3 +1,3 @@
 module Tenancy
-  VERSION = "1.0.0"
+  VERSION = '1.0.1'
 end

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ require "pry"
 require "database_cleaner"
 require "logger"
 require "tenancy"
+require 'minitest/autorun'
 
 # active_record
 if Gem.loaded_specs["activerecord"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenancy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Chamnap Chhorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -48,7 +48,8 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
-- ".rvmrc"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -57,6 +58,7 @@ files:
 - Rakefile
 - gemfiles/active_record_32.gemfile
 - gemfiles/active_record_40.gemfile
+- gemfiles/active_record_41.gemfile
 - gemfiles/mongoid_3.gemfile
 - gemfiles/mongoid_4.gemfile
 - lib/tenancy.rb
@@ -99,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple multitenancy with activerecord/mongoid through scoping

data/.rvmrc

@@ -1,80 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-2.1.0@tenancy"
-
-#
-# Uncomment the following lines if you want to verify rvm version per project
-#
-rvmrc_rvm_version="1.17.10" # 1.10.1 seams as a safe start
-eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-  echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-  return 1
-}
-#
-
-#
-# Uncomment following line if you want options to be set only for given project.
-#
-# PROJECT_JRUBY_OPTS=( --1.9 )
-#
-# The variable PROJECT_JRUBY_OPTS requires the following to be run in shell:
-#
-#    chmod +x ${rvm_path}/hooks/after_use_jruby_opts
-#
-
-#
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
-  then
-    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
-  fi
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  if ! rvm --create use  "$environment_id"
-  then
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  fi
-fi
-
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded. Uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]]
-# then
-#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
-# fi
-
-# If you use bundler, this might be useful to you:
-if [[ -s Gemfile ]] && ! command -v bundle >/dev/null
-then
-    printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-    gem install bundler
-fi
-if [[ -s Gemfile ]] && command -v bundle
-then
-    bundle install
-fi
-
-if [[ $- == *i* ]] # check for interactive shells
-then
-    echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
-else
-  echo "Using: $GEM_HOME" # don't use colors in interactive shells
-fi