declare_schema 0.12.1 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bace1c4f410e4766d4b9aa1414a5394414e8294db88ccd3d168d6db5d9802f6
-  data.tar.gz: da2b3467c656b0bad95b85627c341fb4d447872b144a452e3569a85a7369c452
+  metadata.gz: 4caf19f1ddb0978b9e9bbc5c55d5941a934ded2e4bbd8adfba52c078e599106b
+  data.tar.gz: 2a8d9f9434f6acae5cab5bfe4ffc6eee0d6ce0e31a59b471d0c48b63b0c3260c
 SHA512:
-  metadata.gz: cf6eb2e6b67bd3071b9261a5d07eaa56dc019c148b02bbc11e70dd929934855e0b48a0c4c178d348286ec7bba4ed25f90c8041d855150c6b23c1aa81f26af25f
-  data.tar.gz: 3517a656b7b7edda5ed4164495747b0d879329d96bb44294f5b347acacc96a983e3cb6ab99fad8bf6e7b9fe998634ceb7cbd4ad79383164ab05ea6b273974c9f
+  metadata.gz: 6edfafddcd596afd63417d2e8f59aec7bfcd637e35d0fb77fc06f39e6e78d461da5c2e0b6752cb8b18785afa0ac81cfb7569fa0be85ba06ad3432d3911a624e5
+  data.tar.gz: 7d2d190f0c6928f7b70f96c8ce58517475ce1b512a31a7c33033314bff0405fb51d88c82c72bd0a8a1b25d8558039ef787b0314b60f7fdefbd75975c3320f57e

data/CHANGELOG.md

@@ -4,6 +4,15 @@ 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.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` 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
 - When an `enum` type field is declared, there is now enforcement that its `limit:` must be an array of 1 or more Symbols,
@@ -179,6 +188,8 @@ 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
 [0.11.1]: https://github.com/Invoca/declare_schema/compare/v0.11.0...v0.11.1

data/Gemfile.lock

@@ -1,49 +1,49 @@
 PATH
   remote: .
   specs:
-    declare_schema (0.12.1)
+    declare_schema (0.13.1)
       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

@@ -62,7 +62,7 @@ trigger the `eager_load!` on the `Rails` application and all `Rails::Engine`s lo
 into scope.  If you need to generate migrations for models that aren't automatically loaded by `eager_load!`,
 load them in the `before_generating_migration` block.
 
-**Example Configuration**
+For example:
 
 ```ruby
 DeclareSchema::Migration::Migrator.before_generating_migration do
@@ -70,6 +70,32 @@ DeclareSchema::Migration::Migrator.before_generating_migration do
 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:
+
+```ruby
+DeclareSchema.default_schema do
+  timestamps
+  optimistic_lock
+end
+```
+This will add these fields to the schema of each model (if not already there).
+If you have a model where you don't want the defaults applied, that can be set with the `default_schema:` boolean option to `declare_schema` (the default value is true). For example:
+```ruby
+class User < ActiveRecord::Base
+  declare_schema default_schema: false do
+    ...
+  end
+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

@@ -85,6 +85,19 @@ module DeclareSchema
       @default_generate_indexing = generate_indexing
     end
 
+    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)
       db_migrate_command.is_a?(String) or raise ArgumentError, "db_migrate_command must be a string (got #{db_migrate_command.inspect})"
       @db_migrate_command = db_migrate_command

data/lib/declare_schema/dsl.rb

@@ -7,7 +7,7 @@ module DeclareSchema
     include ::Kernel      # but we need the basic class methods
 
     instance_methods.each do |m|
-      unless m.to_s.starts_with?('__') || m.in?([:object_id, :instance_eval])
+      unless m.to_s.starts_with?('__') || m.in?([:object_id, :instance_eval, :instance_exec])
         undef_method(m)
       end
     end
@@ -32,8 +32,11 @@ module DeclareSchema
       @model.declare_field(name, type, *(args + [@options.merge(options)]))
     end
 
-    def method_missing(type, name, *args)
-      field(name, type, *args)
+    # TODO: make [:required] just another option. Either 'required: true] or 'optional: false'?
+    def method_missing(*args, **options)
+      args.count(&:itself) >= 2 or raise ::ArgumentError, "fields in declare_schema block must be declared as: type name, [:required], options (got #{args.inspect}, #{options.inspect})"
+      type, name, *required = args
+      field(name, type, *required, options)
     end
   end
 end

data/lib/declare_schema/extensions/active_record/fields_declaration.rb

@@ -27,7 +27,7 @@ module DeclareSchema
     end
     deprecate :fields, deprecator: ActiveSupport::Deprecation.new('1.0', 'DeclareSchema')
 
-    def declare_schema(table_options = {}, &block)
+    def declare_schema(default_schema: true, **table_options, &block)
       # Any model that calls 'fields' gets DeclareSchema::Model behavior
       DeclareSchema::Model.mix_in(self)
 
@@ -37,10 +37,9 @@ module DeclareSchema
 
       if block
         dsl = DeclareSchema::Dsl.new(self, null: false)
-        if block.arity == 1
-          yield dsl
-        else
-          dsl.instance_eval(&block)
+        dsl.instance_eval(&block)
+        if default_schema && DeclareSchema.default_schema
+          dsl.instance_exec(&DeclareSchema.default_schema)
         end
       end
     end

data/lib/declare_schema/model.rb

@@ -34,19 +34,16 @@ module DeclareSchema
           # supported options include :charset and :collation
           inheriting_cattr_reader table_options: HashWithIndifferentAccess.new
 
-          # eval avoids the ruby 1.9.2 "super from singleton method ..." error
-
-          eval <<~EOS
-            def self.inherited(klass)
-              unless klass.field_specs.has_key?(inheritance_column)
-                declare_schema do |f|
-                  f.field(inheritance_column, :string, limit: 255, null: true)
-                end
-                index(inheritance_column)
+          def self.inherited(klass)
+            unless klass.field_specs.has_key?(inheritance_column)
+              ic = inheritance_column
+              declare_schema do
+                field(ic, :string, limit: 255, null: true)
               end
-              super
+              index(ic)
             end
-          EOS
+            super
+          end
         end
       end
     end

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "0.12.1"
+  VERSION = "0.13.1"
 end

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

@@ -299,7 +299,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

@@ -1860,6 +1860,8 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       class SuperFancyAdvert < FancyAdvert
       end
 
+      expect(Generators::DeclareSchema::Migration::Migrator.run.first).to be_present
+
       up, _ = Generators::DeclareSchema::Migration::Migrator.run do |migrations|
         expect(migrations).to(
           migrate_up(<<~EOS.strip)
@@ -2491,5 +2493,78 @@ RSpec.describe 'DeclareSchema Migration Generator' do
         end
       end
     end
+
+    context 'default_schema' do
+      let(:default_schema_block) { nil }
+      let(:declare_model) do
+        -> do
+          class Advert < active_record_base_class.constantize
+            declare_schema do
+              integer :price, limit: 8
+            end
+          end
+        end
+      end
+
+      before do
+        DeclareSchema.default_schema(&default_schema_block)
+      end
+
+      after do
+        DeclareSchema.clear_default_schema
+      end
+
+      context 'when unset' do
+        it 'adds nothing' do
+          declare_model.call
+
+          expect(Advert.field_specs.keys).to eq(['price'])
+        end
+      end
+
+      context 'when set to a block' do
+        let(:default_schema_block) do
+          -> do
+            timestamps
+            field :lock_version, :integer, default: 1
+          end
+        end
+
+        it 'adds the fields in that block' do
+          declare_model.call
+
+          expect(Advert.field_specs.keys).to eq(['price', 'created_at', 'updated_at', 'lock_version'])
+        end
+
+        context 'and the model sets default_schema: false' do
+          before do
+            class Advert < active_record_base_class.constantize
+              declare_schema default_schema: false do
+                integer :price, limit: 8
+              end
+            end
+          end
+
+          it 'does not add the default schema fields' do
+            expect(Advert.field_specs.keys).to eq(['price'])
+          end
+        end
+
+        context 'and the block has redundant fields' do
+          before do
+            class Advert < active_record_base_class.constantize
+              declare_schema do
+                integer :price, limit: 8
+                timestamps
+              end
+            end
+          end
+
+          it 'is a no-op' do
+            expect(Advert.field_specs.keys).to eq(['price', 'created_at', 'updated_at', 'lock_version'])
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.1
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails