twirp_rails 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81fc1779265896c8e94b3e133dcb859f9cb88b8c50b243887ba40894ccfb5840
-  data.tar.gz: 481e078b49b5ffce44787f011e8702919efc0c6c1e657c14dd13e13d08065b78
+  metadata.gz: f6df8a4134b84a9843ad8a0db616c68dee24c88e95346ef48a34db3907f5d975
+  data.tar.gz: b113bc311403756b83e6e1464a02504dbd37a6f849a3f3789e22e594191643b0
 SHA512:
-  metadata.gz: 13fd0e6576cb5189487ffe8cfd48c7443faaf4ab94bfdb9c7500d2d7104ddf3cab9a4a0f74acce5e80616c6e998c3b757c75ece1fb0e62d59b3c6fc5ff71afa4
-  data.tar.gz: 281573e3920d9c57f7089ac0b2d5fdf418c70a30de16845ea6ec719b1d7753fac00862022523262abff254e086f60be4f09d97aa1bce38d36a09bf0c266a7d53
+  metadata.gz: 8b63a508a6319c3a1d4977c807bc95b9d262e42fca622fe04f1f350c12aa3716eb53873ce8389cc6515d1aa8a60f0c353713af12846d83d4da2a74c80098df1e
+  data.tar.gz: b5b8cbf244043de39bf8ae47fcc1569c877e199f9489e87db867a4ee467f099328aad9759e3d11ec34fbd8cb86761d566cdca77606f0c81e09e7ea62b64d3e6e

data/lib/twirp_rails/generators/twirp/protoc_adapter.rb

@@ -3,7 +3,7 @@ class ProtocAdapter
 
   attr_reader :twirp_plugin_path, :swagger_plugin_path, :protoc_path
 
-  def initialize(src_path, dst_path, swagger_out_path: nil)
+  def initialize(src_path, dst_path, swagger_out_path)
     @src_path = src_path
     @dst_path = dst_path
     @swagger_out_path = swagger_out_path
@@ -28,17 +28,8 @@ class ProtocAdapter
     end
   end
 
-  def cmd(files, gen_swagger: false)
-    flags = "--proto_path=#{src_path} " \
-            "--ruby_out=#{dst_path} --twirp_ruby_out=#{dst_path} " \
-            "--plugin=#{twirp_plugin_path}"
-
-    if gen_swagger
-      flags += " --plugin=#{swagger_plugin_path}" \
-               " --twirp_swagger_out=#{swagger_out_path}"
-    end
-
-    "#{protoc_path} #{flags} #{files}"
+  def cmd(files, gen_swagger)
+    "#{protoc_path} #{flags(gen_swagger)} #{files}"
   end
 
   def check_requirements(check_swagger: false)
@@ -62,4 +53,20 @@ class ProtocAdapter
       TEXT
     end
   end
+
+  private
+
+  def flags(gen_swagger)
+    [].tap do |flags|
+      flags << "--proto_path=#{src_path}"
+      flags << "--ruby_out=#{dst_path}"
+      flags << "--twirp_ruby_out=#{dst_path}"
+      flags << "--plugin=#{twirp_plugin_path}"
+
+      if gen_swagger
+        flags << "--plugin=#{swagger_plugin_path}"
+        flags << "--twirp_swagger_out=#{swagger_out_path}"
+      end
+    end.join(' ')
+  end
 end

data/lib/twirp_rails/generators/twirp/twirp_generator.rb

@@ -3,7 +3,7 @@ require 'rails/generators'
 class TwirpGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('templates', __dir__)
 
-  class_option :skip_swagger, type: :boolean, default: false
+  class_option :gen_swagger, type: :boolean, default: false
   class_option :swagger_out, type: :string, default: nil
 
   def smart_detect_proto_file_name
@@ -67,9 +67,9 @@ class TwirpGenerator < Rails::Generators::NamedBase
       proto_files.each do |file|
         gen_swagger = gen_swagger? && file =~ %r{/#{file_name}\.proto$}
 
-        FileUtils.mkdir_p swagger_out_path if gen_swagger
+        FileUtils.mkdir_p cfg.swagger_output_path if gen_swagger
 
-        cmd = protoc.cmd(file, gen_swagger: gen_swagger)
+        cmd = protoc.cmd(file, gen_swagger)
 
         protoc_files_count += 1
         swagger_files_count += gen_swagger ? 1 : 0
@@ -188,11 +188,7 @@ class TwirpGenerator < Rails::Generators::NamedBase
   end
 
   def gen_swagger?
-    !options[:skip_swagger] && cfg.swagger_output_path
-  end
-
-  def swagger_out_path
-    options[:swagger_out] || cfg.swagger_output_path
+    options[:gen_swagger] && cfg.swagger_output_path.present?
   end
 
   def abort(msg)
@@ -200,6 +196,6 @@ class TwirpGenerator < Rails::Generators::NamedBase
   end
 
   def protoc
-    @protoc ||= ProtocAdapter.new(src_path, dst_path, swagger_out_path: swagger_out_path)
+    @protoc ||= ProtocAdapter.new(src_path, dst_path, cfg.swagger_output_path)
   end
 end

data/lib/twirp_rails/version.rb

@@ -1,3 +1,3 @@
 module TwirpRails
-  VERSION = '0.4.6'.freeze
+  VERSION = '0.4.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twirp_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Alexandr Zimin