twirp_rails 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de31905ff271c17c94f4d6032ce473cfbd4dba1cdad97266d13fe5977172fd48
-  data.tar.gz: 8c9b485008788d9ad48867e73831bf5f5ade8d01516ea394c0d25808b67bce52
+  metadata.gz: '06560208f92156b0a681508de14468457ca498294e139f6f949f14f037ca03d4'
+  data.tar.gz: '0989d1e84e085f7faaac0514c4140f96d3ffcf11f3bb157f1c775c38f06f83d3'
 SHA512:
-  metadata.gz: f1b5a97a142433adbbf69896c3ce51c9315bba93020dd0b6f780c33462f0fe0b65cea3c920347e84dcb9113ac146aeb670744851ea54ae94e02681961f172095
-  data.tar.gz: 45f8c665c1e546c9646d3a164d0024147940aa18bf685907063d39c9a043e12c4a7cf2bd80c84ae22851446ee14b0e124cec3f9d28c89f4070de0756d5352ccd
+  metadata.gz: a56fe829dba492ce1df60576e045a254a2e116004065ce4d866d625d3717fefda40b48f5d31f5470c5b685f22ab2c3acf76232c6f91959823cf35c57906240ef
+  data.tar.gz: dec12ac4cb49e5d6dca4f8460fa2029648e747b5ddba3653a44f09754dbcf27040cd02473279a11bb2e9a09bedd7bdaa8509f50a8a0926a4101b804ea97b863d

data/CHANGELOG.md

@@ -4,6 +4,16 @@ 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.3.2 - 2020-03-12
+
+### Added
+- Correct code generation for proto files with packages.
+
+## 0.3.1 - 2020-03-10
+
+### Fix
+- Fix default log subscriber to use string keys to avoid SemanticLogger use :exception as parameter
+
 ## 0.3.0 - 2020-02-28
 
 ### Added

data/Gemfile.lock

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

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

@@ -15,7 +15,7 @@ class TwirpGenerator < Rails::Generators::NamedBase
   def check_requirements
     in_root do
       unless File.exist?(proto_file_name)
-        raise "#{proto_file_name} not found #{`pwd`} #{`ls`}"
+        raise "#{proto_file_name} not found"
       end
     end
 
@@ -40,7 +40,8 @@ class TwirpGenerator < Rails::Generators::NamedBase
 
   def generate_twirp_files
     in_root do
-      proto_files = Dir.glob 'app/protos/**/*.proto'
+      protos_mask = File.join *['app/protos', class_path, '**/*.proto'].flatten
+      proto_files = Dir.glob protos_mask
 
       proto_files.each do |file|
         gen_swagger = gen_swagger? && file =~ %r{/#{file_name}\.proto$}
@@ -56,33 +57,40 @@ class TwirpGenerator < Rails::Generators::NamedBase
 
   PROTO_RPC_REGEXP = /\brpc\s+(\S+)\s*\(\s*(\S+)\s*\)\s*returns\s*\(\s*(\S+)\s*\)/m.freeze
 
+  def create_module_files
+    return if regular_class_path.empty?
+
+    class_path.length.times do |i|
+      current_path = class_path[0..i]
+      create_file File.join('app/rpc', "#{current_path.join('/')}.rb"),
+                  module_hier(current_path.map(&:camelize), 0)
+    end
+  end
+
   def generate_handler
-    methods = proto_content.scan(PROTO_RPC_REGEXP).map do |method, arg_type, result_type|
-      result_type = proto_type_to_ruby(result_type)
+    methods = proto_content.scan(PROTO_RPC_REGEXP).map do |method, _arg_type, _result_type|
       optimize_indentation <<~RUBY, 2
         def #{method.underscore}(req, _env)
-          #{result_type}.new
         end
       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
+    create_file "app/rpc/#{file_path}_handler.rb", <<~RUBY
       class #{class_name}Handler
-
       #{methods}end
     RUBY
   end
 
   def generate_route
-    route "mount_twirp :#{file_name}"
+    route "mount_twirp '#{file_path}'"
   end
 
   def generate_rspec_files
     in_root do
       return unless File.exist?('spec')
 
-      methods = 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)
         optimize_indentation <<~RUBY, 2
           context '##{method.underscore}' do
@@ -96,7 +104,7 @@ class TwirpGenerator < Rails::Generators::NamedBase
         RUBY
       end.join("\n")
 
-      create_file "spec/rpc/#{file_name}_handler_spec.rb", <<~RUBY
+      create_file "spec/rpc/#{file_path}_handler_spec.rb", <<~RUBY
         require 'rails_helper'
 
         describe #{class_name}Handler do
@@ -108,6 +116,16 @@ class TwirpGenerator < Rails::Generators::NamedBase
 
   private
 
+  def module_hier(modules, indent)
+    return '' if modules.size.zero?
+
+    cur, *tail = modules
+    optimize_indentation <<~RUBY, indent
+      module #{cur}
+      #{module_hier(tail, indent + 2)}end
+    RUBY
+  end
+
   def proto_type_to_ruby(result_type)
     result_type.split('.').map(&:camelize).join('::')
   end
@@ -139,7 +157,7 @@ class TwirpGenerator < Rails::Generators::NamedBase
   end
 
   def proto_file_name
-    "app/protos/#{file_name}.proto"
+    "app/protos/#{file_path}.proto"
   end
 
   def gen_swagger?

data/lib/twirp_rails/routes.rb

@@ -13,10 +13,16 @@ module TwirpRails
         when String, Symbol
           service_class = Helper.constantize_first "#{name}_service", name
 
-          raise "#{name.camelize}Service or #{name.camelize} is not found" unless service_class
+          unless service_class
+            msg = "mount_twirp of #{name} error. #{name.camelize}Service or #{name.camelize} class is not found"
 
-          handler ||= "#{name}_handler".camelize.constantize
+            raise TwirpRails::Error, msg unless Rails.env.development?
+
+            warn msg
+            return
+          end
 
+          handler ||= "#{name}_handler".camelize.constantize
         else
           raise 'twirp service name required'
         end
@@ -35,7 +41,7 @@ module TwirpRails
 
       def self.constantize_first(*variants)
         variants.each do |name|
-          clazz = name.to_s.camelize.constantize
+          clazz = name.to_s.camelize.safe_constantize
 
           return clazz if clazz
         end

data/lib/twirp_rails/twirp.rb

@@ -5,7 +5,7 @@ module TwirpRails
       twirp_path = Rails.root.join('lib/twirp').to_s
       $LOAD_PATH.unshift(twirp_path) if !$LOAD_PATH.include?(twirp_path)
 
-      Dir.glob(Rails.root.join('lib/twirp/*_twirp.rb')).sort.each do |file|
+      Dir.glob(Rails.root.join('lib/twirp/**/*_twirp.rb')).sort.each do |file|
         require file
       end
     end

data/lib/twirp_rails/version.rb

@@ -1,3 +1,3 @@
 module TwirpRails
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twirp_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Alexandr Zimin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twirp