protobuf-activerecord 3.4.4.pre → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da307ffdb292153c946b5e4d6fb51c601d19f887
-  data.tar.gz: '0548445446f601abd66b34b34cab4bbe8f4237b3'
+  metadata.gz: b94b8ba65793cc1162ee6905716c95d8ba2afb16
+  data.tar.gz: 02fd2e40603b22fc90c9f44f81d724c9940f5054
 SHA512:
-  metadata.gz: 7779dd21a08bde0e8dc52ee6cc84170811dc59ad13dbc4ee43a46c04ffc41912620c2599964ecc20452432f6159c2367eac0203a7c41bc6fe958dae65da278d1
-  data.tar.gz: 972422ff88ff326053604bf64b15cd0c63360146960ea815c81beb7684dbf535282aa27b8e4b640deec9890d6bb7d27cf6846005b4ac1aabe282d89c5cc5e33c
+  metadata.gz: 1c2ceafcbbfe007d619a96fb3289443fa1dfbffef453e139359618d36e4b845a575cefad8bfe248ef3b9ab8aacfe9233325a727941a60cb0cd7ab1176c15bcf7
+  data.tar.gz: 678912754b8c1a7ec44a7d69c9232d4971bd6d225526a098e795a9a864a494c9b36a29badf1b4cb3217df56039bb5f02653c298c40e92d2339ba6575cb2b2d3b

data/lib/protobuf/active_record/serialization.rb

@@ -139,6 +139,16 @@ 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
+            end
+          RUBY
+        end
+
         def _protobuf_write_convert_to_fields_method(field)
           is_datetime_time_or_timestamp_column = _protobuf_date_datetime_time_or_timestamp_column?(field)
           is_date_column = _protobuf_date_column?(field)
@@ -246,6 +256,14 @@ module Protobuf
         fields
       end
 
+      # :nodoc:
+      def _is_collection_association?(field)
+        reflection = self.class.reflect_on_association(field)
+        return false unless reflection
+
+        reflection.macro == :has_many
+      end
+
       # :nodoc:
       def _normalize_options(options)
         options ||= {}
@@ -295,7 +313,11 @@ module Protobuf
             when _protobuf_field_transformers.has_key?(field) then
               self.class._protobuf_write_field_transformer_method(field)
             when respond_to?(field) then
-              self.class._protobuf_write_convert_to_fields_method(field)
+              if _is_collection_association?(field)
+                self.class._protobuf_write_collection_assocation_method(field)
+              else
+                self.class._protobuf_write_convert_to_fields_method(field)
+              end
             else
               self.class._protobuf_write_nil_method(field)
             end

data/lib/protobuf/active_record/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "3.4.4.pre"
+    VERSION = "3.4.4"
   end
 end

data/spec/protobuf/active_record/serialization_spec.rb

@@ -165,6 +165,15 @@ describe Protobuf::ActiveRecord::Serialization do
           expect(fields).to include(:token)
         end
       end
+
+      context "when a field is a collection association" do
+        let(:user) { User.create(attributes) }
+
+        it "terminates the association proxy" do
+          fields = user.fields_from_record(:include => :photos)
+          expect(fields[:photos]).to be_an(Array)
+        end
+      end
     end
 
     describe "#to_proto" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 3.4.4.pre
+  version: 3.4.4
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -245,9 +245,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13