twirp_rails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb9cd76586bee57eba493e9578eb1ddf48c71f1f6aef959d32a73e7a5feafb81
-  data.tar.gz: 6fb7194c09bcdad9392f9f5f1c902efed00b32472ab3ffbb54773cfd15f544d3
+  metadata.gz: f76a67c6644535dc835e68bb6b47b28661dca6922b9733653f0480e297f65bb1
+  data.tar.gz: f0a855d0cb9d1a0b693e5b11c03d7bdca9486ff12bf82ac103298bfdf67dfe88
 SHA512:
-  metadata.gz: 58548bffd0a6faf5a3a55407e5bb88b53cec6ee37d667bff76b4ec34e579bf2960503561d70d8d7dc7bca2a278d2916223ed3516d8c5fadc3ab3cae16c3cfcb1
-  data.tar.gz: ee013919391df0d53e4c5a1acc5a145fff4a39769ed83fbdc98e06cd8bb2ea64e8bda05f3950d534a3112d8d049c449044796395c399b5e0f2a728566d0065e0
+  metadata.gz: 22b8a3a2c75e2a5084a5184c1137726ce3f8978f111a2cd1749028492276b518ab2c03b19e799d9ec858023fe51ce01d79f6d7702357e761ec555e90ac832a5b
+  data.tar.gz: 87bf3f8cc09b9694cdc1f949de56d38f1a6283bc2d6237b0e06f75b15266c4009015a13efa6f74966623d01db2773cc3e4a51fb7bce17401b14830f78c795d4d

data/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.1.3 - 2020-01-28
+
+### Added
+- convert package.message type to Package::Message
+
+### Fixed
+- twirp_ruby missing module workaround https://github.com/twitchtv/twirp-ruby/issues/48
+
 ## 0.1.2 - 2020-01-27
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    twirp_rails (0.1.2)
+    twirp_rails (0.1.3)
       railties (~> 6.0)
       twirp (~> 1)
 

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

@@ -27,17 +27,23 @@ class TwirpGenerator < Rails::Generators::NamedBase
 
   def generate_twirp_files
     in_root do
-      cmd = protoc_cmd
+      proto_files = Dir.glob 'app/protos/**/*.proto'
 
-      `#{cmd}`
+      proto_files.each do |file|
+        cmd = protoc_cmd(file)
 
-      raise "protoc failure: #{cmd}" unless $?.success?
+        `#{cmd}`
+
+        raise "protoc failure: #{cmd}" unless $?.success?
+      end
     end
   end
 
   PROTO_RPC_REGEXP = /\brpc\s+(\S+)\s*\(\s*(\S+)\s*\)\s*returns\s*\(\s*(\S+)\s*\)/m.freeze
+
   def generate_handler
-    calls = proto_content.scan(PROTO_RPC_REGEXP).map do |method, arg_type, result_type|
+    methods = proto_content.scan(PROTO_RPC_REGEXP).map do |method, arg_type, result_type|
+      result_type = proto_type_to_ruby(result_type)
       <<-RUBY
   def #{method.underscore}(req, _env)
     #{result_type}.new
@@ -45,11 +51,11 @@ class TwirpGenerator < Rails::Generators::NamedBase
       RUBY
     end.join("\n")
 
-    # Пока считаем, что имя сервиса совпадает с именем файла,
+    # Let us assume that the service name is the same file name
     create_file "app/rpc/#{file_name}_handler.rb", <<~RUBY
       class #{class_name}Handler
 
-      #{calls}end
+      #{methods}end
     RUBY
   end
 
@@ -63,6 +69,10 @@ class TwirpGenerator < Rails::Generators::NamedBase
 
   private
 
+  def proto_type_to_ruby(result_type)
+    result_type.split('.').map(&:camelize).join('::')
+  end
+
   def from_rails_root(&block)
     old_dir = Dir.pwd
     Dir.chdir Rails.root
@@ -71,12 +81,11 @@ class TwirpGenerator < Rails::Generators::NamedBase
     Dir.chdir old_dir
   end
 
-  def protoc_cmd
+  def protoc_cmd(files)
     FileUtils.mkdir_p 'lib/twirp'
     flags = "--proto_path=app/protos --ruby_out=lib/twirp --twirp_ruby_out=lib/twirp --plugin=#{PLUGIN_PATH}"
 
-    proto_files = Dir.glob 'app/protos/*.proto'
-    "#{PROTOC_PATH} #{flags} #{proto_files.join(' ')}"
+    "#{PROTOC_PATH} #{flags} #{files}"
   end
 
   def proto_content

data/lib/twirp_rails/version.rb

@@ -1,3 +1,3 @@
 module TwirpRails
-  VERSION = "0.1.2"
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twirp_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alexandr Zimin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twirp