apartment 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25a8f63a3b5e73c32fde8b9aa28f45dabaa44008
-  data.tar.gz: 789fc81fa177f663c4c78e3f46f492f0a55b60f9
+  metadata.gz: 9cdae6ddf14e715ae80d9c932ca1d6425e6f56e1
+  data.tar.gz: 8162a81d9eb38bf3992314a4d6fddad14bbc55a8
 SHA512:
-  metadata.gz: 1af4150a26a832f33b80ab5099e4d625275861d2ed9815418a6243ec4c05e48b1d7abd85e12f750073d1f0753c5421b86c2f6fb5f4504e0d12ea934ca20ad1a8
-  data.tar.gz: 37cb6bc1da7d8bff326b11013e9bc789a1c0d265f255f1753094a560719ddbabc91ffd48b8afb77c5985bcc658ef1e7ce8f644c592113212ea4ef47b96865056
+  metadata.gz: 8683c9692ee16ece0b1876937e2ad79d25c057106c1f750e077386f5c0d04e822b5318baf250b10bcb0f9918bbddabdde6a53aaddd9637e9de0ccb9f33748208
+  data.tar.gz: b76295e730aa02ac1f5a89b53459fed7499f70821bc0292321d2b2f7dc8fc036dc441995a25334f8207519102f5375063f6b99099902713db2c935f241e98238

data/.gitignore

@@ -11,3 +11,4 @@ spec/dummy/config/database.yml
 cookbooks
 tmp
 spec/dummy/db/*.sqlite3
+.DS_Store

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1
+ruby-2.2

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 1.0.2
+  * July 2, 2015
+
+  - Fix pg_dump env vars - pull/208 [MitinPavel]
+  - Allow custom seed data file - pull/234 [typeoneerror]
+
 # 1.0.1
   * April 28, 2015
 

data/README.md

@@ -8,6 +8,19 @@ Apartment provides tools to help you deal with multiple tenants in your Rails
 application. If you need to have certain data sequestered based on account or company,
 but still allow some data to exist in a common tenant, Apartment can help.
 
+## Excessive Memory Issues on ActiveRecord 4.x
+
+> If you're noticing ever growing memory issues (ie growing with each tenant you add)
+> when using Apartment, that's because there's [an issue](https://github.com/rails/rails/issues/19578)
+> with how ActiveRecord maps Postgresql data types into AR data types.
+> This has been patched and will be release for AR 4.2.2. It's apparently hard
+> to backport to 4.1 unfortunately.
+> If you want to use this today, you can use our [4.2.1 patched version](https://github.com/influitive/rails/tree/v4.2.1.memfix) on our github account using the code sample below.
+
+```ruby
+gem 'rails', '4.2.1', github: 'influitive/rails', tag: 'v4.2.1.memfix'
+```
+
 
 ## Installation
 
@@ -36,6 +49,9 @@ on a per-user basis, look under "Usage - Switching tenants per request", below.
 > * for Rails 3.1.x: _Rails ~> 3.1.2_, it contains a [patch](https://github.com/rails/rails/pull/3232) that makes prepared statements work with multiple schemas
 
 ## Usage
+### Video Tutorial
+How to separate your application data into different accounts or companies.
+[GoRails #47](https://gorails.com/episodes/multitenancy-with-apartment)
 
 ### Creating new Tenants
 
@@ -284,7 +300,7 @@ This would be for a config with `default_schema` set to `public` and `persistent
 4. Next: `CREATE SCHEMA IF NOT EXISTS hstore;`
 5. Finally: `CREATE EXTENSION IF NOT EXISTS hstore SCHEMA hstore;` and hit enter (`\q` to exit)
 
-To double check, login to the console of your Heroku app and see if `Apartment.connection.default_search_path` is `public,hstore`
+To double check, login to the console of your Heroku app and see if `Apartment.connection.schema_search_path` is `public,hstore`
 
 #### 3. Ensure the schema is in the apartment config
 ```ruby
@@ -326,7 +342,7 @@ config.use_sql = true
 
 ### Managing Migrations
 
-In order to migrate all of your tenants (or posgresql schemas) you need to provide a list
+In order to migrate all of your tenants (or postgresql schemas) you need to provide a list
 of dbs to Apartment.  You can make this dynamic by providing a Proc object to be called on migrations.
 This object should yield an array of string representing each tenant name.  Example:
 
@@ -378,3 +394,5 @@ config.prepend_environment = !Rails.env.production?
 ## License
 
 Apartment is released under the [MIT License](http://www.opensource.org/licenses/MIT).
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/influitive/apartment/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/lib/apartment.rb

@@ -12,7 +12,7 @@ module Apartment
     extend Forwardable
 
     ACCESSOR_METHODS  = [:use_schemas, :use_sql, :seed_after_create, :prepend_environment, :append_environment]
-    WRITER_METHODS    = [:tenant_names, :database_schema_file, :excluded_models, :default_schema, :persistent_schemas, :connection_class, :tld_length, :db_migrate_tenants]
+    WRITER_METHODS    = [:tenant_names, :database_schema_file, :excluded_models, :default_schema, :persistent_schemas, :connection_class, :tld_length, :db_migrate_tenants, :seed_data_file]
 
     attr_accessor(*ACCESSOR_METHODS)
     attr_writer(*WRITER_METHODS)
@@ -62,6 +62,12 @@ module Apartment
       @database_schema_file = Rails.root.join('db', 'schema.rb')
     end
 
+    def seed_data_file
+      return @seed_data_file if defined?(@seed_data_file)
+
+      @seed_data_file = "#{Rails.root}/db/seeds.rb"
+    end
+
     def tld_length
       @tld_length || 1
     end

data/lib/apartment/adapters/abstract_adapter.rb

@@ -138,7 +138,8 @@ module Apartment
       #   Load the rails seed file into the db
       #
       def seed_data
-        silence_stream(STDOUT){ load_or_abort("#{Rails.root}/db/seeds.rb") } # Don't log the output of seeding the db
+        # Don't log the output of seeding the db
+        silence_stream(STDOUT){ load_or_abort(Apartment.seed_data_file) } if Apartment.seed_data_file
       end
       alias_method :seed, :seed_data
 

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -157,7 +157,7 @@ module Apartment
 
         # `pg_dump -s -x -O -n #{default_tenant} #{excluded_tables} #{dbname}`
 
-        `pg_dump -s -x -O -n #{default_tenant} #{dbname}`
+        with_pg_env { `pg_dump -s -x -O -n #{default_tenant} #{dbname}` }
       end
 
       #   Dump data from schema_migrations table
@@ -165,7 +165,22 @@ module Apartment
       #   @return {String} raw SQL contaning inserts with data from schema_migrations
       #
       def pg_dump_schema_migrations_data
-        `pg_dump -a --inserts -t schema_migrations -n #{default_tenant} #{dbname}`
+        with_pg_env { `pg_dump -a --inserts -t schema_migrations -n #{default_tenant} #{dbname}` }
+      end
+
+      # Temporary set Postgresql related environment variables if there are in @config
+      #
+      def with_pg_env(&block)
+        pghost, pgport, pguser, pgpassword =  ENV['PGHOST'], ENV['PGPORT'], ENV['PGUSER'], ENV['PGPASSWORD']
+
+        ENV['PGHOST'] = @config[:host] if @config[:host]
+        ENV['PGPORT'] = @config[:port].to_s if @config[:port]
+        ENV['PGUSER'] = @config[:username].to_s if @config[:username]
+        ENV['PGPASSWORD'] = @config[:password].to_s if @config[:password]
+
+        block.call
+      ensure
+        ENV['PGHOST'], ENV['PGPORT'], ENV['PGUSER'], ENV['PGPASSWORD'] = pghost, pgport, pguser, pgpassword
       end
 
       #   Remove "SET search_path ..." line from SQL dump and prepend search_path set to current tenant

data/lib/apartment/tenant.rb

@@ -9,14 +9,14 @@ module Apartment
     extend self
     extend Forwardable
 
-    def_delegators :adapter, :create, :current_tenant, :current, :current_database, :default_tenant, :drop, :switch, :process_excluded_models, :reset, :seed, :switch!
+    def_delegators :adapter, :create, :drop, :switch, :switch!, :current, :each, :reset, :seed, :current_tenant, :default_tenant
 
     attr_writer :config
 
     #   Initialize Apartment config options such as excluded_models
     #
     def init
-      process_excluded_models
+      adapter.process_excluded_models
     end
 
     #   Fetch the proper multi-tenant adapter based on Rails config

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/dummy/db/seeds/import.rb

@@ -0,0 +1,5 @@
+def create_users
+  6.times {|x| User.where(name: "Different User #{x}").first_or_create! }
+end
+
+create_users

data/spec/tenant_spec.rb

@@ -150,5 +150,34 @@ describe Apartment::Tenant do
         end
       end
     end
+
+    context "seed paths" do
+      before do
+        Apartment.configure do |config|
+          config.excluded_models = []
+          config.use_schemas = true
+          config.seed_after_create = true
+        end
+      end
+
+      after{ subject.drop db1 }
+
+      it 'should seed from default path' do
+        subject.create db1
+        subject.switch! db1
+        User.count.should eq(3)
+        User.first.name.should eq('Some User 0')
+      end
+
+      it 'should seed from custom path' do
+        Apartment.configure do |config|
+          config.seed_data_file = "#{Rails.root}/db/seeds/import.rb"
+        end
+        subject.create db1
+        subject.switch! db1
+        User.count.should eq(6)
+        User.first.name.should eq('Different User 0')
+      end
+    end
   end
 end

data/spec/unit/config_spec.rb

@@ -5,6 +5,7 @@ describe Apartment do
   describe "#config" do
 
     let(:excluded_models){ ["Company"] }
+    let(:seed_data_file_path){ "#{Rails.root}/db/seeds/import.rb" }
 
     it "should yield the Apartment object" do
       Apartment.configure do |config|
@@ -28,6 +29,13 @@ describe Apartment do
       Apartment.use_schemas.should be false
     end
 
+    it "should set seed_data_file" do
+      Apartment.configure do |config|
+        config.seed_data_file = seed_data_file_path
+      end
+      Apartment.seed_data_file.should eq(seed_data_file_path)
+    end
+
     it "should set seed_after_create" do
       Apartment.configure do |config|
         config.excluded_models = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ryan Brunner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -244,6 +244,7 @@ files:
 - spec/dummy/db/migrate/20111202022214_create_table_books.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
+- spec/dummy/db/seeds/import.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -339,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for managing database multitenancy
@@ -378,6 +379,7 @@ test_files:
 - spec/dummy/db/migrate/20111202022214_create_table_books.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
+- spec/dummy/db/seeds/import.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html