saasable 4.0.2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dad7c49704bb790278241fcb9867b97e72ced7b4
-  data.tar.gz: 9163ab17a1a41437c6634ed917c742ae6f297700
+  metadata.gz: e713b6114bc528a35836f8533322fe5d99f43b11
+  data.tar.gz: 4bbf520d6c716841f9aae74cd1d7ca8774e97303
 SHA512:
-  metadata.gz: 1926b99934abdcae4e9c5b432f9c98fde1599d0ad223e66aa4a43f78df7b1dea4443ebd60418187108d9bdef48719f8fc8652a4dfd9ba5db7833a443646cc992
-  data.tar.gz: 752bf47c660c1d26a3fbfed9a0c681e738fe62dad60a125f4d2bb0ac10d1bd4d7e0f30cd508c130a2d3e76dee102ba8820479e7f7c3332ee25f275a9942ceb80
+  metadata.gz: 8720af7407fa29ce8abecd173d7264c81f36f623d6cae6a4ebfbff1fd0251e2239742cb1d0e6a7de9a42c41a4fe9d0c6c5f1a696d5b020f3710ab1d18382eb48
+  data.tar.gz: 6562a424cf45252f5bb110ecf3a26534f72363ed9ebd5a771c71485aea03873f550b05217b423a00388e16a8a20370a14d755d451daa35030fad535cf75d33d5

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1
+ruby-2.2

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "mongoid", "~> 4.0.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,36 +1,35 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.1.4)
-      activesupport (= 4.1.4)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activesupport (4.1.4)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.5)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
-    bson (2.3.0)
+    addressable (2.3.8)
+    bson (3.2.6)
     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.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.7)
-    github_api (0.11.3)
+    git (1.2.9.1)
+    github_api (0.13.0)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
+      hashie (>= 3.4)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6.6)
       oauth2
-    hashie (3.2.0)
-    highline (1.6.21)
-    i18n (0.6.11)
+    hashie (3.4.3)
+    highline (1.7.8)
+    i18n (0.7.0)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -40,50 +39,47 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.0.0)
-    mini_portile (0.6.0)
-    minitest (5.4.0)
-    mongoid (4.0.0)
+    json (1.8.3)
+    jwt (1.5.2)
+    mini_portile (0.6.2)
+    minitest (5.8.3)
+    mongo (2.1.2)
+      bson (~> 3.0)
+    mongoid (5.0.1)
       activemodel (~> 4.0)
-      moped (~> 2.0.0)
+      mongo (~> 2.1)
       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_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.6.4)
+      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.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    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)
+    rack (1.6.4)
+    rake (10.4.2)
+    rdoc (4.2.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       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)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -92,6 +88,9 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler
-  mongoid (~> 4.0.0)
+  mongoid (>= 4.0.0)
   rdoc
   rspec
+
+BUNDLED WITH
+   1.10.6

data/VERSION

@@ -1 +1 @@
-4.0.2
+5.0.0

data/lib/saasable/errors.rb

@@ -1,7 +1,7 @@
 module Saasable::Errors
-  class MultipleSaasDocuments < StandardError; end  
-  class NoSaasDocuments < StandardError; end  
-  
+  class MultipleSaasDocuments < StandardError; end
+  class NoSaasDocuments < StandardError; end
+
   class MultipleSaasFound < StandardError; end
   class SaasNotFound < StandardError; end
-end
+end

data/lib/saasable/middleware.rb

@@ -1,20 +1,15 @@
 class Saasable::Middleware
   def initialize app
     @app = app
-
-    # Loads all models so we know how to apply the scopes on Rails
-    Rails::Mongoid.load_models(Rails.application) if defined?(Rails::Mongoid)
   end
 
   def call env
     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]
+    saas = saas_for_host(env['SERVER_NAME'])
+    saas.activate! if saas
 
-    @app.call(env).tap do
-      env[:saasable][:current_saas].deactivate! if env[:saasable][:current_saas]
-    end
+    @app.call(env).tap { saas.deactivate! if saas }
   end
 
   private

data/lib/saasable/mongoid/saas_document.rb

@@ -12,7 +12,7 @@ module Saasable::Mongoid::SaasDocument
     klass.send(:include, InstanceMethods)
     klass.class_eval do
       # Fields
-      field :hosts, :type => Array
+      field :hosts, type: Array, default: []
 
       # Validations
       validates_uniqueness_of :hosts
@@ -21,7 +21,6 @@ module Saasable::Mongoid::SaasDocument
       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
@@ -30,17 +29,13 @@ module Saasable::Mongoid::SaasDocument
     @saas_document
   end
 
+  def self.active_saas
+    @saas_document.active_saas
+  end
+
   module InstanceMethods
     def activate!
-      Saasable::Mongoid::ScopedDocument.scoped_documents.each do |klass|
-        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)
+      Thread.current[:saasable_active_saas] = self
       self.class.instance_variable_get("@_after_activate_chain").each { |method_name| send(method_name) }
     end
 
@@ -51,28 +46,16 @@ module Saasable::Mongoid::SaasDocument
 
   module ClassMethods
     def deactivate_all!
-      Saasable::Mongoid::ScopedDocument.scoped_documents.each do |klass|
-        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
+      last_active_saas, Thread.current[:saasable_active_saas] = active_saas, nil
       @_after_deactivate_chain.each { |method_name| last_active_saas.send(method_name) }
     end
 
     def find_by_host! a_host
       if Saasable::Mongoid::SaasDocument.saas_document.nil?
-        if Rails.env.production?
-          raise Saasable::Errors::NoSaasDocuments, "you need to set one Saasable::SaasDocument"
-        else
-          return nil
-        end
+        raise Saasable::Errors::NoSaasDocuments, "you need to set one Saasable::SaasDocument"
       end
 
-      possible_saas = Saasable::Mongoid::SaasDocument.saas_document.where(:hosts => a_host).to_a
+      possible_saas = Saasable::Mongoid::SaasDocument.saas_document.where(hosts: a_host.gsub(/^www\./, '')).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
@@ -83,7 +66,7 @@ module Saasable::Mongoid::SaasDocument
     end
 
     def active_saas
-      @_active_saas
+      Thread.current[:saasable_active_saas]
     end
 
     def after_activate *method_names

data/lib/saasable/mongoid/scoped_document.rb

@@ -1,13 +1,12 @@
 module Saasable::Mongoid::ScopedDocument
-  @scoped_documents = []
-
   def self.included klass
-    @scoped_documents << klass unless @scoped_documents.include? klass
-
     klass.extend ClassMethods
     klass.class_eval do
       # Fields
-      field :saas_id, :type => BSON::ObjectId
+      field :saas_id, type: BSON::ObjectId, default: ->{ Saasable::Mongoid::SaasDocument.active_saas }
+
+      # Default scope
+      default_scope ->{ Saasable::Mongoid::SaasDocument.active_saas ? where(saas_id: Saasable::Mongoid::SaasDocument.active_saas) : all }
 
       # Indexes
       index({saas_id: 1})
@@ -19,10 +18,6 @@ module Saasable::Mongoid::ScopedDocument
     end
   end
 
-  def self.scoped_documents
-    @scoped_documents
-  end
-
   def saas= a_saas
     self.saas_id = a_saas._id
   end
@@ -40,7 +35,7 @@ module Saasable::Mongoid::ScopedDocument
       validates_with(Mongoid::Validatable::UniquenessValidator, attributes)
     end
 
-    def index_with_saasable(spec, options = nil)
+    def index_with_saasable(spec, options = {})
       index_without_saasable(spec, options.merge({unique: false}))
       index_without_saasable({saas_id: 1}.merge(spec), options) unless spec.include?(:saas_id)
     end

data/lib/saasable/mongoid.rb

@@ -2,4 +2,4 @@ module Saasable::Mongoid
   # Documents
   autoload :SaasDocument, "saasable/mongoid/saas_document"
   autoload :ScopedDocument, "saasable/mongoid/scoped_document"
-end
+end

data/lib/saasable/railtie.rb

@@ -2,8 +2,8 @@ require "saasable/railties"
 
 class Saasable::Railtie < Rails::Railtie
   config.app_middleware.use Saasable::Middleware
-  
+
   initializer "include helpers" do
     ActionController::Base.send :include, Saasable::Railties::Helpers
   end
-end
+end

data/lib/saasable/railties/helpers.rb

@@ -5,7 +5,7 @@ module Saasable::Railties
       klass.send(:include, InstanceMethods)
       klass.class_eval do
         helper_method :current_saas
-        
+
         before_filter :_redirect_if_saas_not_found unless Rails.env.development?
         saas_not_found_redirect_to "/404.html"
 
@@ -36,7 +36,7 @@ module Saasable::Railties
 
     module InstanceMethods
       def current_saas
-        @current_saas ||= request.env[:saasable][:current_saas]
+        Saasable::Mongoid::SaasDocument.active_saas
       end
     end
   end

data/lib/saasable/railties.rb

@@ -1,4 +1,4 @@
 module Saasable::Railties
   # Railties
   autoload :Helpers, "saasable/railties/helpers"
-end
+end

data/lib/saasable.rb

@@ -1,10 +1,10 @@
 module Saasable
   # Errors
   autoload :Errors, "saasable/errors"
-  
+
   # Middleware
   autoload :Middleware, "saasable/middleware"
-  
+
   # Mongoid
   autoload :Mongoid, "saasable/mongoid"
-end
+end

data/saasable.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: saasable 4.0.2 ruby lib
+# stub: saasable 5.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "saasable"
-  s.version = "4.0.2"
+  s.version = "5.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 = "2014-07-18"
+  s.date = "2015-11-24"
   s.description = "A gem for making a Multi-Tenant SaaS using Mongoid"
   s.email = "suporte@educa2.com.br"
   s.extra_rdoc_files = [
@@ -44,27 +44,27 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/educa2/saasable"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.5.1"
   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>, ["~> 4.0.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>, ["~> 4.0.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>, ["~> 4.0.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"])

data/spec/spec_helper.rb

@@ -8,5 +8,5 @@ require 'saasable'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saasable
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Educa2
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A gem for making a Multi-Tenant SaaS using Mongoid