erd 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1312fbbdfb027c4ddf0da75c7e63beed30068e8
-  data.tar.gz: b3b6ad4ca6ef09e0f300eb13ed3e05fff9f1cbfc
+SHA256:
+  metadata.gz: 89e699a699726399895a401998276b6b36a6b38b120c2e14c973de7c13fbe8f4
+  data.tar.gz: d4a9db8626fbc276f33dd1ed7f820e854a9cef33c41cd4146bc6b6ffe040de13
 SHA512:
-  metadata.gz: bec98c793e0d4092627abd934d540606457bd3a72152d02ddea0bcd5cafc01e52d99470b490c19ac4d88f62c0fd71f23635ede0f1fb3e346336f66e6bcb30cd7
-  data.tar.gz: 26c6d775a0af3d217ebbe86db63140d8a3bb85d1d80f9da050c91c13b1e0f96c2d3aaef8363893d60edb542232f8864076793e4c6374cf6349061fc7c496c875
+  metadata.gz: 61a3938da621aaf9e2f8deb520535744a10b34564649adcdbb6dd2e6e871e8832837f1e8f30030b7e2b67058d11cf093af93e400ef2e9ae513d059582d877cb3
+  data.tar.gz: 1e33ceaabcbc8d5bb750d1fa4a100667f2275e09faa901eabfb291a53befe408c73e5e0d410999d87cdfc4a20bb376b7ab1b769c2f4dee3dda005eb8ac09567a

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+gemfiles/*.lock
 InstalledFiles
 _yardoc
 coverage
@@ -15,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 test/fake_app/tmp/*.*
+test/fake_app/tmp/cache/

data/.travis.yml

@@ -1,7 +1,52 @@
 language: ruby
 
-rvm:
-  - 2.3.0
+sudo: false
+
+addons:
+  apt:
+    packages:
+      - graphviz
+  chrome: stable
+
+cache:
+  - apt
+  - bundler
 
 before_install:
- - sudo apt-get install graphviz
+  - sudo apt update -qq
+  - sudo apt install -y chromium-chromedriver
+  - sudo ln -s /usr/lib/chromium-browser/chromedriver /usr/bin/
+  - gem install bundler
+
+rvm:
+  - 2.5.3
+  - 2.0.0
+
+gemfile:
+  - gemfiles/rails_52.gemfile
+  - gemfiles/rails_51.gemfile
+  - gemfiles/rails_50.gemfile
+  - gemfiles/rails_42.gemfile
+  - gemfiles/rails_41.gemfile
+  - gemfiles/rails_40.gemfile
+  - gemfiles/rails_32.gemfile
+
+matrix:
+  exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_52.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_51.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_50.gemfile
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails_42.gemfile
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails_41.gemfile
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails_40.gemfile
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails_32.gemfile
+  include:
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails_32.gemfile

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in erd.gemspec

data/Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
@@ -11,4 +13,4 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-task default: 'test'
+task :default => 'test'

data/app/controllers/erd/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Erd
   class ApplicationController < ActionController::Base
     protect_from_forgery

data/app/controllers/erd/erd_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 require 'rails_erd/diagram/graphviz'
 require 'erd/application_controller'
@@ -41,7 +43,7 @@ module Erd
               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
+              _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'

data/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler'
 

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Erd::Engine.routes.draw do
   get '/' => 'erd#index'
   put '/' => 'erd#update'

data/erd.gemspec

@@ -1,4 +1,6 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require File.expand_path('../lib/erd/version', __FILE__)
 
 Gem::Specification.new do |gem|
@@ -20,9 +22,13 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'nokogiri'
 
   gem.add_development_dependency 'rails', '>= 3.2'
+  gem.add_development_dependency 'sass-rails'
+  gem.add_development_dependency 'jquery-rails'
+  gem.add_development_dependency 'coffee-rails'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'test-unit-rails'
   gem.add_development_dependency 'capybara', '>= 2'
   gem.add_development_dependency 'rr'
   gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'selenium-webdriver'
 end

data/gemfiles/rails_32.gemfile

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 3.2.0'
+gem 'nokogiri', RUBY_VERSION < '1.9' ? '~> 1.5.0' : RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
+gem 'capybara', '~> 2.0.0'
+gem 'rubyzip', '0.9.9' if RUBY_VERSION < '1.9'
+
+gem 'test-unit-rails', '1.0.2'
+gem 'test-unit', '< 3.1'
+gem 'rails-erd', '< 1.2'

data/gemfiles/rails_40.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 4.0.0'
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'

data/gemfiles/rails_41.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 4.1.0'
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'

data/gemfiles/rails_42.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 4.2.0'
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'

data/gemfiles/rails_50.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 5.0.0'

data/gemfiles/rails_51.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 5.1.0'

data/gemfiles/rails_52.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', '~> 5.2.0'
+gem 'puma'

data/gemfiles/rails_edge.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'rails', github: 'rails/rails'

data/lib/erd.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'erd/version'
 require 'erd/railtie'

data/lib/erd/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Erd
   class Engine < ::Rails::Engine
     isolate_namespace Erd

data/lib/erd/generator_runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 module Erd
@@ -20,11 +22,13 @@ module Erd
       private
       # a dirty workaround to make rspec-rails run
       def overwriting_argv(value, &block)
-        original_argv = ARGV
-        Object.const_set :ARGV, value
+        original_argv = ARGV.dup
+        ARGV.clear
+        ARGV.concat value
         block.call
       ensure
-        Object.const_set :ARGV, original_argv
+        ARGV.clear
+        ARGV.concat original_argv
       end
 
       def execute_generator(type, name, options = nil)

data/lib/erd/migrator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 module Erd
@@ -6,7 +8,8 @@ module Erd
   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}
+        migration_table_name = defined?(ActiveRecord::SchemaMigration) ? ActiveRecord::SchemaMigration.table_name : ActiveRecord::Migrator.schema_migrations_table_name
+        migrated_versions = ActiveRecord::Base.connection.select_values("SELECT version FROM #{migration_table_name}").map {|v| '%.3d' % v}
         migrations = []
         ActiveRecord::Migrator.migrations_paths.each do |path|
           Dir.foreach(Rails.root.join(path)) do |file|
@@ -28,8 +31,13 @@ module Erd
       def run_migrations(migrations)
         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)
+            version = File.basename(version_or_filename)[/\d{3,}/]
+
+            if defined? ActiveRecord::MigrationContext  # >= 5.2
+              ActiveRecord::Base.connection.migration_context.run(direction, version.to_i)
+            else
+              ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_paths, version.to_i)
+            end
           end if version_or_filenames
         end
         if ActiveRecord::Base.schema_format == :ruby

data/lib/erd/railtie.rb

@@ -1,4 +1,6 @@
-require 'rails'
+# frozen_string_literal: true
+
+require 'rails/all'
 require 'erd/engine'
 
 module Erd

data/lib/erd/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Erd
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/test/fake_app/config/database.yml

@@ -0,0 +1,3 @@
+development:
+  adapter: sqlite3
+  database: ":memory:"

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

@@ -1,4 +1,6 @@
-class CreateAuthors < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class CreateAuthors < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
   def change
     create_table :authors do |t|
       t.string :name

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

@@ -1,4 +1,6 @@
-class CreateBooks < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class CreateBooks < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
   def change
     create_table :books do |t|
       t.references :author
@@ -6,6 +8,5 @@ class CreateBooks < ActiveRecord::Migration
 
       t.timestamps
     end
-    add_index :books, :author_id
   end
 end

data/test/fake_app/fake_app.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'action_controller/railtie'
 
 # config
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-
 module ErdApp
   class Application < Rails::Application
     # Rais.root

data/test/features/erd_test.rb

@@ -1,9 +1,16 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class ErdIndexTest < ActionDispatch::IntegrationTest
   test 'with author and book model' do
     visit '/erd'
-    assert has_content? 'Author', minimum: 1
+
+    if Capybara::VERSION > '3'
+      assert has_content? 'Author', :minimum => 1
+    else
+      assert has_content? 'Author'
+    end
     assert has_content? 'name'
     assert has_content? 'Book'
     assert has_content? 'title'

data/test/lib/migrator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class MigratorTest < ActiveSupport::TestCase
@@ -21,8 +23,15 @@ class MigratorTest < ActiveSupport::TestCase
 
   sub_test_case '.run_migrations' do
     setup do
-      FileUtils.touch Rails.root.join('db/migrate/20999999999999_create_foobars.rb')
-      mock(ActiveRecord::Migrator).run(:up, 'db/migrate', 20999999999999)
+      File.open(Rails.root.join('db/migrate/20999999999999_create_foobars.rb'), 'w') do |f|
+        f.puts 'class CreateFoobars < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration; end'
+      end
+
+      if defined? ActiveRecord::MigrationContext  # >= 5.2
+        mock.instance_of(ActiveRecord::MigrationContext).run(:up, 20999999999999)
+      else
+        mock(ActiveRecord::Migrator).run(:up, ['db/migrate'], 20999999999999)
+      end
       mock(ActiveRecord::SchemaDumper).dump(ActiveRecord::Base.connection, anything)
     end
     test 'runs migration by version number' do
@@ -36,7 +45,7 @@ end
 
 class GenaratorRunnerTest < ActiveSupport::TestCase
   setup do
-    stub.proxy(Time).now {|t| stub(t).utc { Time.new 2012, 5, 12, 13, 26 } }
+    stub.proxy(Time).now {|t| stub(t).utc { Time.parse '2012/5/12 13:26' } }
   end
   teardown do
     Dir.glob(Rails.root.join('db/migrate/*.rb')).each do |f|
@@ -45,6 +54,6 @@ class GenaratorRunnerTest < ActiveSupport::TestCase
   end
 
   test '.execute_generate_migration' do
-    assert_includes 'db/migrate/20120512132600_create_foobars.rb', Erd::GenaratorRunner.execute_generate_migration('create_foobars')
+    assert_includes Erd::GenaratorRunner.execute_generate_migration('create_foobars'), 'db/migrate/20120512132600_create_foobars.rb'
   end
 end

data/test/test_helper.rb

@@ -1,11 +1,36 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
+ENV['RAILS_ENV'] = 'development'
+
 # load Rails first
 require 'rails'
+require 'jquery-rails'
 require 'erd'
 require 'fake_app/fake_app'
 require 'test/unit/rails/test_help'
 Bundler.require
+require 'capybara'
+require 'selenium/webdriver'
+
+begin
+  require "action_dispatch/system_test_case"
+rescue LoadError
+  Capybara.register_driver :chrome do |app|
+    options = Selenium::WebDriver::Chrome::Options.new(:args => %w[no-sandbox headless disable-gpu])
+    Capybara::Selenium::Driver.new(app, :browser => :chrome, :options => options)
+  end
+  Capybara.javascript_driver = :chrome
+else
+  ActionDispatch::SystemTestCase.driven_by(:selenium, :using => :headless_chrome)
+end
 
 ActiveRecord::Migration.verbose = false
-ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths.map {|p| Rails.root.join p}, nil)
+if defined? ActiveRecord::MigrationContext  # >= 5.2
+  ActiveRecord::Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
+  ActiveRecord::Base.connection.migration_context.migrate
+else
+  ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths.map {|p| Rails.root.join p}, nil)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erd
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-erd
@@ -52,6 +52,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: erd engine on Rails
 email:
 - ronnie@dio.jp
@@ -149,12 +205,21 @@ files:
 - config.ru
 - config/routes.rb
 - erd.gemspec
+- gemfiles/rails_32.gemfile
+- gemfiles/rails_40.gemfile
+- gemfiles/rails_41.gemfile
+- gemfiles/rails_42.gemfile
+- gemfiles/rails_50.gemfile
+- gemfiles/rails_51.gemfile
+- gemfiles/rails_52.gemfile
+- gemfiles/rails_edge.gemfile
 - lib/erd.rb
 - lib/erd/engine.rb
 - lib/erd/generator_runner.rb
 - lib/erd/migrator.rb
 - lib/erd/railtie.rb
 - lib/erd/version.rb
+- test/fake_app/config/database.yml
 - test/fake_app/db/migrate/20120428022519_create_authors.rb
 - test/fake_app/db/migrate/20120428022535_create_books.rb
 - test/fake_app/db/schema.rb
@@ -207,11 +272,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: erd engine on Rails
 test_files:
+- test/fake_app/config/database.yml
 - test/fake_app/db/migrate/20120428022519_create_authors.rb
 - test/fake_app/db/migrate/20120428022535_create_books.rb
 - test/fake_app/db/schema.rb