erd 0.1.3 → 0.1.4

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

@@ -1,14 +1,6 @@
 class ERD
   constructor: (@name, @elem, @edges) ->
-    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)
+    @paper = Raphael(name, @elem.data('svg_width'), @elem.data('svg_height'))
     @setup_handlers()
     models = @elem.find('.model')
     @models = {}

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

@@ -28,7 +28,6 @@ li {
 }
 
 #migration {
-
   table {
     td {
       font-size: small;
@@ -40,7 +39,6 @@ li {
 }
 
 #erd {
-
   form {
     * {
       float: left;
@@ -136,10 +134,46 @@ li {
   }
 }
 
+#executed,#failed {
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+
+  h2 {
+    text-align: left;
+    font-weight: bold;
+    padding: 5px 5px 5px 15px;
+    font-size: 12px;
+    margin: -7px;
+    margin-bottom: 0px;
+    color: #fff;
+  }
+  h3 {
+    font-size: 12px;
+    margin: 0;
+    padding: 0;
+  }
+  ul li {
+    margin-left: 25px;
+    font-size: 12px;
+    list-style: square;
+  }
+}
+
+
+#executed {
+  border: 2px #0f0 solid;
+  h2 {
+    background-color: #0c0;
+  }
+}
 
 #failed {
   border: 2px #f00 solid;
-  padding: 2px;
+  h2 {
+    background-color: #c00;
+  }
 }
 
 #model_name_changes, #column_name_changes {
@@ -150,4 +184,3 @@ table, th, td {
   border: 1px #000 solid;
   border-collapse: collapse;
 }
-

data/app/controllers/erd/erd_controller.rb

@@ -21,7 +21,7 @@ module Erd
 
     def update
       changes = ActiveSupport::JSON.decode(params[:changes])
-      failed_migrations = []
+      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']
@@ -29,20 +29,30 @@ module Erd
           when 'remove_model'
             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"
+            Erd::Migrator.run_migrations :up => generated_migration_file
+            executed_migrations << generated_migration_file
           when 'rename_model'
             from, to = from.tableize, to.tableize
             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"
+            Erd::Migrator.run_migrations :up => generated_migration_file
+            executed_migrations << generated_migration_file
           when 'add_column'
             name_and_type = column.scan(/(.*)\((.*?)\)/).first
             name, type = name_and_type[0], name_and_type[1]
-            Erd::Migrator.execute_generate_migration "add_#{name}_to_#{model}", ["#{name}:#{type}"]
+            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'
             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"
+            Erd::Migrator.run_migrations :up => generated_migration_file
+            executed_migrations << generated_migration_file
           when 'alter_column'
             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"
+            Erd::Migrator.run_migrations :up => generated_migration_file
+            executed_migrations << generated_migration_file
           when 'move'
             json_file = Rails.root.join('tmp', 'erd_positions.json')
             positions = json_file.exist? ? ActiveSupport::JSON.decode(json_file.read) : {}
@@ -56,12 +66,12 @@ module Erd
         end
       end
 
-      redirect_to erd.root_path, :flash => {:failed_migrations => failed_migrations}
+      redirect_to erd.root_path, :flash => {:executed_migrations => {:up => executed_migrations}, :failed_migrations => failed_migrations}
     end
 
     def migrate
       Erd::Migrator.run_migrations :up => params[:up], :down => params[:down]
-      redirect_to erd.root_path
+      redirect_to erd.root_path, :flash => {:executed_migrations => params.slice(:up, :down)}
     end
 
     private

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

@@ -4,9 +4,22 @@
   </div>
 
   <div id="migration">
+    <%- if flash[:executed_migrations].present? -%>
+      <div id="executed">
+        <h2>Successfully executed the following migrations!</h2>
+        <%- [:up, :down].each do |direction| -%>
+          <h3><%= direction %></h3>
+          <ul>
+          <%- flash[:executed_migrations][direction].each do |m| -%>
+            <li><%= m %></li>
+          <%- end -%>
+          </ul>
+        <%- end -%>
+      </div>
+    <%- end -%>
     <%- if flash[:failed_migrations].present? -%>
       <div id="failed">
-        failed migrations
+        <h2>failed migrations</h2>
         <ul>
         <%- flash[:failed_migrations].each do |m| -%>
           <li><%= m %></li>
@@ -29,7 +42,7 @@
         <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>
+            <tr><td><label><%= check_box_tag (m[:status] == 'up' ? 'down[]' : 'up[]'), m[:filename] %><%= m[:status] %></label></td><td><%= m[:version] %></td><td><%= m[:name] %></td></tr>
           <%- end -%>
         </tbody>
       </table>

data/lib/erd/migrator.rb

@@ -12,20 +12,25 @@ module Erd
           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]}
+              migrations << {:status => status, :version => version_and_name[1], :name => version_and_name[2], :filename => file}
             end
           end
         end
-        migrations += migrated_versions.map {|v| {:status => 'up', :version => v, :name => '*** NO FILE ***'}}
+        migrations += migrated_versions.map {|v| {:status => 'up', :version => v, :name => '*** NO FILE ***', :filename => v}}
         migrations.sort_by {|m| m[:version]}
       end
 
       # `rake db:migrate`
+      # example:
+      #   run_migrations up: '/Users/a_matsuda/my_app/db/migrate/20120423023323_create_products.rb'
+      #   run_migrations up: '20120512020202', down: ...
+      #   run_migrations up: ['20120512020202', '20120609010203', ...]
       def run_migrations(migrations)
-        migrations.each do |direction, versions|
-          versions.each do |version|
+        migrations.each do |direction, version_or_filenames|
+          Array.wrap(version_or_filenames).each do |version_or_filename|
+            /^(?<version>\d{3,})/ =~ File.basename(version_or_filename)
             ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_path, version.to_i)
-          end if versions
+          end if version_or_filenames
         end
         if ActiveRecord::Base.schema_format == :ruby
           File.open(ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb", 'w') do |file|

data/lib/erd/version.rb

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

data/spec/lib/migrator_spec.rb

@@ -26,9 +26,12 @@ describe Erd::Migrator do
       mock(ActiveRecord::Migrator).run(:up, 'db/migrate', 20999999999999)
       mock(ActiveRecord::SchemaDumper).dump(ActiveRecord::Base.connection, anything)
     end
-    specify do
+    it 'runs migration by version number' do
       subject.run_migrations(:up => ['20999999999999'])
     end
+    it 'runs migration by migration filename' do
+      subject.run_migrations(:up => [Rails.root.join('db/migrate/20999999999999_create_foobars.rb')])
+    end
   end
 
   describe '.execute_generate_migration' do

metadata

@@ -1,118 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: erd
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails-erd
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70225565859540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 4
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70225565859540
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70225565857760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70225565857760
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &70225565857080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70225565857080
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &70225565856460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70225565856460
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &70225565855840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70225565855840
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70225565854540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70225565854540
 description: erd engine on Rails
-email: 
+email:
 - ronnie@dio.jp
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -149,38 +120,29 @@ files:
 - 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: erd engine on Rails
-test_files: 
+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