rhino_project_core 0.30.0.alpha.5 → 0.30.0.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c236921f30ba92d324fbf5a6dbce5ecc8d3a3545d87d569aac256d38fb07cf7
-  data.tar.gz: 96280b81678975fa81b37179acf8897520dfc2b5a9e789040df7c272c5997349
+  metadata.gz: 7375d890b7e9ecf59b945b1ee1e46b4ae26aac484cde59f062b0ce36cb466e65
+  data.tar.gz: b78b8369c48e61b6fc28780ac708649a20fbc18a41206b0abd7d12ea288ec2ad
 SHA512:
-  metadata.gz: c69239c775a3da2f7451e66b800ff0887b813cd9f61f3a314f693e46c78120a332c556ae2b0f93b70040aadb9c7c7e70a6c6da821c4d84073ad45fb7baf75a0c
-  data.tar.gz: 8ffa86b1fd8eb3d713f616b4941fd8a77a015c2a94d0e7dd7347dfde9f0816f262186b54de099b71319e5b840fed1842f62e5ae220b8fb01ce9652277025f5f3
+  metadata.gz: 4c67e043a995c9b6166cdf232b7c0c6d56f69001ba1e501fbc7ec395c9c5039c24ce460e3396b7fd2bd388e4ce5238ed50f39c5447606a4b6a9763fe1d54d143
+  data.tar.gz: 1d87c78f76add2df4c33e5ac071ccf126a1cea7a8b29eb59cbb49c97cf22837a226d7c90877498ca683b1600370f1679f23306f171056e48f33f346cbbe2b8e1

data/lib/rhino/resource/active_record_extension/properties_describe.rb

@@ -61,27 +61,29 @@ module Rhino
               }
             end
 
+            DATE_FORMATS = %i[datetime date time].freeze
             def property_type_and_format_attr(name)
-              atype = attribute_types[name.to_s].type
+              type = attribute_types[name.to_s].type
+              format = nil
 
               # The PG array delegates type to "subtype" which is the actual type of the array elements
               if attribute_types[name.to_s].is_a? ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array
                 return {
                   type: :array,
-                  items: {
-                    type: atype
-                  }
+                  items: { type: }
                 }
               end
 
-              if %i[datetime date time].include?(atype)
-                return {
-                  type: "string",
-                  format: atype
-                }
+              # Identifier is a special format for identification on the front end
+              format = :identifier if name == identifier_property
+
+              # Dates and times are strings
+              if DATE_FORMATS.include?(type)
+                format = type
+                type = :string
               end
 
-              { type: atype }
+              { type:, format: }.compact
             end
 
             def nested_array_options(name)
@@ -126,7 +128,6 @@ module Rhino
 
             def property_type_and_format(name) # rubocop:disable Metrics/AbcSize
               # Special cases
-              return { type: :identifier } if name == identifier_property
               return { type: :string } if defined_enums.key?(name)
 
               # FIXME: Hack for tags for now

data/lib/rhino/version.rb

@@ -10,7 +10,7 @@ module Rhino
     MAJOR = 0
     MINOR = 30
     TINY  = 0
-    PRE   = "alpha.5"
+    PRE   = "alpha.6"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhino_project_core
 version: !ruby/object:Gem::Version
-  version: 0.30.0.alpha.5
+  version: 0.30.0.alpha.6
 platform: ruby
 authors:
 - JP Rosevear