mongoid-tenant 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13200e42649305b163500529ef5cf49d9f72b6af
-  data.tar.gz: 3d7df78088d6668b12b1e1f371ff2dd283c2f1fe
+  metadata.gz: 05977824630fa2458706fd4f9df02c28b770884d
+  data.tar.gz: 6f8976a2cf9c0debc07841b29c6cf71d7be1c529
 SHA512:
-  metadata.gz: 890d1639ca4a5b59fe6a49c72ba53942c223c25f766ad84d2ffc1bd15f40a42bb8127810c5af0f6ce69b1bc48efa0f29f5ade830e302ae3c25af2e5ee4a31b6e
-  data.tar.gz: b3784c0a6748cc5380bec1bafab4cd1f317f3d92193d732bc3c5fd1852223a579781a6d2471f8d23a344414e9d4a617d660e9b406d7454ccea4b89fc857a8f2f
+  metadata.gz: 949f8b62dbb9c8da303e0f99f59bd54475dd769d855a4f3eccb418bcc0c97cbbdbf10fb2a7873728e42f40a76e4d8cce7a9ccff9f92b4f9c1c5573eb0f31ba23
+  data.tar.gz: bb5bb3faf2c946d3ed02578d21210eaf8a1665f1950eb4abb417260ac3c21a34907b5cf616aeb43c2dba0f0b938c171481d49d99ddd0684ae470e289e20b5485

data/README.md

@@ -4,6 +4,8 @@ Mongoid::Tenant
 [![Gem Version](https://badge.fury.io/rb/mongoid-tenant.svg)](http://badge.fury.io/rb/mongoid-tenant)
 [![Dependency Status](https://gemnasium.com/nofxx/mongoid-tenant.svg)](https://gemnasium.com/nofxx/mongoid-tenant)
 [![Build Status](https://secure.travis-ci.org/nofxx/mongoid-tenant.svg)](http://travis-ci.org/nofxx/mongoid-tenant)
+[![Code Climate](https://codeclimate.com/github/nofxx/mongoid-tenant/badges/gpa.svg)](https://codeclimate.com/github/nofxx/mongoid-tenant)
+[![Coverage Status](https://coveralls.io/repos/nofxx/mongoid-tenant/badge.svg?branch=master&service=github)](https://coveralls.io/github/nofxx/mongoid-tenant?branch=master)
 
 ## Mongoid::Tenant
 
@@ -15,31 +17,31 @@ Simple multi tenant for mongoid models!
 This library is a simple way to split your client data between databases.
 To mongo it's pretty trivial to use multiple databases. Mongoid helps too.
 
-## Tenant
+Supposing you have a Bike SaaS where each Shop stores:
 
-Models to be splitted, supposing you have a Bike SaaS where each Shop stores
-their bikes:
+## Tenancy
 
 ```
-class Bike
+class Shop
   include Mongoid::Document
-  include Mongoid::Tenant
+  include Mongoid::Tenancy
+
+  tenant_key :url
 end
 ```
 
-And that's all. But we need a tenancy:
+## Tenant
 
-## Tenancy
 
 ```
-class Shop
+class Bike
   include Mongoid::Document
-  include Mongoid::Tenancy
-
-  tenant_key :url
+  include Mongoid::Tenant
 end
 ```
 
+And that's all.
+
 
 ## Helpers
 
@@ -93,8 +95,18 @@ def app_domain
 end
 ```
 
+## Populate & Spec
 
-## Issues
+`Mongoid.purge!` won't work. It doesn't know all dbs.
+A good alternative:
 
+```
+Mongoid.default_client.with(database: db).collections.each(&:drop)
+```
+
+If you don't know every db try `Mongoid.default_client.list_databases`.
+
+
+## Issues
 
 http://github.com/nofxx/mongoid-tenant

data/lib/mongoid/tenancy.rb

@@ -10,13 +10,14 @@ module Mongoid
     # Model instance
     module ClassMethods
       def tenant_key(key, options = {})
-        field key,    type: Symbol
+        field key, type: Symbol
+
         options[:validates] ||= { presence: true }
         options[:index] ||= {}
 
         validates key, { uniqueness: true }.merge(options[:validates])
 
-        index({ key => 1 }, {  unique: true }.merge(options[:index]))
+        index({ key => 1 }, { unique: true }.merge(options[:index]))
 
         define_method(:tenant_key) do
           send(key).to_s

data/lib/mongoid/tenant/tasks/tenant.rake

@@ -4,26 +4,35 @@ Rake::Task['db:mongoid:remove_undefined_indexes'].clear
 namespace :db do
   namespace :mongoid do
     def tenancy_env
-      ENV['TENANCY'] ||
-        fail("Provide a tenancy model: `TENANCY=Foo #{ARGV.join}`")
+      ENV['TENANCY'] && !ENV['TENANCY'].empty? ? ENV['TENANCY'] : nil
     end
 
     desc 'Create Mongoid indexes, tenant aware'
     task create_indexes: [:environment, :load_models] do
-      Rake::Task['db:mongoid:create_indexes'].clear
-      Object.const_get(tenancy_env).all.each do |t|
-        puts "Tenant #{t}"
-        t.tenancy!
-        ::Mongoid::Tasks::Database.create_indexes
+      # Run once, for tables outside tenancy
+      ::Mongoid::Tasks::Database.create_indexes
+      if tenancy_env
+        Object.const_get(tenancy_env).all.each do |t|
+          puts "Tenant #{t}"
+          t.tenancy!
+          ::Mongoid::Tasks::Database.create_indexes
+        end
+      else
+        puts 'Not running tenants: Provide a tenancy model:'
+        puts "`TENANCY=Firm #{ARGV.join(' ')}`"
       end
     end
 
     desc 'Removes undefined Mongoid indexes, tenant aware'
     task remove_undefined_indexes: [:environment, :load_models] do
-      Object.const_get(tenancy_env).all.each do |t|
-        puts "Tenant #{t}"
-        t.tenancy!
-        ::Mongoid::Tasks::Database.remove_undefined_indexes
+      # Run once, for tables outside tenancy
+      ::Mongoid::Tasks::Database.remove_undefined_indexes
+      if tenancy_env
+        Object.const_get(tenancy_env).all.each do |t|
+          puts "Tenant #{t}"
+          t.tenancy!
+          ::Mongoid::Tasks::Database.remove_undefined_indexes
+        end
       end
     end
   end

data/lib/mongoid/tenant/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
   # Mongoid::Tenant::VERSION
   module Tenant
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'.freeze
   end
 end

data/lib/mongoid/tenant.rb

@@ -11,7 +11,13 @@ module Mongoid
     extend ActiveSupport::Concern
 
     included do
-      store_in database: -> { Thread.current[:tenancy] }
+      store_in database: lambda do
+        Thread.current[:tenancy] || raise('No tenancy set!')
+      end
+
+      def tenancy
+        Thread.current[:tenancy]
+      end
     end
   end # Tenant
 end # Mongoid

data/spec/spec_helper.rb

@@ -69,8 +69,8 @@ RSpec.configure do |config|
   end
 
   config.after(:suite) do
-    extra_dbs = fetch_dbs - START_DBS
-    fail "Extra DBs: #{extra_dbs.inspect}" unless extra_dbs.empty?
     puts "\n# With Mongoid v#{Mongoid::VERSION}"
+    extra_dbs = (fetch_dbs - START_DBS) - ['mongoid_tenant_test']
+    fail "Extra DBs: #{extra_dbs.inspect}" unless extra_dbs.empty?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-tenant
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid-tenant
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Multiple databases Models for Mongoid documents.