saasable 0.1.6 → 0.2.0

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
+gem "mongoid"
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -1,21 +1,38 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    bson (1.4.0)
+    builder (3.0.0)
     diff-lcs (1.1.3)
     git (1.2.5)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    mongo (1.4.0)
+      bson (= 1.4.0)
+    mongoid (2.3.3)
+      activemodel (~> 3.1)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
+    multi_json (1.0.3)
+    rake (0.9.2.2)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.7.0)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
@@ -23,4 +40,5 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler
+  mongoid
   rspec

data/README.rdoc

@@ -1,6 +1,6 @@
 = saasable
 
-A gem for making a Multi-Tenant SaaS using MongoId
+A gem for making a Multi-Tenant SaaS using Mongoid
 
 == How to use it
 

data/Rakefile

@@ -33,7 +33,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/lib/saasable/middleware.rb

@@ -0,0 +1,20 @@
+class Saasable::Middleware
+  def initialize app
+    @app = app
+  end
+  
+  def call env
+    # Loads all models so we know how to apply the scopes on Rails
+    Rails::Mongoid.load_models(Rails.application) if defined?(Rails::Mongoid)
+    
+    env[:saasable] = {:current_saas => saas_for_host(env["SERVER_NAME"])}
+    env[:saasable][:current_saas].activate!
+        
+    @app.call env
+  end
+  
+  private
+    def saas_for_host hostname
+      Saasable::Mongoid::SaasDocument.saas_document.find_by_host!(hostname)
+    end
+end

data/lib/saasable/{saas_document.rb → mongoid/saas_document.rb}

@@ -1,4 +1,4 @@
-module Saasable::SaasDocument
+module Saasable::Mongoid::SaasDocument
   @saas_document = nil
   
   def self.included klass
@@ -11,7 +11,11 @@ module Saasable::SaasDocument
     klass.extend ClassMethods
     klass.send(:include, InstanceMethods)
     klass.class_eval do
+      # Fields
       field :hosts, :type => Array
+      
+      # Validations
+      validates_uniqueness_of :hosts
     end
   end
   
@@ -21,7 +25,7 @@ module Saasable::SaasDocument
   
   module InstanceMethods
     def activate!
-      Saasable::ScopedDocument.scoped_documents.each do |klass|
+      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}
@@ -34,7 +38,7 @@ module Saasable::SaasDocument
   
   module ClassMethods
     def find_by_host! a_host
-      if Saasable::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
@@ -42,11 +46,11 @@ module Saasable::SaasDocument
         end
       end
       
-      possible_saas = Saasable::SaasDocument.saas_document.where(:hosts => a_host)
+      possible_saas = Saasable::Mongoid::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}\""
+        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::SaasDocument.saas_document.name} found for the host: \"#{a_host}\""
+        raise Saasable::Errors::MultipleSaasFound, "more then 1 #{Saasable::Mongoid::SaasDocument.saas_document.name} found for the host: \"#{a_host}\""
       else
         return possible_saas.first
       end

data/lib/saasable/{scoped_document.rb → mongoid/scoped_document.rb}

@@ -1,4 +1,4 @@
-module Saasable::ScopedDocument
+module Saasable::Mongoid::ScopedDocument
   @scoped_documents = []
   
   def self.included klass

data/lib/saasable/mongoid.rb

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

data/lib/saasable/railtie.rb

@@ -0,0 +1,9 @@
+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

data/lib/saasable/railties/helpers.rb

@@ -0,0 +1,16 @@
+module Saasable::Railties
+  module Helpers
+    def self.included klass
+      klass.send(:include, InstanceMethods)
+      klass.class_eval do
+        helper_method :current_saas
+      end
+    end
+  
+    module InstanceMethods
+      def current_saas
+        @current_saas ||= request.env[:saasable][:current_saas]
+      end
+    end
+  end
+end

data/lib/saasable/railties.rb

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

data/lib/saasable.rb

@@ -2,10 +2,12 @@ module Saasable
   # Errors
   autoload :Errors, "saasable/errors"
   
-  # Documents
-  autoload :SaasDocument, "saasable/saas_document"
-  autoload :ScopedDocument, "saasable/scoped_document"
+  # Middleware
+  autoload :Middleware, "saasable/middleware"
   
-  # Controllers
-  autoload :ScopedController, "saasable/scoped_controller"
-end
+  # Mongoid
+  autoload :Mongoid, "saasable/mongoid"
+end
+
+# Railtie
+require "saasable/railtie" if defined?(Rails)

data/saasable.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{saasable}
-  s.version = "0.1.6"
+  s.name = "saasable"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Educa2}, %q{Rafael Gaspar}]
-  s.date = %q{2011-10-03}
-  s.description = %q{A gem for making a Multi-Tenant SaaS using Mongoid}
-  s.email = %q{suporte@educa2.com.br}
+  s.authors = ["Educa2", "Rafael Gaspar"]
+  s.date = "2011-11-06"
+  s.description = "A gem for making a Multi-Tenant SaaS using Mongoid"
+  s.email = "suporte@educa2.com.br"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -27,32 +27,39 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/saasable.rb",
     "lib/saasable/errors.rb",
-    "lib/saasable/saas_document.rb",
-    "lib/saasable/scoped_controller.rb",
-    "lib/saasable/scoped_document.rb",
+    "lib/saasable/middleware.rb",
+    "lib/saasable/mongoid.rb",
+    "lib/saasable/mongoid/saas_document.rb",
+    "lib/saasable/mongoid/scoped_document.rb",
+    "lib/saasable/railtie.rb",
+    "lib/saasable/railties.rb",
+    "lib/saasable/railties/helpers.rb",
     "saasable.gemspec",
     "spec/saasable_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/educa2/saasable}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{A gem for making a Multi-Tenant SaaS using Mongoid}
+  s.homepage = "http://github.com/educa2/saasable"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "A gem for making a Multi-Tenant SaaS using Mongoid"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mongoid>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
+      s.add_dependency(%q<mongoid>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
+    s.add_dependency(%q<mongoid>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

metadata

@@ -1,75 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: saasable
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
 platform: ruby
-authors: 
+authors:
 - Educa2
 - Rafael Gaspar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+date: 2011-11-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &70170140248740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70170140248740
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70170140280100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70170140280100
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70170140277920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70170140277920
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70170140273980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: *70170140273980
 description: A gem for making a Multi-Tenant SaaS using Mongoid
 email: suporte@educa2.com.br
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -80,44 +74,42 @@ files:
 - VERSION
 - lib/saasable.rb
 - lib/saasable/errors.rb
-- lib/saasable/saas_document.rb
-- lib/saasable/scoped_controller.rb
-- lib/saasable/scoped_document.rb
+- lib/saasable/middleware.rb
+- lib/saasable/mongoid.rb
+- lib/saasable/mongoid/saas_document.rb
+- lib/saasable/mongoid/scoped_document.rb
+- lib/saasable/railtie.rb
+- lib/saasable/railties.rb
+- lib/saasable/railties/helpers.rb
 - saasable.gemspec
 - spec/saasable_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/educa2/saasable
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3690055476265726699
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A gem for making a Multi-Tenant SaaS using Mongoid
 test_files: []
-

data/lib/saasable/scoped_controller.rb

@@ -1,26 +0,0 @@
-module Saasable::ScopedController
-  def self.included klass
-    klass.send(:include, InstanceMethods)
-    klass.class_eval do
-      before_filter :fetch_current_saas
-      before_filter :scope_models_by_saas
-      
-      helper_method :current_saas
-    end
-  end
-  
-  module InstanceMethods
-    def current_saas
-      @current_saas
-    end
-
-    private
-      def fetch_current_saas
-        @current_saas = Saasable::SaasDocument.saas_document.find_by_host!(request.host)
-      end
-
-      def scope_models_by_saas
-        @current_saas.activate!
-      end
-  end
-end