erd 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49c35f48267facc12a37e826f6f2f794d5142d31
-  data.tar.gz: efa660ae1f7717cbc5be360b0026e6775a83afb9
+  metadata.gz: c95c4586cc6d74e2464968fb1a334cdc1f5703a4
+  data.tar.gz: fddcd53eeb3bd88041f9590a2c2f9ba100bed013
 SHA512:
-  metadata.gz: 3b1b411f46377f22b64aaeeea60f99261e3a33bf19c6add9b7fc4850682f432ae8cdaa4b17c88a3c4438d94916b5ec5f013e84c60705c1d6f1ef073e9f533142
-  data.tar.gz: 19391d806293270dddec609d03ebd63859a5941b19ed012fe3d5bea31bf62da4ecc04372891a23d1a04aa63c395ca9bf71abed8d74d32b4cbaa23be212b9f7e9
+  metadata.gz: cd3f0c4003242d6293d8bdfe967ea34a2e7af4bd28f955c40490471b2ad229f197a91a3b39bf1f3f919e647b9919b37945d2641d5fc3f1f80e1fb53089064b8d
+  data.tar.gz: 2e96eff3f2e0b2b81c28b36cd95802ab53b8d3ad0fe0fc6a2a77ed76028e373906b0b82feefa724eb90f23bdbcfb496d04b0e48e764da830655e817bd76c2aa9

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

@@ -138,20 +138,14 @@ class ERD
     type_span = $("<span/>", class: 'column_type_text unsaved')
       .append(type)
 
-    li_node = $("<li/>", class: 'column unsaved')
-      .append(name_span)
-      .append("&nbsp;")
-      .append(type_span)
+    li_node = $("<li/>", class: 'column unsaved').append(name_span).append("&nbsp;").append(type_span)
 
     target.hide()
       .parent()
       .siblings('.columns')
-      .find('ul')
-      .append(li_node)
+      .find('ul').append(li_node).end()
       .end()
-      .end()
-      .find('a.add_column')
-      .show()
+      .find('a.add_column').show()
 
   handle_change_column_type: (ev) =>
     ev.preventDefault()
@@ -166,12 +160,8 @@ class ERD
       @upsert_change 'alter_column', model, column, type, to
 
     target.hide()
-      .siblings('.column_type_text')
-      .text(to)
-      .show()
-      .addClass('unsaved')
-      .parents('.column')
-      .addClass('unsaved')
+      .siblings('.column_type_text').text(to).show().addClass('unsaved')
+      .parents('.column').addClass('unsaved')
 
   handle_rename_column: (ev) =>
     ev.preventDefault()
@@ -185,11 +175,8 @@ class ERD
       @upsert_change 'rename_column', model, column, column, to
 
     target.hide()
-      .siblings('.column_name_text')
-      .text(to)
-      .show()
-      .parents('.column')
-      .addClass('unsaved')
+      .siblings('.column_name_text').text(to).show()
+      .parents('.column').addClass('unsaved')
 
   handle_rename_model: (ev) =>
     ev.preventDefault()
@@ -202,10 +189,7 @@ class ERD
       @upsert_change 'rename_model', model, '', model, to
 
     target.hide()
-      .siblings('.model_name_text')
-      .text(to)
-      .show()
-      .addClass('unsaved')
+      .siblings('.model_name_text').text(to).show().addClass('unsaved')
 
   handle_add_column_click: (ev) =>
     ev.preventDefault()
@@ -217,16 +201,10 @@ class ERD
       return false
 
     target.hide()
-      .next('form')
-      .show()
-      .find('a.cancel')
-      .show()
-      .find('input[name=type]')
-      .val('string')
-      .end()
-      .find('input[name=name]')
-      .val('')
-      .focus()
+      .next('form').show()
+      .find('a.cancel').show().end()
+      .find('input[name=type]').val('string').end()
+      .find('input[name=name]').val('').focus()
 
   handle_cancel_click: (ev) =>
     ev.preventDefault()
@@ -238,10 +216,8 @@ class ERD
       return false
 
     target.hide()
-      .parent('form')
-      .hide()
-      .prev('a.add_column, span, div')
-      .show()
+      .parent('form').hide()
+      .prev('a.add_column, span, div').show()
 
 
   handle_text_elem_click: (ev) =>
@@ -254,13 +230,9 @@ class ERD
       return false
 
     target.hide()
-      .next('form')
-      .show()
-      .find('a.cancel')
-      .show()
-      .find('input[name=to]')
-      .val(text)
-      .focus()
+      .next('form').show()
+      .find('a.cancel').show().end()
+      .find('input[name=to]').val(text).focus()
 
   handle_remove_model_click: (ev) =>
     ev.preventDefault()
@@ -303,10 +275,8 @@ class ERD
       return false
 
     target.hide()
-      .next('div')
-      .show()
-      .find('#close_migration')
-      .show()
+      .next('div').show()
+      .find('#close_migration').show()
 
 
   handle_close_migration_click: (ev) =>
@@ -321,10 +291,8 @@ class ERD
       return false
 
     target.hide()
-      .parent()
-      .hide()
-      .prev('div')
-      .show()
+      .parent().hide()
+      .prev('div').show()
 
 $ ->
   window.erd = new ERD('erd', $('#erd'), window.raw_edges)

data/app/controllers/erd/erd_controller.rb

@@ -25,51 +25,43 @@ module Erd
       changes.each do |row|
         begin
           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'
-            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'
+          if action == '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
             json_file.open('w') {|f| f.write positions.to_json}
           else
-            raise "unexpected action: #{action}"
+            case action
+            when 'create_model'
+              columns = column.split(' ').compact
+              generated_migration_file = Erd::GenaratorRunner.execute_generate_model model, columns
+            when 'remove_model'
+              model = model.tableize
+              generated_migration_file = Erd::GenaratorRunner.execute_generate_migration "drop_#{model}"
+              gsub_file generated_migration_file, /def (up|change).*  end/m, "def change\n    drop_table :#{model}\n  end"
+            when 'rename_model'
+              model, from, to = from.tableize, to.tableize, model.tableize
+              generated_migration_file = Erd::GenaratorRunner.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"
+            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::GenaratorRunner.execute_generate_migration "add_#{name}_to_#{model}", ["#{name}:#{type}"]
+            when 'rename_column'
+              model = model.tableize
+              generated_migration_file = Erd::GenaratorRunner.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"
+            when 'alter_column'
+              model = model.tableize
+              generated_migration_file = Erd::GenaratorRunner.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"
+            else
+              raise "unexpected action: #{action}"
+            end
+            Erd::Migrator.run_migrations :up => generated_migration_file
+            executed_migrations << generated_migration_file
           end
         rescue ::Erd::MigrationError => e
           failed_migrations << e.message

data/erd.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = 'erd engine on Rails'
   gem.summary       = 'erd engine on Rails'
   gem.homepage      = 'https://github.com/amatsuda/erd'
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/erd/generator_runner.rb

@@ -0,0 +1,38 @@
+module Erd
+  class GenaratorRunner
+    class << self
+      # 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)
+        result = execute_generator 'migration', name, options
+        result.last.last
+      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
+
+      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/migrator.rb

@@ -39,39 +39,6 @@ module Erd
         end
         #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)
-        result = execute_generator 'migration', name, options
-        result.last.last
-      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
-
-      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

@@ -3,6 +3,7 @@ require 'erd/engine'
 
 module Erd
   autoload :Migrator, 'erd/migrator'
+  autoload :GenaratorRunner, 'erd/generator_runner'
 
   class Railtie < ::Rails::Railtie #:nodoc:
     initializer 'erd' do |app|

data/lib/erd/version.rb

@@ -1,3 +1,3 @@
 module Erd
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-erd
@@ -164,6 +164,7 @@ files:
 - erd.gemspec
 - lib/erd.rb
 - lib/erd/engine.rb
+- lib/erd/generator_runner.rb
 - lib/erd/migrator.rb
 - lib/erd/railtie.rb
 - lib/erd/version.rb
@@ -195,7 +196,8 @@ files:
 - vendor/assets/stylesheets/jquery-ui.css
 - vendor/assets/stylesheets/jquery.ui.dialog.css
 homepage: https://github.com/amatsuda/erd
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []