annotaterb 4.12.0 → 4.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +10 -0
  3. data/VERSION +1 -1
  4. data/lib/annotate_rb/model_annotator/annotated_file/updater.rb +1 -1
  5. data/lib/annotate_rb/model_annotator/file_parser/yml_parser.rb +8 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: acf04a7f1c6244fa950273cc78bb159e3f25e1e1f8f154ebb5a668152672f28d
4
- data.tar.gz: 67466b09b7efa8ad90d2b674228c60b368c475b8809a5af7f0c9c48f1bfa3938
3
+ metadata.gz: 7adb0604dd67e60d6658add880eeee01a0367c86f9f0088f557fcb6ab42605c6
4
+ data.tar.gz: faa6374c64ffb979d1690c896cc564c526a6641b2fd79adc8bc922fad2fb25c0
5
5
  SHA512:
6
- metadata.gz: 76fcd6ffe70e014b15a4aab9b8e5f838432281cf7836eb83532a17f3f13c0e70381ea20bcec185efd91816df6eed64ae25d9541403c1aa0e3bb94b7970846f5b
7
- data.tar.gz: 311ccf2c9013fe16ee0b70a693f9c1c478b4ab1543b6f8fdc3baf3fb0b4c9f8840e45d98236d2b634b80e3cadc1b33bb77f92a77f118828e92319292a85d8845
6
+ metadata.gz: 6250eab94f83dd0c3a40d670ad6a151532199d0183f6d13893775094e5581f6bf2513205b04f29034f0c35c8a1e0c34911a964efcb2c3104cfde0c2d6af0c1d0
7
+ data.tar.gz: 39210bfcf75338adf0a0bc88b31720427ed28b2679abed39ee4aa7b2500b88a170665a330a4f709a6c08f1e9d8e628c553502a4143bf4ea5be5eb96e464ebb61
data/CHANGELOG.md CHANGED
@@ -1,5 +1,15 @@
1
1
  # Changelog
2
2
 
3
+ ## [v4.12.0](https://github.com/drwl/annotaterb/tree/v4.12.0) (2024-09-15)
4
+
5
+ [Full Changelog](https://github.com/drwl/annotaterb/compare/v4.11.0...v4.12.0)
6
+
7
+ **Merged pull requests:**
8
+
9
+ - Bump version to v4.12.0 [\#151](https://github.com/drwl/annotaterb/pull/151) ([drwl](https://github.com/drwl))
10
+ - Support postgres NULLS NOT DISTINCT clause in unique index [\#148](https://github.com/drwl/annotaterb/pull/148) ([ENewmeration](https://github.com/ENewmeration))
11
+ - Generate changelog for v4.11.0 [\#147](https://github.com/drwl/annotaterb/pull/147) ([drwl](https://github.com/drwl))
12
+
3
13
  ## [v4.11.0](https://github.com/drwl/annotaterb/tree/v4.11.0) (2024-08-16)
4
14
 
5
15
  [Full Changelog](https://github.com/drwl/annotaterb/compare/v4.10.2...v4.11.0)
data/VERSION CHANGED
@@ -1 +1 @@
1
- 4.12.0
1
+ 4.13.0
data/lib/annotate_rb/model_annotator/annotated_file/updater.rb CHANGED
@@ -20,7 +20,7 @@ module AnnotateRb
20
20
 
21
21
  new_annotation = wrapped_content(@new_annotations)
22
22
 
23
- _content = @file_content.sub(@parsed_file.annotations, new_annotation)
23
+ _content = @file_content.sub(@parsed_file.annotations) { new_annotation }
24
24
  end
25
25
 
26
26
  private
data/lib/annotate_rb/model_annotator/file_parser/yml_parser.rb CHANGED
@@ -40,7 +40,14 @@ module AnnotateRb
40
40
  def parse_yml
41
41
  # https://docs.ruby-lang.org/en/master/Psych.html#module-Psych-label-Reading+to+Psych-3A-3ANodes-3A-3AStream+structure
42
42
  parser = Psych.parser
43
- parser.parse(@input)
43
+ begin
44
+ parser.parse(@input)
45
+ rescue Psych::SyntaxError => _e
46
+ # "Dynamic fixtures with ERB" exist in Rails, and will cause Psych.parser to error
47
+ # This is a hacky solution to get around this and still have it parse
48
+ erb_yml = ERB.new(@input).result
49
+ parser.parse(erb_yml)
50
+ end
44
51
 
45
52
  stream = parser.handler.root
46
53
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: annotaterb
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.12.0
4
+ version: 4.13.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew W. Lee
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-09-15 00:00:00.000000000 Z
11
+ date: 2024-10-21 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Annotates Rails/ActiveRecord Models, routes, fixtures, and others based
14
14
  on the database schema.