protobuf-activerecord 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 827bc732cf495b289b6580b9310b54d599d9a75b
-  data.tar.gz: 31fd6c04948278ca2d2cdcac5f7d6a0cfface6c8
+SHA256:
+  metadata.gz: b0baf0983fc1d7f24b7269e151478bea798a8f1193037541df17a8818b2ba455
+  data.tar.gz: d5f4537f6c7d8967d268435f88872f5f1632ba6ca1fdfd318917a349aaef1879
 SHA512:
-  metadata.gz: 8fa7a80773a2071c3768b6dcfbd032d2cd2cae6e777fbf45563047a84c55cf3c6ded0ce861e1c0e8b1120a87abbdae00e6f1549579fc772ffcd39de7b81ea4d7
-  data.tar.gz: 432524aadcb200fbc52c2eeb099dd29020b197658c30c5257d1f99748924ef04672f278e5c3ec27b9cfd4d81fc5b9541a7c653e40ddabf9d863263a8074a853a
+  metadata.gz: 6d20b5632121f432b90ab19b52bee9ccd75c39ad8473e3b8f97ecbf87bf8d84297581b64a5b6831050f9dea1a4b7b553e30431049cb186dd8be35f12b045fdcc
+  data.tar.gz: a32ced82a52061de22ac52f236df76f35c38870edf8b28693d2a4ae2d093274684a3224fcc181b893a0bf214f65319fe29a73410caf2316b2357694b05052cb9

data/lib/protobuf/active_record/serialization.rb

@@ -20,6 +20,10 @@ module Protobuf
       end
 
       module ClassMethods
+        def _protobuf_field_objects
+          @_protobuf_field_objects ||= {}
+        end
+
         def _protobuf_field_options
           @_protobuf_field_options ||= {}
         end
@@ -139,96 +143,115 @@ module Protobuf
           @protobuf_message
         end
 
-        def _protobuf_write_collection_assocation_method(field)
-          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def _protobuf_active_record_serialize_#{field}
-              value = #{field}.to_a # Terminate the association
-            rescue NameError # Has happened when field is not on model or ignored from db
-              return nil
+        class CollectionAssociationCaller
+          def initialize(method_name)
+            @method_name = method_name
+          end
+
+          def call(selph)
+            selph.__send__(@method_name).to_a
+          rescue NameError # Has happened when field is not on model or ignored from db
+            return nil
+          end
+        end
+
+        def _protobuf_collection_association_object(field)
+          CollectionAssociationCaller.new(field)
+        end
+
+        class DateCaller
+          def initialize(field)
+            @field = field
+          end
+
+          def call(selph)
+            value = selph.__send__(@field)
+
+            if value
+              value.to_time(:utc).to_i
+            else
+              nil
             end
-          RUBY
+          rescue NameError # Has happened when field is not on model or ignored from db
+            return nil
+          end
+        end
+
+        class DateTimeCaller
+          def initialize(field)
+            @field = field
+          end
+
+          def call(selph)
+            value = selph.__send__(@field)
+
+            if value
+              value.to_i
+            else
+              nil
+            end
+          rescue NameError # Has happened when field is not on model or ignored from db
+            return nil
+          end
+        end
+
+        class NoConversionCaller
+          def initialize(field)
+            @field = field
+          end
+
+          def call(selph)
+            selph.__send__(@field)
+          rescue NameError # Has happened when field is not on model or ignored from db
+            return nil
+          end
         end
 
-        def _protobuf_write_convert_to_fields_method(field)
+        def _protobuf_convert_to_fields_object(field)
           is_datetime_time_or_timestamp_column = _protobuf_date_datetime_time_or_timestamp_column?(field)
           is_date_column = _protobuf_date_column?(field)
 
           if is_datetime_time_or_timestamp_column
             if is_date_column
-              self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-                def _protobuf_active_record_serialize_#{field}
-                  value = #{field}
-                  return nil if value.nil?
-
-                  value.to_time(:utc).to_i
-                rescue NameError # Has happened when field is not on model or ignored from db
-                  return nil
-                end
-              RUBY
+              DateCaller.new(field)
             else
-              self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-                def _protobuf_active_record_serialize_#{field}
-                  value = #{field}
-                  return nil if value.nil?
-
-                  value.to_i
-                rescue NameError # Has happened when field is not on model or ignored from db
-                  return nil
-                end
-              RUBY
+              DateTimeCaller.new(field)
             end
           else
-            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def _protobuf_active_record_serialize_#{field}
-                #{field}
-              rescue NameError # Has happened when field is not on model or ignored from db
-                return nil
-              end
-            RUBY
+            NoConversionCaller.new(field)
           end
         end
 
-        def _protobuf_write_field_transformer_method(field)
-          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def _protobuf_active_record_serialize_#{field}
-              self.class._protobuf_field_transformers[:#{field}].call(self)
-            end
-          RUBY
+        def _protobuf_field_transformer_object(field)
+          _protobuf_field_transformers[field]
         end
 
-        def _protobuf_write_nil_method(field)
-          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            def _protobuf_active_record_serialize_#{field}
-              nil
-            end
-          RUBY
+        class NilMethodCaller
+          def initialize; end
+
+          def call(selph)
+            nil
+          end
         end
 
-        def _protobuf_write_symbol_transformer_method(field)
-          transformer_method = _protobuf_field_symbol_transformers[field]
+        def _protobuf_nil_object(field)
+          NilMethodCaller.new
+        end
 
-          if self.respond_to?(transformer_method, true)
-            if self.respond_to?(transformer_method, false)
-              self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-                def _protobuf_active_record_serialize_#{field}
-                  self.class.#{transformer_method}(self)
-                end
-              RUBY
-            else
-              self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-                def _protobuf_active_record_serialize_#{field}
-                  self.class.__send__(:#{transformer_method}, self)
-                end
-              RUBY
-            end
-          else
-            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def _protobuf_active_record_serialize_#{field}
-                #{transformer_method}
-              end
-            RUBY
+        class FieldSymbolTransformerCaller
+          def initialize(instance_class, method_name)
+            @instance_class = instance_class
+            @method_name = method_name
+          end
+
+          def call(selph)
+            @instance_class.__send__(@method_name, selph)
           end
         end
+
+        def _protobuf_symbol_transformer_object(field)
+          FieldSymbolTransformerCaller.new(self, _protobuf_symbol_transformer_object[field])
+        end
       end
 
       # :nodoc:
@@ -301,34 +324,32 @@ module Protobuf
         # in terms of optimization (`while` is slightly faster as no block carried through)
         while attribute_number < limit
           field = field_attributes[attribute_number]
+          field_object = _protobuf_field_objects(field)
+          hash[field] = field_object.call(self)
+          attribute_number += 1
+        end
 
-          begin
-            hash[field] = __send__("_protobuf_active_record_serialize_#{field}")
-          rescue NoMethodError => error
-            raise unless error.message =~ /_protobuf_active_record_serialize/i
-
-            case
-            when _protobuf_field_symbol_transformers.has_key?(field) then
-              self.class._protobuf_write_symbol_transformer_method(field)
-            when _protobuf_field_transformers.has_key?(field) then
-              self.class._protobuf_write_field_transformer_method(field)
-            when respond_to?(field) then
-              if _is_collection_association?(field)
-                self.class._protobuf_write_collection_assocation_method(field)
-              else
-                self.class._protobuf_write_convert_to_fields_method(field)
-              end
+        hash
+      end
+
+      # :nodoc:
+      def _protobuf_field_objects(field)
+        self.class._protobuf_field_objects[field] ||= begin
+          case
+          when _protobuf_field_symbol_transformers.has_key?(field) then
+            self.class._protobuf_symbol_transformer_object(field)
+          when _protobuf_field_transformers.has_key?(field) then
+            self.class._protobuf_field_transformer_object(field)
+          when respond_to?(field) then
+            if _is_collection_association?(field)
+              self.class._protobuf_collection_association_object(field)
             else
-              self.class._protobuf_write_nil_method(field)
+              self.class._protobuf_convert_to_fields_object(field)
             end
-
-            hash[field] = __send__("_protobuf_active_record_serialize_#{field}")
+          else
+            self.class._protobuf_nil_object(field)
           end
-
-          attribute_number += 1
         end
-
-        hash
       end
 
       # :nodoc:

data/lib/protobuf/active_record/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "3.5.1"
+    VERSION = "3.6.0"
   end
 end

data/protobuf-activerecord.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   ##
   # Development dependencies
   #
+  spec.add_development_dependency "benchmark-ips"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ">= 3.3.0"
   spec.add_development_dependency "rspec-pride", ">= 3.1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -249,8 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers integration for Active Record