multi-database-9000 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a0bd63bbdb42aeecff59c066181a15dfca53df9
-  data.tar.gz: 5b9795119229a9472186497bc39660bf4a504157
+  metadata.gz: c1e52410b94cd1ebbf0ba4bff0d6454877eb3089
+  data.tar.gz: c8acc0fbde4701940948b4cfde04da7c46a17c99
 SHA512:
-  metadata.gz: 6c1685722962fa5861406839261f9838d6434bd2d433d929ff69a90dc43fbd5b55ef58d36985cae2601cec563e27a487661e6d4fdf384086c64e8a5e5b2a52d0
-  data.tar.gz: bd143d08b6bd82b799e9250c783bb441b03ce668deeca78a128cee416e6921d1c7146a99410890e21a26e97ae3a5ade7399c463930f4a6945097931f06ab8679
+  metadata.gz: 386f8b2b90cda2dffe2775e08c512317459a1661e6e2ad77609f2fe21555fa27936e8510dce32bd5a76ae56c00a3d8fdd3ef700541463c4f6e27e7aa0a107b8b
+  data.tar.gz: 819a923c069d2d92e2596a8cacf8e21fd050914f503d5872dd885c2422c885c4a8ba5ae0d055b32c4a5e9c66a08ea3bcb72f62a4ce2521bd5dd270e01e0e9846

data/.gitignore

@@ -17,3 +17,4 @@
 *.a
 mkmf.log
 .idea
+*.gem

data/README.md

@@ -39,7 +39,7 @@ Create a new set of connections for your database in database.yml, in the form o
 Create a new directory under db/ called *database_name*_migrate to hold migrations for the database.
 
 ### The Multi Migration command
-Create a new migration with "rails generate multi_migration *migration* *database_name*". The *database_name* is 'default' for your default or original database, otherwise it is the name of the database you wish to migrate to e.g. "rails generate multi_migration AddTitleToWidgets widgets".
+Create a new migration with "rails generate multi_migration *migration* *database_name*". The *database_name* is 'default' for your default or original database (this can also be left off for the default database only and the migration will still work), otherwise it is the name of the database you wish to migrate to e.g. "rails generate multi_migration AddTitleToWidgets widgets".
 
 If you wish to use multi-database-9000 in a single database app, the command 'rails generate migration CreateWidgetsTable' will still work.
 

data/features/running_generators.feature

@@ -1,6 +1,7 @@
 Feature: Running rails generate commands produces migration files in the correct database migration folders
   
   'rails generate migration CreateXxxxxTable' should create a migration file in the 'migrate' folder in a single database app
+  'rails generate multi_migration CreateXxxxxTable' should create a migration file in the 'migrate' folder in a multi-database app
   'rails generate multi_migration CreateXxxxxTable default' should create a migration file in the 'migrate' folder in a multi-database app
   'rails generate multi_migration CreateXxxxxTable users' should create a migration file in the 'users_migrate' folder in a multi-database app 
   'rails generate multi_migration CreateXxxxxTable widgets' should create a migration file in the 'widgets_migrate' folder in a multi-database app
@@ -14,10 +15,21 @@ Feature: Running rails generate commands produces migration files in the correct
     Then I should see the db/migrate folder in a single database app
     And I should see a migration file in the db/migrate folder in a single database app
 
+  Scenario: Running 'rails generate migration' in a multi database app
+    Given There are no migration folders before a migration is generated in a multi database app
+    And I run `rails generate migration CreateFoolsTable` in a multi database app
+    Then I should see the db/migrate folder for the default database
+
+  Scenario: Running 'rails generate multi_migration' in a multi database app
+    Given There are no migration folders before a migration is generated in a multi database app
+    And I run `rails generate multi_migration CreateFoolsTable` in a multi database app
+    Then I should see the db/migrate folder for the default database
+
   Scenario: Running "rails generate multi_migration <database_name>" in a multi database app
     Given There are no migration folders before a migration is generated in a multi database app
     And I run `rails generate multi_migration CreateFoolsTable default` in a multi database app
     Then I should see the db/migrate folder for the default database
+
     And I should see a migration file in the db/migrate folder in a multi database app
     And I run `rails generate multi_migration CreateFoolsTable users` in a multi database app
     Then I should see the db/users_migrate folder for the default database

data/lib/generators/multi_migration_generator.rb

@@ -1,10 +1,9 @@
+
 class MultiMigrationGenerator < Rails::Generators::NamedBase
   include Rails::Generators::Migration
-  
-  argument :database_name, :type => :string, :required => true, :banner => 'DBNAME'
+  argument :database_name, :type => :string, :required => false, :banner => 'DBNAME'
   argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
   
-  hook_for :orm, :required => true
   
   source_root File.expand_path('../templates', __FILE__)
   
@@ -13,7 +12,7 @@ class MultiMigrationGenerator < Rails::Generators::NamedBase
     if ActiveRecord::Base.timestamped_migrations
       [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
     else
-      "%.3d" % next_migration_number
+      SchemaMigration.normalize_migration_number(next_migration_number)
     end
   end
 
@@ -23,21 +22,28 @@ class MultiMigrationGenerator < Rails::Generators::NamedBase
   end
 
   def migration_directory
-    if database_name == "default"
+    if (database_name == "default") || database_is_nil?
       "db/migrate/#{file_name}.rb"
     else
       "db/#{database_name.downcase}_migrate/#{file_name}.rb"
     end
   end
+
+  def database_is_nil?
+    db_name = database_name
+    return true if db_name.nil?
+  end
   
   protected
-    attr_reader :migration_action
 
-    def set_local_assigns!
-      if file_name =~ /^(add|remove)_.*_(?:to|from)_(.*)/
-        @migration_action = $1
-        @table_name       = $2.pluralize
-      end
+  attr_reader :migration_action
+
+  def set_local_assigns!
+    if file_name =~ /^(add|remove)_.*_(?:to|from)_(.*)/
+      @migration_action = $1
+      @table_name       = $2.pluralize
     end
+  end
 end
 
+

data/lib/multi-database-9000/version.rb

@@ -1,3 +1,3 @@
 module MultiDatabase9000
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/multi-db-dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    multi-database-9000 (0.1.0)
+    multi-database-9000 (0.2.1)
       rails (>= 4.0)
 
 GEM

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi-database-9000
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mark Weston
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -281,7 +281,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: Enables Rails apps with multiple databases to handle migrations and rake