mongoid-multitenancy-sidekiq 0.0.1 → 0.0.2

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - "1.9.3"
 services:
   - mongodb
+  - redis
 
 # uncomment this line if your project needs to run something other than `rake`:
 # script: bundle exec rspec spec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-multitenancy-sidekiq (0.0.1)
+    mongoid-multitenancy-sidekiq (0.0.2)
       mongoid-multitenancy
       sidekiq (>= 2.11)
 
@@ -80,4 +80,5 @@ DEPENDENCIES
   mongoid-multitenancy-sidekiq!
   rake (~> 10.0)
   rspec (~> 2.12)
+  rspec-mocks (~> 2.12)
   yard (~> 0.8)

data/lib/mongoid-multitenancy/sidekiq/middleware/client.rb

@@ -1,7 +1,10 @@
 module Mongoid::Multitenancy::Sidekiq::Middleware
   class Client
     def call(worker_class, item, queue)
-      item['tenant'] ||= Mongoid::Multitenancy.current_tenant
+      if Mongoid::Multitenancy.current_tenant
+        item['tenant_class'] ||= Mongoid::Multitenancy.current_tenant.class.to_s
+        item['tenant_id'] ||= Mongoid::Multitenancy.current_tenant.id.to_s
+      end
       yield
     end
   end

data/lib/mongoid-multitenancy/sidekiq/middleware/server.rb

@@ -1,8 +1,9 @@
 module Mongoid::Multitenancy::Sidekiq::Middleware
   class Server
     def call(worker_class, item, queue)
-      if item['tenant']
-        Mongoid::Multitenancy.with_tenant(item['tenant']) do
+      if item['tenant_id'] and item['tenant_class']
+        tenant = item['tenant_class'].constantize.find item['tenant_id']
+        Mongoid::Multitenancy.with_tenant(tenant) do
           yield
         end
       else

data/lib/mongoid-multitenancy/sidekiq/version.rb

@@ -1,7 +1,7 @@
 module Mongoid
   module Multitenancy
     module Sidekiq
-      VERSION = '0.0.1'
+      VERSION = '0.0.2'
     end
   end
 end

data/mongoid-multitenancy-sidekiq.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency('rake', '~> 10.0')
   spec.add_development_dependency('rspec', '~> 2.12')
+  spec.add_development_dependency('rspec-mocks', '~> 2.12')
   spec.add_development_dependency('yard', '~> 0.8')
   spec.add_development_dependency('database_cleaner', '~> 1.0')
 

data/spec/mongoid_multitenancy_sidekiq_spec.rb

@@ -1,43 +1,114 @@
 require 'spec_helper'
 
-class Tenant
-  include Mongoid::Document
-end
-
-class User
-  include Mongoid::Document
-  include Mongoid::Multitenancy::Document
+class FakeActor
+  def processor_done(*args)
+    nil
+  end
 
-  tenant(:tenant, :optional => true)
+  def real_thread(*args)
+    nil
+  end
 end
 
-class UserCreatorWorker
+class TestWorker
   include Sidekiq::Worker
 
   def perform
-    User.create(tenant: Mongoid::Multitenancy.current_tenant)
   end
 end
 
-describe UserCreatorWorker do
-  context 'when the current Tenant is set' do
-    before do
-      @current_tenant = Mongoid::Multitenancy.current_tenant = Tenant.create!
+class Tenant
+  include Mongoid::Document
+end
+
+UnitOfWork = Struct.new(:queue, :message) do
+  def acknowledge
+    # nothing to do
+  end
+
+  def queue_name
+    queue
+  end
+
+  def requeue
+    # nothing to do
+  end
+end
+
+
+describe Mongoid::Multitenancy::Sidekiq::Middleware::Client do
+  describe '#call' do
+    context 'when Mongoid::Multitenancy.current_tenant is set' do
+      before do
+        Mongoid::Multitenancy.current_tenant = Tenant.create!
+        jid = TestWorker.perform_async
+        @job = Sidekiq::Queue.new.find_job(jid)
+      end
+
+      it 'adds both tenant class and tenant_id to the item message' do
+        expect(@job['tenant_class']).to eq Mongoid::Multitenancy.current_tenant.class.to_s
+        expect(@job['tenant_id']).to eq Mongoid::Multitenancy.current_tenant.id.to_s
+      end
     end
 
-    it 'creates the User with the current tenant_id field' do
-      UserCreatorWorker.perform_async
-      User.where(tenant_id: @current_tenant.id).should have(1).items
+    context 'when Mongoid::Multitenancy.current_tenant is nil' do
+      before do
+        Mongoid::Multitenancy.current_tenant = nil
+        jid = TestWorker.perform_async
+        @job = Sidekiq::Queue.new.find_job(jid)
+      end
+
+      it 'does have neither tenant class nor tenant id to the item message' do
+        expect(@job['tenant_class']).to be_nil
+        expect(@job['tenant_id']).to be_nil
+      end
     end
   end
+end
+
+describe Mongoid::Multitenancy::Sidekiq::Middleware::Server do
+  before do
+    actor = FakeActor.new
+    @boss.stub(:async).and_return(actor)
+  end
 
-  context 'when the Tenant is not set' do
-    before { Mongoid::Multitenancy.current_tenant = nil }
+  describe '#call' do
+    context 'when the messsage has tenant_class and tenant_id' do
+      before do
+        @tenant1 = Tenant.create!
+        @tenant2 = Tenant.create!
+        Mongoid::Multitenancy.current_tenant = @tenant1
 
-    it 'creates the User without the tenant_id field' do
-      UserCreatorWorker.perform_async
-      User.where(:tenant_id.ne => '', :tenant_id.exists => true).should have(0).items
-      User.where(tenant_id: nil).should have(1).items
+        jid = TestWorker.perform_async
+        Mongoid::Multitenancy.current_tenant = @tenant2 #change the Tenant, but the worker should be starts with @tenant1
+
+        job = Sidekiq::Queue.new.find_job(jid)
+        msg = Sidekiq.dump_json(job.item)
+        @work = UnitOfWork.new('default', msg)
+      end
+
+      it 'yields the Worker with Mongoid::Multitenancy.with_tenant(@tenant1) block' do
+        Mongoid::Multitenancy.should_receive(:with_tenant).with(@tenant1)
+        @processor.process(@work)
+      end
+    end
+
+    context 'when the messsage does not have tenant_class and tenant_id' do
+      before do
+        Mongoid::Multitenancy.current_tenant = nil
+        jid = TestWorker.perform_async
+
+        Mongoid::Multitenancy.current_tenant = Tenant.create! #change the Tenant, but the worker should be starts without tenant
+
+        job = Sidekiq::Queue.new.find_job(jid)
+        msg = Sidekiq.dump_json(job.item)
+        @work = UnitOfWork.new('default', msg)
+      end
+
+      it 'does not yield the Worker with Mongoid::Multitenancy.with_tenant block' do
+        Mongoid::Multitenancy.should_not_receive(:with_tenant)
+        @processor.process(@work)
+      end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -11,16 +11,29 @@ require 'rspec'
 require 'mongoid'
 require 'mongoid-multitenancy'
 require 'database_cleaner'
+
+require 'celluloid'
+Celluloid.logger = nil
+
+require 'sidekiq'
+require 'sidekiq/cli'
+require 'sidekiq/processor'
+require 'sidekiq/util'
 require 'mongoid-multitenancy-sidekiq'
-require 'sidekiq/testing/inline'
 
 
+Sidekiq.logger.level = Logger::ERROR
+
+require 'sidekiq/redis_connection'
+REDIS = Sidekiq::RedisConnection.create(:url => "redis://localhost/15", :namespace => 'testfoo')
+
 Mongoid.configure do |config|
   config.connect_to "mongoid_multitenancy_sidekiq"
 end
 
 DatabaseCleaner.orm = 'mongoid'
 
+Mongoid::Multitenancy::Sidekiq::Middleware.run
 
 RSpec.configure do |config|
   config.include Mongoid::Matchers
@@ -31,6 +44,13 @@ RSpec.configure do |config|
 
   config.before(:each) do
     DatabaseCleaner.start
+
+    Celluloid.boot
+    @boss = Object.new
+    @processor = ::Sidekiq::Processor.new(@boss)
+
+    Sidekiq.redis = REDIS
+    Sidekiq.redis { |c| c.flushdb }
   end
 
   config.after(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-multitenancy-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement