erd 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f72d039d2e3a380b178558b66f5d6f5f2bf27dc
-  data.tar.gz: 44dbc5d5f38a2bd2b633227edbc56baafca34b6a
+  metadata.gz: 6f3eac74801a463df2f61072f1b5c507cc239a59
+  data.tar.gz: 93513fa3186082756f00f26ec6d64086b5f165cd
 SHA512:
-  metadata.gz: ed3527095628c3148b30ff030608f933ea8910b3f7a4f565bd6d7eb3b826ac9f44e5b9eb0334ea7feb50745a014602c8a83cae4091501ce210e53b7436cd1859
-  data.tar.gz: 07a41f90d9fb8746d106f3ccca5a52b681da491f4c95f54c2538cdf48ddfe299af9f69925cf901ee1c7a956adf58fff8f891fcf72c75603964483aa392cde5fc
+  metadata.gz: 3d497649ac58ef2f0bfefcee033bf6a28846475f19b9e0c944a0abb38b59c153057c96d5f1a52a370f516f0dbe6f93c4a9ebc439f361b774e6ddf648d4b8a588
+  data.tar.gz: 8987e3253a555bc40448c3581b6463bb807421af495293e9b1950c033ecbb14da27c97373f54e37d5fc49ee8f5b3d7b94ed072549e888866cb3b5dd9f222b57e

data/README.rdoc

@@ -30,7 +30,7 @@ Browse at your http://localhost:3000/erd
 
 * You can drag and arrange the positions of each model
 
-* You can operate DB schema manipulations such as `add column`, `rename column`, `alter column`, and `drop table`
+* You can operate DB schema manipulations such as `add column`, `rename column`, `alter column`, `create model (as well as table)`, and `drop table`
 
 * Then, Erd generates migration files on the server
 
@@ -39,12 +39,8 @@ Browse at your http://localhost:3000/erd
 
 == TODO
 
-* Better UI
-
 * Fix buggy JS
 
-* create table (we need to generate AR model file at the same time)
-
 * drop column (need to think of the UI)
 
 * stop depending on rails-erd and Graphviz
@@ -59,6 +55,12 @@ Browse at your http://localhost:3000/erd
 * Send me your pull requests!
 
 
+=- Team
+
+* {Akira Matsuda}[https://github.com/amatsuda]
+* {Teppei Machida}[http://github.com/machida] (design)
+
+
 == Copyright
 
 Copyright (c) 2012 Akira Matsuda. See MIT-LICENSE for further details.

data/app/assets/javascripts/erd/erd.js.coffee

@@ -92,6 +92,8 @@ class ERD
     $('div.model a.add_column').on 'click', @handle_add_column_click
     $('div.model a.cancel').on 'click', @handle_cancel_click
     $('div.model a.close').on 'click', @handle_remove_model_click
+    $('#new_model_add_column').on 'click', @handle_new_model_add_column_click
+    $('div.model a.cancel').on 'click', @handle_cancel_click
     $('div#open_migration').on 'click', @handle_open_migration_click
     $('div#close_migration').on 'click', @handle_close_migration_click
 
@@ -273,8 +275,8 @@ class ERD
 
     return unless confirm('remove this table?')
 
-    model_name = parent.data('model_name')
-    upsert_change 'remove_model', model_name, '', '', ''
+    model_name = m.data('model_name')
+    window.erd.upsert_change 'remove_model', model_name, '', '', ''
     parent.hide()
 
     $.each @edges, (i, edge) =>
@@ -282,6 +284,13 @@ class ERD
     @paper.clear()
     @connect_arrows(@edges)
 
+  handle_new_model_add_column_click: (ev) =>
+    ev.preventDefault()
+    target = $(ev.currentTarget)
+
+    target.parent().siblings('table').append('<tr><td><input type="text" /></td><td class="separator">:</td><td><input type="text" value="string" /></td></tr>').find('tr:last > td > input:first').focus()
+
+
   handle_open_migration_click: (ev) =>
     ev.preventDefault()
 
@@ -325,7 +334,10 @@ $ ->
     $('#erd').css('height', window.innerHeight)
 
   $("#open_migration").click ->
-    $('#close_migration').css('right', $('#migration').width() + ($(this).width() / 2) - 5)
+    $('#close_migration, #open_create_model_dialog').css('right', $('#migration').width() + ($(this).width() / 2) - 5)
+
+  $("#close_migration").click ->
+    $('#open_create_model_dialog').css('right', 15)
 
   $('#open_up').click ->
     $('#migration_status .up').addClass('open')
@@ -337,3 +349,29 @@ $ ->
 
   $('#close_all').click ->
     $('#migration_status tr').removeClass('open')
+
+  $('#create_model_form').dialog
+    autoOpen: false,
+    height: 450,
+    width: 450,
+    modal: true,
+    buttons:
+      'Create Model': ->
+        model = $('#new_model_name').val()
+        columns = ''
+        $('#create_model_table > tbody > tr').each (i, row) ->
+          [name, type] = $(row).find('input')
+          columns += "#{$(name).val()}:#{$(type).val()} "
+        window.erd.upsert_change 'create_model', model, columns, '', ''
+        $(this).find('table > tbody > tr').each (i, row) ->
+          row.remove() if i >= 1
+        $(this).find('input').val('')
+        $(this).find('input[name=new_model_column_type_1]').val('string')
+
+        $(this).dialog('close')
+      Cancel: ->
+        $(this).dialog('close')
+
+  $('#open_create_model_dialog').click (ev) ->
+    ev.preventDefault()
+    $('#create_model_form').dialog('open')

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

@@ -9,5 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
+ *= require jquery-ui
  *= require_tree .
 */

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

@@ -535,3 +535,55 @@ li {
 #model_name_changes, #column_name_changes {
   display: none;
 }
+
+#open_create_model_dialog {
+  position: fixed;
+  right: 15px;
+  top: 70px;
+  background: rgba(0, 0, 0, .6);
+  padding: 12px 20px;
+  color: $white;
+  text-decoration: none;
+  font-size: 13px;
+  &:hover {
+    background: rgba(0, 0, 0, .8)
+  }
+}
+
+#create_model_form {
+  font-size: 14px;
+}
+#create_model_table {
+  margin: 12px auto;
+  border-spacing: 0;
+  width: 100%;
+  tr {
+    &:nth-child(odd) {
+      td {
+        background: #f8f8f8;
+      }
+    }
+    &:nth-child(even) {
+      td {
+        background: #eee;
+      }
+    }
+    td {
+      padding: 6px 12px;
+      input {
+        width: 100%;
+        box-sizing: border-box;
+      }
+      &.separator {
+        padding: 6px 0;
+      }
+    }
+  }
+}
+#new_model_add_column {
+  margin: 10px auto 0;
+  display: block;
+  width: 160px;
+  padding: 2px 10px;
+  text-decoration: none;
+}

data/app/controllers/erd/erd_controller.rb

@@ -24,36 +24,46 @@ module Erd
       executed_migrations, failed_migrations = [], []
       changes.each do |row|
         begin
-          action, model, column, from, to = row['action'], row['model'].tableize, row['column'], row['from'], row['to']
+          action, model, column, from, to = row['action'], row['model'], row['column'], row['from'], row['to']
           case action
+          when 'create_model'
+            columns = column.split(' ').compact
+            generated_migration_file = Erd::Migrator.execute_generate_model model, columns
+            Erd::Migrator.run_migrations :up => generated_migration_file
+            executed_migrations << generated_migration_file
           when 'remove_model'
+            model = model.tableize
             generated_migration_file = Erd::Migrator.execute_generate_migration "drop_#{model}"
             gsub_file generated_migration_file, /def (up|change).*  end/m, "def change\n    drop_table :#{model}\n  end"
             Erd::Migrator.run_migrations :up => generated_migration_file
             executed_migrations << generated_migration_file
           when 'rename_model'
-            from, to = from.tableize, to.tableize
+            model, from, to = from.tableize, to.tableize, model.tableize
             generated_migration_file = Erd::Migrator.execute_generate_migration "rename_#{from}_to_#{to}"
             gsub_file generated_migration_file, /def (up|change).*  end/m, "def change\n    rename_table :#{from}, :#{to}\n  end"
             Erd::Migrator.run_migrations :up => generated_migration_file
             executed_migrations << generated_migration_file
           when 'add_column'
+            model = model.tableize
             name_and_type = column.scan(/(.*)\((.*?)\)/).first
             name, type = name_and_type[0], name_and_type[1]
             generated_migration_file = Erd::Migrator.execute_generate_migration "add_#{name}_to_#{model}", ["#{name}:#{type}"]
             Erd::Migrator.run_migrations :up => generated_migration_file
             executed_migrations << generated_migration_file
           when 'rename_column'
+            model = model.tableize
             generated_migration_file = Erd::Migrator.execute_generate_migration "rename_#{model}_#{from}_to_#{to}"
             gsub_file generated_migration_file, /def (up|change).*  end/m, "def change\n    rename_column :#{model}, :#{from}, :#{to}\n  end"
             Erd::Migrator.run_migrations :up => generated_migration_file
             executed_migrations << generated_migration_file
           when 'alter_column'
+            model = model.tableize
             generated_migration_file = Erd::Migrator.execute_generate_migration "change_#{model}_#{column}_type_to_#{to}"
             gsub_file generated_migration_file, /def (up|change).*  end/m, "def change\n    change_column :#{model}, :#{column}, :#{to}\n  end"
             Erd::Migrator.run_migrations :up => generated_migration_file
             executed_migrations << generated_migration_file
           when 'move'
+            model = model.tableize
             json_file = Rails.root.join('tmp', 'erd_positions.json')
             positions = json_file.exist? ? ActiveSupport::JSON.decode(json_file.read) : {}
             positions[model] = to
@@ -78,6 +88,7 @@ module Erd
     def render_plain(plain, positions)
       _scale, svg_width, svg_height = plain.scan(/\Agraph ([0-9\.]+) ([0-9\.]+) ([0-9\.]+)$/).first
       # node name x y width height label style shape color fillcolor
+      max_model_x, max_model_y = 0, 0
       models = plain.scan(/^node ([^ ]+) ([0-9\.]+) ([0-9\.]+) ([0-9\.]+) ([0-9\.]+) <\{?(<((?!^\}?>).)*)^\}?> [^ ]+ [^ ]+ [^ ]+ [^ ]+\n/m).map {|node_name, x, y, width, height, label|
         label_doc = Nokogiri::HTML::DocumentFragment.parse(label)
         model_name = node_name.dup
@@ -89,11 +100,13 @@ module Erd
           columns = cols_table.search('tr > td').map {|col| col_name, col_type = col.text.split(' '); {:name => col_name, :type => col_type}}
         end
         custom_x, custom_y = positions[model_name.tableize].try(:split, ',')
-        {:model => model_name, :x => (custom_x || (BigDecimal(x) * 72).round), :y => (custom_y || (BigDecimal(y) * 72).round), :width => (BigDecimal(width) * 72).round, :height => height, :columns => columns}
+        h = {:model => model_name, :x => (custom_x || (BigDecimal(x) * 72).round), :y => (custom_y || (BigDecimal(y) * 72).round), :width => (BigDecimal(width) * 72).round, :height => height, :columns => columns}
+        max_model_x, max_model_y = [h[:x].to_i + h[:width].to_i, max_model_x, 1024].max, [h[:y].to_i + h[:height].to_i, max_model_y, 768].max
+        h
       }.compact
       # edge tail head n x1 y1 .. xn yn [label xl yl] style color
       edges = plain.scan(/^edge ([^ ]+)+ ([^ ]+)/).map {|from, to| {:from => from.sub(/^m_/, ''), :to => to.sub(/^m_/, '')}}
-      render_to_string 'erd/erd/erd', :layout => nil, :locals => {:width => (BigDecimal(svg_width) * 72).round, :height => (BigDecimal(svg_height) * 72).round, :models => models, :edges => edges}
+      render_to_string 'erd/erd/erd', :layout => nil, :locals => {:width => [(BigDecimal(svg_width) * 72).round, max_model_x].max, :height => [(BigDecimal(svg_height) * 72).round, max_model_y].max, :models => models, :edges => edges}
     end
 
     def gsub_file(path, flag, *args, &block)

data/app/controllers/erd/models_controller.rb

@@ -0,0 +1,9 @@
+module Erd
+  class ModelsController < ::Erd::ApplicationController
+    # doesn't actually create anything. Just draw the given model
+    def create
+      model = {:model => params[:model_name], :x => 300, :y => 100, :width => 300, :height => 300, :columns => params[:columns]}
+      <%= render :partial => 'erd/erd/model', :object => model -%>
+    end
+  end
+end

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

@@ -13,7 +13,7 @@
             <h3><%= direction %></h3>
             <ul>
             <%- flash[:executed_migrations][direction].each do |m| -%>
-              <li><%= File.basename m %></li>
+              <li><%= File.basename m.to_s %></li>
             <%- end -%>
             </ul>
           <%- end -%>
@@ -67,4 +67,20 @@
       <%= submit_tag 'run migrations' %>
     <% end %>
   </div>
+  <a href="#" id='open_create_model_dialog'%>Create Model</a>
+  <div id="create_model_form">
+    <form>
+      Model Name: <input id="new_model_name" name="new_model_name" type="text" /><br>
+      <table id="create_model_table">
+        <tbody>
+          <tr>
+            <td><input name="new_model_column_name_1" type="text" /></td>
+            <td class="separator">:</td>
+            <td><input name="new_model_column_type_1" type="text" value="string" /></td>
+          </tr>
+        </tbody>
+      </table>
+      <div><a href="#" id="new_model_add_column" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span class="ui-button-text">Add More Column</span></a></div>
+    </form>
+  </div>
 </div>

data/lib/erd/migrator.rb

@@ -40,15 +40,18 @@ module Erd
         #TODO unload migraion classes
       end
 
+      # runs `rails g model [name]`
+      # @return generated migration filename
+      def execute_generate_model(name, options = nil)
+        result = execute_generator 'model', name, options
+        result.flatten.grep(%r(/db/migrate/.*\.rb))
+      end
+
       # runs `rails g migration [name]`
       # @return generated migration filename
       def execute_generate_migration(name, options = nil)
-        overwriting_argv([name, options]) do
-          Rails::Generators.configure! Rails.application.config.generators
-          result = Rails::Generators.invoke 'migration', [name, options], :behavior => :invoke, :destination_root => Rails.root
-          raise ::Erd::MigrationError, "#{name}#{"(#{options})" if options}" unless result
-          result.last.last
-        end
+        result = execute_generator 'migration', name, options
+        result.last.last
       end
 
       private
@@ -60,6 +63,15 @@ module Erd
       ensure
         Object.const_set :ARGV, original_argv
       end
+
+      def execute_generator(type, name, options = nil)
+        overwriting_argv([name, options]) do
+          Rails::Generators.configure! Rails.application.config.generators
+          result = Rails::Generators.invoke type, [name, options], :behavior => :invoke, :destination_root => Rails.root
+          raise ::Erd::MigrationError, "#{name}#{"(#{options})" if options}" unless result
+          result
+        end
+      end
     end
   end
 end

data/lib/erd/railtie.rb

@@ -5,10 +5,12 @@ module Erd
   autoload :Migrator, 'erd/migrator'
 
   class Railtie < ::Rails::Railtie #:nodoc:
-    config.to_prepare do
-      if Rails.env.development?
-        Rails.application.routes.append do
-          mount Erd::Engine, :at => '/erd'
+    initializer 'erd' do |app|
+      ActiveSupport.on_load(:after_initialize) do
+        if Rails.env.development?
+          Rails.application.routes.append do
+            mount Erd::Engine, :at => '/erd'
+          end
         end
       end
     end

data/lib/erd/version.rb

@@ -1,3 +1,3 @@
 module Erd
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end