declare_schema 0.1.1 → 0.3.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c1bc236be22c712ca8a65ef4ed294301fc7d2021167dd0e2501066abe30b3ba
-  data.tar.gz: b41b86f51293569be553bab41fc245601ad82f98f4546af8d5d9d46601070fe3
+  metadata.gz: 2a82a5e54f5dadf8a733520efe057d8b1a0319e1725ef82d41d97004ee68cf0c
+  data.tar.gz: 899e9f135706d4883b448bcffc09b5f962cb84892c1bf1be27e6f2e36209454f
 SHA512:
-  metadata.gz: 3a7b1808736b5f6c1ed69eb88a6afa7a69dbc6fcb014fbd5afb23734abd177348440caf5394ba941e66f6473011fae7543ce5b1e43b81ec8231ab3abfc369627
-  data.tar.gz: b96afd3ecfc86d51a795e43f5b04859d7e45c7869ffcf9f21a6a8a63da05e8499dd03b66e4e951b967f0e4feb8d21c2c0cf6aa88e952e53b3254c12ab541e0eb
+  metadata.gz: 0465ffd5522605f9e0c61beffc2571ab76d077020596d82fe616c60cd631c6663b399c9c5d02c8983d9060223f3bb100932baf411efa69a3a7f236097784ae9e
+  data.tar.gz: 4c6b7b49067650cd0791257614dc84e1f6f6a9191346578249fa196dc0d9f621c491d597aaa32f82c64bde8f6e7fe8e18f1974f89c4677ade6c8203aede20ec4

data/.travis.yml

@@ -0,0 +1,37 @@
+---
+dist: trusty
+os: linux
+language: ruby
+cache: bundler
+rvm:
+  - 2.4.5
+  - 2.5.8
+  - 2.6.5
+  - 2.7.1
+  - ruby-head
+gemfile:
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.gemfile
+  - gemfiles/rails_6.gemfile
+jobs:
+  fast_finish: false
+  exclude:
+    - gemfile: gemfiles/rails_4.gemfile
+      rvm: 2.7.1
+    - gemfile: gemfiles/rails_5.gemfile
+      rvm: 2.4.5
+    - gemfile: gemfiles/rails_6.gemfile
+      rvm: 2.4.5
+  allow_failures:
+    - rvm: ruby-head
+before_install:
+  - rm -f /home/travis/.rvm/rubies/ruby-2.*/lib/ruby/gems/2.*/specifications/default/bundler-2.*.gemspec
+  - echo y | rvm @global do gem install bundler -v 1.17.3 --force --default
+  - gem install bundler -v 1.17.3 --force --default
+  - gem install bundler -v 1.17.3
+install:
+  - bundle --version
+  - bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+script:
+  - bundle exec rake test:prepare_testapp[force]
+  - bundle exec rake test:all < test_responses.txt

data/CHANGELOG.md

@@ -1,11 +1,43 @@
-# CHANGELOG for `declarative_schema`
+# CHANGELOG for `declare_schema`
 
 Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.1.0] - Unreleased
+## [0.3.0] - Unreleased
 ### Added
-- Initial version from https://github.com/Invoca/declare_schema v4.0.0.
+- Added support for `belongs_to optional:`.
+If given, it is passed through to `ActiveRecord`'s `belong_to`.
+If not given in Rails 5+, the `optional:` value is set equal to the `null:` value (default: `false`) and that
+is is passed to `ActiveRecord`'s `belong_to`. 
 
-[0.1.0]: https://github.com/Invoca/declarative_schema/tree/v0.1.0
+## [0.2.0] - 2020-10-26
+### Added
+- Automatically eager_load! all Rails::Engines before generating migrations.
+
+### Changed
+- Changed tests from rdoctest to rspec.
+
+### Fixed
+- Fixed a bug where `:text limit: 0xffff_ffff` (max size) was omitted from migrations.
+- Fixed a bug where `:bigint` foreign keys were omitted from the migration. 
+
+## [0.1.3] - 2020-10-08
+### Changed
+- Updated the `always_ignore_tables` list in `Migrator` to access Rails metadata table names
+using the appropriate Rails configuration attributes.
+
+## [0.1.2] - 2020-09-29
+### Changed
+- Added travis support and created 2 specs as a starting point.
+
+
+## [0.1.1] - 2020-09-24
+### Added
+- Initial version from https://github.com/Invoca/hobo_fields v4.1.0.
+
+[0.3.0]: https://github.com/Invoca/declare_schema/compare/v0.2.0...v0.3.0
+[0.2.0]: https://github.com/Invoca/declare_schema/compare/v0.1.3...v0.2.0
+[0.1.3]: https://github.com/Invoca/declare_schema/compare/v0.1.2...v0.1.3
+[0.1.2]: https://github.com/Invoca/declare_schema/compare/v0.1.1...v0.1.2
+[0.1.1]: https://github.com/Invoca/declare_schema/tree/v0.1.1

data/Gemfile

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-source 'https://gem.fury.io/invoca'
 
 gemspec
 
@@ -19,6 +18,5 @@ gem 'rails',            '~> 5.2', '>= 5.2.4.3'
 gem 'responders'
 gem 'rspec'
 gem 'rubocop'
-gem 'rubydoctest'
 gem 'sqlite3'
 gem 'yard'

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    declare_schema (0.1.1)
+    declare_schema (0.3.0.pre.1)
       rails (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
-  remote: https://gem.fury.io/invoca/
   specs:
     actioncable (5.2.4.4)
       actionpack (= 5.2.4.4)
@@ -160,7 +159,6 @@ GEM
     rubocop-ast (0.4.2)
       parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
-    rubydoctest (1.1.5)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -195,7 +193,6 @@ DEPENDENCIES
   responders
   rspec
   rubocop
-  rubydoctest
   sqlite3
   yard
 

data/Rakefile

@@ -14,7 +14,6 @@ $LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'declare_schema'
 
 RUBY = 'ruby'
-RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
 GEM_ROOT = __dir__
 TESTAPP_PATH = ENV['TESTAPP_PATH'] || File.join(Dir.tmpdir, 'declare_schema_testapp')
 BIN = File.expand_path('bin/declare_schema', __dir__)
@@ -24,13 +23,7 @@ task default: 'test:all'
 include Rake::DSL
 
 namespace "test" do
-  task all: [:doctest, :spec]
-
-  desc "Run the doctests"
-  task :doctest do |_t|
-    files = Dir['test/*.rdoctest'].sort.map { |f| File.expand_path(f) }.join(' ')
-    system("#{RUBYDOCTEST} #{files}") or exit(1)
-  end
+  task all: :spec
 
   desc "Prepare a rails application for testing"
   task :prepare_testapp, :force do |_t, args|
@@ -38,19 +31,19 @@ namespace "test" do
       FileUtils.remove_entry_secure(TESTAPP_PATH, true)
       sh %(#{BIN} new #{TESTAPP_PATH} --skip-wizard --skip-bundle)
       FileUtils.chdir TESTAPP_PATH
-      sh %(bundle install)
-      sh %(echo "" >> Gemfile)
-      sh %(echo "gem 'irt', :group => :development" >> Gemfile) # to make the bundler happy
-      sh %(echo "gem 'therubyracer'" >> Gemfile)
-      sh %(echo "gem 'kramdown'" >> Gemfile)
-      sh %(echo "" > app/models/.gitignore) # because git reset --hard would rm the dir
-      rm %(.gitignore) # we need to reset everything in a testapp
-      sh %(git init && git add . && git commit -m "initial commit")
-      puts %(The testapp has been created in '#{TESTAPP_PATH}')
+      sh "bundle install"
+      sh "(echo '';
+           echo \"gem 'irt', :group => :development\";
+           echo \"gem 'therubyracer'\";
+           echo \"gem 'kramdown'\") > Gemfile"
+      sh "echo '' > app/models/.gitignore" # because git reset --hard would rm the dir
+      rm ".gitignore" # we need to reset everything in a testapp
+      sh "git init && git add . && git commit -m \"initial commit\""
+      puts "The testapp has been created in '#{TESTAPP_PATH}'"
     else
-      FileUtils.chdir TESTAPP_PATH
-      sh %(git add .)
-      sh %(git reset --hard -q HEAD)
+      FileUtils.chdir(TESTAPP_PATH)
+      sh "git add ."
+      sh "git reset --hard -q HEAD"
     end
   end
 end

data/gemfiles/rails_4.gemfile

@@ -1,25 +1,22 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
-source "https://gem.fury.io/invoca"
 
 gem "appraisal"
+gem "bundler", "< 2"
+gem "climate_control", "~> 0.2"
 gem "pry"
 gem "pry-byebug"
 gem "rails", "~> 4.2"
 gem "responders"
-gem "rubydoctest"
+gem "rspec"
+gem "rubocop"
 gem "sqlite3", "~> 1.3.0"
-gem "test_overrides"
 gem "yard"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false
-  gem "kramdown"
   gem "listen"
-  gem "RedCloth"
 end
 
 gemspec path: "../"

data/gemfiles/rails_5.gemfile

@@ -1,25 +1,22 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
-source "https://gem.fury.io/invoca"
 
 gem "appraisal"
+gem "bundler", "< 2"
+gem "climate_control", "~> 0.2"
 gem "pry"
 gem "pry-byebug"
 gem "rails", "~> 5.2"
 gem "responders"
-gem "rubydoctest"
+gem "rspec"
+gem "rubocop"
 gem "sqlite3"
-gem "test_overrides"
 gem "yard"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false
-  gem "kramdown"
   gem "listen"
-  gem "RedCloth"
 end
 
 gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -1,25 +1,22 @@
-# frozen_string_literal: true
-
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
-source "https://gem.fury.io/invoca"
 
 gem "appraisal"
+gem "bundler", "< 2"
+gem "climate_control", "~> 0.2"
 gem "pry"
 gem "pry-byebug"
 gem "rails", "~> 6.0"
 gem "responders"
-gem "rubydoctest"
+gem "rspec"
+gem "rubocop"
 gem "sqlite3"
-gem "test_overrides"
 gem "yard"
 
 group :testapp do
   gem "bootsnap", ">= 1.1.0", require: false
-  gem "kramdown"
   gem "listen"
-  gem "RedCloth"
 end
 
 gemspec path: "../"

data/lib/declare_schema/model.rb

@@ -106,18 +106,9 @@ module DeclareSchema
       end
 
       # Extend belongs_to so that it creates a FieldSpec for the foreign key
-      def belongs_to(name, *args, &block)
-        if args.size == 0 || (args.size == 1 && args[0].is_a?(Proc))
-          options = {}
-          args.push(options)
-        elsif args.size == 1
-          options = args[0]
-        else
-          options = args[1]
-        end
+      def belongs_to(name, scope = nil, **options, &block)
         column_options = {}
         column_options[:null] = options.delete(:null) || false
-        column_options[:comment] = options.delete(:comment) if options.has_key?(:comment)
         column_options[:default] = options.delete(:default) if options.has_key?(:default)
         column_options[:limit] = options.delete(:limit) if options.has_key?(:limit)
 
@@ -130,20 +121,27 @@ module DeclareSchema
         fk_options[:constraint_name] = options.delete(:constraint) if options.has_key?(:constraint)
         fk_options[:index_name] = index_options[:name]
 
+        fk = options[:foreign_key]&.to_s || "#{name}_id"
+
+        if !options.has_key?(:optional) && Rails::VERSION::MAJOR >= 5
+          options[:optional] = column_options[:null]
+        end
+
         fk_options[:dependent] = options.delete(:far_end_dependent) if options.has_key?(:far_end_dependent)
-        super(name, *args, &block).tap do |_bt|
-          refl = reflections[name.to_s] or raise "Couldn't find reflection #{name} in #{reflections.keys}"
-          fkey = refl.foreign_key
-          declare_field(fkey.to_sym, :integer, column_options)
-          if refl.options[:polymorphic]
-            foreign_type = options[:foreign_type] || "#{name}_type"
-            declare_polymorphic_type_field(foreign_type, column_options)
-            index([foreign_type, fkey], index_options) if index_options[:name] != false
-          else
-            index(fkey, index_options) if index_options[:name] != false
-            options[:constraint_name] = options
-            constraint(fkey, fk_options) if fk_options[:constraint_name] != false
-          end
+
+        super(name, scope, options)
+
+        refl = reflections[name.to_s] or raise "Couldn't find reflection #{name} in #{reflections.keys}"
+        fkey = refl.foreign_key or raise "Couldn't find foreign_key for #{name} in #{refl.inspect}"
+        declare_field(fkey.to_sym, :integer, column_options)
+        if refl.options[:polymorphic]
+          foreign_type = options[:foreign_type] || "#{name}_type"
+          declare_polymorphic_type_field(foreign_type, column_options)
+          index([foreign_type, fkey], index_options) if index_options[:name] != false
+        else
+          index(fkey, index_options) if index_options[:name] != false
+          options[:constraint_name] = options
+          constraint(fkey, fk_options) if fk_options[:constraint_name] != false
         end
       end
 

data/lib/declare_schema/model/field_spec.rb

@@ -53,7 +53,7 @@ module DeclareSchema
             @options[:limit] = self.class.round_up_mysql_text_limit(@options[:limit] || MYSQL_LONGTEXT_LIMIT)
           end
         when :string
-          @options[:limit] or raise "limit must be given for :string field #{model}##{@name}: #{@options.inspect}; do you want 255?"
+          @options[:limit] or raise "limit must be given for :string field #{model}##{@name}: #{@options.inspect}; do you want `limit: 255`?"
         end
         @position = position_option || model.field_specs.length
       end
@@ -102,10 +102,6 @@ module DeclareSchema
         @options[:default]
       end
 
-      def comment
-        @options[:comment]
-      end
-
       def same_type?(col_spec)
         type = sql_type
         normalized_type           = TYPE_SYNONYMS[type] || type
@@ -115,13 +111,6 @@ module DeclareSchema
 
       def different_to?(col_spec)
         !same_type?(col_spec) ||
-          # we should be able to use col_spec.comment, but col_spec has
-          # a nil table_name for some strange reason.
-          (model.table_exists? &&
-            ActiveRecord::Base.respond_to?(:column_comment) &&
-            !(col_comment = ActiveRecord::Base.column_comment(col_spec.name, model.table_name)).nil? &&
-            col_comment != comment
-          ) ||
           begin
             native_type = native_types[type]
             check_attributes = [:null, :default]

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "0.1.1"
+  VERSION = "0.3.0.pre.1"
 end

data/lib/generators/declare_schema/migration/migration_generator.rb

@@ -3,6 +3,7 @@
 require 'rails/generators/migration'
 require 'rails/generators/active_record'
 require 'generators/declare_schema/support/thor_shell'
+require 'declare_schema/model/field_spec'
 
 module DeclareSchema
   class MigrationGenerator < Rails::Generators::Base
@@ -85,7 +86,7 @@ module DeclareSchema
         @down = down
         @migration_class_name = final_migration_name.camelize
 
-        migration_template 'migration.rb.erb', "db/migrate/#{final_migration_name.underscore}.rb"
+        migration_template('migration.rb.erb', "db/migrate/#{final_migration_name.underscore}.rb")
         if action == 'm'
           case Rails::VERSION::MAJOR
           when 4
@@ -117,14 +118,13 @@ module DeclareSchema
                              ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration).pending_migrations
                            end
 
-      if pending_migrations.any?
-        say "You have #{pending_migrations.size} pending migration#{'s' if pending_migrations.size > 1}:"
-        pending_migrations.each do |pending_migration|
-          say format('  %4d %s', pending_migration.version, pending_migration.name)
+      pending_migrations.any?.tap do |any|
+        if any
+          say "You have #{pending_migrations.size} pending migration#{'s' if pending_migrations.size > 1}:"
+          pending_migrations.each do |pending_migration|
+            say format('  %4d %s', pending_migration.version, pending_migration.name)
+          end
         end
-        true
-      else
-        false
       end
     end
 
@@ -138,10 +138,10 @@ module DeclareSchema
           loop do
             if rename_to_choices.empty?
               say "\nCONFIRM DROP! #{kind_str} #{name_prefix}#{t}"
-              resp = ask("Enter 'drop #{t}' to confirm or press enter to keep:")
-              if resp.strip == "drop #{t}"
+              resp = ask("Enter 'drop #{t}' to confirm or press enter to keep:").strip
+              if resp == "drop #{t}"
                 break
-              elsif resp.strip.empty?
+              elsif resp.empty?
                 to_drop.delete(t)
                 break
               else
@@ -150,8 +150,7 @@ module DeclareSchema
             else
               say "\nDROP, RENAME or KEEP?: #{kind_str} #{name_prefix}#{t}"
               say "Rename choices: #{to_create * ', '}"
-              resp = ask "Enter either 'drop #{t}' or one of the rename choices or press enter to keep:"
-              resp = resp.strip
+              resp = ask("Enter either 'drop #{t}' or one of the rename choices or press enter to keep:").strip
 
               if resp == "drop #{t}"
                 # Leave things as they are
@@ -182,3 +181,11 @@ module DeclareSchema
     end
   end
 end
+
+module Generators
+  module DeclareSchema
+    module Migration
+      MigrationGenerator = ::DeclareSchema::MigrationGenerator
+    end
+  end
+end