twirp_rails 0.4.5 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 477944b4a12be7ec5c354f3e545be24ffbd562a9817acf0bd9235190bc90325e
-  data.tar.gz: 108ecd574533f26d780b02312940ed7ced9fd992b04e33effb9ac30d5d9e774a
+  metadata.gz: '0781426359346a251fd1e21694aea0a5997d7dd777cb500adb7fe1e78c95fc91'
+  data.tar.gz: e8b3b1e10de47f2eb10686eaf9f554258a335834fab7c79b7d946ab27647257f
 SHA512:
-  metadata.gz: 9d36af88586289fdcd24881e3da96ecd861410481a69452be77c378ffd08b025eedbb62cd5cb939bb967c01139dd7c4b29cd00498373c6caa5631f21a29d4923
-  data.tar.gz: 2807c0a3972dbda9867c750cc5acbaa64b0912eba7ff33e351edec650cc25d85b6e0841a9ba2bcb49499c94d5472246444dd787cdec1532c5d1ce8db72c085a0
+  metadata.gz: 2c60929fae2b45db84e61255efcb5d95347a01fbdefe79b65b4f6eea754f06f8af6ba668db1dc22155f6782ab8384262f6b8ed831fa237f347128dae8abdc17d
+  data.tar.gz: 5ad5e99a83dd34186ee6348337a8e9a0877fb11a7527ce33d07980edd2ac49afdab871ccc23a1865966b6972bb2b452a246e33c003ca709474edc8e62556f73d

data/Gemfile.lock

@@ -1,59 +1,59 @@
 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.2.1)
-      actionview (= 6.0.2.1)
-      activesupport (= 6.0.2.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.2.1)
-      activesupport (= 6.0.2.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.2.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     builder (3.2.4)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     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-universal-darwin)
-    i18n (1.8.2)
+    google-protobuf (3.12.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    loofah (2.4.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     multipart-post (2.1.1)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.1.1)
+    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.2.1)
-      actionpack (= 6.0.2.1)
-      activesupport (= 6.0.2.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)
@@ -94,9 +94,9 @@ GEM
     twirp (1.5.0)
       faraday (< 2)
       google-protobuf (~> 3.0, >= 3.0.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

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.rb

@@ -123,6 +123,17 @@ module TwirpRails
     Time.zone.at seconds
   end
 
+  # Utility for converting a Ruby Time instance to a
+  # Google::Protobuf::Timestamp.
+  #
+  # @param time [Time] The Time to be converted.
+  #
+  # @return [Google::Protobuf::Timestamp] The converted
+  #   Google::Protobuf::Timestamp.
+  def self.time_to_timestamp(time)
+    Google::Protobuf::Timestamp.new(seconds: time.to_i, nanos: time.nsec)
+  end
+
   def self.client(klass, url)
     client = klass.new(url)
 

data/lib/twirp_rails/error_handling/error_handling_factory.rb

@@ -31,7 +31,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 +43,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.5'.freeze
+  VERSION = '0.4.10'.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.5
+  version: 0.4.10
 platform: ruby
 authors:
 - Alexandr Zimin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-21 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.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Use twirp-ruby from rails.
 test_files: []