model_driven_api 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a72bb6cfea6d9f8e0fd4fff0643ee5f73c4c4434532092bd428c7b048c5f9b0
-  data.tar.gz: 51c3691214427e0aaa6111cf00a9b476fdb4c91861ba1819a227ea859f924a2d
+  metadata.gz: 1272f499542ca137fd53edb4e8e0221021c9640a8d0f964fc41546c6d55e3873
+  data.tar.gz: 23c1b8dafdcf82ffdfcc68113568ee07e9bd9ee10efaaeb860be8459e09a1c2e
 SHA512:
-  metadata.gz: af0ddbc93b40f315b170630facacb7357022880e560502c83f4e2f2e5ac4342ffb5eaece4be1e1e591d5f0fa6b0a447b1e49ecbd6f9bf2975ee15c2a4b5c8743
-  data.tar.gz: f6318805dc382e2ce28494a74174d01bd53fb12749151a6ea5b21d4ea610dd23a9a4ac8c3dce09ff241c21202f8c3291694056917024781df012f39ac8e25460
+  metadata.gz: 53941a7154e66342de797d2350fffe085f74cc6ddafc75c4d15231e14d1628b1d03c6891ee74674e0a47f634550cfc4c01bb335f2b58b5b592da5b20c4b72559
+  data.tar.gz: 22289e5e28cdd414390d2019b9f48526d606eacbdc026c259f3c8444fcf039b712e5099062f0b811970ce3ba00d3803870c97541faa6b94e2c5c2662ee89e856

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

@@ -84,14 +84,36 @@ class Api::V2::InfoController < Api::V2::ApplicationController
     method_key.type.to_s
   end
 
+  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)
-    JSON.parse(model.new.to_json(dsl)).keys.map do |k|
+    parsed_json = JSON.parse(model.new.to_json(dsl))
+    parsed_json.keys.map do |k|
       type = compute_type(model, k)
       
       # 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" }]
@@ -422,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

data/lib/model_driven_api/version.rb

@@ -1,3 +1,3 @@
 module ModelDrivenApi
-  VERSION = "3.1.6".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.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Gabriele Tassoni