declare_schema 0.13.0.pre.1 → 0.13.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef97a705f29e37659ade688c2c64b30f0df1eabc76ab47ceb1272f2eec10845
-  data.tar.gz: 3602d932b5bae67c6cfd367750e399d44ab65afa4fd19c4923ff5e447b79ca40
+  metadata.gz: 6a0a46f7400412223cb7e7bab356450fa5d0a58cf05ee2c70c1bc6b5d9c91ed1
+  data.tar.gz: a3f0ce02021eab5d27dc338634d07d6ac942eae493f868c0ba68850bbb5c0ff9
 SHA512:
-  metadata.gz: 770d10d283e399d3ca37537e7ed4c68d0dde1a6ba28e033148ed7ed86d0e0833256d0b2446688538ef34f39cac9c1fe535914824d4bf7e6de17d11554b876ec2
-  data.tar.gz: 134add2558ab3374d741e04839913257eb48e8b98d4b80a3bc3c35927369032fd9549d9a1dd2768c702386f44b4265c0379475cd01f8097288cad53b479a4ee9
+  metadata.gz: d9cc9136bcadb5bd2426ada4419e08e772a6976e98a0c96a6fe2129d79da4917819f4126966c4b1d0056b2b94e948433cfbc4370c7f6b85cab3f0ab9fd0b3c82
+  data.tar.gz: e5b96f7e05837c4a142651282381dbc7ad7647b8122946b221befcf858992a755ce0a15bf4f893f6d920353393145b305774f6fb38cab922641fc4f8ebda0f75

data/CHANGELOG.md

@@ -6,7 +6,7 @@ Note: this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0
 
 ## [0.13.0] - Unreleased
 ### 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    declare_schema (0.13.0.pre.1)
+    declare_schema (0.13.0.pre.2)
       rails (>= 4.2)
 
 GEM

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.0.pre.2"
 end

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -2507,11 +2507,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.0.pre.2
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-06 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails