roomer 0.0.11 → 1.0.0

data/.gitignore

@@ -7,3 +7,4 @@ pkg/*
 test/tmp*
 tmp*
 test/rails_app/log*
+.rvmrc

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "rails3" do
+  gem "rails", "3.0.9"
+end
+
+appraise "rails31" do
+  gem "rails", "3.1.8"
+end
+
+appraise "rails32" do
+  gem "rails", "3.2.8"
+end

data/Gemfile

@@ -1,29 +1,2 @@
-source "http://rubygems.org"
+source :rubygems
 gemspec
-
-group :doc do
-  gem "yard"
-end
-
-group :test do
-  gem "webrat",         "~> 0.7.2",   :require => false
-  gem "mocha",          "~> 0.9.12",  :require => false
-  gem "ZenTest",        "~> 4.6.2",   :require => false
-  gem "autotest-growl", "~> 0.2.9",   :require => false
-end
-
-platforms :ruby do
-  group :db do
-    gem "pg", ">= 0.11.0"
-  end
-end
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter"
-end
-
-platforms :mri_18 do
-  group :test do
-    gem "ruby-debug", ">= 0.10.3"
-  end
-end

data/Rakefile

@@ -1,9 +1,12 @@
 # encoding: UTF-8
-
+require 'rubygems'
+require 'bundler/setup'
 require "bundler/gem_tasks"
 require 'rake/testtask'
 require 'rdoc/task'
 
+require 'appraisal'
+
 desc 'Run Roomer unit tests'
 Rake::TestTask.new(:test) do |t|
   t.libs    << 'lib'

data/gemfiles/rails3.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal", "~> 0.4.1"
+gem "mocha", "~> 0.9.12", :require=>false
+gem "rails", "3.0.9"
+
+gemspec :path=>"../"

data/gemfiles/rails3.gemfile.lock

@@ -0,0 +1,91 @@
+PATH
+  remote: /Users/gosuri/projects/roomer
+  specs:
+    roomer (0.0.11)
+      pg (>= 0.11.0)
+      rails (>= 3.0.9)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (2.0.10)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    json (1.7.5)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    mocha (0.9.12)
+    pg (0.14.1)
+    polyglot (0.3.3)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
+      bundler (~> 1.0)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    thor (0.14.6)
+    treetop (1.4.11)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.1)
+  mocha (~> 0.9.12)
+  rails (= 3.0.9)
+  roomer!

data/gemfiles/rails31.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal", "~> 0.4.1"
+gem "mocha", "~> 0.9.12", :require=>false
+gem "rails", "3.1.8"
+
+gemspec :path=>"../"

data/gemfiles/rails31.gemfile.lock

@@ -0,0 +1,102 @@
+PATH
+  remote: /Users/gosuri/projects/roomer
+  specs:
+    roomer (0.0.11)
+      pg (>= 0.11.0)
+      rails (>= 3.0.9)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.8)
+      actionpack (= 3.1.8)
+      mail (~> 2.3.3)
+    actionpack (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.8)
+      activesupport (= 3.1.8)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+    activesupport (3.1.8)
+      multi_json (>= 1.0, < 1.3)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (2.2.3)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    json (1.7.5)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    mocha (0.9.12)
+    multi_json (1.2.0)
+    pg (0.14.1)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.1.8)
+      actionmailer (= 3.1.8)
+      actionpack (= 3.1.8)
+      activerecord (= 3.1.8)
+      activeresource (= 3.1.8)
+      activesupport (= 3.1.8)
+      bundler (~> 1.0)
+      railties (= 3.1.8)
+    railties (3.1.8)
+      actionpack (= 3.1.8)
+      activesupport (= 3.1.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.11)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.1)
+  mocha (~> 0.9.12)
+  rails (= 3.1.8)
+  roomer!

data/gemfiles/rails32.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal", "~> 0.4.1"
+gem "mocha", "~> 0.9.12", :require=>false
+gem "rails", "3.2.8"
+
+gemspec :path=>"../"

data/gemfiles/rails32.gemfile.lock

@@ -0,0 +1,100 @@
+PATH
+  remote: /Users/gosuri/projects/roomer
+  specs:
+    roomer (0.0.11)
+      pg (>= 0.11.0)
+      rails (>= 3.0.9)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    mocha (0.9.12)
+    multi_json (1.3.6)
+    pg (0.14.1)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
+      bundler (~> 1.0)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.11)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.1)
+  mocha (~> 0.9.12)
+  rails (= 3.2.8)
+  roomer!

data/lib/generators/roomer/install/templates/roomer.rb

@@ -47,7 +47,7 @@ Roomer.setup do |config|
 
   # Use Tentant migrations directory?
   # Default is set to false
-  # config.use_tenanted_migrations_directory = false
+  config.use_tenanted_migrations_directory = true
 
   # Directory where shared migrations are stored. Please make
   # sure your migrations are present in this directory.
@@ -65,4 +65,7 @@ Roomer.setup do |config|
 
   # Filename to use for shared schema
   # config.shared_schema_filename = "shared_schema.rb"
+
+  # Safe to run on Heroku
+  # Roomer.heroku_safe = true
 end

data/lib/roomer.rb

@@ -92,13 +92,17 @@ module Roomer
   # This will be used only if use_tenanted_migration_directory is set to
   # true if not usual rails migraiton directory db/migrate will be used
   mattr_writer :tenanted_migrations_directory
-  @@tenanted_migrations_directory = File.join(migrations_directory,tenants_table.to_s)
+  @@tenanted_migrations_directory = File.join(migrations_directory, "tenanted")
 
 
   # Directory where shared migrations are stored.
   mattr_accessor :shared_migrations_directory
   @@shared_migrations_directory = File.join(migrations_directory,shared_schema_name.to_s)
 
+  # When set to true will not dump schema files
+  mattr_accessor :heroku_safe
+  @@heroku_safe = true
+
   # Fetches the migrations directory for Tenanted migrations. 
   # returns the standard rails migration directory "db/migrate" is the 
   # use_tenanted_migrations_directory is set to false

data/lib/roomer/extensions/controller.rb

@@ -20,6 +20,8 @@ module Roomer
       # Sets the current tenant, this method is set in the before_filter
       # @throws if tenant is not found
       def set_current_tenant!
+        return if Roomer.current_tenant.try(:url_identifier) == url_identifier
+
         # Raise an exception if the current tenant is blank
         raise "No tenant found for '#{url_identifier}' url identifier" if current_tenant.blank?
         Roomer.current_tenant = current_tenant

data/lib/roomer/extensions/model.rb

@@ -43,9 +43,29 @@ module Roomer
           roomer_set_table_name_prefix
           reset_table_name 
           reset_column_information
+          reset_associations
         end
 
         protected
+
+        # Resets cached data in associations
+        # Fixes bug that mixed table_name_prefix
+        # between tenants
+        def reset_associations
+          reflections.each_value do |r|
+            r.instance_variable_set(:@quoted_table_name, nil)
+            table_name = r.instance_variable_get(:@table_name)
+            if (table_name)
+              table_name = table_name.split(".").last
+              klass = r.class_name.constantize
+              schema_name = klass.tenanted? ? Roomer.current_tenant.schema_name.to_s : Roomer.shared_schema_name.to_s
+              table_name = "#{schema_name}#{Roomer.schema_seperator}#{table_name}"
+              r.instance_variable_set(:@table_name, table_name)
+              r.instance_variable_set(:@quoted_table_name, connection.quote_table_name(table_name))
+            end
+          end
+        end
+
         # Resolves the full table name prefix
         def roomer_full_table_name_prefix(schema_name)
           "#{schema_name.to_s}#{Roomer.schema_seperator}"

data/lib/roomer/helpers/postgres_helper.rb

@@ -75,10 +75,10 @@ module Roomer
       #      Person.find(1)  # => will execute "SELECT id FROM 'global.person' where 'id' = 1"
       #   end
       def ensure_prefix(prefix, &block)
-        @old_prefix = ActiveRecord::Base.table_name_prefix
+        old_prefix = ActiveRecord::Base.table_name_prefix
         ActiveRecord::Base.table_name_prefix = "#{prefix.to_s}#{Roomer.schema_seperator.to_s}"
         yield
-        ActiveRecord::Base.table_name_prefix = @old_prefix
+        ActiveRecord::Base.table_name_prefix = old_prefix
       end
 
       # Ensures schema_migrations table exists and creates otherwise
@@ -93,6 +93,15 @@ module Roomer
         ActiveRecord::Migrator.new(:up,Roomer.shared_migrations_directory)
       end
 
+      # Get view definitions for given schema
+      # @returns [Array] with all definitions for a given schema
+      def view_definitions(schema_name)
+        ActiveRecord::Base.connection.select_all(%{
+          SELECT definition 
+          FROM   pg_views
+          WHERE  schemaname = '#{schema_name}';
+        })
+      end
     end
   end
 end

data/lib/roomer/rails.rb

@@ -5,6 +5,7 @@ module Roomer
       # load model extensions
       ActiveSupport.on_load(:active_record) do
         include Roomer::Extensions::Model
+        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:include, Roomer::Helpers::PostgresHelper)
       end
 
       # load controller extensions

data/lib/roomer/schema.rb

@@ -19,22 +19,24 @@ module Roomer
     end
 
     def self.dump(scope=:tenanted)
-      case scope
-        when :shared
-          schema_name = Roomer.shared_schema_name.to_s
-          filename = Roomer.shared_schema_filename
-        when :tenanted
-          tenant = Tenant.first
-          return if tenant.blank?
+      unless Roomer.heroku_safe && ENV['HEROKU_UPID']
+        case scope
+          when :shared
+            schema_name = Roomer.shared_schema_name.to_s
+            filename = Roomer.shared_schema_filename
+          when :tenanted
+            tenant = Tenant.first
+            return if tenant.blank?
 
-          schema_name = Tenant.first.schema_name.to_s
-          filename = Roomer.tenanted_schema_filename
+            schema_name = Tenant.first.schema_name.to_s
+            filename = Roomer.tenanted_schema_filename
+        end
+        FileUtils.mkdir_p(Roomer.schemas_directory) unless File.exists?(Roomer.schemas_directory)
+        filepath = File.expand_path(File.join(Roomer.schemas_directory, filename))
+        ActiveRecord::Base.connection.schema_search_path = schema_name
+        ActiveRecord::Base.table_name_prefix = "#{schema_name}."
+        Roomer::SchemaDumper.dump(ActiveRecord::Base.connection, File.new(filepath, "w"))
       end
-      FileUtils.mkdir_p(Roomer.schemas_directory) unless File.exists?(Roomer.schemas_directory)
-      filepath = File.expand_path(File.join(Roomer.schemas_directory, filename))
-      ActiveRecord::Base.connection.schema_search_path = schema_name
-      ActiveRecord::Base.table_name_prefix = "#{schema_name}."
-      Roomer::SchemaDumper.dump(ActiveRecord::Base.connection, File.new(filepath, "w"))
     end
 
     def self.load(schema_name, scope=:tenanted)
@@ -61,11 +63,11 @@ module Roomer
 
     def self.current_schema
       ActiveRecord::Base.table_name_prefix.split('.').first
-    end 
+    end
 
     def self.current_tenant
       return nil if current_schema == Roomer.shared_schema_name.to_s
       Tenant.find_by_schema_name(current_schema)
-    end 
+    end
   end
 end

data/lib/roomer/schema_dumper.rb

@@ -1,6 +1,14 @@
 module Roomer
   class SchemaDumper < ActiveRecord::SchemaDumper
 
+    def dump(stream)
+      header(stream)
+      tables(stream)
+      views(stream)
+      trailer(stream)
+      stream
+    end 
+
     protected
     def header(stream)
       define_params = @version ? ":version => #{@version}" : ""
@@ -12,12 +20,48 @@ Roomer::Schema.define(#{define_params}) do
 HEADER
     end
 
+    def views(stream)
+      stream.puts <<VIEWS
+  # Database Views
+  # The following statements persist database views across tenants
+
+VIEWS
+      # Make sure search_path is public so schema name gets dumped 
+      # along with table names.
+      current_schema = @connection.schema_search_path
+      @connection.schema_search_path = "public"
+      views = @connection.select_all(%{
+        SELECT *
+        FROM   pg_views
+        WHERE  schemaname = '#{current_schema}';
+      })
+      # Reinstating previous search path to make sure nothing breaks
+      @connection.schema_search_path = current_schema
+      unless views.empty?
+        views.each do |view|
+          stream.puts <<VIEWS
+  execute("CREATE OR REPLACE VIEW \#{ActiveRecord::Base.table_name_prefix}#{view['viewname']} AS #{view['definition'].gsub(/#{current_schema}\./, '#{ActiveRecord::Base.table_name_prefix}')}")
+VIEWS
+        end
+      end 
+    end
+
+    def roomer_index_name(index_name)
+      sections = index_name.split(".")
+      if sections.length > 1
+        if sections[0].split("_")[0] == "index"
+          sections[0] = "index"
+        end
+      end
+      sections.join(".")
+    end
+
     def indexes(table, stream)
       if (indexes = @connection.indexes(table)).any?
         add_index_statements = indexes.map do |index|
           statement_parts = [ ('add_index ' + index.table.inspect) ]
           statement_parts << index.columns.inspect
-          statement_parts << (':name => "' + index.name + '"')
+          statement_parts << (':name => "' + roomer_index_name(index.name) + '"')
           statement_parts << ':unique => true' if index.unique
   
           index_lengths = index.lengths.compact if index.lengths.is_a?(Array)

data/lib/roomer/utils.rb

@@ -40,8 +40,11 @@ module Roomer
     # @return [Symbol] the current tenant key in the thread
     def current_tenant=(val)
       key = :"roomer_current_tenant"
-      Thread.current[key] = val
-      ensure_tenant_model_reset
+      unless  Thread.current[key].try(:url_identifier) == val.url_identifier
+        Thread.current[key] = val
+        ensure_tenant_model_reset
+      end
+      Thread.current[key]
     end
 
     # Fetches the current tenant
@@ -60,9 +63,19 @@ module Roomer
 
     # Reset cached data in tenanted models
     def ensure_tenant_model_reset
+      reset_models
+    end
+
+    protected
+
+    def reset_models
       ActiveRecord::Base.descendants.each do |model|
-        model.roomer_reset if model.tenanted?
+        model.roomer_reset
       end
     end
+
+    def clean_environment
+      ActionDispatch::Reloader.cleanup!
+    end
   end
 end

data/lib/roomer/version.rb

@@ -1,9 +1,9 @@
 module Roomer
   module VERSION # :nodoc:
     unless defined? MAJOR
-      MAJOR  = 0
+      MAJOR  = 1
       MINOR  = 0
-      TINY   = 11
+      TINY   = 0
       PRE    = nil
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/roomer.gemspec

@@ -10,13 +10,16 @@ Gem::Specification.new do |s|
   s.summary     = "Roomer is a multitenant framework for Rails using PostgreSQL"
   s.description = Roomer::VERSION::SUMMARY
 
-  s.authors     = ["Greg Osuri","Daniel Ceballos"]
-  s.email       = ["gosuri@gmail.com","dceballos@gmail.com"]
+  s.authors     = ["Greg Osuri", "Daniel Ceballos"]
+  s.email       = ["gosuri@gmail.com", "dceballos@gmail.com"]
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency  'rails','>= 3.0.9'
+  s.add_dependency 'rails' , '>= 3.0.9'
+  s.add_dependency 'pg'    , '>= 0.11.0'
+
+  s.add_development_dependency 'appraisal', '~> 0.4.1'
 end

data/test/config.rb

@@ -1,3 +1,3 @@
-require 
+require
 TEST_ROOT = File.expand_path(File.dirname(__FILE__))
 

data/test/config.yml

@@ -1,7 +1,6 @@
+# TODO: Remove this file, currently unused
 postgresql: &postgresql
   adapter:  postgresql
   encoding: unicode
   database: roomer_test
   username: postgres
-
-

data/test/generators/migration_generator_test.rb

@@ -23,7 +23,7 @@ class MigrationGeneratorTest < Rails::Generators::TestCase
   test "create migration for a tenanted model in tenant dir" do
     Roomer.use_tenanted_migrations_directory = true
     run_generator %w(add_tenant_bar_to_foos bar:string)
-    assert_migration "db/migrate/tenants/roomer_add_tenant_bar_to_foos.rb"
+    assert_migration "db/migrate/tenanted/roomer_add_tenant_bar_to_foos.rb"
   end
 
   test "create migration for shared model" do

data/test/rails_app/config/database.yml

@@ -1,2 +1,5 @@
-<%= IO.read(File.expand_path("test/config.yml")) %>
-test: *postgresql
+test:
+  adapter:  postgresql
+  encoding: unicode
+  database: roomer_test
+  username: <%= ENV['PG_USER'] || ENV['USER'] %>

data/test/roomer/helpers/postgres_helper_test.rb

@@ -16,7 +16,7 @@ class PostgresHelperTest < ActiveSupport::TestCase
     assert_nothing_raised { create_schema("old_test_schema") }
     assert schemas.include? "old_test_schema"
     assert_nothing_raised { drop_schema("old_test_schema") }
-    assert (! schemas.include?("old_test_schema"))
+    assert !(schemas.include?("old_test_schema"))
   end
 
   test 'ensure prefix' do
@@ -27,7 +27,7 @@ class PostgresHelperTest < ActiveSupport::TestCase
     assert_equal ActiveRecord::Base.table_name_prefix, "old_prefix_"
   end
 
-  test'ensure schema migrations' do
+  test 'ensure schema migrations' do
     create_schema("test_schema")
     ensure_prefix(:test_schema) do
       ensure_schema_migrations
@@ -41,7 +41,7 @@ class PostgresHelperTest < ActiveSupport::TestCase
     end
 
     assert_nothing_raised do
-      assert (! schemas.include?("new_tenant"))
+      assert !(schemas.include?("new_tenant"))
       ensuring_schema(:new_tenant) do
         assert schemas.include? "new_tenant"
         assert_equal ActiveRecord::Base.table_name_prefix, "new_tenant."

data/test/roomer/roomer_test.rb

@@ -11,27 +11,9 @@ class RoomerTest < ActiveSupport::TestCase
   test 'return migrations directory' do
     assert_equal Roomer.tenanted_migrations_directory, "db/migrate"
     Roomer.use_tenanted_migrations_directory = true
-    assert_equal Roomer.tenanted_migrations_directory, "db/migrate/tenants"
+    assert_equal Roomer.tenanted_migrations_directory, "db/migrate/tenanted"
   end
 
-
   test 'set the current tenant' do
-    tenant1 = mock()
-    tenant2 = mock()
-
-    assert_not_equal(tenant1,tenant2)
-
-    thread1 = Thread.new do
-      Roomer.current_tenant = tenant1
-      sleep 1
-      assert_equal(Roomer.current_tenant,tenant1)
-    end
-
-    thread2 = Thread.new do
-      Roomer.current_tenant = tenant2
-      assert_equal(Roomer.current_tenant,tenant2)
-    end
-
-    thread2.join
   end
 end

data/test/test_helper.rb

@@ -1,4 +1,3 @@
-
 # FIXME Remove Postgres Server Hard dependency
 
 ENV["RAILS_ENV"] = "test"
@@ -7,17 +6,5 @@ require "roomer"
 require "rails_app/config/environment"
 require "rails/test_help"
 
-require 'mocha'
-#require 'webrat'
-#Webrat.configure do |config|
-#  config.mode = :rails
-#  config.open_error_files = false
-#end
-
-# Add support to load paths so we can overwrite broken webrat setup
-#$:.unshift File.expand_path('../support', __FILE__)
-#Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
 # For generators
 require "rails/generators/test_case"
-

metadata

@@ -1,54 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: roomer
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 11
-  version: 0.0.11
 platform: ruby
-authors: 
+authors:
 - Greg Osuri
 - Daniel Ceballos
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.9
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 0
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.9
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
   type: :runtime
-  version_requirements: *id001
-description: roomer 0.0.11
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+description: roomer 1.0.0
+email:
 - gosuri@gmail.com
 - dceballos@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
 - .gitignore
-- .rvmrc
 - .travis.yml
+- Appraisals
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -78,6 +101,12 @@ files:
 - doc/js/jquery.js
 - doc/method_list.html
 - doc/top-level-namespace.html
+- gemfiles/rails3.gemfile
+- gemfiles/rails3.gemfile.lock
+- gemfiles/rails31.gemfile
+- gemfiles/rails31.gemfile.lock
+- gemfiles/rails32.gemfile
+- gemfiles/rails32.gemfile.lock
 - lib/generators/roomer/install/install_generator.rb
 - lib/generators/roomer/install/templates/README
 - lib/generators/roomer/install/templates/roomer.rb
@@ -148,38 +177,35 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/gosuri/roomer
 licenses: []
-
 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: 2764573444954838764
+required_rubygems_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"
+      hash: 2764573444954838764
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Roomer is a multitenant framework for Rails using PostgreSQL
-test_files: 
+test_files:
 - test/config.rb
 - test/config.yml
 - test/generators/install_generator_test.rb

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm ruby-1.8.7-p334@roomer --create
-echo "commencing countdown, engines on!"