declare_schema 0.13.0.pre.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef97a705f29e37659ade688c2c64b30f0df1eabc76ab47ceb1272f2eec10845
-  data.tar.gz: 3602d932b5bae67c6cfd367750e399d44ab65afa4fd19c4923ff5e447b79ca40
+  metadata.gz: e3a8974d1b6642065c32bf892d5b8eb2a7da63064bcc74a5b6f4982a21ac1771
+  data.tar.gz: d1cd0489a73e399b4ed21ec3e83c761d5edf821bcc1435d4f42e171700ccc27c
 SHA512:
-  metadata.gz: 770d10d283e399d3ca37537e7ed4c68d0dde1a6ba28e033148ed7ed86d0e0833256d0b2446688538ef34f39cac9c1fe535914824d4bf7e6de17d11554b876ec2
-  data.tar.gz: 134add2558ab3374d741e04839913257eb48e8b98d4b80a3bc3c35927369032fd9549d9a1dd2768c702386f44b4265c0379475cd01f8097288cad53b479a4ee9
+  metadata.gz: 8926952cc9aec61b28cc9fe74d5766d3c67f35734b9bec4d93a767e58966a48bccc8bd49b919f9699c9d0e386f0ae2b9d43ffa65fec764959e6389b3daf92496
+  data.tar.gz: 9149635173ede506625904d2ffa6aa4864c7dae69c0edf1dba776a60c5a46e77c95ccbb711d8db6c2aef63e4f38ae58e795686bbcce1574fc1ace064077eb593

data/CHANGELOG.md

@@ -4,9 +4,18 @@ 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.13.0] - Unreleased
+## [0.13.2] - 2021-08-04
+### Fixed
+- Fixed issue with disable_auto_increment support for new tables.
+
+## [0.13.1] - 2021-08-02
+### Fixed
+- Fixed migration file indentation bug in Rails 5 where the first line was indented an extra 4 characters.
+ And fixed the longstanding triple-spacing bug to use double spacing.
+
+## [0.13.0] - 2021-06-11
 ### Added
-- Added support for `default_schema =` to apply a default schema to every model, unless disabld for that model with `declare_schema: false`.
+- Added support for `default_schema` block to apply a default schema to every model, unless disabled for that model with `default_schema: false`.
 
 ## [0.12.1] - 2021-05-10
 ### Fixed
@@ -183,6 +192,7 @@ using the appropriate Rails configuration attributes.
 ### Added
 - Initial version from https://github.com/Invoca/hobo_fields v4.1.0.
 
+[0.13.1]: https://github.com/Invoca/declare_schema/compare/v0.13.0...v0.13.1
 [0.13.0]: https://github.com/Invoca/declare_schema/compare/v0.12.1...v0.13.0
 [0.12.1]: https://github.com/Invoca/declare_schema/compare/v0.12.0...v0.12.1
 [0.12.0]: https://github.com/Invoca/declare_schema/compare/v0.11.1...v0.12.0

data/Gemfile.lock

@@ -1,49 +1,49 @@
 PATH
   remote: .
   specs:
-    declare_schema (0.13.0.pre.1)
+    declare_schema (0.13.2)
       rails (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.5)
-      actionpack (= 5.2.4.5)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.5)
-      actionpack (= 5.2.4.5)
-      actionview (= 5.2.4.5)
-      activejob (= 5.2.4.5)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.5)
-      actionview (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.5)
-      activesupport (= 5.2.4.5)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.4.5)
-      activesupport (= 5.2.4.5)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.5)
-      activesupport (= 5.2.4.5)
-    activerecord (5.2.4.5)
-      activemodel (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
       arel (>= 9.0)
-    activestorage (5.2.4.5)
-      actionpack (= 5.2.4.5)
-      activerecord (= 5.2.4.5)
-      marcel (~> 0.3.1)
-    activesupport (5.2.4.5)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -60,33 +60,31 @@ GEM
     byebug (11.1.3)
     climate_control (0.2.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
     diff-lcs (1.4.4)
     erubi (1.10.0)
-    ffi (1.14.2)
+    ffi (1.15.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.4.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.9.0)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
-    minitest (5.14.3)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
     msgpack (1.4.2)
-    nio4r (2.5.5)
-    nokogiri (1.11.1)
+    nio4r (2.5.7)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     parallel (1.19.2)
@@ -102,33 +100,33 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.5)
-      actioncable (= 5.2.4.5)
-      actionmailer (= 5.2.4.5)
-      actionpack (= 5.2.4.5)
-      actionview (= 5.2.4.5)
-      activejob (= 5.2.4.5)
-      activemodel (= 5.2.4.5)
-      activerecord (= 5.2.4.5)
-      activestorage (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.5)
+      railties (= 5.2.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.4.5)
-      actionpack (= 5.2.4.5)
-      activesupport (= 5.2.4.5)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     rake (13.0.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (1.8.0)
@@ -174,7 +172,7 @@ GEM
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     yard (0.9.26)

data/README.md

@@ -72,10 +72,10 @@ end
 
 ### default_schema
 If there are default columns you would like in the schema for every model, you can define them in a block that is registered with
-`DeclareSchema.default_schema =`. For example:
+`DeclareSchema.default_schema`. For example:
 
 ```ruby
-DeclareSchema.default_schema = -> do
+DeclareSchema.default_schema do
   timestamps
   optimistic_lock
 end
@@ -90,6 +90,12 @@ class User < ActiveRecord::Base
 end
 ```
 
+### clear_default_schema
+This method clears out any previously declared `default_schema`.
+```ruby
+DeclareSchema.clear_default_schema
+```
+
 ### Global Configuration
 Configurations can be set at the global level to customize default declaration for the following values:
 

data/lib/declare_schema.rb

@@ -37,7 +37,7 @@ module DeclareSchema
 
   class << self
     attr_reader :default_charset, :default_collation, :default_text_limit, :default_string_limit, :default_null,
-                :default_generate_foreign_keys, :default_generate_indexing, :default_schema, :db_migrate_command
+                :default_generate_foreign_keys, :default_generate_indexing, :db_migrate_command
 
     def to_class(type)
       case type
@@ -85,9 +85,17 @@ module DeclareSchema
       @default_generate_indexing = generate_indexing
     end
 
-    def default_schema=(default_schema)
-      default_schema.nil? || default_schema.respond_to?(:call) or raise "default_schema must be nil or a block that responds to call"
-      @default_schema = default_schema
+    def default_schema(&block)
+      if block.nil?
+        @default_schema # equivalent to attr_reader :default_schema
+      else
+        block.respond_to?(:call) or raise "default_schema must be passed a block that responds to call"
+        @default_schema = block
+      end
+    end
+
+    def clear_default_schema
+      @default_schema = nil
     end
 
     def db_migrate_command=(db_migrate_command)

data/lib/declare_schema/version.rb

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

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

@@ -226,7 +226,9 @@ module Generators
 
             primary_key_definition =
               if disable_auto_increment
-                [:integer, :id, limit: 8, auto_increment: false, primary_key: true]
+                [[:integer, :id, limit: 8, auto_increment: false, primary_key: true]]
+              else
+                []
               end
 
             field_definitions = model.field_specs.values.sort_by(&:position).map do |f|
@@ -237,7 +239,7 @@ module Generators
             table_options = create_table_options(model, disable_auto_increment)
 
             table_add = ::DeclareSchema::SchemaChange::TableAdd.new(t,
-                                                                    Array(primary_key_definition) + field_definitions,
+                                                                    primary_key_definition + field_definitions,
                                                                     table_options,
                                                                     sql_options: table_options_definition.settings)
             [
@@ -299,7 +301,7 @@ module Generators
           up   = migration_commands.map(&:up  ).select(&:present?)
           down = migration_commands.map(&:down).select(&:present?).reverse
 
-          [up * "\n\n", down * "\n\n"]
+          [up * "\n", down * "\n"]
         end
 
         def create_table_options(model, disable_auto_increment)

data/lib/generators/declare_schema/migration/templates/migration.rb.erb

@@ -1,9 +1,9 @@
 class <%= @migration_class_name %> < (ActiveSupport::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration)
   def self.up
-    <%= @up.presence or raise "no @up given!" %>
+<%= @up.presence or raise "no @up given!" %>
   end
 
   def self.down
-    <%= @down.presence or raise "no @down given!" %>
+<%= @down.presence or raise "no @down given!" %>
   end
 end

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -803,9 +803,34 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         EOS
       )
 
+      Advert.connection.schema_cache.clear!
+      Advert.reset_column_information
+
       nuke_model_class(Advert)
       ActiveRecord::Base.connection.execute("drop table `adverts`;")
 
+      class Advert < ActiveRecord::Base
+        def self.disable_auto_increment
+          true
+        end
+
+        fields do
+          description :text, limit: 250, null: true
+        end
+      end
+
+      up, _ = Generators::DeclareSchema::Migration::Migrator.run.tap do |migrations|
+        expect(migrations).to(
+          migrate_up(<<~EOS.strip)
+            create_table :adverts, id: false do |t|
+              t.integer :id, limit: 8, auto_increment: false, primary_key: true
+              t.text    :description, limit: nil, null: true
+            end
+          EOS
+            .and migrate_down("drop_table :adverts")
+        )
+      end
+
       ## DSL
 
       # The DSL allows lambdas and constants
@@ -2507,11 +2532,11 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
 
       before do
-        DeclareSchema.default_schema = default_schema_block
+        DeclareSchema.default_schema(&default_schema_block)
       end
 
       after do
-        DeclareSchema.default_schema = nil
+        DeclareSchema.clear_default_schema
       end
 
       context 'when unset' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 0.13.0.pre.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-06 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,7 +128,7 @@ homepage: https://github.com/Invoca/declare_schema
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Database schema declaration and migration generator for Rails
 test_files: []