apartment 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7511a4af17aae3dc546bb1c76342c5b8301829c6
-  data.tar.gz: 819a8d11d7cf74fea4d67d9d7c364c92f6bf8aeb
+  metadata.gz: 03f280f5d2148e5b660dde41e23369489468087a
+  data.tar.gz: ade6d3c1bb87c88bd9d2c5068cd6c569d9c02a46
 SHA512:
-  metadata.gz: 67dbe1ad054395e0466e785b9c3d81d17b7ff97147a2e04f76b1af951a806045bd774e6a9cf4c372860389d9b63919cb22d742c6165b1d25bbe60505a1b41d9d
-  data.tar.gz: 4fd680bc07c8e12f5a88fc143a1a26c09c289b6ae9c3a96296b5d3b48137cfd680132a6aa2b1ac28e3316d9350dae1fe43c9c718b49088cdf1ff18366dfafee6
+  metadata.gz: 380c40d97af604ca13f4f2be3cee4acf8f204608ca1591e1108486da41601f64221efb7191982bb0bbcd5ffc6e68dcdf4eb4c3eec0c57984423e2e647967651c
+  data.tar.gz: 54ee70f9434af342864877bdebb7f20679593b3c0041bda6c50ea7717cf444fc55de78e126e94f2cdd57379fb315d5b41c14bc5a9a4f0608021cd85318ec2ab1

data/HISTORY.md

@@ -1,3 +1,8 @@
+# 0.25.0
+  * July 17, 2014
+
+  - Fixed a few vestiges of Apartment::Database
+
 # 0.25.0
   * July 3, 2014
 

data/README.md

@@ -253,7 +253,15 @@ schema_search_path: "public,shared_extensions"
 ...
 ```
 
-This would be for a config with `default_schema` set to `public` and `persistent_schemas` set to `['shared_extensions']`. **Note**: This only works on Heroku with [Rails 4.1+](https://devcenter.heroku.com/changelog-items/427). For older Rails versions Heroku regenerates a completely different `database.yml` for each deploy and your predefined `schema_search_path` will be deleted. ActiveRecord's `schema_search_path` will be the default `\"$user\",public`.
+This would be for a config with `default_schema` set to `public` and `persistent_schemas` set to `['shared_extensions']`. **Note**: This only works on Heroku with [Rails 4.1+](https://devcenter.heroku.com/changelog-items/427). For apps that use older Rails versions hosted on Heroku, the only way to properly setup is to start with a fresh PostgreSQL instance:
+
+1. Append `?schema_search_path=public,hstore` to your `DATABASE_URL` environment variable, by this you don't have to revise the `database.yml` file (which is impossible since Heroku regenerates a completely different and immutable `database.yml` of its own on each deploy)
+2. Run `heroku pg:psql` from your command line
+3. And then `DROP EXTENSION hstore;` (**Note:** This will drop all columns that use `hstore` type, so proceed with caution; only do this with a fresh PostgreSQL instance)
+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`
 
 #### 3. Ensure the schema is in the apartment config
 ```ruby

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -148,8 +148,6 @@ module Apartment
       #   @return {String} raw SQL contaning only postgres schema dump
       #
       def pg_dump_schema
-        dbname = ActiveRecord::Base.connection_config[:database]
-        default_schema = Apartment.default_schema
 
         # Skip excluded tables? :/
         # excluded_tables =
@@ -167,7 +165,7 @@ 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 #{Apartment.default_schema} bithub_development`
+        `pg_dump -a --inserts -t schema_migrations -n #{default_schema} #{dbname}`
       end
 
       #   Remove "SET search_path ..." line from SQL dump and prepend search_path set to current tenant
@@ -198,6 +196,18 @@ module Apartment
         end
       end
 
+      # Convenience method for current database name
+      #
+      def dbname 
+        ActiveRecord::Base.connection_config[:database]
+      end
+
+      # Convenience method for the default schema
+      #
+      def default_schema 
+        Apartment.default_schema
+      end
+
     end
 
 

data/lib/apartment/migrator.rb

@@ -7,7 +7,7 @@ module Apartment
 
     # Migrate to latest
     def migrate(database)
-      Database.process(database) do
+      Tenant.process(database) do
         version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
 
         ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, version) do |migration|
@@ -18,14 +18,14 @@ module Apartment
 
     # Migrate up/down to a specific version
     def run(direction, database, version)
-      Database.process(database) do
+      Tenant.process(database) do
         ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_paths, version)
       end
     end
 
     # rollback latest migration `step` number of times
     def rollback(database, step = 1)
-      Database.process(database) do
+      Tenant.process(database) do
         ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
       end
     end

data/lib/apartment/reloader.rb

@@ -14,8 +14,8 @@ module Apartment
     end
 
     def call(env)
-      Database.init
+      Tenant.init
       @app.call(env)
     end
   end
-end
+end

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.25.0"
+  VERSION = "0.25.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apartment
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Ryan Brunner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord