saasable 0.3.5 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 984b4b0314088a951aa9f67135535f91b717a4ec
-  data.tar.gz: a744a30e81e45da7844b5fea24970c75a842f538
+  metadata.gz: 96efcc9b26a6dfa1ac4461fc8bbefddcf8c9794d
+  data.tar.gz: cbea1ffd6c0b5f188d6eb948410dd639584f3da3
 SHA512:
-  metadata.gz: 170690059cb62f526e384137e1fca12643a59bec6d83757cbb3327137cc8c87768a742e4f3f1acd7af6c762af49e4b4cf44ba99690699b70109b9cc981505879
-  data.tar.gz: 893f923f73e4f7867b8e89b6c8f3236a0d6982a7d9300a986a2e813c163cdc7bdb3296cca565028f2db07cdfbe73536d20c9cc029c10a9d54a0539ba0a67bdd0
+  metadata.gz: 9aec30de71488cfeafd46ef598b094e1b10103e339da448955f9dbc7293e962b2fe402f76124f2f8dbbeb70ef1038162f4a823fecd71bec6092c7cd88153aed1
+  data.tar.gz: f032f197e8adb948c6048a1fc50127ae7d8f33285a9436fda2865da14095b6760c0a592fe1d01e8c2892edff6c8729fbd5c1089d8166a3720e74b7790b3206eb

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.1

data/Gemfile

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

data/Gemfile.lock

@@ -1,72 +1,90 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.15)
-      activesupport (= 3.2.15)
-      builder (~> 3.0.0)
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.3.5)
-    bson (1.9.2)
-    builder (3.0.4)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
+    bson (2.3.0)
+    builder (3.2.2)
+    connection_pool (2.0.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.7)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
       hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpauth (0.2.0)
-    i18n (0.6.5)
-    jeweler (1.8.8)
+    hashie (3.2.0)
+    highline (1.6.21)
+    i18n (0.6.11)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    mongo (1.9.2)
-      bson (~> 1.9.2)
-    mongoid (2.5.2)
-      activemodel (~> 3.1)
-      mongo (~> 1.7)
-      tzinfo (~> 0.3.22)
-    multi_json (1.8.2)
+    jwt (1.0.0)
+    mini_portile (0.6.0)
+    minitest (5.4.0)
+    mongoid (4.0.0)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    moped (2.0.0)
+      bson (~> 2.2)
+      connection_pool (~> 2.0)
+      optionable (~> 0.2.0)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    optionable (0.2.0)
+    origin (2.1.1)
     rack (1.5.2)
-    rake (10.1.0)
-    rdoc (4.0.1)
+    rake (10.3.2)
+    rdoc (4.1.1)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    tzinfo (0.3.38)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
+    thread_safe (0.3.4)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -74,6 +92,6 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler
-  mongoid (~> 2.5.0)
+  mongoid (~> 4.0.0)
   rdoc
   rspec

data/VERSION

@@ -1 +1 @@
-0.3.5
+4.0.0

data/lib/saasable/middleware.rb

@@ -7,7 +7,9 @@ class Saasable::Middleware
   end
 
   def call env
-    env[:saasable] = {:current_saas => saas_for_host(env["SERVER_NAME"])}
+    return @app.call(env) if env['PATH_INFO'].start_with?('/assets')
+
+    env[:saasable] = {:current_saas => saas_for_host(env['SERVER_NAME'])}
     env[:saasable][:current_saas].activate! if env[:saasable][:current_saas]
 
     @app.call(env).tap do
@@ -16,9 +18,9 @@ class Saasable::Middleware
   end
 
   private
-    def saas_for_host hostname
-      Saasable::Mongoid::SaasDocument.saas_document.find_by_host!(hostname)
-    rescue Saasable::Errors::SaasNotFound
-      nil # Saas not found is treated by the Rails Helper
-    end
-end
+  def saas_for_host hostname
+    Saasable::Mongoid::SaasDocument.saas_document.find_by_host!(hostname)
+  rescue Saasable::Errors::SaasNotFound
+    nil # Saas not found is treated by the Rails Helper
+  end
+end

data/lib/saasable/mongoid/saas_document.rb

@@ -1,68 +1,68 @@
 module Saasable::Mongoid::SaasDocument
   @saas_document = nil
-  
+
   def self.included klass
     if @saas_document and @saas_document.name != klass.name
       raise Saasable::Errors::MultipleSaasDocuments, "you can only have one Saasable::SaasDocument"
     else
       @saas_document = klass
     end
-    
+
     klass.extend ClassMethods
     klass.send(:include, InstanceMethods)
     klass.class_eval do
       # Fields
       field :hosts, :type => Array
-      
+
       # Validations
       validates_uniqueness_of :hosts
-      
+
       # Indexes
-      index :hosts
+      index({hosts: 1})
     end
-    
+
     klass.instance_variable_set("@_active_saas", nil)
     klass.instance_variable_set("@_after_activate_chain", [])
     klass.instance_variable_set("@_after_deactivate_chain", [])
   end
-  
+
   def self.saas_document
     @saas_document
   end
-  
+
   module InstanceMethods
     def activate!
       Saasable::Mongoid::ScopedDocument.scoped_documents.each do |klass|
-        # Create a default scope without messing with the ones already in place.
-        klass.default_scoping ||= {}
-        klass.default_scoping[:where] ||= {:saas_id => nil}
-        
-        klass.default_scoping[:where][:saas_id] = self._id
-        klass.class_eval "field :saas_id, :type => BSON::ObjectId, :default => BSON::ObjectId(\"#{self._id}\")"
+        saasble_criteria = Mongoid::Criteria.new(klass).where(saas_id: self._id)
+        klass.default_scoping = klass.default_scoping? ? saasble_criteria.merge(klass.default_scoping.call).to_proc : saasble_criteria.to_proc
+
+        klass.fields["saas_id"].default_val = self._id
+        klass.fields["saas_id"].options[:default] = 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
-    
+
     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]
-        
+        saasble_criteria = Mongoid::Criteria.new(klass).where(saas_id: @_active_saas._id)
+        klass.default_scoping = klass.default_scoping.call.remove_scoping(saasble_criteria).to_proc
+
         klass.fields["saas_id"].default_val = nil
         klass.fields["saas_id"].options.delete(:default)
       end
-      
+
       last_active_saas, @_active_saas = active_saas, nil
       @_after_deactivate_chain.each { |method_name| last_active_saas.send(method_name) }
-    end    
-    
+    end
+
     def find_by_host! a_host
       if Saasable::Mongoid::SaasDocument.saas_document.nil?
         if Rails.env.production?
@@ -71,8 +71,8 @@ module Saasable::Mongoid::SaasDocument
           return nil
         end
       end
-      
-      possible_saas = Saasable::Mongoid::SaasDocument.saas_document.where(:hosts => a_host)
+
+      possible_saas = Saasable::Mongoid::SaasDocument.saas_document.where(:hosts => a_host).to_a
       if possible_saas.empty?
         raise Saasable::Errors::SaasNotFound, "no #{Saasable::Mongoid::SaasDocument.saas_document.name} found for the host: \"#{a_host}\""
       elsif possible_saas.count > 1
@@ -81,25 +81,25 @@ module Saasable::Mongoid::SaasDocument
         return possible_saas.first
       end
     end
-    
+
     def active_saas
       @_active_saas
     end
-    
+
     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
+end

data/lib/saasable/mongoid/scoped_document.rb

@@ -8,10 +8,14 @@ module Saasable::Mongoid::ScopedDocument
     klass.class_eval do
       # Fields
       field :saas_id, :type => BSON::ObjectId
-      
+
       # Indexes
-      index :saas_id
-      index [[:saad_id, 1], [:_id, 1]]
+      index({saas_id: 1})
+      index({saad_id: 1, _id: 1})
+
+      class << self
+        alias_method_chain :index, :saasable
+      end
     end
   end
 
@@ -33,7 +37,12 @@ module Saasable::Mongoid::ScopedDocument
       attributes[:scope] ||= []
       attributes[:scope] << :saas_id unless attributes[:scope].include?(:saas_id)
 
-      validates_with(Mongoid::Validations::UniquenessValidator, attributes)
+      validates_with(Mongoid::Validatable::UniquenessValidator, attributes)
+    end
+
+    def index_with_saasable(spec, options = nil)
+      index_without_saasable(spec, options.except(:unique)) # Never create this one with unique since it's only unique in the saas scope.
+      index_without_saasable({saas_id: 1}.merge(spec), options) unless spec.include?(:saas_id)
     end
   end
 end

data/lib/saasable/railties/helpers.rb

@@ -6,16 +6,16 @@ module Saasable::Railties
       klass.class_eval do
         helper_method :current_saas
         
-        before_filter :_redirect_if_saas_not_found
+        before_filter :_redirect_if_saas_not_found unless Rails.env.development?
         saas_not_found_redirect_to "/404.html"
-        
+
         private
-          def _skip_saasable
-            current_saas.deactivate! if current_saas
-          end
+        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
@@ -27,17 +27,17 @@ module Saasable::Railties
             end
         METHOD
       end
-      
+
       def skip_saasable options
         skip_before_filter :_redirect_if_saas_not_found, options
         before_filter :_skip_saasable, options
       end
     end
-  
+
     module InstanceMethods
       def current_saas
         @current_saas ||= request.env[:saasable][:current_saas]
       end
     end
   end
-end
+end

data/saasable.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: saasable 0.3.5 ruby lib
+# stub: saasable 4.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "saasable"
-  s.version = "0.3.5"
+  s.version = "4.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Educa2", "Rafael Gaspar"]
-  s.date = "2013-11-22"
+  s.date = "2014-07-17"
   s.description = "A gem for making a Multi-Tenant SaaS using Mongoid"
   s.email = "suporte@educa2.com.br"
   s.extra_rdoc_files = [
@@ -43,28 +44,27 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/educa2/saasable"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "2.2.2"
   s.summary = "A gem for making a Multi-Tenant SaaS using Mongoid"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.5.0"])
+      s.add_runtime_dependency(%q<mongoid>, ["~> 4.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>, ["~> 2.5.0"])
+      s.add_dependency(%q<mongoid>, ["~> 4.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>, ["~> 2.5.0"])
+    s.add_dependency(%q<mongoid>, ["~> 4.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.3.5
+  version: 4.0.0
 platform: ruby
 authors:
 - Educa2
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A gem for making a Multi-Tenant SaaS using Mongoid