declare_schema 1.5.0.pre.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9389b7ee742afb3976a2eb8468ab59f37782cdf1b60c75e64e0cd999aa12ae8b
-  data.tar.gz: 778b052b3107291f4305af5eb62798d5a3f30d931a936fdaa957f8016871d1a9
+  metadata.gz: 92f1ec3624f575f6cbf8fb884b726c2957661f3d77078a467ca78e42dd95bdb2
+  data.tar.gz: 8735c888f46d675e49d06e56a37629e9cdf633218ce956ab111defc00013971f
 SHA512:
-  metadata.gz: 53d80c7f261bf5e646478556ae721ee6beecf8aa98446e768292aac9f6a53ec5f3270f580095aadacc8aa7a3ad60510e9589cc2dafb6756ee14770c0a86df113
-  data.tar.gz: dcd96a0d62da5dc3ffc4a2f48443b93b8991053fedd3a179ba6953f08b2801c649ffc893915a7fa77c75d1ffb74f8f5b468094f6e0c645b86a92dd91caaddd75
+  metadata.gz: c874389f98b8b7e6a5128a97324ad3a00597dc0892673f6d13c7b95611bb286d64afc40bee89cf992f71ba998a67fcd366ee2bd3527b71eb4113df8514ffe00d
+  data.tar.gz: 2a815e79364ae5eeb718488fa246adbf0730f0d9c4d92db802eedc2b9795c95a4061ca1d2a07014104a83f50a1dd6befb65ae49990e09f42e05a7b7e64fc0849

data/CHANGELOG.md

@@ -4,10 +4,12 @@ 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).
 
-## [1.5.0] - Unreleased
+## [2.0.0] - 2024-05-14
 ### Added
 - Added support for Rails 7.0 and 7.1
 - Add support for automatic enum scopes for each value in the `:limit` array
+### Removed
+- Removed support for Rails < 6.0
 
 ## [1.4.0] - 2024-01-24
 ### Added

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    declare_schema (1.5.0.pre.1)
-      rails (>= 5.0)
+    declare_schema (2.0.0)
+      rails (>= 6.0)
 
 GEM
   remote: https://rubygems.org/

data/declare_schema.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '>= 5.0'
+  s.add_dependency 'rails', '>= 6.0'
 end

data/lib/declare_schema/version.rb

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

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

@@ -113,10 +113,8 @@ module DeclareSchema
           ActiveRecord::Base.connection.schema_migration,
           ActiveRecord::Base.connection.internal_metadata
         ).migrations
-      elsif ActiveSupport.version >= Gem::Version.new('6.0.0')
+      else
         ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration).migrations
-      else # Rails 5.2 and earlier
-        ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrations
       end
     end
 
@@ -129,10 +127,8 @@ module DeclareSchema
           ActiveRecord::Base.connection.schema_migration,
           ActiveRecord::Base.connection.internal_metadata
         ).pending_migrations
-      elsif ActiveSupport.version >= Gem::Version.new('6.0.0')
+      else
         ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration).pending_migrations
-      else # Rails 5.2 and earlier
-        ActiveRecord::Migrator.new(:up, migrations).pending_migrations
       end
     end
 

data/spec/lib/declare_schema/api_spec.rb

@@ -39,10 +39,6 @@ RSpec.describe 'DeclareSchema API' do
 
       load_models
 
-      if ActiveSupport::VERSION::MAJOR == 5
-        generate_migrations '-n', '-m'
-      end
-
       require 'advert'
       Advert.reset_primary_key
 

data/spec/lib/declare_schema/generator_spec.rb

@@ -19,77 +19,37 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
     EOS
 
-    if ActiveSupport::VERSION::MAJOR >= 7
-      expect_model_definition_to_eq('alpha', <<~EOS)
-        module Alpha
-          def self.table_name_prefix
-            "alpha_"
-          end
+    expect_model_definition_to_eq('alpha', <<~EOS)
+      module Alpha
+        def self.table_name_prefix
+          #{ActiveSupport::VERSION::MAJOR >= 7 ? '"alpha_"' : "'alpha_'"}
         end
-      EOS
-    else
-      expect_model_definition_to_eq('alpha', <<~EOS)
-        module Alpha
-          def self.table_name_prefix
-            'alpha_'
-          end
-        end
-      EOS
-    end
+      end
+    EOS
 
-    case ActiveSupport::VERSION::MAJOR
-    when 5
-      expect_test_definition_to_eq('alpha/beta', <<~EOS)
-        require "test_helper"
+    expect_test_definition_to_eq('alpha/beta', <<~EOS)
+      require "test_helper"
 
-        class Alpha::BetaTest < ActiveSupport::TestCase
-          # test "the truth" do
-          #   assert true
-          # end
-        end
-      EOS
-    else
-      expect_test_definition_to_eq('alpha/beta', <<~EOS)
-        require "test_helper"
-
-        class Alpha::BetaTest < ActiveSupport::TestCase
-          # test "the truth" do
-          #   assert true
-          # end
-        end
-      EOS
-    end
+      class Alpha::BetaTest < ActiveSupport::TestCase
+        # test "the truth" do
+        #   assert true
+        # end
+      end
+    EOS
 
-    case ActiveSupport::VERSION::MAJOR
-    when 5
-      expect_test_fixture_to_eq('alpha/beta', <<~EOS)
-        # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-        # This model initially had no columns defined. If you add columns to the
-        # model remove the '{}' from the fixture names and add the columns immediately
-        # below each fixture, per the syntax in the comments below
-        #
-        one: {}
-        # column: value
-        #
-        two: {}
-        # column: value
-      EOS
-    when 6
-      expect_test_fixture_to_eq('alpha/beta', <<~EOS)
-        # Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-        # This model initially had no columns defined. If you add columns to the
-        # model remove the '{}' from the fixture names and add the columns immediately
-        # below each fixture, per the syntax in the comments below
-        #
-        one: {}
-        # column: value
-        #
-        two: {}
-        # column: value
-      EOS
-    end
+    expect_test_fixture_to_eq('alpha/beta', <<~EOS)
+      # Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+      # This model initially had no columns defined. If you add columns to the
+      # model remove the #{ActiveSupport::VERSION::MAJOR >= 7 ? '"{}"' : "'{}'"} from the fixture names and add the columns immediately
+      # below each fixture, per the syntax in the comments below
+      #
+      one: {}
+      # column: value
+      #
+      two: {}
+      # column: value
+    EOS
 
     $LOAD_PATH << "#{TESTAPP_PATH}/app/models"
 

data/spec/lib/declare_schema/migration_generator_spec.rb

@@ -38,12 +38,7 @@ RSpec.describe 'DeclareSchema Migration Generator' do
   end
   let(:table_options) do
     if defined?(Mysql2)
-      ", options: \"#{'ENGINE=InnoDB ' if ActiveSupport::VERSION::MAJOR == 5}DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin\"" +
-        if ActiveSupport::VERSION::MAJOR >= 6
-          ', charset: "utf8mb4", collation: "utf8mb4_bin"'
-        else
-          ''
-        end
+      ', options: "DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin", charset: "utf8mb4", collation: "utf8mb4_bin"'
     else
       ", id: :integer"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: declare_schema
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Invoca Development adapted from hobo_fields by Tom Locke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-12 00:00:00.000000000 Z
+date: 2024-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 description: Declare your Rails/active_record model schemas and have database migrations
   generated for you!
 email: development@invoca.com