multiverse 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eea234fa322f20367a744c695ef78e2bbfa2ebf
-  data.tar.gz: 76c3dae97ada18e90a1b65cdfc6ed0a5cfd86444
+  metadata.gz: f4569d0c19e94ae2656d0b6bf1b83023c28a96d1
+  data.tar.gz: 696ab1dfa89bdffdfb4af49e2d6d7ac02f7a56ea
 SHA512:
-  metadata.gz: 4b33ae3a1ba4916c3fb3a43b6f4318e90f253ddcfab2303ad8d184d7e9a192dfcd0e8bbd24138b66c994f76cb97b5aa39a57c2abb78cc346a3e38d17e3d457f4
-  data.tar.gz: 8ccdc35fa5cc7d4f618923e0d80a1f1194b221bc853bd07b208419ba1db82d8d0b38f7c3df5455fdcd543c35f3db62c6d15d94591062a2e46cfbcde8ac7ed2a5
+  metadata.gz: ed54801e4b6ed8992884635bcf5f638cd0c1b7140fc852e062b54290ab0af49b32d5a7c3ef6ea5fdc4706e7a20ccd7e08cea63a9906ba39c3486e0e20edc7357
+  data.tar.gz: a496c9ecbf793d6ee89b79df65b89d50a4ca8b818f79fad7eff152c60397347dec5df38561ae15cee7efe5c6a6751616682fb2f2410bfacce0d9c36926d609cd

data/.travis.yml

@@ -3,12 +3,17 @@ rvm: 2.4.2
 gemfile:
   - Gemfile
 sudo: false
-before_install: gem install bundler
+before_install:
+  - gem install bundler
+  - unset RAILS_ENV
+  - unset RACK_ENV
 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
+  - RAILS_VERSION=5.2.0.rc1
+  - RAILS_VERSION=5.1.4
+  - RAILS_VERSION=5.0.6
+  - RAILS_VERSION=4.2.10

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.0
+
+- Added support for Rails 4.2
+- Fixed migration generation when DB specified for Rails < 5.0.3
+- Less dependencies
+- Less patching
+
 ## 0.1.2
 
 - Fixed `db:structure:dump` when DB specified

data/README.md

@@ -4,7 +4,7 @@
 
 One of the easiest ways to scale your database is to move large, infrequently-joined tables to a separate database. **ActiveRecord supports multiple databases, but Rails doesn’t provide a way to manage them.** Multiverse changes this.
 
-Works with Rails 5+
+Works with Rails 4.2+
 
 [![Build Status](https://travis-ci.org/ankane/multiverse.svg?branch=master)](https://travis-ci.org/ankane/multiverse)
 

data/lib/multiverse.rb

@@ -1,5 +1,4 @@
 require "multiverse/generators"
-require "multiverse/patches"
 require "multiverse/railtie"
 require "multiverse/version"
 
@@ -18,32 +17,17 @@ module Multiverse
     end
 
     def parent_class_name
-      db ? "#{db.camelize}Record" : "ApplicationRecord"
-    end
-
-    def record_class
       if db
-        record_class = parent_class_name.safe_constantize
-        abort "Missing model: #{parent_class_name}" unless record_class
-        record_class
+        "#{db.camelize}Record"
+      elsif ActiveRecord::VERSION::MAJOR >= 5
+        "ApplicationRecord"
       else
-        ActiveRecord::Base
+        "ActiveRecord::Base"
       end
     end
 
     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::Migrator.prepend Multiverse::Migrator
-  ActiveRecord::SchemaDumper.singleton_class.prepend Multiverse::SchemaDumper
-end

data/lib/multiverse/generators.rb

@@ -11,5 +11,11 @@ module Multiverse
         Multiverse.migrate_path
       end
     end
+
+    module MigrationTemplate
+      def migration_template(source, destination, config = {})
+        super(source, destination.sub("db/migrate", Multiverse.migrate_path), config)
+      end
+    end
   end
 end

data/lib/multiverse/railtie.rb

@@ -3,58 +3,59 @@ require "rails/railtie"
 module Multiverse
   class Railtie < Rails::Railtie
     generators do
-      require "rails/generators/active_record/migration"
-      ActiveRecord::Generators::Migration.prepend(Multiverse::Generators::Migration)
+      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)
+
+      # 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/migration/migration_generator"
+        ActiveRecord::Generators::MigrationGenerator.prepend(Multiverse::Generators::Migration)
+      end
     end
 
     rake_tasks do
-      namespace :db do
+      namespace :multiverse do
         task :load_config do
-          ActiveRecord::Tasks::DatabaseTasks.migrations_paths = [Multiverse.migrate_path]
-          ActiveRecord::Tasks::DatabaseTasks.db_dir = [Multiverse.db_dir]
-          Rails.application.paths["db/seeds.rb"] = ["#{Multiverse.db_dir}/seeds.rb"]
-        end
-
-        namespace :test do
-          task load_schema: %w(db:test:purge) do
-            begin
-              should_reconnect = ActiveRecord::Base.connection_pool.active_connection?
-              ActiveRecord::Schema.verbose = false
-              ActiveRecord::Tasks::DatabaseTasks.load_schema ActiveRecord::Base.configurations[Multiverse.env("test")], :ruby, ENV["SCHEMA"]
-            ensure
-              if should_reconnect
-                ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Multiverse.env(ActiveRecord::Tasks::DatabaseTasks.env)])
+          if Multiverse.db
+            ActiveRecord::Tasks::DatabaseTasks.migrations_paths = [Multiverse.migrate_path]
+            ActiveRecord::Tasks::DatabaseTasks.db_dir = [Multiverse.db_dir]
+            Rails.application.paths["db/seeds.rb"] = ["#{Multiverse.db_dir}/seeds.rb"]
+
+            if ActiveRecord::Tasks::DatabaseTasks.database_configuration
+              new_config = {}
+              Rails.application.config.database_configuration.each do |env, config|
+                if env.start_with?("#{Multiverse.db}_")
+                  new_config[env.sub("#{Multiverse.db}_", "")] = config
+                end
               end
+              ActiveRecord::Tasks::DatabaseTasks.database_configuration.merge!(new_config)
             end
-          end
 
-          task load_structure: %w(db:test:purge) do
-            ActiveRecord::Tasks::DatabaseTasks.load_schema ActiveRecord::Base.configurations[Multiverse.env("test")], :sql, ENV["SCHEMA"]
-          end
+            # load config
+            ActiveRecord::Base.configurations = ActiveRecord::Tasks::DatabaseTasks.database_configuration || {}
+            ActiveRecord::Migrator.migrations_paths = ActiveRecord::Tasks::DatabaseTasks.migrations_paths
+
+            ActiveRecord::Base.establish_connection
 
-          task purge: %w(environment load_config check_protected_environments) do
-            ActiveRecord::Tasks::DatabaseTasks.purge ActiveRecord::Base.configurations[Multiverse.env("test")]
+            # need this to run again if environment is loaded afterwards
+            Rake::Task["db:load_config"].reenable
           end
         end
       end
 
-      namespace :multiverse do
-        task :load_config do
-          ActiveRecord::Base.establish_connection(Multiverse.record_class.connection_config)
-        end
-
-        task :override_config do
-          ActiveRecord::Tasks::DatabaseTasks.current_config = ActiveRecord::Base.configurations[Multiverse.env(ActiveRecord::Tasks::DatabaseTasks.env)]
-        end
+      Rake::Task["db:load_config"].enhance do
+        Rake::Task["multiverse:load_config"].execute
       end
-
-      Rake::Task["db:migrate:status"].enhance ["multiverse:load_config"]
-      Rake::Task["db:structure:dump"].enhance ["multiverse:load_config", "multiverse:override_config"]
-      Rake::Task["db:schema:cache:dump"].enhance ["multiverse:load_config"]
-      Rake::Task["db:version"].enhance ["multiverse:load_config"]
     end
   end
 end

data/lib/multiverse/version.rb

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

data/multiverse.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", ">= 5"
+  spec.add_dependency "activesupport", ">= 4.2"
+  spec.add_dependency "activerecord", ">= 4.2"
+  spec.add_dependency "railties", ">= 4.2"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: multiverse
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +126,6 @@ files:
 - lib/generators/multiverse/templates/record.rb
 - lib/multiverse.rb
 - lib/multiverse/generators.rb
-- lib/multiverse/patches.rb
 - lib/multiverse/railtie.rb
 - lib/multiverse/version.rb
 - multiverse.gemspec

data/lib/multiverse/patches.rb

@@ -1,54 +0,0 @@
-module Multiverse
-  module DatabaseTasks
-    def each_current_configuration(environment)
-      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|
-        yield configuration unless configuration['database'].blank?
-      end
-    end
-  end
-
-  module Migrator
-    def initialize(*_)
-      # ActiveRecord::Migration#initialize calls
-      # ActiveRecord::SchemaMigration.create_table and
-      # ActiveRecord::InternalMetadata.create_table
-      # which both inherit from ActiveRecord::Base
-      #
-      # We need to change this for migrations
-      # but not for db:schema:load, as this
-      # will mess up the Multiverse test environment
-      ActiveRecord::SchemaMigration.singleton_class.prepend(Multiverse::Connection)
-      ActiveRecord::InternalMetadata.singleton_class.prepend(Multiverse::Connection)
-      super
-    end
-  end
-
-  module Connection
-    def connection
-      Multiverse.record_class.connection
-    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|
-        super(conn, direction)
-      end
-    end
-  end
-
-  module SchemaDumper
-    def dump(connection = ActiveRecord::Base.connection, stream = STDOUT, config = ActiveRecord::Base)
-      new(Multiverse.record_class.connection, generate_options(Multiverse.record_class)).dump(stream)
-      stream
-    end
-  end
-end