api_scaffolding 1.0.3.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cf16a7cedbb1200b634e5b8c4e1a73c6b47931d6902bfebe6d95f54464de262
-  data.tar.gz: 8bc2cead74432092c135b3f25ac0be29671b4cf8b311ef00b374c3b9f3483f44
+  metadata.gz: '08c5ec74d829c952e8a2ceb573f4730efad6a959079353cc1b7d64ff04fced97'
+  data.tar.gz: 17aac17e0026af1f9aa8edb11606c4abf8e6817dc77720c45b183cbaeb890b7b
 SHA512:
-  metadata.gz: f86d9eafb4a861573437f01e3b6230022da1d6ff97ccb0fe3806b04a7f0547d760a07970e81731acc410870f8379ad0177aa4d9c037dc140a14e07b43fac1d42
-  data.tar.gz: 88c3120719bbcaf1ae49c5753b19ada845425f7c70bde3a9cd64fb7be58ec7e1d362389fedcbfe6eb3736b13abde8c1b439b718beab9988c4860dc501bb05cc8
+  metadata.gz: ba57f6f99006c3933af779cfd849e491a64392bd053a6b18b1bd215723c52c762d3b3d2de3634b233d285a0aef0931b3d0ac83030765e3384130e9417ca693ef
+  data.tar.gz: 84caddd41decc1abced9faf367ec2f75dc32651d967e2d475b958b7987717ea6e634751b2c8632229739b1f72a774ca293d85eddea8ab16cc95ad16934ccf4ce

data/lib/generators/api_scaffold/entity_generator.rb

@@ -29,7 +29,7 @@ module ApiScaffold
         model.columns.map do |column|
           next if %w[name].exclude?(column.name)
 
-          entity_field(column)
+          entity_field(column).force_encoding(Encoding::BINARY)
         end.compact.join(fields_separator)
       end
 
@@ -38,29 +38,40 @@ module ApiScaffold
         model.columns.map do |column|
           next if ApiScaffolding.config.entity_fields_exclusions.include?(column.name)
 
-          entity_field(column)
+          entity_field(column).force_encoding(Encoding::BINARY)
         end.compact.join(fields_separator)
       end
 
       def fields_separator
         # разделение полей в генерируемом файле
-        "\n" + (' ' * 4)
+        "\n\n" + (' ' * 4)
       end
 
       def entity_field(column)
+        # разделение для форматирования поля
+        separator = "\n" + (' ' * 11)
+
+        # описание поля
+        desc = column.comment
+        if column.type == :enum
+          desc += " (enum: #{column.sql_type})"
+        end
+
         case column.type
-        when :string, :enum
-          "expose :#{column.name}"
+        when :string
+          "expose :#{column.name},#{separator}documentation: { desc: '#{desc}' }"
+        when :enum
+          "expose :#{column.name},#{separator}documentation: { values: #{model}.#{column.name.pluralize}.values, desc: '#{desc}' }"
         when :integer
-          "expose :#{column.name}, documentation: { type: 'Integer' }"
+          "expose :#{column.name},#{separator}documentation: { type: 'Integer', desc: '#{desc}' }"
         when :float
-          "expose :#{column.name}, documentation: { type: 'Float' }"
+          "expose :#{column.name},#{separator}documentation: { type: 'Float', desc: '#{desc}' }"
         when :decimal
-          "expose :#{column.name}, documentation: { type: 'Float', values: [#{decimal_example(column)}] }"
+          "expose :#{column.name},#{separator}documentation: { type: 'Float', values: [#{decimal_example(column)}], desc: '#{desc}' }"
         when :date
-          "expose :#{column.name}, documentation: { type: 'Date' }"
+          "expose :#{column.name},#{separator}documentation: { type: 'Date', desc: '#{desc}' }"
         when :boolean
-          "expose :#{column.name}, documentation: { type: 'Boolean' }"
+          "expose :#{column.name},#{separator}documentation: { type: 'Boolean', desc: '#{desc}' }"
         end
       end
 

data/lib/generators/api_scaffold/params_concern_generator.rb

@@ -37,11 +37,16 @@ module ApiScaffold
           when :decimal
             'Float'
           else
-            column.type.capitalize
+            column.type.to_s.capitalize
           end
 
         # базовая строка
-        line = "optional :#{column.name}, type: #{type}"
+        line = "optional :#{column.name}"
+
+        # добавление типа
+        if type != 'String'
+          line += ", type: #{type}"
+        end
 
         # добавление возможных значений enum
         if column.type == :enum

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: api_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.0.3.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Павел Бабин
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2024-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: grape-entity
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +51,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,18 +61,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Генерация контроллеров API и модулей с параметрами Grape и Grape Entity