model_driven_api 3.1.5 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c1a8a56c9fefaf12a3a21235edbb91325a78b9d95a63d0cab7ed3ba12cda2bf
-  data.tar.gz: 50dcc8e5cc20032bb9e912abed38b43c24c24f6917852bc0ccdc139e55dd080c
+  metadata.gz: 1272f499542ca137fd53edb4e8e0221021c9640a8d0f964fc41546c6d55e3873
+  data.tar.gz: 23c1b8dafdcf82ffdfcc68113568ee07e9bd9ee10efaaeb860be8459e09a1c2e
 SHA512:
-  metadata.gz: b140b53e7de7d56349f61713d6b39607132e8bde7c4f15a110f6061f53e76d1d7b4b4460b5ab9c4a5ff107a4dd84dab2c46ad9dba47b2db25b20a756c186c84b
-  data.tar.gz: 93636d414d491988dbab88b309ac42737c36056637e27e89f8bb36a60b12a9f69fa683ea2d4764b1317ea6963020b68d9422580fbfae5f9277fac24ccfad8b4b
+  metadata.gz: 53941a7154e66342de797d2350fffe085f74cc6ddafc75c4d15231e14d1628b1d03c6891ee74674e0a47f634550cfc4c01bb335f2b58b5b592da5b20c4b72559
+  data.tar.gz: 22289e5e28cdd414390d2019b9f48526d606eacbdc026c259f3c8444fcf039b712e5099062f0b811970ce3ba00d3803870c97541faa6b94e2c5c2662ee89e856

data/app/controllers/api/v2/info_controller.rb

@@ -84,12 +84,36 @@ class Api::V2::InfoController < Api::V2::ApplicationController
     method_key.type.to_s
   end
 
-  def create_properties_from_model(model, dsl)
-    JSON.parse(model.new.to_json(dsl)).keys.map do |k|
-      # Rails.logger.debug "###################### Model #{model.model_name.human rescue ""} Key #{k}"
+  def integer?(str)
+    true if Integer(str) rescue false
+  end
+
+  def number?(str)
+    true if Float(str) rescue false
+  end
+
+  def datetime?(str)
+    true if DateTime.parse(str) rescue false
+  end
+
+  def create_properties_from_model(model, dsl, remove_reserved = false)
+    parsed_json = JSON.parse(model.new.to_json(dsl))
+    parsed_json.keys.map do |k|
       type = compute_type(model, k)
-      # Rails.logger.debug "###################### Model #{model.model_name.human rescue ""} Type for #{k} is #{type}"
-      if type == "method"
+      
+      # Remove fields that cannot be created or updated
+      if remove_reserved && %w( id created_at updated_at lock_version).include?(k.to_s)
+        nil
+      elsif type == "method" && (parsed_json[k].is_a?(FalseClass) || parsed_json[k].is_a?(TrueClass))
+        [k, { "type": "boolean" }]
+      elsif type == "method" && parsed_json[k].is_a?(String) && number?(parsed_json[k])
+        [k, { "type": "number" }]
+      elsif type == "method" && parsed_json[k].is_a?(String) && integer?(parsed_json[k])
+        [k, { "type": "integer" }]
+      elsif type == "method" && parsed_json[k].is_a?(String) && datetime?(parsed_json[k])
+        [k, { "type": "string", "format": "date-time" }]
+      elsif type == "method"
+        # Unknown or complex format returned
         [k, { "type": "object", "additionalProperties": true }]
       elsif type == "date"
         [k, { "type": "string", "format": "date" }]
@@ -420,7 +444,7 @@ class Api::V2::InfoController < Api::V2::ApplicationController
         }
       }
     }
-    ApplicationRecord.subclasses.each do |d|
+    ApplicationRecord.subclasses.sort_by { |d| d.to_s }.each do |d|
       # Only if current user can read the model
       if true # can? :read, d
         model = d.to_s.underscore.tableize
@@ -468,7 +492,7 @@ class Api::V2::InfoController < Api::V2::ApplicationController
                     "properties": {
                       "#{model.singularize}": {
                         "type": "object",
-                        "properties": create_properties_from_model(d, {})
+                        "properties": create_properties_from_model(d, {}, true)
                       }
                     }
                   }
@@ -611,7 +635,7 @@ class Api::V2::InfoController < Api::V2::ApplicationController
                     "properties": {
                       "#{model.singularize}": {
                         "type": "object",
-                        "properties": create_properties_from_model(d, {})
+                        "properties": create_properties_from_model(d, {}, true)
                       }
                     }
                   }
@@ -660,7 +684,7 @@ class Api::V2::InfoController < Api::V2::ApplicationController
                     "properties": {
                       "#{model.singularize}": {
                         "type": "object",
-                        "properties": create_properties_from_model(d, {})
+                        "properties": create_properties_from_model(d, {}, true)
                       }
                     }
                   }

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.1.5".freeze
+  VERSION = "3.1.7".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.7
 platform: ruby
 authors:
 - Gabriele Tassoni