annotaterb 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 349c4c734ded99ebac4d6ec075372fe814dff54e7edd7834a4b7c254aa046571
-  data.tar.gz: 715b408a71123bc45986f4aca53c1c34b0debb92b01dc770085a7ba5aac6ae45
+  metadata.gz: a337f543f32142efaffbfd396196692d42a98438352b3bdd406c104c25a9958a
+  data.tar.gz: 27d091e7fed5953ccdd26c4b4874e45a0fcff541630595fa467e010629efb9ba
 SHA512:
-  metadata.gz: d843a40644a70550177193b9f1e559c541852384bf4e26f489a45d6ad486d8ddf6157d94abc9c98072acfad802e3144db40fe9ba1e6a3b00018d7865c92dc78a
-  data.tar.gz: e3706615de5bca13aa90353aec34bcc9a728400c139321d051edac045d4c2f24edc032129f666eb012da7b88587bd90bab979e40f77fb25c0568b39559a8302a
+  metadata.gz: 44125b3f65246ad1b5a0dd0d354487462ea6584c6147165650268244fd8d3c9826cf337873f24c31e008efa1c560b37bcb71e36af7fc05c9bc381d48e2b1e4b0
+  data.tar.gz: 7979e2309e3c09ee11fc090a424e7006a94634c7a970fe34b61028b3a90d495b684cc2a4a6fa78221b288dfe5e6682567835fb6839ada3903dfaa599a4f8cfdc

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v4.4.0](https://github.com/drwl/annotaterb/tree/v4.4.0) (2023-06-24)
+
+[Full Changelog](https://github.com/drwl/annotaterb/compare/v4.3.1...v4.4.0)
+
+**Merged pull requests:**
+
+- Bump version to v4.4.0 [\#52](https://github.com/drwl/annotaterb/pull/52) ([drwl](https://github.com/drwl))
+- Flatten tests in `annotation_builder_spec.rb` [\#51](https://github.com/drwl/annotaterb/pull/51) ([drwl](https://github.com/drwl))
+- Add support for table comments [\#50](https://github.com/drwl/annotaterb/pull/50) ([drwl](https://github.com/drwl))
+- Improve some model annotator tests [\#49](https://github.com/drwl/annotaterb/pull/49) ([drwl](https://github.com/drwl))
+- Make tests that use `mock_column` more accurate [\#48](https://github.com/drwl/annotaterb/pull/48) ([drwl](https://github.com/drwl))
+- Generate changelog for v4.3.1 [\#47](https://github.com/drwl/annotaterb/pull/47) ([drwl](https://github.com/drwl))
+
 ## [v4.3.1](https://github.com/drwl/annotaterb/tree/v4.3.1) (2023-06-15)
 
 [Full Changelog](https://github.com/drwl/annotaterb/compare/v4.3.0...v4.3.1)

data/VERSION

@@ -1 +1 @@
-4.4.0
+4.4.1

data/exe/annotaterb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-unless File.exist?("./Rakefile") || File.exist?("./Gemfile")
+if !File.exist?("./Rakefile") && !File.exist?("./Gemfile")
   abort "Please run annotaterb from the root of the project."
 end
 

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

@@ -88,17 +88,7 @@ module AnnotateRb
 
         # Simple quoting for the default column value
         def quote(value)
-          case value
-          when NilClass then "NULL"
-          when TrueClass then "TRUE"
-          when FalseClass then "FALSE"
-          when Float, Integer then value.to_s
-          # BigDecimals need to be output in a non-normalized form and quoted.
-          when BigDecimal then value.to_s("F")
-          when Array then value.map { |v| quote(v) }
-          else
-            value.inspect
-          end
+          DefaultValueBuilder.new(value).build
         end
       end
     end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module AnnotateRb
+  module ModelAnnotator
+    module ColumnAnnotation
+      class DefaultValueBuilder
+        def initialize(value)
+          @value = value
+        end
+
+        # @return [String]
+        # Returns the value to get written to file by file.puts. Strings get written to file so escaped quoted strings
+        # get written as quoted. For example, if `value: "\"some_string\""` then "some_string" gets written.
+        # Same with arrays, if `value: "[\"a\", \"b\", \"c\"]"` then `["a", "b", "c"]` gets written.
+        #
+        # @example "\"some_string\""
+        # @example "NULL"
+        # @example "1.2"
+        def build
+          if @value.is_a?(Array)
+            quote_array(@value)
+          else
+            quote(@value)
+          end
+        end
+
+        private
+
+        def quote(value)
+          case value
+          when NilClass then "NULL"
+          when TrueClass then "TRUE"
+          when FalseClass then "FALSE"
+          when Float, Integer then value.to_s
+          # BigDecimals need to be output in a non-normalized form and quoted.
+          when BigDecimal then value.to_s("F")
+          when String then value.inspect
+          else
+            value.inspect
+          end
+        end
+
+        def quote_array(value)
+          content = value.map { |v| quote(v) }.join(", ")
+          "[" + content + "]"
+        end
+      end
+    end
+  end
+end

data/lib/annotate_rb/model_annotator/column_annotation.rb

@@ -7,6 +7,7 @@ module AnnotateRb
       autoload :TypeBuilder, "annotate_rb/model_annotator/column_annotation/type_builder"
       autoload :ColumnWrapper, "annotate_rb/model_annotator/column_annotation/column_wrapper"
       autoload :AnnotationBuilder, "annotate_rb/model_annotator/column_annotation/annotation_builder"
+      autoload :DefaultValueBuilder, "annotate_rb/model_annotator/column_annotation/default_value_builder"
     end
   end
 end

data/lib/annotate_rb.rb

@@ -10,8 +10,6 @@ require "active_support/core_ext/string/inflections"
 
 require "rake"
 
-require "annotate_rb/active_record_patch"
-
 require_relative "annotate_rb/helper"
 require_relative "annotate_rb/core"
 require_relative "annotate_rb/commands"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annotaterb
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Andrew W. Lee
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-24 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies: []
 description: Annotates Rails/ActiveRecord Models, routes, fixtures, and others based
   on the database schema.
@@ -25,7 +25,6 @@ files:
 - VERSION
 - exe/annotaterb
 - lib/annotate_rb.rb
-- lib/annotate_rb/active_record_patch.rb
 - lib/annotate_rb/commands.rb
 - lib/annotate_rb/commands/annotate_models.rb
 - lib/annotate_rb/commands/annotate_routes.rb
@@ -48,6 +47,7 @@ files:
 - lib/annotate_rb/model_annotator/column_annotation/annotation_builder.rb
 - lib/annotate_rb/model_annotator/column_annotation/attributes_builder.rb
 - lib/annotate_rb/model_annotator/column_annotation/column_wrapper.rb
+- lib/annotate_rb/model_annotator/column_annotation/default_value_builder.rb
 - lib/annotate_rb/model_annotator/column_annotation/type_builder.rb
 - lib/annotate_rb/model_annotator/file_builder.rb
 - lib/annotate_rb/model_annotator/file_components.rb

data/lib/annotate_rb/active_record_patch.rb

@@ -1,11 +0,0 @@
-# monkey patches
-
-# standard:disable Style/MissingRespondToMissing
-module ::ActiveRecord
-  class Base
-    def self.method_missing(_name, *_args)
-      # ignore this, so unknown/unloaded macros won't cause parsing to fail
-    end
-  end
-end
-# standard:enable Style/MissingRespondToMissing