saasable 0.2.2 → 0.3.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "mongoid"
+gem "mongoid", "< 3.0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,41 +1,42 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
+    activesupport (3.2.9)
       i18n (~> 0.6)
-    activesupport (3.1.1)
       multi_json (~> 1.0)
-    bson (1.4.0)
-    builder (3.0.0)
+    bson (1.7.0)
+    builder (3.0.4)
     diff-lcs (1.1.3)
     git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.6.4)
+    i18n (0.6.1)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.5)
-    mongo (1.4.0)
-      bson (= 1.4.0)
-    mongoid (2.3.3)
+      rdoc
+    json (1.7.5)
+    mongo (1.7.0)
+      bson (~> 1.7.0)
+    mongoid (2.5.1)
       activemodel (~> 3.1)
-      mongo (~> 1.3)
+      mongo (~> 1.7)
       tzinfo (~> 0.3.22)
-    multi_json (1.0.3)
-    rake (0.9.2.2)
+    multi_json (1.3.7)
+    rake (10.0.0)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    tzinfo (0.3.31)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -43,6 +44,6 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler
-  mongoid
+  mongoid (< 3.0.0)
   rdoc
   rspec

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/saasable/middleware.rb

@@ -8,13 +8,13 @@ class Saasable::Middleware
     Rails::Mongoid.load_models(Rails.application) if defined?(Rails::Mongoid)
     
     env[:saasable] = {:current_saas => saas_for_host(env["SERVER_NAME"])}
-    env[:saasable][:current_saas].activate!
+    env[:saasable][:current_saas].activate! if env[:saasable][:current_saas]
         
     @app.call env
   end
   
   private
     def saas_for_host hostname
-      Saasable::Mongoid::SaasDocument.saas_document.find_by_host!(hostname)
+      Saasable::Mongoid::SaasDocument.saas_document.find_by_host!(hostname) rescue nil
     end
 end

data/lib/saasable/mongoid/saas_document.rb

@@ -17,6 +17,9 @@ module Saasable::Mongoid::SaasDocument
       # Validations
       validates_uniqueness_of :hosts
     end
+    
+    klass.instance_variable_set("@_after_activate_chain", [])
+    klass.instance_variable_set("@_after_deactivate_chain", [])
   end
   
   def self.saas_document
@@ -33,10 +36,27 @@ module Saasable::Mongoid::SaasDocument
         klass.default_scoping[:where][:saas_id] = self._id
         klass.class_eval "field :saas_id, :type => BSON::ObjectId, :default => BSON::ObjectId(\"#{self._id}\")"
       end
+      
+      self.class.instance_variable_get("@_after_activate_chain").each { |method_name| send(method_name) }
+    end
+    
+    def deactivate!
+      self.class.deactivate_all!
     end
   end
   
   module ClassMethods
+    def deactivate_all!
+      Saasable::Mongoid::ScopedDocument.scoped_documents.each do |klass|
+        klass.default_scoping[:where].delete(:saas_id) if klass.default_scoping && klass.default_scoping[:where]
+        
+        klass.fields["saas_id"].default_val = nil
+        klass.fields["saas_id"].options.delete(:default)
+      end
+      
+      @_after_deactivate_chain.each { |method_name| send(method_name) }
+    end    
+    
     def find_by_host! a_host
       if Saasable::Mongoid::SaasDocument.saas_document.nil?
         if Rails.env.production?
@@ -55,5 +75,13 @@ module Saasable::Mongoid::SaasDocument
         return possible_saas.first
       end
     end
+    
+    def after_activate method_name
+      @_after_activate_chain << method_name
+    end
+    
+    def after_deactivate method_name
+      @_after_deactivate_chain << method_name
+    end
   end
 end

data/lib/saasable/mongoid/scoped_document.rb

@@ -7,6 +7,9 @@ module Saasable::Mongoid::ScopedDocument
     klass.extend ClassMethods
     klass.class_eval do
       field :saas_id, :type => BSON::ObjectId
+      
+      index :saas_id
+      index [[:saad_id, 1], [:_id, 1]]
     end
   end
 

data/lib/saasable/railties/helpers.rb

@@ -1,9 +1,36 @@
 module Saasable::Railties
   module Helpers
     def self.included klass
+      klass.extend ClassMethods
       klass.send(:include, InstanceMethods)
       klass.class_eval do
         helper_method :current_saas
+        
+        before_filter :_redirect_if_saas_not_found
+        saas_not_found_redirect_to "/404.html"
+        
+        private
+          def _skip_saasable
+            current_saas.deactivate! if current_saas
+          end
+      end
+    end
+    
+    module ClassMethods
+      def saas_not_found_redirect_to path_or_url
+        self.class_eval <<-METHOD, __FILE__, __LINE__ + 1
+          private
+            def _redirect_if_saas_not_found
+              unless current_saas
+                redirect_to "#{path_or_url}"
+              end
+            end
+        METHOD
+      end
+      
+      def skip_saasable options
+        skip_before_filter :_redirect_if_saas_not_found, options
+        before_filter :_skip_saasable, options
       end
     end
   

data/saasable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "saasable"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Educa2", "Rafael Gaspar"]
-  s.date = "2012-04-24"
+  s.date = "2012-11-12"
   s.description = "A gem for making a Multi-Tenant SaaS using Mongoid"
   s.email = "suporte@educa2.com.br"
   s.extra_rdoc_files = [
@@ -41,27 +41,27 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/educa2/saasable"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "A gem for making a Multi-Tenant SaaS using Mongoid"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 0"])
+      s.add_runtime_dependency(%q<mongoid>, ["< 3.0.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
-      s.add_dependency(%q<mongoid>, [">= 0"])
+      s.add_dependency(%q<mongoid>, ["< 3.0.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
-    s.add_dependency(%q<mongoid>, [">= 0"])
+    s.add_dependency(%q<mongoid>, ["< 3.0.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saasable
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70206917131020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70206917131020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70206917130500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206917130500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70206917129860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206917129860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70206917129120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206917129120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70206917162640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +86,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206917162640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem for making a Multi-Tenant SaaS using Mongoid
 email: suporte@educa2.com.br
 executables: []
@@ -110,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 685054745294099642
+      hash: 758273759438966357
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A gem for making a Multi-Tenant SaaS using Mongoid