protobuf-activerecord 3.2.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90545cb2f19b9a54086785f64eb7f6aeca67c17f
-  data.tar.gz: da7799d0f3deb1e2ed5f95d39df427f7ac5ca2f9
+  metadata.gz: 199e64b43cb1b81008ac6b34da4141f4657bfcd9
+  data.tar.gz: 2e8291702c65ade44ad9eb2e8ff5b056d5e03b97
 SHA512:
-  metadata.gz: 04345ee9db33e0212bfa94d12c994412ed8326c40bdc3b737735494054dd7f756c4fe0d14855a89b48d119fd57d534d53d33cd762d3ab43fb40ffb18a570e0d6
-  data.tar.gz: 7dabbb91f14d697099776512a688611326900609366684b5dda15c37eb95cddacacd1be152fc5e516bf600bca3803b82e823ca2d5e108716999d176fb8ce33ab
+  metadata.gz: e26afd09e666fcbcbe940c576e0fb2ba5205eb1ca37def8a8eed16d15db3c1f556ced283bc4496b6f4572ddc226b7f815f821c3c67cd98f65f437c28269ab03a
+  data.tar.gz: 26290cb0c1b2a2781206966c171e754bd4260a799083f636544f8baee1525dc045010e0d5c5f0d90df4414a8a0a314688a0cbca4c7ddc08bc6f692ed4dedf2a4

data/lib/protobuf/active_record/serialization.rb

@@ -1,4 +1,5 @@
-'active_support/concerns'
+require 'set'
+require 'active_support/concern'
 
 module Protobuf
   module ActiveRecord
@@ -20,22 +21,20 @@ module Protobuf
       module ClassMethods
         # :nodoc:
         def _protobuf_convert_attributes_to_fields(key, value)
-          return value if value.nil?
-
-          value = case
-                  when _protobuf_date_column?(key) then
-                    value.to_time.to_i
-                  when _protobuf_datetime_column?(key) then
-                    value.to_i
-                  when _protobuf_time_column?(key) then
-                    value.to_i
-                  when _protobuf_timestamp_column?(key) then
-                    value.to_i
-                  else
-                    value
-                  end
-
-          return value
+          case
+          when value.nil? then
+            value
+          when _protobuf_date_column?(key) then
+            value.to_time.to_i
+          when _protobuf_datetime_column?(key) then
+            value.to_i
+          when _protobuf_time_column?(key) then
+            value.to_i
+          when _protobuf_timestamp_column?(key) then
+            value.to_i
+          else
+            value
+          end
         end
 
         def _protobuf_field_options
@@ -46,6 +45,36 @@ module Protobuf
           @_protobuf_field_transformers ||= {}
         end
 
+        def _protobuf_instance_respond_to_from_cache?(key)
+          _protobuf_respond_to_cache.include?(key)
+        end
+
+        def _protobuf_message_deprecated_fields
+          @_protobuf_message_deprecated_fields ||= begin
+            self.protobuf_message.all_fields.map do |field|
+              next if field.nil?
+              next unless field.deprecated?
+
+              field.name.to_sym
+            end
+          end
+        end
+
+        def _protobuf_message_non_deprecated_fields
+          @_protobuf_message_non_deprecated_fields ||= begin
+            self.protobuf_message.all_fields.map do |field|
+              next if field.nil?
+              next if field.deprecated?
+
+              field.name.to_sym
+            end
+          end
+        end
+
+        def _protobuf_respond_to_cache
+          @_protobuf_respond_to_cache ||= ::Set.new
+        end
+
         # Define a field transformation from a record. Accepts a Symbol,
         # callable, or block that is called with the record being serialized.
         #
@@ -146,16 +175,12 @@ module Protobuf
 
       # :nodoc:
       def _filtered_fields(options = {})
-        exclude_deprecated = ! options.fetch(:deprecated, true)
+        include_deprecated = options.fetch(:deprecated, true)
 
-        fields = self.class.protobuf_message.all_fields.map do |field|
-          next if field.nil?
-          next if field.deprecated? && exclude_deprecated
-
-          field.name.to_sym
-        end
-        fields += [ options.fetch(:include, nil) ]
-        fields.flatten!
+        fields = []
+        fields.concat(self.class._protobuf_message_non_deprecated_fields)
+        fields.concat(self.class._protobuf_message_deprecated_fields) if include_deprecated
+        fields.concat([options[:include]].flatten) if options[:include].present?
         fields.compact!
         fields.uniq!
 
@@ -182,23 +207,39 @@ module Protobuf
       #   fields_from_record(:except => :email_domain, :deprecated => false)
       #
       def fields_from_record(options = {})
+        hash = {}
         field_attributes = _filter_field_attributes(options)
-        field_attributes += [ options.fetch(:include, []) ]
-        field_attributes.flatten!
-        field_attributes.compact!
-        field_attributes.uniq!
-
-        field_attributes = field_attributes.inject({}) do |hash, field|
-          if _protobuf_field_transformers.has_key?(field)
-            hash[field] = _protobuf_field_transformers[field].call(self)
-          else
-            value = respond_to?(field) ? __send__(field) : nil
-            hash[field] = _protobuf_convert_attributes_to_fields(field, value)
-          end
-          hash
+
+        # Already flattened / compacted / uniqued ... unless we must include
+        if options[:include].present?
+          field_attributes.concat([ options[:include] ].flatten)
+          field_attributes.compact!
+          field_attributes.uniq!
+        end
+
+        attribute_number = 0
+        limit = field_attributes.size
+
+        # One of the very few places the diff between each/while can make a difference
+        # in terms of optimization (`while` is slightly faster as no block carried through)
+        while attribute_number < limit
+          field = field_attributes[attribute_number]
+          hash[field] = case
+                        when _protobuf_field_transformers.has_key?(field) then
+                          _protobuf_field_transformers[field].call(self)
+                        when self.class._protobuf_instance_respond_to_from_cache?(field) then
+                          _protobuf_convert_attributes_to_fields(field, __send__(field))
+                        when respond_to?(field) then
+                          self.class._protobuf_respond_to_cache << field
+                          _protobuf_convert_attributes_to_fields(field, __send__(field))
+                        else
+                          nil
+                        end
+
+          attribute_number += 1
         end
 
-        field_attributes
+        hash
       end
 
       # :nodoc:

data/lib/protobuf/active_record/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "3.2.2"
+    VERSION = "3.3.0"
   end
 end

data/spec/protobuf/active_record/serialization_spec.rb

@@ -135,20 +135,20 @@ describe Protobuf::ActiveRecord::Serialization do
       context "when options has :except" do
         it "returns all except the given field(s)" do
           fields = user._filter_field_attributes(:except => :name)
-          expect(fields).to eq [ :guid, :email, :email_domain, :password, :nullify ]
+          expect(fields).to match_array([ :guid, :email, :email_domain, :password, :nullify ])
         end
       end
     end
 
     describe "#_filtered_fields" do
       it "returns protobuf fields" do
-        expect(user._filtered_fields).to eq [ :guid, :name, :email, :email_domain, :password, :nullify ]
+        expect(user._filtered_fields).to match_array([ :guid, :name, :email, :email_domain, :password, :nullify ])
       end
 
       context "given :deprecated => false" do
         it "filters all deprecated fields" do
           fields = user._filtered_fields(:deprecated => false)
-          expect(fields).to eq [ :guid, :name, :email, :password, :nullify ]
+          expect(fields).to match_array([ :guid, :name, :email, :password, :nullify ])
         end
 
         context 'and :include => :email_domain' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers integration for Active Record