erd 0.0.2 → 0.1.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = Erd
 
-A Rails engine for drawing your app's ER diagram
+A Rails engine for drawing your app's ER diagram and operating migrations
 
 
 == Requirements
@@ -30,15 +30,11 @@ Browse at your http://localhost:3000/erd
 
 * You can drag and arrange the positions of each model
 
-* You can add column
+* You can operate DB schema manipulations such as `add column`, `rename column`, `alter column`, and `drop table`
 
-* You can rename column
+* Then, Erd generates migration files on the server
 
-* You can alter column type
-
-* You can drop table
-
-* Finally, Erd generates migration files on the server (you need to run `rake db:migrate` by hand)
+* And you can run each migration on your browser
 
 
 == TODO

data/app/assets/stylesheets/erd/erd.css.scss

@@ -1,11 +1,11 @@
 * {
-	margin: 0;
-	padding: 0;
+  margin: 0;
+  padding: 0;
 }
 
 body div {
-	text-align: left;
-	margin: 0 auto;
+  text-align: left;
+  margin: 0 auto;
 }
 
 li {
@@ -29,6 +29,12 @@ fieldset { padding:0; border:0; margin-top:25px; }
   position: relative;
   float: right;
   z-index: 999;
+
+  table {
+    td {
+      font-size: small;
+    }
+  }
 }
 
 #erd {
@@ -113,12 +119,9 @@ fieldset { padding:0; border:0; margin-top:25px; }
 }
 
 
-#generated {
-  border: 1px #000 solid;
-}
-
-#changes {
-  display: none;
+#failed {
+  border: 2px #f00 solid;
+  padding: 2px;
 }
 
 #model_name_changes, #column_name_changes {

data/app/controllers/erd/erd_controller.rb

@@ -19,11 +19,24 @@ module Erd
         {}
       end
       @erd = render_plain plain, positions
+
+      migrated_versions = ActiveRecord::Base.connection.select_values("SELECT version FROM #{ActiveRecord::Migrator.schema_migrations_table_name}").map {|v| '%.3d' % v}
+      @migrations = []
+      ActiveRecord::Migrator.migrations_paths.each do |path|
+        Dir.foreach(path) do |file|
+          if (version_and_name = /^(\d{3,})_(.+)\.rb$/.match(file))
+            status = migrated_versions.delete(version_and_name[1]) ? 'up' : 'down'
+            @migrations << {status: status, version: version_and_name[1], name: version_and_name[2]}
+          end
+        end
+      end
+      @migrations += migrated_versions.map {|v| {status: 'up', version: v, name: '*** NO FILE ***'}}
+      @migrations.sort_by! {|m| m[:version]}
     end
 
     def update
       changes = ActiveSupport::JSON.decode(params[:changes])
-      generated_migrations, failed_migrations = [], []
+      failed_migrations = []
       changes.each do |row|
         begin
           action, model, column, from, to = row['action'], row['model'].tableize, row['column'], row['from'], row['to']
@@ -33,35 +46,29 @@ module Erd
             execute_generate_migration "drop_#{model}"
             generated_migration_file = (Dir.glob(Rails.root.join('db', 'migrate', '*.rb')) - before_migration_files).first
             gsub_file generated_migration_file, /def up.*  end/m, "def change\n    drop_table :#{model}\n  end"
-            generated_migrations << File.basename(generated_migration_file)
           when 'rename_model'
             from, to = from.tableize, to.tableize
             execute_generate_migration "rename_#{from}_to_#{to}"
             generated_migration_file = (Dir.glob(Rails.root.join('db', 'migrate', '*.rb')) - before_migration_files).first
             gsub_file generated_migration_file, /def up.*  end/m, "def change\n    rename_table :#{from}, :#{to}\n  end"
-            generated_migrations << File.basename(generated_migration_file)
           when 'add_column'
             name_and_type = column.scan(/(.*)\((.*?)\)/).first
             name, type = name_and_type[0], name_and_type[1]
             execute_generate_migration "add_#{name}_to_#{model}", ["#{name}:#{type}"]
             generated_migration_file = (Dir.glob(Rails.root.join('db', 'migrate', '*.rb')) - before_migration_files).first
-            generated_migrations << File.basename(generated_migration_file)
           when 'rename_column'
             execute_generate_migration "rename_#{model}_#{from}_to_#{to}"
             generated_migration_file = (Dir.glob(Rails.root.join('db', 'migrate', '*.rb')) - before_migration_files).first
             gsub_file generated_migration_file, /def up.*  end/m, "def change\n    rename_column :#{model}, :#{from}, :#{to}\n  end"
-            generated_migrations << File.basename(generated_migration_file)
           when 'alter_column'
             execute_generate_migration "change_#{model}_#{column}_type_to_#{to}"
             generated_migration_file = (Dir.glob(Rails.root.join('db', 'migrate', '*.rb')) - before_migration_files).first
             gsub_file generated_migration_file, /def up.*  end/m, "def change\n    change_column :#{model}, :#{column}, :#{to}\n  end"
-            generated_migrations << File.basename(generated_migration_file)
           when 'move'
             json_file = Rails.root.join('tmp', 'erd_positions.json')
             positions = json_file.exist? ? ActiveSupport::JSON.decode(json_file.read) : {}
             positions[model] = to
             json_file.open('w') {|f| f.write positions.to_json}
-            generated_migrations << 'saved entity positions'
           else
             raise "unexpected action: #{action}"
           end
@@ -70,7 +77,12 @@ module Erd
         end
       end
 
-      redirect_to erd.root_path, :flash => {:generated_migrations => generated_migrations, :failed_migrations => failed_migrations}
+      redirect_to erd.root_path, :flash => {:failed_migrations => failed_migrations}
+    end
+
+    def migrate
+      run_migrations :up => params[:up], :down => params[:down]
+      redirect_to erd.root_path
     end
 
     private
@@ -103,10 +115,14 @@ module Erd
     end
 
     # `rake db:migrate`
-    def migrate
-      ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_path, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+    def run_migrations(migrations)
+      migrations.each do |direction, versions|
+        versions.each do |version|
+          ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_path, version.to_i)
+        end if versions
+      end
       if ActiveRecord::Base.schema_format == :ruby
-        File.open(ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb", "w") do |file|
+        File.open(ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb", 'w') do |file|
           ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
         end
       end

data/app/views/erd/erd/index.html.erb

@@ -4,18 +4,8 @@
   </div>
 
   <div id="migration">
-    <%- if flash[:generated_migrations].present? -%>
-      <div id="generated">
-        generated migrations (please run rake db:migrate)
-        <ul>
-        <%- flash[:generated_migrations].each do |m| -%>
-          <li><%= m %></li>
-        <%- end -%>
-        </ul>
-      </div>
-    <%- end -%>
     <%- if flash[:failed_migrations].present? -%>
-      <div id="generated">
+      <div id="failed">
         failed migrations
         <ul>
         <%- flash[:failed_migrations].each do |m| -%>
@@ -25,6 +15,7 @@
       </div>
     <%- end -%>
     <table id="changes">
+      <caption>schema changes</caption>
       <thead><tr><th>action</th><th>model</th><th>column</th><th>from</th><th>to</th></tr></thead>
       <tbody></tbody>
     </table>
@@ -32,5 +23,17 @@
       <%= hidden_field_tag 'changes' %>
       <%= submit_tag 'save changes' %>
     <% end %>
+    <%= form_tag '/erd/migrate', :method => :put do %>
+      <table>
+        <caption>migration status</caption>
+        <thead><tr><th>status</th><th>version</th><th>name</th></tr></thead>
+        <tbody>
+          <%- @migrations.each do |m| -%>
+            <tr><td><label><%= check_box_tag (m[:status] == 'up' ? 'down[]' : 'up[]'), m[:version] %><%= m[:status] %></label></td><td><%= m[:version] %></td><td><%= m[:name] %></td></tr>
+          <%- end -%>
+        </tbody>
+      </table>
+    <%= submit_tag 'run migrations' %>
+    <% end %>
   </div>
 </div>

data/config/routes.rb

@@ -1,5 +1,6 @@
 Erd::Engine.routes.draw do
   get '/' => 'erd#index'
   put '/' => 'erd#update'
+  put '/migrate' => 'erd#migrate', :as => 'migrate'
   root :to => 'erd#index'
 end

data/lib/erd/version.rb

@@ -1,3 +1,3 @@
 module Erd
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erd
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-erd
-  requirement: &70212407699740 !ruby/object:Gem::Requirement
+  requirement: &70264677495520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70212407699740
+  version_requirements: *70264677495520
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70212407698520 !ruby/object:Gem::Requirement
+  requirement: &70264677495100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212407698520
+  version_requirements: *70264677495100
 description: erd engine on Rails
 email:
 - ronnie@dio.jp