openapi2ruby 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f4c6123cb3514c275e9f51e81a3776e10072141ea644cb686d626e40d3ec2d0
-  data.tar.gz: 88c01d745890bb64911f5d1392b890ee97622c36f1f25f159e2bb09050b037e1
+  metadata.gz: 2ce32df5e809f2e8d1ca8a8541e1aba92bdbfcb0b33b04dd8f8dada8f96ee1e1
+  data.tar.gz: bf4ae95664894cecde89c5a53c1e0c8e76184e431ee277bd1d65884a0fde0270
 SHA512:
-  metadata.gz: 3f643a49e8afd59229c59265ba9e3b35d75e1364bcdaff49735d23f508a272f00a86dc442a698efd928968452db64625c066580be42ceed0e686634f54f741c6
-  data.tar.gz: 0e16178a67ba986da2c49654ed875ef956a401b380c588d6eed1f10cac1dc3ff46286f6e7936ae2c0d73ef4cc81c151b9cb0a9385d45b36781616a9355053375
+  metadata.gz: 953267ea4d81f51a158499950d0598266663fd0c127b1217eaa2e2d6c7afe8d08caea17b34d678bf9c8fb5ed9343d368986d3359ec3cd87b670f6625a8e14c50
+  data.tar.gz: d4e8858dc138fc7c8eba1f83f785907c3b561ad970ec4f2740efc50b0836e69dd52f7e37dd9b81e041973d5c2c693b6eceacdc064c69c754a371f75c61c585bd

data/.gitignore

@@ -46,9 +46,9 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
+Gemfile.lock
+.ruby-version
+.ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc

data/.travis.yml

@@ -3,9 +3,10 @@ sudo: false
 cache: bundler
 rvm:
   - 2.3.0
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.1
   - ruby-head
 matrix:
   fast_finish: true

data/lib/openapi2ruby/cli.rb

@@ -4,7 +4,7 @@ module Openapi2ruby
   class Cli < Thor
     desc 'parse', 'load openapi.yaml'
     def parse(path)
-      puts 'Loading...'
+      puts 'Loading OpenAPI yaml file...'
       raise "File not found. #{path}" unless File.exist?(path)
 
       openapi = Openapi2ruby::Parser.parse(path)
@@ -15,12 +15,13 @@ module Openapi2ruby
     option :out, required: true, type: :string
     desc 'generate', 'load openapi.yaml and generate serializer'
     def generate(path)
-      puts 'Loading...'
+      puts 'Loading OpenAPI yaml file...'
       raise "File not found. #{path}" unless File.exist?(path)
 
       openapi = Openapi2ruby::Parser.parse(path)
       openapi.schemas.each do |schema|
-        Openapi2ruby::Generator.generate(schema, options[:out], options[:template])
+        serializer = Openapi2ruby::Generator.generate(schema, options[:out], options[:template])
+        puts "Created: #{serializer}"
       end
     end
   end

data/lib/openapi2ruby/generator.rb

@@ -28,6 +28,7 @@ module Openapi2ruby
 
       output_file = Pathname.new(output_path).join("#{@schema.name.underscore}_serializer.rb")
       File.open(output_file.to_s, 'w') { |file| file << generated_class }
+      output_file.to_s
     end
   end
 end

data/lib/openapi2ruby/openapi/schema.rb

@@ -34,5 +34,16 @@ module Openapi2ruby
       return false if requireds.nil?
       requireds.include?(property.name)
     end
+
+    def one_ofs
+      return [] if properties.empty?
+      properties.each_with_object([]) do |value, results|
+        if value.one_of?
+          results << value.one_of_refs
+        else
+          results
+        end
+      end
+    end
   end
 end

data/lib/openapi2ruby/openapi/schema/property.rb

@@ -8,6 +8,14 @@ module Openapi2ruby
       @items = content[:definition]['items']
       @format = content[:definition]['format']
       @ref = content[:definition]['$ref']
+      if content[:definition]['oneOf']
+        @type = 'oneOf'
+        @one_of_refs = content[:definition]['oneOf'].map do |content|
+          content['$ref'].split('/').last
+        end
+      else
+        @one_of_refs = []
+      end
     end
 
     # OpenAPI schema ref property name
@@ -38,10 +46,20 @@ module Openapi2ruby
     # OpenAPI schema property types
     # @return [Array[Class]]
     def types
+      return [Hash] if one_of?
       return [ref] if @type.nil?
+
       converted_types
     end
 
+    def one_of?
+      @type == 'oneOf' && !@one_of_refs.empty?
+    end
+
+    def one_of_refs
+      @one_of_refs
+    end
+
     private
 
     # OpenAPI schema property types in Ruby

data/lib/openapi2ruby/templates/serializer.rb.erb

@@ -19,8 +19,17 @@ class <%= @schema.name %>Serializer < ActiveModel::Serializer
     <%- if @schema.required?(p) %>
     required_check(<%= ":#{p.name}" %>)
     <%- end %>
+    <%- if p.one_of? -%>
+    type_check(<%= ":#{p.name}"-%>, [
+    <%- p.one_of_refs.map do |ref| -%>
+      <%= ref -%>,
+    <%- end -%>
+    ])
+    one_of_<%=- p.name %>(object.<%=- p.name %>)
+    <%- else -%>
     type_check(<%= ":#{p.name}, #{p.types}" -%>)
     object.<%=- p.name %>
+    <%- end -%>
   end
   <%- end %>
   private
@@ -32,4 +41,11 @@ class <%= @schema.name %>Serializer < ActiveModel::Serializer
   def type_check(name, types)
     raise "Field type is invalid. #{name}" unless types.include?(object.send(name).class)
   end
+  <%- @schema.properties.select{ |p| p.one_of? }.each do |p| %>
+  def one_of_<%=- p.name %>(one_of_value)
+    serializer = ActiveModelSerializers::SerializableResource.new(one_of_value).serializer
+    raise "Undefined serializer one_of ref: #{one_of_value.class}" if serializer.nil?
+    serializer.new(one_of_value)
+  end
+  <%- end -%>
 end

data/lib/openapi2ruby/version.rb

@@ -1,3 +1,3 @@
 module Openapi2ruby
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/openapi2ruby.gemspec

@@ -25,8 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport'
   spec.add_dependency 'thor', '~> 0.20'
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi2ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - takanamito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -42,46 +42,32 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -106,7 +92,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -143,8 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A simple ruby class generator from OpenAPI schema

data/Gemfile.lock

@@ -1,56 +0,0 @@
-PATH
-  remote: .
-  specs:
-    openapi2ruby (0.1.0)
-      activesupport
-      thor (~> 0.20)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.2.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    i18n (1.0.1)
-      concurrent-ruby (~> 1.0)
-    method_source (0.9.0)
-    minitest (5.11.3)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.15)
-  openapi2ruby!
-  pry
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.1