twirp_rails 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7fbba3b1fe02ffed0c06b8a421f52577aab8634e0c3628c079721415c22df56
-  data.tar.gz: 25ab97b4b24fd79ea5c338bbef35f124e082c3ce34a9588b0d66658858936f77
+  metadata.gz: 9815b0f64ccd2cf6527a6490bf58d33bf9603e50ed403977c6f2cc345fdd38e7
+  data.tar.gz: 486da8791965cbf5c167968c1caf72651d304c5eb4f73f418bcef7c0140d2810
 SHA512:
-  metadata.gz: 11e6b0f20cfc055c2b0d89b06e7a79011b3ca28b5d0f4456d8872b62c67e6c22e8ca50728f6d1c3700fbf8c6bc04b5bcef0245c37392eb3f687b1329603446d2
-  data.tar.gz: 2ee3fb02db058cea267475e4e872cc5049f732a3877a4454677ff9b4cbf9445f2c83b00fc654fae274f8994d822cdefdabb2656c178c886070ccd9ef02fd29fb
+  metadata.gz: 8968da209d19ab694bd5c26f3ea568dfecb7c249ddf5501b2b213b0c1502a925330ab1554344a1f862bd00a8497cf2dd51f3e0c64bfb55968ddfa89efb893dec
+  data.tar.gz: 04040171424b881f5746ba5edad5ce19f4cf1e90155dec5eccf8e5bbee4f67b2411cd258bf4f34f8c8765b6e479aa42877addeee9235d2596464354f36e4e500

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    twirp_rails (0.4.1)
+    twirp_rails (0.4.2)
       railties (~> 6.0)
       twirp (~> 1)
 
@@ -67,7 +67,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -105,7 +105,7 @@ DEPENDENCIES
   bundler (~> 1.17)
   generator_spec (~> 0.9)
   pry (~> 0.12)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rspec-rails (~> 3.0)
   twirp_rails!

data/lib/twirp_rails/active_record_extension.rb

@@ -26,29 +26,32 @@ module TwirpRails
     # used by relation method to_twirp
     # @param [Array|Class] fields_or_class - array of converted fields or message class to
     def to_twirp(*fields_or_class)
-      fields = fields_or_class
-      result = attributes
-
-      if fields.empty? && self.class.twirp_message_class
-        fields = [self.class.twirp_message_class]
+      if fields_or_class.empty? && self.class.twirp_message_class
+        to_twirp_as_class(self.class.twirp_message_class)
+      elsif fields_or_class.one? && fields_or_class.first.is_a?(Class)
+        to_twirp_as_class(fields_or_class.first)
+      elsif fields_or_class.any?
+        to_twirp_as_fields(fields_or_class)
+      else
+        attributes
       end
+    end
 
-      if fields.one? && fields.first.is_a?(Class)
-        message_class = fields.first
+    private
 
-        unless message_class.respond_to?(:descriptor)
-          raise "Class #{message_class} must me a protobuf message class"
-        end
+    def to_twirp_as_class(klass)
+      unless klass.respond_to?(:descriptor)
+        raise "Class #{klass} must be a protobuf message class"
+      end
 
-        # TODO performance optimization needed
-        fields = message_class.descriptor.map &:name
+      # TODO performance optimization needed
+      to_twirp_as_fields(klass.descriptor.map &:name)
+    end
 
-        result = result.slice(*fields)
-      elsif fields.any?
-        result = result.slice(*fields)
+    def to_twirp_as_fields(fields)
+      fields.each_with_object({}) do |field, h|
+        h[field] = attributes.fetch(field) { public_send(field) }
       end
-
-      result
     end
   end
 end

data/lib/twirp_rails/version.rb

@@ -1,3 +1,3 @@
 module TwirpRails
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/twirp_rails.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'railties', '~> 6.0'
 
   spec.add_development_dependency 'bundler', '~> 1.17'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.0'
   spec.add_development_dependency 'generator_spec', '~> 0.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twirp_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Alexandr Zimin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twirp
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement