saasable 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/saasable/errors.rb

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

data/lib/saasable/saas_document.rb

@@ -2,8 +2,8 @@ module Saasable::SaasDocument
   @saas_document = nil
   
   def self.included klass
-    if @saas_document and @saas_document != klass
-      raise Saasable::Errors::MultipleSaasDocuments, "you can only have one Saasable::SaasDocument" 
+    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

data/lib/saasable/scoped_controller.rb

@@ -16,8 +16,21 @@ module Saasable::ScopedController
 
     private
       def fetch_current_saas
-        unless Saasable::SaasDocument.saas_document.nil?
-          @current_saas = Saasable::SaasDocument.saas_document.where(:hosts => request.host).first
+        if Saasable::SaasDocument.saas_document.nil?
+          if Rails.env.production?
+            raise Saasable::Errors::NoSaasDocuments, "you need to set one Saasable::SaasDocument"
+          else
+            return @current_saas = nil
+          end
+        end
+        
+        possible_saas = Saasable::SaasDocument.saas_document.where(:hosts => request.host)
+        if possible_saas.empty?
+          raise Saasable::Errors::SaasNotFound, "no Saasable::SaasDocument found for the host: \"#{request.host}\""
+        elsif possible_saas.count > 1
+          raise Saasable::Errors::MultipleSaasFound, "more then 1 Saasable::SaasDocument found for the host: \"#{request.host}\""
+        else
+          @current_saas = possible_saas.first
         end
       end
 

data/saasable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{saasable}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Rafael Gaspar}]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saasable
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Rafael Gaspar