acts_as_tenant 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b818ac81194035979865164439e777511f68c06c
-  data.tar.gz: f395680cfb279dd618df7e88ca6373adb2f6596a
+  metadata.gz: 215e3c4bffac36cc0e111df4d91ce5d48cd9180b
+  data.tar.gz: 4cc15333e4bb02df2708e6e1b65d8b1d62fe0732
 SHA512:
-  metadata.gz: 61cffd95ae9374d1f09a6353785468d8b13db7a3fbb2e9936585d9b0f8092a34a6d683bb20032715465e7cb4e72afacd67fc80dd5cf6c6b1b01178658b67bc36
-  data.tar.gz: 9f2f90d90b7ec7a25b443da85dc89cb75912bf348e600175e5a83af9ed14699ab1a2313e463eda90bfbd3db87674e148bacdc11e0d275a5aa5c2928590fc4387
+  metadata.gz: 13089890ed6915b0cac19a818ca3d45d30e3e24c4534aa238a3f039674f1d375508534271b919c31aa142ed3871afde6c1796ea5123e3acf1db6c50dc67eb567
+  data.tar.gz: 444740576efaca0fd486d3a8ab8d72b39f33122dbbec9cf18f40a7f16089cb97c2107624e1d131b6df27190f7c89ab006b83e1cd58dcec216380698b4bfdcc0a

data/.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
-services:
-  - mongodb
 before_install:
   - gem update bundler
-script: bundle exec rake spec:all
+script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.4.1
+------
+* Removed (stale, no longer working) MongoDB support; moved code to separate branch
+* Added without_tenant option (see readme, thx duboff)
+
 0.4.0
 ------
 * (Sub)domain lookup is no longer case insensitive

data/Rakefile

@@ -3,14 +3,3 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
-
-desc 'Run the test suite for all supported ORMs.'
-namespace :spec do
-  task :all do
-    %w[active_record mongoid].each do |orm|
-      ENV["ORM"] = orm
-      Rake::Task["spec"].reenable
-      Rake::Task["spec"].invoke
-    end
-  end
-end

data/acts_as_tenant.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  #add_runtime_dependency("rails")
   s.add_runtime_dependency('request_store', '>= 1.0.5')
   s.add_dependency('rails','>= 3.1')
   #s.add_dependency('request_store', '>= 1.0.5')
@@ -27,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec-rails')
   s.add_development_dependency('database_cleaner', '~> 1.3.0')
   s.add_development_dependency('sqlite3')
-  s.add_development_dependency('mongoid', '~> 4.0')
+  #s.add_development_dependency('mongoid', '~> 4.0')
 
   s.add_development_dependency('sidekiq', '3.2.1')
 end

data/lib/acts_as_tenant/model_extensions.rb

@@ -1,5 +1,6 @@
 module ActsAsTenant
   @@tenant_klass = nil
+  @@models_with_global_records = []
 
   def self.set_tenant_klass(klass)
     @@tenant_klass = klass
@@ -9,6 +10,14 @@ module ActsAsTenant
     @@tenant_klass
   end
 
+  def self.models_with_global_records
+    @@models_with_global_records
+  end
+
+  def self.add_global_record_model model
+    @@models_with_global_records.push(model)
+  end
+
   def self.fkey
     "#{@@tenant_klass.to_s}_id"
   end
@@ -78,6 +87,8 @@ module ActsAsTenant
       def acts_as_tenant(tenant = :account, options = {})
         ActsAsTenant.set_tenant_klass(tenant)
 
+        ActsAsTenant.add_global_record_model(self) if options[:has_global_records]
+
         # Create the association
         valid_options = options.slice(:foreign_key, :class_name, :inverse_of)
         fkey = valid_options[:foreign_key] || ActsAsTenant.fkey
@@ -88,7 +99,9 @@ module ActsAsTenant
             raise ActsAsTenant::Errors::NoTenantSet
           end
           if ActsAsTenant.current_tenant
-            where(fkey.to_sym => ActsAsTenant.current_tenant.id)
+            keys = [ActsAsTenant.current_tenant.id]
+            keys.push(nil) if options[:has_global_records]
+            where(fkey.to_sym => keys)
           else
             Rails::VERSION::MAJOR < 4 ? scoped : all
           end
@@ -167,6 +180,26 @@ module ActsAsTenant
         end
 
         validates_uniqueness_of(fields, args)
+
+        if ActsAsTenant.models_with_global_records.include?(self)
+          validate do |instance|
+            Array(fields).each do |field|
+              if instance.new_record?
+                unless self.class.where(fkey.to_sym => [nil, instance[fkey]],
+                                        field.to_sym => instance[field]).empty?
+                  errors.add(field, 'has already been taken') 
+                end
+              else
+                unless self.class.where(fkey.to_sym => [nil, instance[fkey]],
+                                        field.to_sym => instance[field])
+                                 .where.not(:id => instance.id).empty?
+                  errors.add(field, 'has already been taken') 
+                end
+
+              end
+            end
+          end
+        end
       end
     end
   end

data/lib/acts_as_tenant/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTenant
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/active_record_models.rb

@@ -107,3 +107,10 @@ class Comment < ActiveRecord::Base
   belongs_to :task, -> { where(comments: { commentable_type: 'Task'  })  }, foreign_key: 'commentable_id'
   acts_as_tenant :account
 end
+
+class GlobalProject < ActiveRecord::Base
+  self.table_name = 'projects'
+
+  acts_as_tenant :account, has_global_records: true
+  validates_uniqueness_to_tenant :name
+end

data/spec/acts_as_tenant/model_extensions_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require "#{$orm}_models"
+require 'active_record_models'
 
 describe ActsAsTenant do
   after { ActsAsTenant.current_tenant = nil }
@@ -123,6 +123,32 @@ describe ActsAsTenant do
     it { @project.account }
   end
 
+  describe 'A tenant model with global records' do
+    before do
+      @account = Account.create!(:name => 'foo')
+      @project1 = GlobalProject.create!(:name => 'foobar global')
+      @project2 = GlobalProject.create!(:name => 'unaccessible project', :account => Account.create!)
+      ActsAsTenant.current_tenant = @account
+      @project3 = GlobalProject.create!(:name => 'foobar')
+    end
+
+    it 'should return two projects' do
+      expect(GlobalProject.all.count).to eq(2)
+    end
+
+    it 'should validate the project name against the global records too' do
+      expect(GlobalProject.new(:name => 'foobar').valid?).to be(false)
+      expect(GlobalProject.new(:name => 'foobar new').valid?).to be(true)
+      expect(GlobalProject.new(:name => 'foobar global').valid?).to be(false)
+      expect(@project1.valid?).to be(true)
+    end
+
+    it 'should add the model to ActsAsTenant.models_with_global_records' do
+      expect(ActsAsTenant.models_with_global_records.include?(GlobalProject)).to be(true)
+      expect(ActsAsTenant.models_with_global_records.include?(Project)).to be(false)
+    end
+  end
+
   # Associations
   describe 'Associations should be correctly scoped by current tenant' do
     before do

data/spec/spec_helper.rb

@@ -1,8 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-$orm = ENV["ORM"] || "active_record"
-require "#{$orm}_helper"
+require "active_record_helper"
 
 require 'rspec/rails'
 require 'acts_as_tenant'
@@ -11,7 +10,7 @@ RSpec.configure do |config|
   config.after(:each) do
     ActsAsTenant.current_tenant = nil
   end
-  
+
   config.infer_base_class_for_anonymous_controllers = true
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tenant
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Erwin Matthijssen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -155,9 +141,6 @@ files:
 - spec/acts_as_tenant/tenant_by_subdomain_or_domain.rb
 - spec/acts_as_tenant/tenant_by_subdomain_spec.rb
 - spec/database.yml
-- spec/mongoid.yml
-- spec/mongoid_helper.rb
-- spec/mongoid_models.rb
 - spec/spec_helper.rb
 homepage: http://www.rollcallapp.com/blog
 licenses: []
@@ -192,7 +175,4 @@ test_files:
 - spec/acts_as_tenant/tenant_by_subdomain_or_domain.rb
 - spec/acts_as_tenant/tenant_by_subdomain_spec.rb
 - spec/database.yml
-- spec/mongoid.yml
-- spec/mongoid_helper.rb
-- spec/mongoid_models.rb
 - spec/spec_helper.rb

data/spec/mongoid.yml

@@ -1,6 +0,0 @@
-test:
-  sessions:
-    default:
-      database: acts_as_tenant_test
-      hosts:
-        - localhost:27017

data/spec/mongoid_helper.rb

@@ -1,23 +0,0 @@
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require 'mongoid'
-require 'database_cleaner'
-
-Mongoid.logger = Moped.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
-Mongoid.logger.level = Moped.logger.level = Logger::DEBUG
-Mongoid.load!(File.join(File.dirname(__FILE__), "/mongoid.yml"), :test)
-
-RSpec.configure do |config|
-  config.before(:suite) do
-    DatabaseCleaner[:mongoid].strategy = :truncation
-    DatabaseCleaner[:mongoid].clean_with(:truncation)
-  end
-
-  config.before(:each) do
-    DatabaseCleaner[:mongoid].start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner[:mongoid].clean
-  end
-end

data/spec/mongoid_models.rb

@@ -1,81 +0,0 @@
-class Account
-  include Mongoid::Document
-  include ActsAsTenant::ModelExtensions
-  field :name, type: String
-  field :subdomain, type: String
-  field :domain, type: String
-  has_many :projects
-end
-
-class Project
-  include Mongoid::Document
-  include ActsAsTenant::ModelExtensions
-  field :name, type: String
-  has_one :manager
-  has_many :tasks
-  acts_as_tenant :account
-
-  validates_uniqueness_to_tenant :name
-end
-
-class Manager
-  include Mongoid::Document
-  include ActsAsTenant::ModelExtensions
-  field :name, type: String
-  belongs_to :project
-  acts_as_tenant :account
-end
-
-class Task
-  include Mongoid::Document
-  include ActsAsTenant::ModelExtensions
-  field :name, type: String
-  field :completed, type: Boolean
-  belongs_to :project
-  default_scope -> { where(:completed => nil).order("name" => :asc) }
-
-  acts_as_tenant :account
-  validates_uniqueness_of :name
-end
-
-class UnscopedModel
-  include Mongoid::Document
-  include ActsAsTenant::ModelExtensions
-  field :name, type: String
-  validates_uniqueness_of :name
-end
-
-class AliasedTask
-  include Mongoid::Document
-  include ActsAsTenant::ModelExtensions
-  field :name, type: String
-  acts_as_tenant(:account)
-  belongs_to :project_alias, :class_name => "Project"
-end
-
-class UniqueTask
-  include Mongoid::Document
-  include ActsAsTenant::ModelExtensions
-  field :name, type: String
-  field :user_defined_scope, type: String
-  acts_as_tenant(:account)
-  belongs_to :project
-  validates_uniqueness_to_tenant :name, scope: :user_defined_scope
-end
-
-class CustomForeignKeyTask
-  include Mongoid::Document
-  include ActsAsTenant::ModelExtensions
-  field :name, type: String
-  field :accountID, type: Integer
-  acts_as_tenant(:account, :foreign_key => "accountID")
-  validates_uniqueness_to_tenant :name
-end
-
-class Comment
-  include Mongoid::Document
-  include ActsAsTenant::ModelExtensions
-  belongs_to :commentable, polymorphic: true
-  belongs_to :task, foreign_key: 'commentable_id'
-  acts_as_tenant :account
-end