multi-database-9000 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b615a4d064746274e944f5bd1c41720eb88e416
-  data.tar.gz: 3d988a77248229b87e719feee2fd930abd3f4867
+  metadata.gz: 053dcf36754207e2afd03e12dbbc523acefe665d
+  data.tar.gz: 964c14eda0b97b3a2acb60cfe8751be735b98915
 SHA512:
-  metadata.gz: 0bd12c0da8d04f705809843bcaf6db87380dab761ec3301964f7483755c0c0f8f5a4c5b3545995cc4001296d3aa180ffede8fd393f20e89f83df44f8ecafc3d0
-  data.tar.gz: 7a1b040ea4ff78b2e9a1e1c41c0269a81f3a72c7e83e201af8bd3ba464c74e84083e3f1a199d1a4c8688158f1ae0005e2108a3decdbd837e95c857b0154be904
+  metadata.gz: 5610ed20bb066f1163bbc8adface34b51b8160017c4f6b6cdd2212c8a2f9bf68e20dd34d8490f293e3e183165f40673eba671d272e3c52843a09c9cd94d2ef9f
+  data.tar.gz: b66a494376a8443ae0f54b87471cac4190000f720fcf06c91eea25e9d4f317d752c790c807415e9fe8d8c6f5c2e661d7988ee9036b8f2433b4a091722aa4fe52

data/README.md

@@ -32,20 +32,25 @@ and production connections defined in database.yml. Also that there are one or m
 
 ## Usage
 
-Create a new set of connections for your database in database.yml, in the form of "<database_name>_test",
-"<database_name>_production" etc.
+### Database Connections
+Create a new set of connections for your database in database.yml, in the form of "*database_name*_test",
+"*database_name*_production" etc.
 
-Create a new directory under db/ called <database_name>_migrate to hold migrations for the database.
+Create a new directory under db/ called *database_name*_migrate to hold migrations for the database.
 
-Create a new migration with rails g migration DATABASE=<database_name>. The DATABASE environment variable can be left
-off if the target of the migration is your default database; alternatively multi-database-9000 also accepts DATABASE=default
+### 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".
 
-rake db:create will attempt to create all databases for all connections.  rake db:create DATABASE=widgets will only created
-databases for connections with "widget" in their name.
+If you wish to use multi-database-9000 in a single database app, the command 'rails generate migration CreateWidgetsTable' will still work.
 
-Similarly, rake db:schema:load and rake:db:schema:dump will load or dump schemas for all connections to all databases.
-rake db:schema:load DATABASE=widget will only load the schema for databases in connections with "widget" in their name.
+### Rake Tasks
+"rake db:create" will attempt to create all databases for all connections.  
+"rake db:create DATABASE=widgets" will only create databases for connections with "widget" in their name.
 
+Similarly, "rake db:schema:load" and "rake db:schema:dump" will load or dump schemas for all connections to all databases.
+"rake db:schema:load DATABASE=widget" will only load the schema for databases in connections with "widget" in their name.
+
+### Database Schema
 In order for test database schemas to be kept updated, add the following line to your `test_helper` or `spec_helper` files:
 
     MultiDatabase9000.maintain_all_test_schemas!

data/features/running_generators.feature

@@ -0,0 +1,27 @@
+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 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
+  
+  Background: 
+    Given empty databases have been created for the app
+
+  Scenario: Running 'rails generate migration' in a single database app
+    Given There is no db/migrate folder before a migration is generated in a single database app
+    And I run `rails generate migration CreateFoolsTable` in a single database app
+    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 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
+    And I should see a migration file in the db/users_migrate folder in a multi database app
+    And I run `rails generate multi_migration CreateFoolsTable widgets` in a multi database app
+    Then I should see the db/widgets_migrate folder for the default database
+    And I should see a migration file in the db/widgets_migrate folder in a multi database app

data/features/step_definitions/running_generators_steps.rb

@@ -0,0 +1,48 @@
+
+Given(/^There is no db\/migrate folder before a migration is generated in a single database app$/) do
+  expect('../../single-db-dummy/db/migrate').not_to be_an_existing_directory
+end
+
+Then(/^I should see the db\/migrate folder in a single database app$/) do
+  expect('../../single-db-dummy/db/migrate').to be_an_existing_directory
+end
+
+
+Then(/^I should see a migration file in the db\/migrate folder in a single database app$/) do
+  expect('../../single-db-dummy/db/migrate').not_to be_empty
+  expect(Dir.entries("single-db-dummy/db/migrate").last).to include "_create_fools_table.rb"
+end
+
+
+Given(/^There are no migration folders before a migration is generated in a multi database app$/) do
+  expect('../../multi-db-dummy/db/migrate').not_to be_an_existing_directory
+  expect('../../multi-db-dummy/db/users_migrate').not_to be_an_existing_directory
+  expect('../../multi-db-dummy/db/widgets_migrate').not_to be_an_existing_directory
+end
+
+Then(/^I should see the db\/migrate folder for the default database$/) do
+  expect('../../multi-db-dummy/db/migrate').to be_an_existing_directory
+end
+
+Then(/^I should see a migration file in the db\/migrate folder in a multi database app$/) do
+  expect('../../multi-db-dummy/db/migrate').not_to be_empty
+  expect(Dir.entries("multi-db-dummy/db/migrate").last).to include "_create_fools_table.rb"
+end
+
+Then(/^I should see the db\/users_migrate folder for the default database$/) do
+   expect('../../multi-db-dummy/db/users_migrate').to be_an_existing_directory
+end
+
+Then(/^I should see a migration file in the db\/users_migrate folder in a multi database app$/) do
+  expect('../../multi-db-dummy/db/users_migrate').not_to be_empty
+  expect(Dir.entries("multi-db-dummy/db/users_migrate").last).to include "_create_fools_table.rb"
+end
+
+Then(/^I should see the db\/widgets_migrate folder for the default database$/) do
+  expect('../../multi-db-dummy/db/widgets_migrate').to be_an_existing_directory
+end
+
+Then(/^I should see a migration file in the db\/widgets_migrate folder in a multi database app$/) do
+  expect('../../multi-db-dummy/db/widgets_migrate').not_to be_empty
+  expect(Dir.entries("multi-db-dummy/db/widgets_migrate").last).to include "_create_fools_table.rb"
+end

data/lib/generators/multi_migration_generator.rb

@@ -0,0 +1,44 @@
+ require 'pry'
+class MultiMigrationGenerator < Rails::Generators::NamedBase
+  include Rails::Generators::Migration
+  
+  argument :database_name, :type => :string, :required => true, :banner => 'DBNAME'
+  argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+  
+  hook_for :orm, :required => true
+  
+  source_root File.expand_path('../templates', __FILE__)
+  
+  def self.next_migration_number(dirname)
+    next_migration_number = current_migration_number(dirname) + 1
+    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
+    end
+  end
+
+  def create_migration_file
+    set_local_assigns!
+    migration_template "migration.rb", migration_directory
+  end
+
+  def migration_directory
+    if database_name == "default"
+      "db/migrate/#{file_name}.rb"
+    else
+      "db/#{database_name.downcase}_migrate/#{file_name}.rb"
+    end
+  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
+    end
+end
+

data/lib/generators/templates/migration.rb

@@ -0,0 +1,26 @@
+
+class <%= migration_class_name %> < ActiveRecord::Migration
+<%- if migration_action == 'add' -%>
+  def change
+<% attributes.each do |attribute| -%>
+    add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %>
+<%- end -%>
+  end
+<%- else -%>
+  def up
+<% attributes.each do |attribute| -%>
+  <%- if migration_action -%>
+    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end %>
+  <%- end -%>
+<%- end -%>
+  end
+
+  def down
+<% attributes.reverse.each do |attribute| -%>
+  <%- if migration_action -%>
+    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><% end %>
+  <%- end -%>
+<%- end -%>
+  end
+<%- end -%>
+end

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

@@ -1,3 +1,3 @@
 module MultiDatabase9000
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/multi-database-9000.rb

@@ -7,4 +7,5 @@ module MultiDatabase9000
       load "multi-database-9000/tasks/multi-database-9000_tasks.rake"
     end
   end
+
 end

data/multi-db-dummy/Gemfile.lock

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

data/single-db-dummy/Gemfile.lock

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi-database-9000
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mark Weston
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,13 +139,17 @@ files:
 - features/creating_databases.feature
 - features/development_migrations.feature
 - features/production_migrations.feature
+- features/running_generators.feature
 - features/step_definitions/development_migrations_steps.rb
 - features/step_definitions/production_migration_steps.rb
+- features/step_definitions/running_generators_steps.rb
 - features/step_definitions/sqlite_database_steps.rb
 - features/step_definitions/test_migration_steps.rb
 - features/support/env.rb
 - features/test_app.feature
 - features/test_migrations.feature
+- lib/generators/multi_migration_generator.rb
+- lib/generators/templates/migration.rb
 - lib/multi-database-9000.rb
 - lib/multi-database-9000/multi-database-9000.rb
 - lib/multi-database-9000/tasks/multi-database-9000_tasks.rake
@@ -277,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Enables Rails apps with multiple databases to handle migrations and rake
@@ -286,8 +290,10 @@ test_files:
 - features/creating_databases.feature
 - features/development_migrations.feature
 - features/production_migrations.feature
+- features/running_generators.feature
 - features/step_definitions/development_migrations_steps.rb
 - features/step_definitions/production_migration_steps.rb
+- features/step_definitions/running_generators_steps.rb
 - features/step_definitions/sqlite_database_steps.rb
 - features/step_definitions/test_migration_steps.rb
 - features/support/env.rb