reynard 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d85681365ddb46b06c062b39bdea10bf46810d80d813c9737df0ee3aeb38e843
-  data.tar.gz: '007908692ed0a3c437befba30a29d0f694429033097b7ae47ca2aaf7050c05ea'
+  metadata.gz: 891b142e2ca908078c960db4b36040b407974da43395d02b7ee3f768a1c758b4
+  data.tar.gz: 5deefbad34c0364cfd3c3a04910b882499c3b96d7c4d642fdb10fbdcc3e9898f
 SHA512:
-  metadata.gz: 1e23bf2702660623a61039bb8444ea3e0f4bdd7eaceab42d22dbca2ea157e705a54af69558ce84812d4ef2f13c1330071781e8da61d3ed44c8b0d2a944816752
-  data.tar.gz: 9e973c551d30a6b7e6ab8ef494d270b5dac05dfd96de86c49448c5889b070a07ee8d8aa486de1f80c3d372c73ed7b11e37da49625fdeb64d21e84352130e55f3
+  metadata.gz: 393b2cab7867c45c53b761f42b03e609e653600981aa1283cf3f7c0213379adb9a1eeb1530b3a0f826e07d1ceb5c3fab0d8afc114a2001ec773f71d2484bc109
+  data.tar.gz: c14ebcc55481c202c0c3c7b7dd36e68eb5b72f0297c0339867e6c298d4a3605284dff2e041d33b074c8c9e3b8064f450fdf481fa686e56c1e764af59a1050593

data/lib/reynard/object_builder.rb

@@ -14,6 +14,8 @@ class Reynard
     def object_class
       if @media_type.schema_name
         self.class.model_class(@media_type.schema_name, @schema.object_type)
+      elsif @schema.object_type == 'array'
+        Array
       else
         Reynard::Model
       end

data/lib/reynard/specification.rb

@@ -112,6 +112,14 @@ class Reynard
                  .gsub(/\A(.)/) { Regexp.last_match(1).upcase }
     end
 
+    def self.normalize_model_title(title)
+      title
+        .gsub(/[^[:alpha:]]/, ' ')
+        .gsub(/\s{2,}/, ' ')
+        .gsub(/(\s+)([[:alpha:]])/) { Regexp.last_match(2).upcase }
+        .strip
+    end
+
     private
 
     def read
@@ -150,17 +158,25 @@ class Reynard
     # rubocop:enable Metrics/MethodLength
 
     def schema_name(response)
-      ref = response.dig('schema', '$ref')
-      return unless ref
-
-      self.class.normalize_model_name(ref&.split('/')&.last)
+      extract_schema_name(response['schema'])
     end
 
     def item_schema_name(schema)
-      ref = schema.dig('items', '$ref')
-      return unless ref
+      if schema['type'] == 'array'
+        extract_schema_name(schema['items'])
+      else
+        extract_schema_name(schema)
+      end
+    end
+
+    def extract_schema_name(definition)
+      ref = definition['$ref']
+      return self.class.normalize_model_name(ref&.split('/')&.last) if ref
+
+      title = definition['title']
+      return unless title
 
-      self.class.normalize_model_name(ref&.split('/')&.last)
+      self.class.normalize_model_title(title)
     end
   end
 end

data/lib/reynard/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Reynard
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reynard
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Manfred Stienstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json