saasable 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/saasable/middleware.rb

@@ -10,7 +10,9 @@ class Saasable::Middleware
     env[:saasable] = {:current_saas => saas_for_host(env["SERVER_NAME"])}
     env[:saasable][:current_saas].activate! if env[:saasable][:current_saas]
 
-    @app.call env
+    @app.call(env).tap do
+      env[:saasable][:current_saas].deactivate! if env[:saasable][:current_saas]
+    end
   end
 
   private

data/lib/saasable/mongoid/saas_document.rb

@@ -21,6 +21,7 @@ module Saasable::Mongoid::SaasDocument
       index :hosts
     end
     
+    klass.instance_variable_set("@_active_saas", nil)
     klass.instance_variable_set("@_after_activate_chain", [])
     klass.instance_variable_set("@_after_deactivate_chain", [])
   end
@@ -40,6 +41,7 @@ module Saasable::Mongoid::SaasDocument
         klass.class_eval "field :saas_id, :type => BSON::ObjectId, :default => BSON::ObjectId(\"#{self._id}\")"
       end
       
+      self.class.instance_variable_set("@_active_saas", self)
       self.class.instance_variable_get("@_after_activate_chain").each { |method_name| send(method_name) }
     end
     
@@ -57,7 +59,8 @@ module Saasable::Mongoid::SaasDocument
         klass.fields["saas_id"].options.delete(:default)
       end
       
-      @_after_deactivate_chain.each { |method_name| send(method_name) }
+      last_active_saas, @_active_saas = active_saas, nil
+      @_after_deactivate_chain.each { |method_name| last_active_saas.send(method_name) }
     end    
     
     def find_by_host! a_host
@@ -79,12 +82,24 @@ module Saasable::Mongoid::SaasDocument
       end
     end
     
-    def after_activate method_name
-      @_after_activate_chain << method_name
+    def active_saas
+      @_active_saas
     end
     
-    def after_deactivate method_name
-      @_after_deactivate_chain << method_name
+    def after_activate *method_names
+      @_after_activate_chain += method_names
+    end
+    
+    def after_deactivate *method_names
+      @_after_deactivate_chain += method_names
+    end
+    
+    def remove_after_activate *method_names
+      @_after_activate_chain -= method_names
+    end
+    
+    def remove_after_deactivate *method_names
+      @_after_deactivate_chain -= method_names
     end
   end
 end

data/saasable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "saasable"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Educa2", "Rafael Gaspar"]
-  s.date = "2013-04-18"
+  s.date = "2013-10-15"
   s.description = "A gem for making a Multi-Tenant SaaS using Mongoid"
   s.email = "suporte@educa2.com.br"
   s.extra_rdoc_files = [

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: saasable
 version: !ruby/object:Gem::Version
+  version: 0.3.3
   prerelease: 
-  version: 0.3.2
 platform: ruby
 authors:
 - Educa2
@@ -10,88 +10,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
 description: A gem for making a Multi-Tenant SaaS using Mongoid
 email: suporte@educa2.com.br
 executables: []
@@ -128,20 +128,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: -1849778942002607944
-      version: '0'
-  none: false
+      hash: -553495662299571050
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25