saasable 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/saasable/saas_document.rb

@@ -8,6 +8,8 @@ module Saasable::SaasDocument
       @saas_document = klass
     end
     
+    klass.extend ClassMethods
+    klass.send(:include, InstanceMethods)
     klass.class_eval do
       field :hosts, :type => Array
     end
@@ -16,4 +18,38 @@ module Saasable::SaasDocument
   def self.saas_document
     @saas_document
   end
+  
+  module InstanceMethods
+    def activate!
+      Saasable::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}\")"
+      end
+    end
+  end
+  
+  module ClassMethods
+    def find_by_host! a_host
+      if Saasable::SaasDocument.saas_document.nil?
+        if Rails.env.production?
+          raise Saasable::Errors::NoSaasDocuments, "you need to set one Saasable::SaasDocument"
+        else
+          return nil
+        end
+      end
+      
+      possible_saas = Saasable::SaasDocument.saas_document.where(:hosts => a_host)
+      if possible_saas.empty?
+        raise Saasable::Errors::SaasNotFound, "no #{Saasable::SaasDocument.saas_document.name} found for the host: \"#{a_host}\""
+      elsif possible_saas.count > 1
+        raise Saasable::Errors::MultipleSaasFound, "more then 1 #{Saasable::SaasDocument.saas_document.name} found for the host: \"#{a_host}\""
+      else
+        return possible_saas.first
+      end
+    end
+  end
 end

data/lib/saasable/scoped_controller.rb

@@ -16,35 +16,11 @@ module Saasable::ScopedController
 
     private
       def fetch_current_saas
-        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.saas_document.name} found for the host: \"#{request.host}\""
-        elsif possible_saas.count > 1
-          raise Saasable::Errors::MultipleSaasFound, "more then 1 #{Saasable::SaasDocument.saas_document.name} found for the host: \"#{request.host}\""
-        else
-          @current_saas = possible_saas.first
-        end
+        @current_saas = Saas::SaasDocument.find_by_host!(request.host)
       end
 
       def scope_models_by_saas
-        Saasable::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}
-          
-          if @current_saas
-            klass.default_scoping[:where][:saas_id] = @current_saas._id
-            klass.class_eval "field :saas_id, :type => BSON::ObjectId, :default => BSON::ObjectId(\"#{@current_saas._id}\")"
-          end
-        end
+        @current_saas.activate!
       end
   end
 end

data/lib/saasable/scoped_document.rb

@@ -4,6 +4,7 @@ module Saasable::ScopedDocument
   def self.included klass
     @scoped_documents << klass unless @scoped_documents.include? klass
     
+    klass.extend ClassMethods
     klass.class_eval do
       field :saas_id, :type => BSON::ObjectId
     end
@@ -12,4 +13,14 @@ module Saasable::ScopedDocument
   def self.scoped_documents
     @scoped_documents
   end
+  
+  module ClassMethods
+    def validates_uniqueness_of(*args)
+      attributes = _merge_attributes(args)
+      attributes[:scope] ||= []
+      attributes[:scope] << :saas_id unless attributes[:scope].include?(:saas_id)
+      
+      validates_with(Mongoid::Validations::UniquenessValidator, attributes)
+    end
+  end
 end

data/saasable.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saasable
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Educa2