erd 0.1.1 → 0.1.2

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

@@ -10,14 +10,22 @@ class ERD
     $(rows).each (i, row) ->
       existing = row if (action == $(row[0]).html()) && (model == $(row[1]).html()) && (column == $(row[2]).html())
     if existing == null
-      $('#changes > tbody').append("<tr><td>#{action}</td><td>#{model}</td><td>#{column}</td><td>#{from}</td><td>#{to}</td></tr>")
+      $('#changes > tbody').append("""
+        <tr>
+          <td data-name="action">#{action}</td>
+          <td data-name="model">#{model}</td>
+          <td data-name="column">#{column}</td>
+          <td data-name="from">#{from}</td>
+          <td data-name="to">#{to}</td>
+        </tr>
+      """)
     else
       $(existing[3]).text(from)
       $(existing[4]).text(to)
     $('#changes').show()
 
   positions: (div) ->
-    [left, width, top, height] = [parseInt(div.css('left')), parseInt(div.css('width')), parseInt(div.css('top')), parseInt(div.css('height'))]
+    [left, width, top, height] = [parseFloat(div.css('left')), parseFloat(div.css('width')), parseFloat(div.css('top')), parseFloat(div.css('height'))]
     {left: left, right: left + width, top: top, bottom: top + height, center: {x: (left + left + width) / 2, y: (top + top + height) / 2}, vertex: {}}
 
   connect_arrows: ->
@@ -52,9 +60,9 @@ class ERD
         from.vertex.direction = 'h'
 
     if from.vertex.direction == 'h'
-      path = "M#{parseInt(from.vertex.x)} #{parseInt(from.vertex.y)}H#{parseInt((from.vertex.x + to.vertex.x) / 2)} V#{parseInt(to.vertex.y)} H#{parseInt(to.vertex.x)}"
+      path = "M#{Math.floor(from.vertex.x)} #{Math.floor(from.vertex.y)}H#{Math.floor((from.vertex.x + to.vertex.x) / 2)} V#{Math.floor(to.vertex.y)} H#{Math.floor(to.vertex.x)}"
     else
-      path = "M#{parseInt(from.vertex.x)} #{parseInt(from.vertex.y)}V#{parseInt((from.vertex.y + to.vertex.y) / 2)} H#{parseInt(to.vertex.x)} V#{parseInt(to.vertex.y)}"
+      path = "M#{Math.floor(from.vertex.x)} #{Math.floor(from.vertex.y)}V#{Math.floor((from.vertex.y + to.vertex.y) / 2)} H#{Math.floor(to.vertex.x)} V#{Math.floor(to.vertex.y)}"
 
     @paper.path(path).attr({'stroke-width': 2, opacity: 0.5, 'arrow-end': 'classic-wide-long'})
 
@@ -91,16 +99,18 @@ class ERD
     $('form.add_column_form').on 'submit', @handle_add_column
     $('#changes_form').on 'submit', @handle_save
 
-  handle_save: ->
-    j = '['
-    rows = ($(tr).find('td') for tr in $('#changes > tbody > tr'))
-    $(rows).each (i, row) ->
-      j += "{\"action\": \"#{$(row[0]).html()}\", \"model\": \"#{$(row[1]).html()}\", \"column\": \"#{$(row[2]).html()}\", \"from\": \"#{$(row[3]).html()}\", \"to\": \"#{$(row[4]).html()}\"}"
-      j += ',' if i < rows.length - 1
-    j += ']'
-    $('#changes_form').find('input[name=changes]').val(j)
-
-  handle_add_column: (ev) ->
+  handle_save: (ev) =>
+    changes = $('#changes > tbody > tr').map(->
+      change = {}
+      $(this).find('td').each ->
+        name = $(this).data('name')
+        value = $(this).html()
+        change[name] = value
+      change
+    ).toArray()
+    $('#changes_form').find('input[name=changes]').val(JSON.stringify(changes))
+
+  handle_add_column: (ev) =>
     ev.preventDefault()
     target = $(ev.target)
     name = target.find('input[name=name]').val()
@@ -108,7 +118,7 @@ class ERD
 
     model = target.find('input[name=model]').val()
     type  = target.find('input[name=type]').val()
-    upsert_change 'add_column', model, "#{name}(#{type})", '', ''
+    @upsert_change 'add_column', model, "#{name}(#{type})", '', ''
 
     name_span = $("<span/>", class: 'column_name_text')
       .append(name)
@@ -131,7 +141,7 @@ class ERD
       .find('a.add_column')
       .show()
 
-  handle_change_column_type: (ev) ->
+  handle_change_column_type: (ev) =>
     ev.preventDefault()
     target = $(ev.target)
     to = target.find('input[name=to]').val()
@@ -141,14 +151,14 @@ class ERD
     column = target.find('input[name=column]').val()
     type   = target.find('input[name=type]').val()
     if to != type
-      upsert_change 'alter_column', model, column, type, to
+      @upsert_change 'alter_column', model, column, type, to
 
     target.hide()
       .siblings('.column_type_text')
       .text(to)
       .show()
 
-  handle_rename_column: (ev) ->
+  handle_rename_column: (ev) =>
     ev.preventDefault()
     target = $(ev.target)
     to = target.find('input[name=to]').val()
@@ -157,14 +167,14 @@ class ERD
     model = target.find('input[name=model]').val()
     column = target.find('input[name=column]').val()
     if to != column
-      upsert_change 'rename_column', model, column, column, to
+      @upsert_change 'rename_column', model, column, column, to
 
     target.hide()
       .siblings('.column_name_text')
       .text(to)
       .show()
 
-  handle_rename_model: (ev) ->
+  handle_rename_model: (ev) =>
     ev.preventDefault()
     target = $(ev.target)
     to = target.find('input[name=to]').val()
@@ -172,16 +182,16 @@ class ERD
 
     model = target.find('input[name=model]').val()
     if to != model
-      upsert_change 'rename_model', model, '', model, to
+      @upsert_change 'rename_model', model, '', model, to
 
     target.hide()
       .siblings('.model_name_text')
       .text(to)
       .show()
 
-  handle_add_column_click: (ev) ->
+  handle_add_column_click: (ev) =>
     ev.preventDefault()
-    target = $(@)
+    target = $(ev.currentTarget)
 
     m = target.parents('div.model')
     if m.hasClass('noclick')
@@ -198,8 +208,8 @@ class ERD
       .val('')
       .focus()
 
-  handle_text_elem_click: (ev) ->
-    target = $(@)
+  handle_text_elem_click: (ev) =>
+    target = $(ev.currentTarget)
     text = target.text()
 
     m = target.parents('div.model')

data/app/controllers/erd/erd_controller.rb

@@ -8,9 +8,8 @@ module Erd
 
   class ErdController < ::Erd::ApplicationController
     def index
-  #     `bundle exec rake erd filename=tmp/erd filetype=plain`
       Rails.application.eager_load!
-      RailsERD.options[:filename], RailsERD.options[:filetype] = 'tmp/erd', 'plain'
+      RailsERD.options[:filename], RailsERD.options[:filetype] = Rails.root.join('tmp/erd'), 'plain'
       RailsERD::Diagram::Graphviz.create
       plain = Rails.root.join('tmp/erd.plain').read
       positions = if (json = Rails.root.join('tmp/erd_positions.json')).exist?
@@ -23,7 +22,7 @@ module Erd
       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|
+        Dir.foreach(Rails.root.join(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]}

data/config.ru

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
+
+Combustion.initialize!
+run Combustion::Application

data/erd.gemspec

@@ -17,4 +17,9 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'rails-erd', ['>= 0.4.5']
   gem.add_runtime_dependency 'nokogiri'
+
+  gem.add_development_dependency 'ruby-debug19'
+  gem.add_development_dependency 'combustion', '~> 0.3.1'
+  gem.add_development_dependency 'rspec-rails'
+  gem.add_development_dependency 'sqlite3'
 end

data/lib/erd/version.rb

@@ -1,3 +1,3 @@
 module Erd
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/controllers/erd_controller_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Erd::ErdController do
+  it 'should GET :index' do
+    get :index
+
+    response.should render_template('index')
+  end
+end
+

data/spec/internal/app/models/post.rb

@@ -0,0 +1,3 @@
+class Post < ActiveRecord::Base
+  belongs_to :user
+end

data/spec/internal/app/models/user.rb

@@ -0,0 +1,3 @@
+class User < ActiveRecord::Base
+  has_many :posts
+end

data/spec/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/combustion_test.sqlite

data/spec/internal/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  #
+end

data/spec/internal/db/schema.rb

@@ -0,0 +1,15 @@
+ActiveRecord::Schema.define do
+  create_table "posts", :force => true do |t|
+    t.string   "title"
+    t.text     "content"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+end

data/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
+
+Combustion.initialize!
+
+require 'rspec/rails'
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-erd
-  requirement: &70208383601640 !ruby/object:Gem::Requirement
+  requirement: &70212334462400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70208383601640
+  version_requirements: *70212334462400
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70208383631860 !ruby/object:Gem::Requirement
+  requirement: &70212334461440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,51 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208383631860
+  version_requirements: *70212334461440
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &70212334460620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70212334460620
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: &70212334459800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *70212334459800
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &70212334459100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70212334459100
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70212334458260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70212334458260
 description: erd engine on Rails
 email:
 - ronnie@dio.jp
@@ -56,12 +100,23 @@ files:
 - app/views/erd/erd/erd.html.erb
 - app/views/erd/erd/index.html.erb
 - app/views/layouts/erd/application.html.erb
+- config.ru
 - config/routes.rb
 - erd.gemspec
 - lib/erd.rb
 - lib/erd/engine.rb
 - lib/erd/railtie.rb
 - lib/erd/version.rb
+- spec/controllers/erd_controller_spec.rb
+- spec/internal/app/models/post.rb
+- spec/internal/app/models/user.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/internal/public/favicon.ico
+- spec/spec_helper.rb
 - vendor/assets/javascripts/raphael-min.js
 homepage: https://github.com/amatsuda/erd
 licenses: []
@@ -87,4 +142,14 @@ rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: erd engine on Rails
-test_files: []
+test_files:
+- spec/controllers/erd_controller_spec.rb
+- spec/internal/app/models/post.rb
+- spec/internal/app/models/user.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/internal/public/favicon.ico
+- spec/spec_helper.rb