erd 0.1.2 → 0.1.3

data/.gitignore

@@ -14,4 +14,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+spec/fake_app/tmp/*.*

data/Rakefile

@@ -1,2 +1,10 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+task :noop do; end
+task :default => :spec
+
+RSpec::Core::RakeTask.new(:spec => :noop)

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

@@ -1,8 +1,20 @@
 class ERD
   constructor: (@name, @elem, @edges) ->
-    @paper = Raphael(name, @elem.css('width'), @elem.css('height'))
+    svg_width = @elem.data('svg_width')
+    svg_height = @elem.data('svg_height')
+    if (svg_width > @elem.width())
+      size = @elem.width() / svg_width
+      $('#erd > .model').each ->
+        left = parseFloat $(this).css('left')
+        top = parseFloat $(this).css('top')
+        $(this).css({left: left * size, top: top * size})
+    @paper = Raphael(name, @elem.width(), svg_height)
     @setup_handlers()
-    @connect_arrows()
+    models = @elem.find('.model')
+    @models = {}
+    for model in models
+      @models[$(model).data('model_name')] = model
+    @connect_arrows(@edges)
 
   upsert_change: (action, model, column, from, to) ->
     rows = ($(tr).find('td') for tr in $('#changes > tbody > tr'))
@@ -28,14 +40,16 @@ class ERD
     [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: ->
-    $.each @edges, (i, edge) =>
-      @connect_arrow $("##{edge.from}"), $("##{edge.to}")
+  connect_arrows: (edges) =>
+    $.each edges, (i, edge) =>
+      @connect_arrow edge, $(@models[edge.from]), $(@models[edge.to])
 
-  connect_arrow: (from_elem, to_elem) ->
+  connect_arrow: (edge, from_elem, to_elem) ->
     #TODO handle self referential associations
     return if from_elem.attr('id') == to_elem.attr('id')
 
+    edge.path.remove() if edge.path?
+
     from = @positions(from_elem)
     to = @positions(to_elem)
     #FIXME terrible code
@@ -64,7 +78,7 @@ class ERD
     else
       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'})
+    edge.path = @paper.path(path).attr({'stroke-width': 2, opacity: 0.5, 'arrow-end': 'classic-wide-long'})
 
   setup_handlers: ->
     @setup_click_handlers()
@@ -74,21 +88,14 @@ class ERD
   handle_drag: (ev, ui) =>
     target = $(ev.target)
     target.addClass('noclick')
-    model = target.data('model_name')
+    model_name = target.data('model_name')
     from = target.data('original_position')
     to = [target.css('left').replace(/px$/, ''), target.css('top').replace(/px$/, '')].join()
-    @upsert_change 'move', model, '', '', to
-    @paper.clear()
-    @connect_arrows(@edges)
+    @upsert_change 'move', model_name, '', '', to
+    @connect_arrows(@edges.filter((e)-> e.from == model_name || e.to == model_name))
 
   setup_click_handlers: ->
-    text_elems = [
-      'div.model_name_text',
-      'span.column_name_text',
-      'span.column_type_text'
-    ].join()
-
-    $(text_elems).on 'click', @handle_text_elem_click
+    $('div.model_name_text, span.column_name_text, span.column_type_text').on 'click', @handle_text_elem_click
     $('div.model a.add_column').on 'click', @handle_add_column_click
     $('div.model a.close').on 'click', @handle_remove_model_click
 
@@ -237,12 +244,12 @@ class ERD
 
     return unless confirm('remove this table?')
 
-    [model_id, model_name] = [parent.attr('id'), parent.data('model_name')]
+    model_name = parent.data('model_name')
     upsert_change 'remove_model', model_name, '', '', ''
     parent.hide()
 
     $.each @edges, (i, edge) =>
-      @edges.splice i, 1 if (edge.from == model_id) || (edge.to == model_id)
+      @edges.splice i, 1 if (edge.from == model_name) || (edge.to == model_name)
     @paper.clear()
     @connect_arrows(@edges)
 

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

@@ -1,44 +1,45 @@
-* {
+html, body, p, ul, ol, dl, p, li, dt, dd, form {
   margin: 0;
   padding: 0;
 }
 
-body div {
-  text-align: left;
-  margin: 0 auto;
-}
-
 li {
   list-style-type: none;
 }
 
-
-label, input { display:block; }
-input.text { margin-bottom:0px; width:95%; padding: 0; }
-fieldset { padding:0; border:0; margin-top:25px; }
-.ui-button { outline: 0; margin:0; padding: .4em 1em .5em; text-decoration:none; cursor:pointer; position: relative; text-align: center; }
-.ui-dialog .ui-state-highlight, .ui-dialog .ui-state-error { padding: 0; }
-
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
+#erd_box {
+  display: -webkit-box;
+  display: -moz-box;
+  display: box;
+}
 #erd_container {
-  float: left;
+  -webkit-box-flex: 1;
+  -moz-box-flex: 1;
+  box-flex: 1;
+}
+@mixin table-header {
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0.88, #aaa), color-stop(0.00, #eee));
+  background: -webkit-linear-gradient(top, #eee 0%, #aaa 88%);
+  background: -moz-linear-gradient(top, #eee 0%, #aaa 88%);
+  background: -o-linear-gradient(top, #eee 0%, #aaa 88%);
+  background: -ms-linear-gradient(top, #eee 0%, #aaa 88%);
+  background: linear-gradient(to bottom, #eee 0%, #aaa 88%);
+  font-weight: normal;
 }
 
 #migration {
-  position: relative;
-  float: right;
-  z-index: 999;
 
   table {
     td {
       font-size: small;
     }
+    th {
+      @include table-header;
+    }
   }
 }
 
 #erd {
-  position: absolute;
 
   form {
     * {
@@ -53,7 +54,23 @@ fieldset { padding:0; border:0; margin-top:25px; }
     cursor: move;
 
     a.close {
-      position:absolute; top:-1px; right:-1px; z-index:5; vertical-align:middle; line-height: 0.5; font-family:Arial, sans-serif; text-decoration:none; font-weight:normal; background-color:#c22; border:2px solid #999; color:#555; display:block; width:10px; height:10px; text-align:center; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; -moz-box-shadow: 0 0 1px 1px #666;-webkit-box-shadow: 0 0 1px 1px #666;box-shadow: 0 0 1px 1px #666;
+      position:absolute;
+      top:-6px;
+      right:-6px;
+      z-index:5;
+      vertical-align:middle;
+      line-height: 13px;
+      font-family:Arial, sans-serif;
+      text-decoration:none;
+      font-weight:normal;
+      background-color:#eee;
+      border:1px solid #500;
+      color:#500;
+      display:block;
+      width:16px;
+      height:16px;
+      text-align:center;
+      border-radius: 8px;
     }
     div.add_column_box {
       text-align: center;
@@ -70,6 +87,7 @@ fieldset { padding:0; border:0; margin-top:25px; }
       margin: 1px 5px 0 5px auto;
       div.model_name_text {
         text-align: center;
+        @include table-header;
       }
     }
     div.model_name > div.model_name_text:hover {
@@ -132,3 +150,4 @@ table, th, td {
   border: 1px #000 solid;
   border-collapse: collapse;
 }
+

data/app/controllers/erd/erd_controller.rb

@@ -1,11 +1,8 @@
-require 'rails/generators'
 require 'nokogiri'
 require 'rails_erd/diagram/graphviz'
 require 'erd/application_controller'
 
 module Erd
-  class MigrationError < StandardError; end
-
   class ErdController < ::Erd::ApplicationController
     def index
       Rails.application.eager_load!
@@ -19,18 +16,7 @@ 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(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]}
-          end
-        end
-      end
-      @migrations += migrated_versions.map {|v| {status: 'up', version: v, name: '*** NO FILE ***'}}
-      @migrations.sort_by! {|m| m[:version]}
+      @migrations = Erd::Migrator.status
     end
 
     def update
@@ -39,29 +25,23 @@ module Erd
       changes.each do |row|
         begin
           action, model, column, from, to = row['action'], row['model'].tableize, row['column'], row['from'], row['to']
-          before_migration_files = Dir.glob Rails.root.join('db', 'migrate', '*.rb')
           case action
           when 'remove_model'
-            execute_generate_migration "drop_#{model}"
-            generated_migration_file = (Dir.glob(Rails.root.join('db', 'migrate', '*.rb')) - before_migration_files).first
+            generated_migration_file = Erd::Migrator.execute_generate_migration "drop_#{model}"
             gsub_file generated_migration_file, /def up.*  end/m, "def change\n    drop_table :#{model}\n  end"
           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
+            generated_migration_file = Erd::Migrator.execute_generate_migration "rename_#{from}_to_#{to}"
             gsub_file generated_migration_file, /def up.*  end/m, "def change\n    rename_table :#{from}, :#{to}\n  end"
           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
+            Erd::Migrator.execute_generate_migration "add_#{name}_to_#{model}", ["#{name}:#{type}"]
           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
+            generated_migration_file = Erd::Migrator.execute_generate_migration "rename_#{model}_#{from}_to_#{to}"
             gsub_file generated_migration_file, /def up.*  end/m, "def change\n    rename_column :#{model}, :#{from}, :#{to}\n  end"
           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
+            generated_migration_file = Erd::Migrator.execute_generate_migration "change_#{model}_#{column}_type_to_#{to}"
             gsub_file generated_migration_file, /def up.*  end/m, "def change\n    change_column :#{model}, :#{column}, :#{to}\n  end"
           when 'move'
             json_file = Rails.root.join('tmp', 'erd_positions.json')
@@ -80,7 +60,7 @@ module Erd
     end
 
     def migrate
-      run_migrations :up => params[:up], :down => params[:down]
+      Erd::Migrator.run_migrations :up => params[:up], :down => params[:down]
       redirect_to erd.root_path
     end
 
@@ -91,51 +71,20 @@ module Erd
       # node name x y width height label style shape color fillcolor
       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 = label_doc.search('table')[0].search('tr > td').first.text
+        model_name = node_name.sub(/^m_/, '')
         next if model_name == 'ActiveRecord::SchemaMigration'
         columns = []
         if (cols_table = label_doc.search('table')[1])
           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, :name => node_name, :x => (custom_x || BigDecimal(x) * ratio), :y => (custom_y || BigDecimal(y) * ratio), :width => BigDecimal(width) * ratio, :height => height, :columns => columns}
+        {:model => model_name, :x => (custom_x || BigDecimal(x) * ratio), :y => (custom_y || BigDecimal(y) * ratio), :width => BigDecimal(width) * ratio, :height => height, :columns => columns}
       }.compact
       # edge tail head n x1 y1 .. xn yn [label xl yl] style color
-      edges = plain.scan(/^edge ([^ ]+)+ ([^ ]+)/).map {|from, to| {:from => from, :to => to}}
+      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) * ratio, :height => BigDecimal(svg_height) * ratio, :models => models, :edges => edges}
     end
 
-    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
-      end
-    end
-
-    # `rake db:migrate`
-    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|
-          ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-        end
-      end
-    end
-
-    # a dirty workaround to make rspec-rails run
-    def overwriting_argv(value, &block)
-      original_argv = ARGV
-      Object.const_set :ARGV, value
-      block.call
-    ensure
-      Object.const_set :ARGV, original_argv
-    end
-
     def gsub_file(path, flag, *args, &block)
       path = File.expand_path path, Rails.root
 

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

@@ -1,4 +1,4 @@
-<div id="<%= model[:name] %>" class="model" style="top: <%= model[:y] %>px; left: <%= model[:x] %>px;" data-model_name="<%= model[:model] %>">
+<div id="erd-<%= model[:model] %>" class="model" style="top: <%= model[:y] %>px; left: <%= model[:x] %>px;" data-model_name="<%= model[:model] %>">
   <a href="#!" class="close"> x </a>
   <div class="model_name">
     <div class="model_name_text"><%= model[:model] %></div>

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

@@ -1,6 +1,4 @@
-<div id="erd" style="border: 1px solid black; width: <%= width %>pt; height: <%= height %>pt;">
+<div id="erd" data-svg_width="<%= width %>" data-svg_height="<%= height %>">
   <%= render :partial => 'erd/erd/model', :collection => models -%>
-  <svg width="<%= width %>pt" height="<%= height %>pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  </svg>
   <script>window.raw_edges = <%= edges.to_json.html_safe %>;</script>
 </div>

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

@@ -1,4 +1,4 @@
-<div>
+<div id="erd_box">
   <div id="erd_container">
     <%=raw @erd %>
   </div>

data/app/views/layouts/erd/application.html.erb

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <meta charset='utf-8'>
   <title>ERD - <%= Rails.application.class.parent.name %></title>
   <%= stylesheet_link_tag    'erd/application', :media => 'all' %>
   <%= javascript_include_tag 'erd/application' %>

data/erd.gemspec

@@ -18,8 +18,8 @@ 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 'capybara'
+  gem.add_development_dependency 'rr'
   gem.add_development_dependency 'sqlite3'
 end

data/lib/erd/migrator.rb

@@ -0,0 +1,60 @@
+require 'rails/generators'
+
+module Erd
+  class MigrationError < StandardError; end
+
+  class Migrator
+    class << self
+      def status
+        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(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]}
+            end
+          end
+        end
+        migrations += migrated_versions.map {|v| {:status => 'up', :version => v, :name => '*** NO FILE ***'}}
+        migrations.sort_by {|m| m[:version]}
+      end
+
+      # `rake db:migrate`
+      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|
+            ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+          end
+        end
+        #TODO unload migraion classes
+      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
+      end
+
+      private
+      # a dirty workaround to make rspec-rails run
+      def overwriting_argv(value, &block)
+        original_argv = ARGV
+        Object.const_set :ARGV, value
+        block.call
+      ensure
+        Object.const_set :ARGV, original_argv
+      end
+    end
+  end
+end

data/lib/erd/railtie.rb

@@ -1,7 +1,10 @@
 require 'rails'
 require 'erd/engine'
 
+
 module Erd
+  autoload :Migrator, 'erd/migrator'
+
   class Railtie < ::Rails::Railtie #:nodoc:
     initializer 'erd' do |app|
       ActiveSupport.on_load(:after_initialize) do

data/lib/erd/version.rb

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

data/spec/fake_app/db/migrate/20120428022519_create_authors.rb

@@ -0,0 +1,9 @@
+class CreateAuthors < ActiveRecord::Migration
+  def change
+    create_table :authors do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/spec/fake_app/db/migrate/20120428022535_create_books.rb

@@ -0,0 +1,11 @@
+class CreateBooks < ActiveRecord::Migration
+  def change
+    create_table :books do |t|
+      t.references :author
+      t.string :title
+
+      t.timestamps
+    end
+    add_index :books, :author_id
+  end
+end

data/spec/fake_app/fake_app.rb

@@ -0,0 +1,30 @@
+require 'active_record'
+require 'action_controller/railtie'
+
+# config
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+
+module ErdApp
+  class Application < Rails::Application
+    # Rais.root
+    config.root = File.dirname(__FILE__)
+
+    config.secret_token = 'fall to your knees and repent if you please'
+    config.session_store :cookie_store, :key => '_myapp_session'
+    config.active_support.deprecation = :log
+
+    config.app_generators.orm :active_record, :migration => true, :timestamps => true
+  end
+end
+ErdApp::Application.initialize!
+
+# models
+class Author < ActiveRecord::Base
+  has_many :books
+end
+class Book < ActiveRecord::Base
+  belongs_to :author
+end
+
+# helpers
+module ApplicationHelper; end

data/spec/lib/migrator_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe Erd::Migrator do
+  subject { Erd::Migrator }
+  after do
+    Dir.glob(Rails.root.join('db/migrate/*.rb')).each do |f|
+      FileUtils.rm f unless File.basename(f).in? %w(20120428022519_create_authors.rb 20120428022535_create_books.rb)
+    end
+  end
+  describe '.status' do
+    context 'when all migrations are up' do
+      its(:status) { should == [{:status => 'up', :version => '20120428022519', :name => 'create_authors'}, {:status => 'up', :version => '20120428022535', :name => 'create_books'}] }
+    end
+
+    context 'when one is undone' do
+      before do
+        FileUtils.touch Rails.root.join('db/migrate/20999999999999_create_foobars.rb')
+      end
+      its(:status) { should == [{:status => 'up', :version => '20120428022519', :name => 'create_authors'}, {:status => 'up', :version => '20120428022535', :name => 'create_books'}, {:status => 'down', :version => '20999999999999', :name => 'create_foobars'}] }
+    end
+  end
+
+  describe '.run_migrations' do
+    before do
+      FileUtils.touch Rails.root.join('db/migrate/20999999999999_create_foobars.rb')
+      mock(ActiveRecord::Migrator).run(:up, 'db/migrate', 20999999999999)
+      mock(ActiveRecord::SchemaDumper).dump(ActiveRecord::Base.connection, anything)
+    end
+    specify do
+      subject.run_migrations(:up => ['20999999999999'])
+    end
+  end
+
+  describe '.execute_generate_migration' do
+    before do
+      stub.proxy(Time).now {|t| stub(t).utc { Time.new 2012, 5, 12, 13, 26 } }
+    end
+    specify do
+      subject.execute_generate_migration('create_foobars').should eq Rails.root.join('db/migrate', '20120512132600_create_foobars.rb').to_s
+    end
+  end
+end

data/spec/requests/erd_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+feature 'erd#index' do
+  scenario 'with author and book model' do
+    visit '/erd'
+    page.should have_content 'Author'
+    page.should have_content 'name'
+    page.should have_content 'Book'
+    page.should have_content 'title'
+  end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,19 @@
-require 'rubygems'
-require 'bundler'
-
-Bundler.require :default, :development
-
-Combustion.initialize!
-
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+# load Rails first
+require 'rails'
+require 'erd'
+# needs to load the app before loading rspec/rails => capybara
+require 'fake_app/fake_app'
 require 'rspec/rails'
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.use_transactional_fixtures = true
+  config.mock_with :rr
+  config.before :all do
+    ActiveRecord::Migration.verbose = false
+    ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths.map {|p| Rails.root.join p}, nil)
+  end
 end

metadata

@@ -1,89 +1,118 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: erd
-version: !ruby/object:Gem::Version
-  version: 0.1.2
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
-authors:
+authors: 
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-22 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails-erd
-  requirement: &70212334462400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 4
+        - 5
         version: 0.4.5
   type: :runtime
-  prerelease: false
-  version_requirements: *70212334462400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &70212334461440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
   prerelease: false
-  version_requirements: *70212334461440
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &70212334460620 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: capybara
   prerelease: false
-  version_requirements: *70212334460620
-- !ruby/object:Gem::Dependency
-  name: combustion
-  requirement: &70212334459800 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rr
   prerelease: false
-  version_requirements: *70212334459800
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: &70212334459100 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70212334459100
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &70212334458260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70212334458260
+  version_requirements: *id006
 description: erd engine on Rails
-email:
+email: 
 - ronnie@dio.jp
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -105,51 +134,59 @@ files:
 - erd.gemspec
 - lib/erd.rb
 - lib/erd/engine.rb
+- lib/erd/migrator.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/fake_app/db/migrate/20120428022519_create_authors.rb
+- spec/fake_app/db/migrate/20120428022535_create_books.rb
+- spec/fake_app/db/schema.rb
+- spec/fake_app/fake_app.rb
+- spec/fake_app/log/.gitignore
+- spec/fake_app/tmp/.gitkeep
+- spec/lib/migrator_spec.rb
+- spec/requests/erd_spec.rb
 - spec/spec_helper.rb
 - vendor/assets/javascripts/raphael-min.js
 homepage: https://github.com/amatsuda/erd
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: erd engine on Rails
-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
+test_files: 
+- spec/fake_app/db/migrate/20120428022519_create_authors.rb
+- spec/fake_app/db/migrate/20120428022535_create_books.rb
+- spec/fake_app/db/schema.rb
+- spec/fake_app/fake_app.rb
+- spec/fake_app/log/.gitignore
+- spec/fake_app/tmp/.gitkeep
+- spec/lib/migrator_spec.rb
+- spec/requests/erd_spec.rb
 - spec/spec_helper.rb

data/spec/controllers/erd_controller_spec.rb

@@ -1,10 +0,0 @@
-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

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

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

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

data/spec/internal/config/database.yml

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

data/spec/internal/config/routes.rb

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

data/spec/internal/db/schema.rb

@@ -1,15 +0,0 @@
-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