mongoid-multitenancy 0.3.4 → 0.4.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTdmMTA4ODVhMTI1Njk1YzMyMGI3OTA5ZDUxYmNkMDkzMmY3MTE4Nw==
+  data.tar.gz: !binary |-
+    NGY5ZGFlNmJjMjQ5MzhlOWI4M2NhY2FkMGRkZTk0MjQzNmI3ZDY1MQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZDQwNDZmZDc3N2NlYmRiMDJhMzQ0YmVlZDc2NWVmZmY4ZWRkYTY0ZjgzMzVk
+    Yzg1M2I5ZDZkOWM4ZDk1YTJhODk4YWNhNjVkY2I1NTM0MTNjNTRlNDZmNzBi
+    ZTM0NDAzYTM3YmI5NDZhOTI5ODQ4MTEzMGRhNWViOTc0NWZmY2Y=
+  data.tar.gz: !binary |-
+    OTkwYmNkMzIwY2MwNjRhNTIwZTVkNjliNDM0NWZiNzUzNTI3NWQ0YTY3NGZk
+    YjgxYzQ0M2RmZWMzNjYxZGNiNDUzZjNhOTkyNjJlYmU4ZGVlZDA3NmNiZjJi
+    OWFjMzEzYjdjNWY3MTcxZWRjN2JlNzBhMDE5YzVlMzMyOTBhZmU=

data/.gitignore

@@ -16,3 +16,4 @@ tmp
 .yardoc
 _yardoc
 doc/
+Gemfile*.lock

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - ruby-head
+  - jruby
+  - jruby-head
+gemfile:
+  - gemfiles/Gemfile.mongoid-3.0
+  - gemfiles/Gemfile.mongoid-4.0
+  - Gemfile
+services:
+  - mongodb

data/Gemfile

@@ -1,4 +1,16 @@
 source 'https://rubygems.org'
 
+gem 'mongoid', '~> 4.0.alpha'
+
+gem 'rake', '~> 10.0'
+
+group :test do
+  gem 'coveralls', :require => false
+  gem 'rspec', '~> 2.12'
+  gem 'yard', '~> 0.8'
+  gem 'mongoid-rspec', '~> 1.5'
+  gem 'database_cleaner', '~> 1.0'
+end
+
 # Specify your gem's dependencies in mongoid-multitenancy.gemspec
-gemspec
+gemspec

data/README.md

@@ -1,4 +1,4 @@
-# mongoid-multitenancy
+# mongoid-multitenancy [![Build Status](https://travis-ci.org/PerfectMemory/mongoid-multitenancy.png?branch=master)](https://travis-ci.org/PerfectMemory/mongoid-multitenancy.png?branch=master) [![Coverage Status](https://coveralls.io/repos/PerfectMemory/mongoid-multitenancy/badge.png?branch=master)](https://coveralls.io/r/PerfectMemory/mongoid-multitenancy) [![Code Climate](https://codeclimate.com/github/PerfectMemory/mongoid-multitenancy.png)](https://codeclimate.com/github/PerfectMemory/mongoid-multitenancy) [![Dependency Status](https://gemnasium.com/PerfectMemory/mongoid-multitenancy.png)](https://gemnasium.com/PerfectMemory/mongoid-multitenancy)
 
 mongoid-multitenancy adds the ability to scope [Mongoid](https://github.com/mongoid/mongoid) models to a tenant in a **shared database strategy**. Tenants are represented by a tenant model, such as `Client`. mongoid-multitenancy will help you set the current tenant on each request and ensures all 'tenant models' are always properly scoped to the current tenant: when viewing, searching and creating.
 

data/gemfiles/Gemfile.mongoid-3.0

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+gem 'mongoid', '~> 3.0'
+
+gem 'rake', '~> 10.0'
+
+group :test do
+  gem 'coveralls', :require => false
+  gem 'rspec', '~> 2.12'
+  gem 'yard', '~> 0.8'
+  gem 'mongoid-rspec', '~> 1.5'
+  gem 'database_cleaner', '~> 1.0'
+end
+
+# Specify your gem's dependencies in mongoid-multitenancy.gemspec
+gemspec :path => '..'

data/gemfiles/Gemfile.mongoid-4.0

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+gem 'mongoid', '~> 4.0.alpha'
+
+gem 'rake', '~> 10.0'
+
+group :test do
+  gem 'coveralls', :require => false
+  gem 'rspec', '~> 2.12'
+  gem 'yard', '~> 0.8'
+  gem 'mongoid-rspec', '~> 1.5'
+  gem 'database_cleaner', '~> 1.0'
+end
+
+# Specify your gem's dependencies in mongoid-multitenancy.gemspec
+gemspec :path => '..'

data/lib/mongoid/multitenancy.rb

@@ -7,6 +7,11 @@ module Mongoid
   module Multitenancy
     class << self
 
+      # Returns true if using Mongoid 4
+      def mongoid4?
+        Mongoid::VERSION.start_with? '4'
+      end
+
       # Set the current tenant. Make it Thread aware
       def current_tenant=(tenant)
         Thread.current[:current_tenant] = tenant

data/lib/mongoid/multitenancy/document.rb

@@ -50,7 +50,13 @@ module Mongoid
 
         # Redefine 'validates_with' to add the tenant scope when using a UniquenessValidator
         def validates_with(*args, &block)
-          if args.first == Validations::UniquenessValidator
+          validator = if Mongoid::Multitenancy.mongoid4?
+            Validatable::UniquenessValidator
+          else
+            Validations::UniquenessValidator
+          end
+
+          if args.first == validator
             args.last[:scope] = Array(args.last[:scope]) << self.tenant_field
           end
           super(*args, &block)

data/lib/mongoid/multitenancy/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Multitenancy
-    VERSION = "0.3.4"
+    VERSION = "0.4.0"
   end
 end

data/mongoid-multitenancy.gemspec

@@ -15,12 +15,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Mongoid::Multitenancy::VERSION
 
-  gem.add_dependency('mongoid', '~> 3')
-
-  gem.add_development_dependency('rake', '~> 10.0')
-  gem.add_development_dependency('rspec', '~> 2.12')
-  gem.add_development_dependency('yard', '~> 0.8')
-  gem.add_development_dependency('mongoid-rspec', '~> 1.5')
-  gem.add_development_dependency('database_cleaner', '~> 1.0')
-  gem.add_development_dependency('redcarpet', '~> 2.2')
+  gem.add_dependency('mongoid', '>= 3.0')
 end

data/spec/spec_helper.rb

@@ -1,9 +1,13 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 MODELS = File.join(File.dirname(__FILE__), "models")
 
-require 'rubygems'
-require 'bundler/setup'
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
 require 'rspec'
 require 'mongoid'
@@ -11,6 +15,8 @@ require 'mongoid-multitenancy'
 require 'database_cleaner'
 require 'mongoid-rspec'
 
+require_relative 'support/mongoid'
+
 Dir["#{MODELS}/*.rb"].each { |f| require f }
 
 Mongoid.configure do |config|

data/spec/support/mongoid.rb

@@ -0,0 +1,30 @@
+module Mongoid
+  module Matchers
+    class HaveIndexForMatcher
+      def matches?(klass)
+        @klass  = klass.is_a?(Class) ? klass : klass.class
+        @errors = []
+
+        if Mongoid::VERSION.to_i < 4
+          index_options = @klass.index_options
+        else
+          index_options = Hash[@klass.index_specifications.map{|i| [i.key, i.options]}]
+        end
+
+        unless index_options[@index_fields]
+          @errors.push "no index for #{@index_fields}"
+        else
+          if !@options.nil? && !@options.empty?
+            @options.each do |option, option_value|
+              if index_options[@index_fields][option] != option_value
+                @errors.push "index for #{@index_fields.inspect} with options of #{index_options[@index_fields].inspect}"
+              end
+            end
+          end
+        end
+
+        @errors.empty?
+      end
+    end
+  end
+end

metadata

@@ -1,128 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Aymeric Brisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3'
-  prerelease: false
+        version: '3.0'
   type: :runtime
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  name: mongoid-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.2'
-  prerelease: false
-  type: :development
+        version: '3.0'
 description: MultiTenancy with Mongoid
 email:
 - aymeric.brisse@mperfect-memory.com
@@ -132,11 +33,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.TXT
 - README.md
 - Rakefile
+- gemfiles/Gemfile.mongoid-3.0
+- gemfiles/Gemfile.mongoid-4.0
 - lib/mongoid-multitenancy.rb
 - lib/mongoid/multitenancy.rb
 - lib/mongoid/multitenancy/document.rb
@@ -157,36 +60,30 @@ files:
 - spec/mutable_spec.rb
 - spec/optional_spec.rb
 - spec/spec_helper.rb
+- spec/support/mongoid.rb
 homepage: https://github.com/PerfectMemory/mongoid-multitenancy
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 1046556066794350660
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 1046556066794350660
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Support of a multi-tenant database with Mongoid
 test_files:
 - spec/immutable_spec.rb
@@ -203,4 +100,5 @@ test_files:
 - spec/mutable_spec.rb
 - spec/optional_spec.rb
 - spec/spec_helper.rb
+- spec/support/mongoid.rb
 has_rdoc: 

data/Gemfile.lock

@@ -1,55 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mongoid-multitenancy (0.3.4)
-      mongoid (~> 3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.15)
-      activesupport (= 3.2.15)
-      builder (~> 3.0.0)
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    builder (3.0.4)
-    database_cleaner (1.2.0)
-    diff-lcs (1.2.4)
-    i18n (0.6.5)
-    mongoid (3.1.5)
-      activemodel (~> 3.2)
-      moped (~> 1.4)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.29)
-    mongoid-rspec (1.9.0)
-      mongoid (>= 3.0.1)
-      rake
-      rspec (>= 2.14)
-    moped (1.5.1)
-    multi_json (1.8.2)
-    origin (1.1.0)
-    rake (10.1.0)
-    redcarpet (2.3.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.6)
-    rspec-expectations (2.14.3)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    tzinfo (0.3.38)
-    yard (0.8.7.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  database_cleaner (~> 1.0)
-  mongoid-multitenancy!
-  mongoid-rspec (~> 1.5)
-  rake (~> 10.0)
-  redcarpet (~> 2.2)
-  rspec (~> 2.12)
-  yard (~> 0.8)