annotaterb 4.6.0 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c9e326fa73164a6a2e43edc402e6990cfbb5d953ac5fd1ccf8c71fa6d358ee1
-  data.tar.gz: dabf1afd54a8dec7a96ed8c259ca84e0a6085618713be78f43f075a51a22db7f
+  metadata.gz: f31e6cf08a5d57a35274e5964a5da9e4a01d006e0ddf3d4ac4467932901709ac
+  data.tar.gz: 020ad6bab20eb3c029173d5764050d7c62855785c2fa357750bc2fbff27cd02b
 SHA512:
-  metadata.gz: 12e277c2d09e37e1001e64b0f08542ff03981bf5bbe37e86ed3dca01b1ec52c5b1805ce6f5cb1a8e5b25c3b9d655cb2345d0c9d878ecf4ae6bbfd265870445ac
-  data.tar.gz: 88d7c9ba17c3abbf38e635365314d1c4b372e67ec5ef0dcba9f7f4f5b6ef90d0e285a2150887127fa75f847a1ee2e8e4c7a30548729a4f903cf71f42be793177
+  metadata.gz: 1a52c81202a634161721175021e8ee8742cad49f0eab0aab2e89319d856a8f81fe0e1e2ea3de1e78e3695f261a6d2ee5bd5b41ea1ac8c9b2d072a62bcec4b1cd
+  data.tar.gz: b01f86669748d083e52a0f3fef891632cff7fcf1c476ae1ce71e5e654cc028105435c4ceadcc73b23443dba28f3dd9c082ebbadeae541ad053a3cd93005d59cb

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [v4.6.0](https://github.com/drwl/annotaterb/tree/v4.6.0) (2024-02-27)
+
+[Full Changelog](https://github.com/drwl/annotaterb/compare/v4.5.0...v4.6.0)
+
+Adds two big changes: Fix annotations swallowing comments [\#72](https://github.com/drwl/annotaterb/pull/72) and 
+Add Zeitwerk support [\#85](https://github.com/drwl/annotaterb/pull/85).  
+Please report any issues you encounter. 
+
+**Closed issues:**
+
+- Add support for `data_migrate` gem [\#89](https://github.com/drwl/annotaterb/issues/89)
+
+**Merged pull requests:**
+
+- Bump version to v4.6.0 [\#95](https://github.com/drwl/annotaterb/pull/95) ([drwl](https://github.com/drwl))
+- Add support for parsing RSpec files [\#94](https://github.com/drwl/annotaterb/pull/94) ([drwl](https://github.com/drwl))
+- Add support for model name without namespace in resolver [\#93](https://github.com/drwl/annotaterb/pull/93) ([drwl](https://github.com/drwl))
+- Fixes for `RelatedFilesListBuilder` [\#92](https://github.com/drwl/annotaterb/pull/92) ([drwl](https://github.com/drwl))
+- Refactor `AnnotatedFile` classes [\#91](https://github.com/drwl/annotaterb/pull/91) ([drwl](https://github.com/drwl))
+- Add support for data\_migrate gem [\#90](https://github.com/drwl/annotaterb/pull/90) ([cmer](https://github.com/cmer))
+- Support non-model files in `CustomParser` [\#88](https://github.com/drwl/annotaterb/pull/88) ([drwl](https://github.com/drwl))
+- Fix flakey integration test [\#87](https://github.com/drwl/annotaterb/pull/87) ([drwl](https://github.com/drwl))
+- Improve integration tests [\#86](https://github.com/drwl/annotaterb/pull/86) ([drwl](https://github.com/drwl))
+- Add Zeitwerk support [\#85](https://github.com/drwl/annotaterb/pull/85) ([drwl](https://github.com/drwl))
+- Improve annotate after adding new migration integration test [\#84](https://github.com/drwl/annotaterb/pull/84) ([drwl](https://github.com/drwl))
+- Add integration test using force [\#81](https://github.com/drwl/annotaterb/pull/81) ([drwl](https://github.com/drwl))
+- Generate changelog for v4.5.0 [\#80](https://github.com/drwl/annotaterb/pull/80) ([drwl](https://github.com/drwl))
+- Fix annotations swallowing comments [\#72](https://github.com/drwl/annotaterb/pull/72) ([drwl](https://github.com/drwl))
+
 ## [v4.5.0](https://github.com/drwl/annotaterb/tree/v4.5.0) (2024-02-08)
 
 [Full Changelog](https://github.com/drwl/annotaterb/compare/v4.4.1...v4.5.0)

data/VERSION

@@ -1 +1 @@
-4.6.0
+4.7.0

data/lib/annotate_rb/model_annotator/column_annotation/attributes_builder.rb

@@ -8,7 +8,7 @@ module AnnotateRb
         NO_DEFAULT_COL_TYPES = %w[json jsonb hstore].freeze
 
         def initialize(column, options, is_primary_key, column_indices, column_defaults)
-          @column = ColumnWrapper.new(column, column_defaults)
+          @column = ColumnWrapper.new(column, column_defaults, options)
           @options = options
           @is_primary_key = is_primary_key
           @column_indices = column_indices

data/lib/annotate_rb/model_annotator/column_annotation/column_wrapper.rb

@@ -4,9 +4,10 @@ module AnnotateRb
   module ModelAnnotator
     module ColumnAnnotation
       class ColumnWrapper
-        def initialize(column, column_defaults)
+        def initialize(column, column_defaults, options)
           @column = column
           @column_defaults = column_defaults
+          @options = options
         end
 
         def raw_default
@@ -88,7 +89,7 @@ module AnnotateRb
 
         # Simple quoting for the default column value
         def quote(value)
-          DefaultValueBuilder.new(value).build
+          DefaultValueBuilder.new(value, @options).build
         end
       end
     end

data/lib/annotate_rb/model_annotator/column_annotation/default_value_builder.rb

@@ -4,8 +4,9 @@ module AnnotateRb
   module ModelAnnotator
     module ColumnAnnotation
       class DefaultValueBuilder
-        def initialize(value)
+        def initialize(value, options)
           @value = value
+          @options = options
         end
 
         # @return [String]
@@ -27,6 +28,8 @@ module AnnotateRb
         private
 
         def quote(value)
+          return value.to_s.inspect if @options[:classes_default_to_s]&.include?(value.class.name)
+
           case value
           when NilClass then "NULL"
           when TrueClass then "TRUE"

data/lib/annotate_rb/model_annotator/column_annotation/type_builder.rb

@@ -10,7 +10,7 @@ module AnnotateRb
 
         def initialize(column, options, column_defaults)
           # Passing `column_defaults` for posterity, don't actually need it here since it's not used
-          @column = ColumnWrapper.new(column, column_defaults)
+          @column = ColumnWrapper.new(column, column_defaults, options)
           @options = options
         end
 

data/lib/annotate_rb/options.rb

@@ -76,7 +76,8 @@ module AnnotateRb
       target_action: :do_annotations, # Core; Possible values: :do_annotations, :remove_annotations
       wrapper: nil, # ModelAnnotator, RouteAnnotator
       wrapper_close: nil, # ModelAnnotator, RouteAnnotator
-      wrapper_open: nil # ModelAnnotator, RouteAnnotator
+      wrapper_open: nil, # ModelAnnotator, RouteAnnotator,
+      classes_default_to_s: [] # ModelAnnotator
     }.freeze
 
     PATH_OPTIONS = {
@@ -135,7 +136,8 @@ module AnnotateRb
       :target_action,
       :wrapper,
       :wrapper_close,
-      :wrapper_open
+      :wrapper_open,
+      :classes_default_to_s
     ].freeze
 
     PATH_OPTION_KEYS = [

data/lib/annotate_rb/parser.rb

@@ -9,7 +9,7 @@ module AnnotateRb
 
     BANNER_STRING = <<~BANNER.freeze
       Usage: annotaterb [command] [options]
-      
+
       Commands:
           models [options]
           routes [options]
@@ -248,6 +248,15 @@ module AnnotateRb
         "exclude table comments in model annotations") do
         @options[:with_table_comments] = false
       end
+
+      option_parser.on("--classes-default-to-s class",
+        "Custom classes to be represented with `to_s`, may be used multiple times") do |klass|
+        @options[:classes_default_to_s] = if @options[:classes_default_to_s].present?
+          [*@options[:classes_default_to_s], klass]
+        else
+          [klass]
+        end
+      end
     end
 
     def add_route_options_to_parser(option_parser)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annotaterb
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.7.0
 platform: ruby
 authors:
 - Andrew W. Lee
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies: []
 description: Annotates Rails/ActiveRecord Models, routes, fixtures, and others based
   on the database schema.