katarina 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43ab1c6567c37055c23ed9124d0f8b9add6ab70a94d5b5407887658e912001c7
-  data.tar.gz: a39845bd2f5982306e5434bd5fbf7fbe1357a7c9f759af2862b0a381df29f797
+  metadata.gz: 939fc8cc32495c0feae72bb679e8f8ea4ef41e67fe5a54ce3e4f369b208c8822
+  data.tar.gz: 917af113bc30c06b636e863fe0dcfe04823323af2c1507a80478075a955586d2
 SHA512:
-  metadata.gz: a508469b087a906598ef45f32d126bfe6a583c8f698266d40e30d4314547a4e1450bfca3432a2d088c5df50f59461f49e0d80ca967d5b147788de3f6bada7594
-  data.tar.gz: 9c9bd1067dd1f825a79885c4df133778a49e3bb3437eb2e319ce1a45dd4a0240172bd4b048f7fa8871e4e383144495bed1d84c07896adf9fb3499d79c38f5e31
+  metadata.gz: 19d58a0db473de561c66fb1af44195282e30e6bdeb55c19899f7f4d96c9a57fc4711f461c4fa2c4a64caafcad74e5591b2ccaf4c8d27cd3917c2d58163d771d9
+  data.tar.gz: 810b0b4c2c6dea8991567238d2c5a0f30c9ead69df0f2c4550baa96654762f2ccf61e8938fd31efe95545e4fc991d79718ce5ee1bf5efb876c76b754b59dfb59

data/lib/katarina/type_generator.rb

@@ -5,44 +5,48 @@ module Katarina
     class << self
       def generate(schema)
         [
-          "type #{schema.name} = {",
+          "type #{schema.name} = ",
           members(schema.types),
-          "}\n"
-        ].join("\n")
+          "\n",
+        ].join
       end
 
       private
 
-      def members(types, level = 1)
+      def members(types, level = 0)
         case types
         when Hash
-          types.map { |name, type| member(name, type, level) }.join("\n")
+          [
+            "{",
+            types.map { |name, type| member(name, type, level + 1) },
+            "#{indent(level)}}",
+          ].join("\n")
         when Array
           "#{members(types.first, level)}[]"
+        when String
+          number?(types) ? 'number' : types
         else
-          types
+          raise "unknown type => #{types.class}: #{types}"
         end
       end
 
       def member(name, type, level)
         case type
         when Hash
-          [
-            "#{key(name, level)} {",
-            members(type, level + 1),
-            "#{indent(level)}}"
-          ]
+          "#{key(name, level)} #{members(type, level)}"
         when Array
-          if type.first != 'null'
-            "#{member(name, type.first, level).join("\n")}[]"
-          else
-            "#{key(name, level)} null[]"
-          end
+          "#{member(name, type.first, level)}[]"
         when String
-          "#{key(name, level)} #{type == 'integer' ? 'number' : type}"
+          "#{key(name, level)} #{number?(type) ? 'number' : type}"
+        else
+          raise "unknown type => #{type.class}: #{type}"
         end
       end
 
+      def number?(type)
+        %w[integer float].include?(type)
+      end
+
       def key(name, level)
         "#{indent(level)}#{name}:"
       end

data/lib/katarina/version.rb

@@ -1,3 +1,3 @@
 module Katarina
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katarina
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - masatoshi_moritsuka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -116,8 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: This gem generates type definitions for TypeScript from a OpenAPI Documentation