multiverse 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efd32f0437186abbe23bde74a36c059124592e49
-  data.tar.gz: 848d77b215192dd19f7a5091225120fdfe7cba1b
+  metadata.gz: ce5783babc9113d0316026b66a1422a96197a3a6
+  data.tar.gz: 61c98174e4f294ec7b06153f5317d698c150b574
 SHA512:
-  metadata.gz: c2080ba271e93150ddc91d790a109ced1258c1fea53a948f8a2661ef9e89ba34d05d1d081153793c10d1cd246b30ee6da15924d7cdf6fba1f4df5776ade9cd32
-  data.tar.gz: ecfc897bedd8b7ccfc2e914db917f783b60256636c0aac57eae7f6e27152d94b96fd743b6b242470e4eaf29696ad86b0f97bbd16c55460361a112e17836bf85b
+  metadata.gz: 7fb064da5869d11381bed4badda210c0ea09eedde16a70ce1bae61a44f5f68fd34ecae1144cd6a9a6e5a10e5196b90fa3b5f541da5cbe21f75958579b1e9ad6a
+  data.tar.gz: b5756f721abc0b70b68c2aef1251ec7bdb6449c0dacee2cf005c891eb2602aa8e975a0e9b892a7b953544d47d4846a1cd2e38f86b5853eb655a7379319cf8836

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm: 2.4.2
+gemfile:
+  - Gemfile
+sudo: false
+before_install: gem install bundler
+script: bundle exec rake test
+notifications:
+  email:
+    on_success: never
+    on_failure: change
+env:
+  - RAILS_VERSION=5.1.4 RAILS_ENV=development
+  - RAILS_VERSION=5.0.6 RAILS_ENV=development

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.0.2
+
+- Better configuration for SQLite
+- Fixed issues with `db:schema:load` and `db:test:prepare`
+
 ## 0.0.1
 
 - First release

data/README.md

@@ -24,7 +24,7 @@ rails generate multiverse:db catalog
 
 This generates `CatalogRecord` class for models to inherit from and adds configuration to `config/database.yml`. It also creates a `db/catalog` directory for migrations and `schema.rb` to live.
 
-`rails` and `rake` commands will run for the original database by default. To run commands for the new database, use the `DB` environment variable. For instance:
+`rails` and `rake` commands run for the original database by default. To run commands for the new database, use the `DB` environment variable. For instance:
 
 Create the database
 
@@ -65,34 +65,30 @@ class Product < CatalogRecord
 end
 ```
 
-## Seeds
-
-Use `db/seeds.rb` for all databases
-
 ## Web Servers
 
+For web servers that fork, be sure to reconnect after forking (just like you do with `ActiveRecord::Base`)
+
 ### Puma
 
-Add to `config/puma.rb`
+In `config/puma.rb`, add inside the `on_worker_boot` block
 
 ```ruby
-on_worker_boot do
-  CatalogRecord.establish_connection :"catalog_#{Rails.env}"
-end
+CatalogRecord.establish_connection :"catalog_#{Rails.env}"
 ```
 
 ### Unicorn
 
-Add to `config/unicorn.rb`
+In `config/unicorn.rb`, add inside the `before_fork` block
 
 ```ruby
-before_fork do |server, worker|
-  CatalogRecord.connection.disconnect!
-end
+CatalogRecord.connection.disconnect!
+```
 
-after_fork do |server, worker|
-  CatalogRecord.establish_connection :"catalog_#{Rails.env}"
-end
+And inside the `after_fork` block
+
+```ruby
+CatalogRecord.establish_connection :"catalog_#{Rails.env}"
 ```
 
 ## History

data/lib/generators/multiverse/db_generator.rb

@@ -12,19 +12,30 @@ module Multiverse
 
         template "record.rb", "app/models/#{lower_name}_record.rb"
 
+        case ActiveRecord::Base.connection_config[:adapter]
+        when "sqlite3"
+          development_conf = "database: db/#{lower_name}_development.sqlite3"
+          test_conf = "database: db/#{lower_name}_test.sqlite3"
+          production_conf = "database: db/#{lower_name}_production.sqlite3"
+        else
+          development_conf = "database: #{lower_name}_development"
+          test_conf = "database: #{lower_name}_development"
+          production_conf = "url: <%= ENV['#{lower_name.upcase}_DATABASE_URL'] %>"
+        end
+
         append_to_file "config/database.yml" do
           "
 #{name}_development:
   <<: *default
-  database: #{lower_name}_development
+  #{development_conf}
 
 #{name}_test:
   <<: *default
-  database: #{lower_name}_test
+  #{test_conf}
 
 #{name}_production:
   <<: *default
-  url: <%= ENV['#{lower_name.upcase}_DATABASE_URL'] %>
+  #{production_conf}
 "
         end
 

data/lib/multiverse.rb

@@ -30,12 +30,16 @@ module Multiverse
     def migrate_path
       "#{db_dir}/migrate"
     end
+
+    def env(environment)
+      db ? "#{db}_#{environment}" : environment
+    end
   end
 end
 
 ActiveSupport.on_load(:active_record) do
   ActiveRecord::Tasks::DatabaseTasks.singleton_class.prepend Multiverse::DatabaseTasks
   ActiveRecord::Migration.prepend Multiverse::Migration
-  ActiveRecord::SchemaMigration.singleton_class.prepend Multiverse::SchemaMigration
+  ActiveRecord::Migrator.prepend Multiverse::Migrator
   ActiveRecord::SchemaDumper.singleton_class.prepend Multiverse::SchemaDumper
 end

data/lib/multiverse/patches.rb

@@ -1,15 +1,11 @@
 module Multiverse
   module DatabaseTasks
     def each_current_configuration(environment)
-      if Multiverse.db
-        environments = ["#{Multiverse.db}_#{environment}"]
-        environments << "#{Multiverse.db}_test" if environment == "development"
-        self.migrations_paths = Multiverse.migrate_path
-        self.db_dir = Multiverse.db_dir
-      else
-        environments = [environment]
-        environments << "test" if environment == "development"
-      end
+      environments = [Multiverse.env(environment)]
+      environments << Multiverse.env("test") if environment == "development"
+
+      self.migrations_paths = Multiverse.migrate_path
+      self.db_dir = Multiverse.db_dir
 
       configurations = ActiveRecord::Base.configurations.values_at(*environments)
       configurations.compact.each do |configuration|
@@ -18,11 +14,23 @@ module Multiverse
     end
   end
 
-  module Migration
-    def connection
-      @connection || Multiverse.record_class.connection
+  module Migrator
+    def initialize(*_)
+      puts "Migrator#initialize"
+      # ActiveRecord::Migration#initialize calls
+      # ActiveRecord::SchemaMigration.create_table
+      # ActiveRecord::InternalMetadata.create_table
+      # which both inherit from ActiveRecord::Base
+      #
+      # We need to change this for migrations
+      # but not for db:schema:load (messes up multiverse test env otherwise)
+      ActiveRecord::SchemaMigration.singleton_class.prepend(Multiverse::Connection)
+      ActiveRecord::InternalMetadata.singleton_class.prepend(Multiverse::Connection)
+      super
     end
+  end
 
+  module Migration
     # TODO don't checkout main connection at all
     def exec_migration(_, direction)
       Multiverse.record_class.connection_pool.with_connection do |conn|
@@ -31,7 +39,7 @@ module Multiverse
     end
   end
 
-  module SchemaMigration
+  module Connection
     def connection
       Multiverse.record_class.connection
     end

data/lib/multiverse/railtie.rb

@@ -16,6 +16,12 @@ module Multiverse
           ActiveRecord::Tasks::DatabaseTasks.migrations_paths = [Multiverse.migrate_path]
           ActiveRecord::Tasks::DatabaseTasks.db_dir = [Multiverse.db_dir]
         end
+
+        namespace :test do
+          task purge: %w(environment load_config check_protected_environments) do
+            ActiveRecord::Tasks::DatabaseTasks.purge ActiveRecord::Base.configurations[Multiverse.env("test")]
+          end
+        end
       end
     end
   end

data/lib/multiverse/version.rb

@@ -1,3 +1,3 @@
 module Multiverse
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/multiverse.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "sqlite3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multiverse
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Kane
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - andrew@chartkick.com
@@ -74,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt