multiverse 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f4569d0c19e94ae2656d0b6bf1b83023c28a96d1
-  data.tar.gz: 696ab1dfa89bdffdfb4af49e2d6d7ac02f7a56ea
+SHA256:
+  metadata.gz: 365e44dc02e354cb81a8d5e8962c51ec0873e208e35be402d24ce5826aee5a54
+  data.tar.gz: 262ca4346fcb9a9800cc5d8016860f64d9e88f0318cdde986626a09310a9a783
 SHA512:
-  metadata.gz: ed54801e4b6ed8992884635bcf5f638cd0c1b7140fc852e062b54290ab0af49b32d5a7c3ef6ea5fdc4706e7a20ccd7e08cea63a9906ba39c3486e0e20edc7357
-  data.tar.gz: a496c9ecbf793d6ee89b79df65b89d50a4ca8b818f79fad7eff152c60397347dec5df38561ae15cee7efe5c6a6751616682fb2f2410bfacce0d9c36926d609cd
+  metadata.gz: aa190b450724f9aa7d2c0fbe21618eb2fe8acb4169886129a018a1d20bf2e888884f33d604cff01c9d60c0599f6c33453a900eb2e81067a3d7788ea904183819
+  data.tar.gz: dde00c42005d41c515d0519719c7287d7bdd74fdbe66244167d772096928193a2d3cef51b057ba2af8695e00de8f98e6754784a1397ebb9448e0044c1e958738

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-rvm: 2.4.2
+rvm: 2.5.1
 gemfile:
   - Gemfile
 sudo: false
@@ -13,7 +13,8 @@ notifications:
     on_success: never
     on_failure: change
 env:
-  - RAILS_VERSION=5.2.0.rc1
-  - RAILS_VERSION=5.1.4
-  - RAILS_VERSION=5.0.6
+  - RAILS_VERSION=5.2.1
+  - RAILS_VERSION=5.2.1 API=t
+  - RAILS_VERSION=5.1.6
+  - RAILS_VERSION=5.0.7
   - RAILS_VERSION=4.2.10

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.1
+
+- Added support for `config.paths["db"]`
+- Fixed migration generation when DB specified for Rails < 5.0.2
+- Fixed Rails API
+
 ## 0.2.0
 
 - Added support for Rails 4.2

data/README.md

@@ -33,7 +33,7 @@ This creates a `CatalogRecord` class for models to inherit from and adds configu
 Create the database
 
 ```sh
-DB=catalog rake db:create
+DB=catalog rails db:create
 ```
 
 Create a migration
@@ -45,13 +45,13 @@ DB=catalog rails generate migration add_name_to_products
 Run migrations
 
 ```sh
-DB=catalog rake db:migrate
+DB=catalog rails db:migrate
 ```
 
 Rollback
 
 ```sh
-DB=catalog rake db:rollback
+DB=catalog rails db:rollback
 ```
 
 ## Models

data/lib/multiverse.rb

@@ -11,19 +11,13 @@ module Multiverse
     end
 
     def db_dir
-      db_dir = db ? "db/#{db}" : "db"
-      abort "Unknown DB: #{db}" if db && !Dir.exist?(db_dir)
+      db_dir = "#{Rails.application.config.paths["db"].first}/#{db}"
+      abort "Unknown DB: #{db}" unless Dir.exist?(db_dir)
       db_dir
     end
 
     def parent_class_name
-      if db
-        "#{db.camelize}Record"
-      elsif ActiveRecord::VERSION::MAJOR >= 5
-        "ApplicationRecord"
-      else
-        "ActiveRecord::Base"
-      end
+      "#{db.camelize}Record"
     end
 
     def migrate_path

data/lib/multiverse/generators.rb

@@ -2,19 +2,23 @@ module Multiverse
   module Generators
     module ModelGenerator
       def parent_class_name
-        Multiverse.parent_class_name
+        Multiverse.db ? Multiverse.parent_class_name : super
       end
     end
 
     module Migration
       def db_migrate_path
-        Multiverse.migrate_path
+        Multiverse.db ? Multiverse.migrate_path : super
       end
     end
 
     module MigrationTemplate
       def migration_template(source, destination, config = {})
-        super(source, destination.sub("db/migrate", Multiverse.migrate_path), config)
+        if Multiverse.db
+          super(source, destination.sub("db/migrate", Multiverse.migrate_path), config)
+        else
+          super
+        end
       end
     end
   end

data/lib/multiverse/railtie.rb

@@ -3,23 +3,21 @@ require "rails/railtie"
 module Multiverse
   class Railtie < Rails::Railtie
     generators do
-      if ActiveRecord::VERSION::MAJOR >= 5
-        require "rails/generators/active_record/migration"
-        ActiveRecord::Generators::Migration.prepend(Multiverse::Generators::Migration)
-      else
-        require "rails/generators/migration"
-        Rails::Generators::Migration.prepend(Multiverse::Generators::MigrationTemplate)
-      end
-
-      require "rails/generators/active_record/model/model_generator"
-      ActiveRecord::Generators::ModelGenerator.prepend(Multiverse::Generators::ModelGenerator)
+      ActiveSupport.on_load(:active_record) do
+        if ActiveRecord::VERSION::MAJOR >= 5
+          require "rails/generators/active_record/migration"
+          ActiveRecord::Generators::Migration.prepend(Multiverse::Generators::Migration)
+        else
+          require "rails/generators/migration"
+          Rails::Generators::Migration.prepend(Multiverse::Generators::MigrationTemplate)
+        end
 
-      # for Rails < 5.0.3, need to patch db_migrate_path in model and migration generator
-      if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord.version < Gem::Version.new("5.0.3")
-        ActiveRecord::Generators::ModelGenerator.prepend(Multiverse::Generators::Migration)
+        require "rails/generators/active_record/model/model_generator"
+        ActiveRecord::Generators::ModelGenerator.prepend(Multiverse::Generators::ModelGenerator)
+        ActiveRecord::Generators::ModelGenerator.prepend(Multiverse::Generators::MigrationTemplate)
 
         require "rails/generators/active_record/migration/migration_generator"
-        ActiveRecord::Generators::MigrationGenerator.prepend(Multiverse::Generators::Migration)
+        ActiveRecord::Generators::MigrationGenerator.prepend(Multiverse::Generators::MigrationTemplate)
       end
     end
 

data/lib/multiverse/version.rb

@@ -1,3 +1,3 @@
 module Multiverse
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiverse
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -123,7 +123,7 @@ files:
 - README.md
 - Rakefile
 - lib/generators/multiverse/db_generator.rb
-- lib/generators/multiverse/templates/record.rb
+- lib/generators/multiverse/templates/record.rb.tt
 - lib/multiverse.rb
 - lib/multiverse/generators.rb
 - lib/multiverse/railtie.rb
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Multiple databases for Rails