swagger-to-rbs 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 651f699800da6263854e5f030b5b2e9084570686b17b92b164319c8c18dbe28f
-  data.tar.gz: 23e3253fd8e999fa5042045c9548227e5addd97ed26fe230c0303850665a6d85
+  metadata.gz: 4609330c97363e8fc3f14d202f55904f026124a77a13c9e9bfcf8728a75aab42
+  data.tar.gz: 4ebb0337d6d72947aa3ce27ce4e2d8a99cbc63eb7f33a8015a3dccacb668696a
 SHA512:
-  metadata.gz: 6ceb2196aaf7cb48385a7c3d200f45a1c28880385ce00da876a6dcb9d19c08ca1a991fbc461e5d026e4276f78266e8f5d3ccc444f26d6fb61c309b9e5edae73b
-  data.tar.gz: 27fc3959ff9f6a56846322e03b14e83fd60a96659e006abfe23c6ccb069bd404e4a4a89b0472edc92c4b87415bedf6b1bbad47ef96721a47473adfc1fd3b59c9
+  metadata.gz: 7899e345942d1014a68dccf6a866295a2afafefabc80d4a2abc439a15ab4f6bb35d7ab708f3ef4eb7b548602902b66c850d015fae56b3b4efdc7ab3c4dca5781
+  data.tar.gz: 58a8e1db7ae6b58d0e3e0611c4e4b6346e3871ee5556f3f01018d812eb2027703d2bfa3733f63c346304cfbd322b68ec316c8ecb031dfdb356be8a3075a9157a

data/README.md

@@ -1,4 +1,10 @@
-### Usage
+## Install
+
+```
+gem install swagger-to-rbs
+```
+
+## Usage
 
 Dowload swagger spec
 
@@ -11,7 +17,7 @@ curl https://petstore3.swagger.io/api/v3/openapi.json > swagger.json
 Generate http client based on [Httparty gem](https://github.com/jnunemaker/httparty)
 
 ```
-swagger-to-rbs generate --name MyApi --spec swagger.json
+swagger-to-rbs generate --name PetApi --spec swagger.json
 ```
 
 Result:
@@ -24,16 +30,20 @@ class PetApi
   base_uri "/api/v3"
   #...
 
-  def getPetById(petId, params, options = {})
-    self.class.get("/pet/#{petId}", params: params.to_json, headers: { 'Content-Type' => 'application/json' }.merge(options))
+  def initialize
+    self.class.headers({ 'Content-Type' => 'application/json' })
+  end
+
+  def getPetById(petId, options = {})
+    self.class.get("/pet/#{petId}", options)
   end
 
   def updatePet(body, options = {})
-    self.class.put("/pet", body: body.to_json, headers: { 'Content-Type' => 'application/json' }.merge(options))
+    self.class.put("/pet", { body: body.to_json }.merge(options))
   end
 
   def addPet(body, options = {})
-    self.class.post("/pet", body: body.to_json, headers: { 'Content-Type' => 'application/json' }.merge(options))
+    self.class.post("/pet", { body: body.to_json }.merge(options))
   end
   #...
 end
@@ -44,7 +54,7 @@ end
 Authorization example:
 
 ```
-api = MyApi.new
+api = PetApi.new
 
 MyApi.headers(Authorization: "Bearer #{access_token}")
 MyApi.base_uri("http://otherurl.test/api/v1)

data/lib/swagger2_rbs/rest_endpoint.rb

@@ -1,8 +1,10 @@
 require 'slugify'
+require_relative 'rest_endpoint_typed'
 
 module Swagger2Rbs
   class RestEndpoint
     attr_reader :path, :method, :props
+    include RestEndpointTyped
 
     def initialize(path, method, props)
       @path = path
@@ -13,14 +15,28 @@ module Swagger2Rbs
     def to_h
       {
         path: path_with_parameters,
+        http_method: method,
+        parameters_for_method: parameters_for_method,
+        typed_parameters_for_method: typed_parameters_for_method,
+        has_body: body?,
+        method_name: method_name,
+        response_typed: response_typed,
+      }
+    rescue => e
+      raise e, "Context: #{path} #{method} Message: #{e.message}"
+    end
+
+    def body?
+      body && !body.empty?
+    end
+
+    def to_yaml
+      {
+        path: path,
         method: method,
         parameters: parameters,
-        parameters_for_method: parameters_for_method,
-        parameters_typed: parameters_typed,
         method_name: method_name,
         body: body,
-        body_typed: body_typed,
-        response_typed: response_typed,
       }
     rescue => e
       raise e, "Context: #{path} #{method} Message: #{e.message}"
@@ -37,39 +53,7 @@ module Swagger2Rbs
     def parameters
       return [] unless props["parameters"]
 
-      props["parameters"].select{|it| it["in"] == "path"}.map{|it| it["name"]}
-    end
-
-    def response_typed
-      schema = resolve_all_of(@props.dig("responses", "200", "content", "application/json", "schema"))
-      schema_to_typed(schema, {})
-    end
-
-    def parameters_typed
-      return nil if method != "get"
-      parameters.map{|it| "String #{it}" }
-      .push("?Hash[untyped, untyped] options")
-      .join(", ")
-    end
-
-    def body_typed
-      return nil if method != "post"
-
-      return "Hash[String, untyped]" unless body
-      return "Hash[String, untyped]" if body.empty?
-
-    "{" + body.map{ |k, v| to_typed(k, v) }.join(", ") + "}" + " body, ?Hash[untyped, untyped] options"
-    end
-
-    def to_typed(k, v)
-      return "#{k}: #{v&.capitalize}" unless v.is_a?(Array) || v.is_a?(Hash)
-      return "#{k}: {#{v.map{ |k2, v2| to_typed(k2, v2) }.join(", ")}}" if v.is_a?(Hash)
-
-      if v[0]&.is_a?(Hash)
-        "#{k}: Array[{" + v[0].map{ |k, v| to_typed(k, v) }.join(", ") + "}]"
-      else
-        "#{k}: Array[#{v[0]&.capitalize}]"
-      end
+      props["parameters"]&.select{|it| it["in"] == "path"}&.map{|it| it["name"]}
     end
 
     def body
@@ -80,26 +64,12 @@ module Swagger2Rbs
     end
 
     def parameters_for_method
-      return parameters.push("options = {}").join(", ") if (method == "get")
+      return parameters.push("options = {}").join(", ") if method == "get"
 
-      parameters.push("body").push("options = {}").join(", ")
-    end
-
-    def schema_to_typed(schema, memo = {})
-      return nil unless schema
-
-      schema["properties"]&.reduce(memo)do |memo, (k,v)|
-        if v["type"] == "object"
-          memo.merge({k => schema_to_typed(v, {})})
-        elsif v["type"] == "array"
-          if v.dig("items", "type") == "object"
-            memo.merge({k => [schema_to_typed(v["items"], {})] })
-          else
-            memo.merge({k => [v.dig("items", "type")] })
-          end
-        else
-          memo.merge({k => v["type"] })
-        end
+      if body&.empty?
+        parameters.push("options = {}").join(", ")
+      else
+        parameters.push("body").push("options = {}").join(", ")
       end
     end
 

data/lib/swagger2_rbs/rest_endpoint_typed.rb

@@ -0,0 +1,74 @@
+module Swagger2Rbs
+
+  module RestEndpointTyped
+    def response_typed
+      schema = resolve_all_of(@props.dig("responses", "200", "content", "application/json", "schema"))
+      schema_to_typed(schema, {})
+    end
+
+    def typed_parameters_for_method
+      options_typed = "?Hash[untyped, untyped] options"
+      return "(#{options_typed})" unless body && parameters
+      return "(#{options_typed})" if body.empty? && parameters.empty?
+
+      typed_parameters = parameters&.map{|it| "String #{it}" } || []
+
+      typed_parameters.push("#{body_typed} body") if body?
+
+      "(#{typed_parameters.push(options_typed).join(', ')})"
+    end
+
+    def body_typed
+      return nil unless body?
+      typed = (body.is_a?(Array) ? body[0] : body)&.map{ |k, v| to_typed(k, v) }.join(', ')
+      if body.is_a?(Array)
+        "Array[{ #{typed} }]"
+      else
+        "{ #{typed} }"
+      end
+    end
+
+    def type_case(str)
+      case str
+      when "boolean"
+        "bool"
+      else
+        str&.capitalize
+      end
+    end
+
+    def to_typed(k, v)
+      return "#{k}: #{type_case(v)}" unless v.is_a?(Array) || v.is_a?(Hash)
+      return "#{k}: {#{v.map{ |k2, v2| to_typed(k2, v2) }.join(", ")}}" if v.is_a?(Hash)
+
+      if v[0]&.is_a?(Hash)
+        "#{k}: Array[{" + v[0].map{ |k, v| to_typed(k, v) }.join(", ") + "}]"
+      else
+        "#{k}: Array[#{type_case(v[0])}]"
+      end
+    end
+
+    def schema_to_typed(schema, memo = {})
+      return nil unless schema
+
+      properties = schema["type"]["array"] ? schema["items"]["properties"] : schema["properties"]
+
+      result = properties&.reduce(memo)do |memo, (k,v)|
+        if v["type"] == "object"
+          memo.merge({k => schema_to_typed(v, {})})
+        elsif v["type"] == "array"
+          if v.dig("items", "type") == "object"
+            memo.merge({k => [schema_to_typed(v["items"], {})] })
+          else
+            memo.merge({k => [v.dig("items", "type")] })
+          end
+        else
+          memo.merge({k => v["type"] })
+        end
+      end
+      return [result] if schema["type"]["array"]
+
+      result
+    end
+  end
+end

data/lib/templates/http_client.rb.erb

@@ -1,5 +1,6 @@
 
 require 'httparty'
+require 'json'
 
 class <%= @module_name %>
   include HTTParty
@@ -11,13 +12,13 @@ class <%= @module_name %>
   end
   <%- @data[:endpoints].each do |endpoint| -%>
 
-  <%- if endpoint[:method] == 'get' -%>
+  <%- unless endpoint[:has_body] -%>
   def <%= endpoint[:method_name] %>(<%= endpoint[:parameters_for_method] %>)
-    self.class.<%= endpoint[:method] %>("<%= endpoint[:path] %>", options)
+    self.class.<%= endpoint[:http_method] %>("<%= endpoint[:path] %>", options)
   end
   <%- else -%>
   def <%= endpoint[:method_name] %>(<%= endpoint[:parameters_for_method] %>)
-    self.class.<%= endpoint[:method] %>("<%= endpoint[:path] %>", { body: body.to_json }.merge(options))
+    self.class.<%= endpoint[:http_method] %>("<%= endpoint[:path] %>", { body: body.to_json }.merge(options))
   end
   <%- end -%>
   <%- end -%>

data/lib/templates/http_client.rbs.erb

@@ -1,16 +1,18 @@
-
 # Classes
 
+module HTTParty
+  class Response
+    def body: -> untyped
+    def success?: -> bool
+  end
+end
+
 class <%= @module_name %>
   include HTTParty
 
   def initialize: -> void
   <%- @data[:endpoints].each do |endpoint| -%>
 
-  <%- if endpoint[:method] == 'get' -%>
-  def <%= endpoint[:method_name] %>(<%= endpoint[:parameters_typed] %>) -> HTTParty::Response
-  <%- else -%>
-  def <%= endpoint[:method_name] %>(<%= endpoint[:body_typed] %>) -> HTTParty::Response
-  <%- end -%>
+  def <%= endpoint[:method_name] %>: <%= endpoint[:typed_parameters_for_method] %> -> HTTParty::Response
   <%- end -%>
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swagger-to-rbs
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Miguel Savignano
@@ -14,14 +14,14 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -52,6 +52,7 @@ files:
 - lib/swagger2_rbs/cli.rb
 - lib/swagger2_rbs/hash_helper.rb
 - lib/swagger2_rbs/rest_endpoint.rb
+- lib/swagger2_rbs/rest_endpoint_typed.rb
 - lib/templates/http_client.rb.erb
 - lib/templates/http_client.rbs.erb
 homepage: https://github.com/MiguelSavignano/swagger-to-rbs