twirp_rails 0.4.6 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81fc1779265896c8e94b3e133dcb859f9cb88b8c50b243887ba40894ccfb5840
-  data.tar.gz: 481e078b49b5ffce44787f011e8702919efc0c6c1e657c14dd13e13d08065b78
+  metadata.gz: 5da53563962b8a7e80b095b7e26b1e1836d5b55456ec967d8df459f9b557d571
+  data.tar.gz: 26ff87c7460f1a4d53487b414c4c7174e0b05df9178c34642eca8d60c6bd9ed5
 SHA512:
-  metadata.gz: 13fd0e6576cb5189487ffe8cfd48c7443faaf4ab94bfdb9c7500d2d7104ddf3cab9a4a0f74acce5e80616c6e998c3b757c75ece1fb0e62d59b3c6fc5ff71afa4
-  data.tar.gz: 281573e3920d9c57f7089ac0b2d5fdf418c70a30de16845ea6ec719b1d7753fac00862022523262abff254e086f60be4f09d97aa1bce38d36a09bf0c266a7d53
+  metadata.gz: 4271e7ae75cc007dcc4bc2fd38748a0084e3fde41c834dbc859ef1152138f02d3c6eca09c957bf3dbb9720f47c96dcdc297f57d48f417238abd357859998ec59
+  data.tar.gz: c84132c42322964c4150191bf1d3201d9d3128fca47a8b70af4285b59e1d70ab28271e96234d675645c5b0274941307bd4f9da4840d2234b4c32f565456206d1

data/.gitignore

@@ -9,6 +9,7 @@
 /.idea/
 
 .rspec_status
+.rakeTasks
 
 /spec/dummy/tmp
 /spec/dummy/log

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    twirp_rails (0.4.5)
+    twirp_rails (0.4.9)
       railties (~> 6.0)
-      twirp (~> 1)
+      twirp (~> 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.3.1)
-      actionview (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionpack (6.0.3.2)
+      actionview (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionview (6.0.3.2)
+      activesupport (= 6.0.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -33,15 +33,15 @@ GEM
     crass (1.0.6)
     diff-lcs (1.3)
     erubi (1.9.0)
-    faraday (0.17.3)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    google-protobuf (3.12.0)
-    i18n (1.8.2)
+    google-protobuf (3.12.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    loofah (2.5.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.9.2)
@@ -53,7 +53,7 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.2.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -61,9 +61,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    railties (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)

data/README.md

@@ -160,7 +160,7 @@ This feature allow to use ruby style exception handling flow in ruby code.
 
 Create class to describe translate error rules
 ```ruby
-  class ErrorTranslator < TwirpRails::ErrorHandling::Base
+  class ApplicationErrorTranslator < TwirpRails::ErrorHandling::Base
     # rules to translate exception raised by handler to twirp
     translate_exception ArgumentError, with: :invalid_argument
     translate_exception ActiveRecord::NotFound do |exception, handler|
@@ -177,9 +177,9 @@ Create class to describe translate error rules
 
 And configure TwirpRails to use it:
 ```ruby
-# config/initializers/twirp_ruby.rb
+# config/initializers/twirp_rails.rb
 # ...
-  config.twirp_exception_translator_class = 'ErrorTranslator' 
+  config.twirp_exception_translator_class = 'ApplicationErrorTranslator' 
 # ... 
 ```
 

data/lib/twirp_rails/error_handling/error_handling_factory.rb

@@ -12,6 +12,14 @@ module TwirpRails
       def method_missing(method, *args)
         handler.public_send method, *args
       rescue => e
+        if ENV['RAISE_TWIRP_ERRORS'].present?
+          raise e
+        else
+          Rails.logger.warn("Muted error: #{e.message}")
+          Rails.logger.warn("Muted error: #{e.full_message}")
+          Rails.logger.warn('Enable raise with RAISE_TWIRP_ERRORS env variable')
+        end
+
         translator_class.exception_to_twirp(e, handler)
       end
       # rubocop:enable Style/MethodMissingSuper
@@ -31,7 +39,7 @@ module TwirpRails
 
       def raise_on_error(twirp_result)
         if twirp_result.error
-          exception = translator_class.twirp_to_exception(twirp_result.error)
+          exception = translator_class.twirp_to_exception(twirp_result.error, client)
           raise exception
         else
           twirp_result
@@ -43,15 +51,15 @@ module TwirpRails
         if method =~ /!$/
           # when we call a bang version of client method - raise exception translated from error
           method = method[0..-2]
-          raise_on_error client.public_send(method, args)
+          raise_on_error client.public_send(method, *args)
         else
-          client.public_send method, args
+          client.public_send method, *args
         end
       end
       # rubocop:enable Style/MethodMissingSuper
 
       def respond_to_missing?(method, include_all = false)
-        handler.respond_to?(method, include_all)
+        client.respond_to?(method, include_all)
       end
     end
 

data/lib/twirp_rails/generators/twirp/clients/clients_generator.rb

@@ -31,7 +31,7 @@ module Twirp
         proto_files = Dir.glob protos_mask
 
         proto_files.each do |file|
-          cmd = protoc.cmd(file)
+          cmd = protoc.cmd(file, false)
 
           `#{cmd}`
 

data/lib/twirp_rails/generators/twirp/init/templates/twirp_rails.rb

@@ -36,7 +36,7 @@ TwirpRails.configure do |config|
   #   translate_exception Mongoid::Errors::DocumentNotFound, with: :not_found
   #   translate_error :not_found, with: Mongoid::Errors::DocumentNotFound
   # end
-  # config.twirp_exception_translator_class = 'SampleTranslator'
+  # config.twirp_exception_translator_class = 'ApplicationErrorTranslator'
   # default:
   # config.twirp_exception_translator_class = nil
 end

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 = nil)
     @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.11'.freeze
 end

data/twirp_rails.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'twirp', '~> 1'
+  spec.add_dependency 'twirp', '~> 1.4'
   spec.add_dependency 'railties', '~> 6.0'
 
   spec.add_development_dependency 'bundler', '~> 1.17'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twirp_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.11
 platform: ruby
 authors:
 - Alexandr Zimin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twirp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
-description: 
+description:
 email:
 - a.zimin@talenttech.ru
 executables: []
@@ -167,7 +167,7 @@ homepage: https://github.com/severgroup-tt/twirp_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -182,8 +182,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Use twirp-ruby from rails.
 test_files: []