saasable 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 706a317694accede180544529880f60f3e335d01
-  data.tar.gz: 0c0dbd9d65b4fb663d8d86a8c75db9feb7d73234
+  metadata.gz: dad7c49704bb790278241fcb9867b97e72ced7b4
+  data.tar.gz: 9163ab17a1a41437c6634ed917c742ae6f297700
 SHA512:
-  metadata.gz: 53f9e84236a4a4ec43210c5fd76b2216058085b368d0f79a39e15a9c0fbe25734ae92719d2a1685c40b259ca0225413d05a2248578057a8db141809c519bcc16
-  data.tar.gz: ac887ff9f4075e3d62d910dabbdbecf969777b365912ff8c6507e62fa23f7b3ce557e01d1f362f9b4d8e6c59fb9dbb2771e4b9356e088e48d0ed4ef2e14c35d8
+  metadata.gz: 1926b99934abdcae4e9c5b432f9c98fde1599d0ad223e66aa4a43f78df7b1dea4443ebd60418187108d9bdef48719f8fc8652a4dfd9ba5db7833a443646cc992
+  data.tar.gz: 752bf47c660c1d26a3fbfed9a0c681e738fe62dad60a125f4d2bb0ac10d1bd4d7e0f30cd508c130a2d3e76dee102ba8820479e7f7c3332ee25f275a9942ceb80

data/VERSION

@@ -1 +1 @@
-4.0.1
+4.0.2

data/lib/saasable/errors.rb

@@ -2,5 +2,6 @@ module Saasable::Errors
   class MultipleSaasDocuments < StandardError; end  
   class NoSaasDocuments < StandardError; end  
   
+  class MultipleSaasFound < StandardError; end
   class SaasNotFound < StandardError; end
 end

data/lib/saasable/mongoid/saas_document.rb

@@ -64,13 +64,21 @@ module Saasable::Mongoid::SaasDocument
     end
 
     def find_by_host! a_host
-      raise Saasable::Errors::NoSaasDocuments, "you need to set one Saasable::SaasDocument" if Saasable::Mongoid::SaasDocument.saas_document.nil?
+      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
+      end
 
-      a_saas = Saasable::Mongoid::SaasDocument.saas_document.where(:hosts => a_host).first
-      if a_saas.nil?
+      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
+        raise Saasable::Errors::MultipleSaasFound, "more then 1 #{Saasable::Mongoid::SaasDocument.saas_document.name} found for the host: \"#{a_host}\""
       else
-        return a_saas
+        return possible_saas.first
       end
     end
 

data/lib/saasable/mongoid/scoped_document.rb

@@ -41,7 +41,7 @@ module Saasable::Mongoid::ScopedDocument
     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(spec, options.merge({unique: false}))
       index_without_saasable({saas_id: 1}.merge(spec), options) unless spec.include?(:saas_id)
     end
   end

data/saasable.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: saasable 4.0.1 ruby lib
+# stub: saasable 4.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "saasable"
-  s.version = "4.0.1"
+  s.version = "4.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saasable
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Educa2