bullet_train-api 1.6.23 → 1.6.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1408a5f8a1cd991f433fdbe440207296f58513d23c35210e04b38cefc4f8e723
-  data.tar.gz: 643696920dbccb4855509436a9bfdb6dc9a4de5a83674bed38fa18f27fbcb0cc
+  metadata.gz: d804ed1dce182c742eaea6f67f798bd160baa8e483e5bf0b778e2aaf53cfea7a
+  data.tar.gz: a979a3734abc96534ed39004f738415f064cd11ad4363044cc51002b51748fe4
 SHA512:
-  metadata.gz: 612c965ce9f13b0b6735958babc3b43a5d33bd2a28b87173923014bddadb574b15c8d9543d06122947dad182987b1a620d2f1bef2627f9e6ebc9ad89d5df758a
-  data.tar.gz: e861d158f819d3597b9cd2e2a649d68128326663e4c921104c6c6f3c36907e642255bba67a41619c715f72d7cb04349ed56c42642fae8c25234f9c989c96cfcb
+  metadata.gz: 9a6f2a8c49a6b17d12338c876a69443c6f2ccf7f604401d65f8541fb222528290de3a38b299c3d40590ef3294c3a70252e0220fde62c725f162145a621b13a65
+  data.tar.gz: 71c2c5a0ed25655ba970f3add908f418b252f525ea71f55b2af873c80128786c26bdd8caea75a098a6d0760c55e4b7eb4d566431d1825b08d22df123453eb666

data/app/helpers/api/open_api_helper.rb

@@ -27,18 +27,23 @@ module Api
       output = render("api/#{@version}/open_api/shared/paths", except: except)
       output = Scaffolding::Transformer.new(model.name, [parent&.name]).transform_string(output).html_safe
 
-      custom_actions_file_path = "api/#{@version}/open_api/#{model.name.underscore.pluralize}/paths"
-      output += render(custom_actions_file_path) if lookup_context.exists?(custom_actions_file_path, [], true)
-
-      # There are some placeholders specific to this method that we still need to transform.
-      model_symbol = model.name.underscore.tr("/", "_").to_sym
+      custom_actions_file_path = "api/#{@version}/open_api/#{model.model_name.collection}/paths"
+      custom_output = render(custom_actions_file_path).html_safe if lookup_context.exists?(custom_actions_file_path, [], true)
 
       FactoryBot::ExampleBot::REST_METHODS.each do |method|
-        if (code = FactoryBot.send(method, model_symbol, version: @version))
+        if (code = FactoryBot.send(method, model.model_name.param_key.to_sym, version: @version))
           output.gsub!("🚅 #{method}", code)
+          custom_output&.gsub!("🚅 #{method}", code)
         end
       end
 
+      if custom_output
+        merge = deep_merge(YAML.load(output), YAML.load(custom_output)).to_yaml.html_safe
+        # YAML.load escapes emojis https://github.com/ruby/psych/issues/371
+        # Next line returns emojis back and removes yaml garbage
+        output = merge.gsub("---", "").gsub(/\\u[\da-f]{8}/i) { |m| [m[-8..].to_i(16)].pack("U") }
+      end
+
       indent(output, 1)
     end
 
@@ -147,5 +152,17 @@ module Api
         end
       end
     end
+
+    def deep_merge(hash1, hash2)
+      hash1.merge(hash2) do |_, old_val, new_val|
+        if old_val.is_a?(Hash) && new_val.is_a?(Hash)
+          deep_merge(old_val, new_val)
+        elsif old_val.is_a?(Array) && new_val.is_a?(Array)
+          (old_val + new_val).uniq
+        else
+          new_val
+        end
+      end
+    end
   end
 end

data/lib/bullet_train/api/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module Api
-    VERSION = "1.6.23"
+    VERSION = "1.6.24"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-api
 version: !ruby/object:Gem::Version
-  version: 1.6.23
+  version: 1.6.24
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard