protobuf-activerecord 3.4.3 → 3.4.4.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40a8056f1bb9bf2ac10f53ea39f1447e909a3227
-  data.tar.gz: 11b9ffcbe3645dbe06bc677730fe360cb66d0f5b
+  metadata.gz: da307ffdb292153c946b5e4d6fb51c601d19f887
+  data.tar.gz: '0548445446f601abd66b34b34cab4bbe8f4237b3'
 SHA512:
-  metadata.gz: cc1d009811935c2ad4026862e8f20f00ddc51e8f1220a5a309a0e3c5d25654e817e1363220b49a8c49bfd60ad931fcb884fa3ecaa2d73c7ad713edda0b0d5e0d
-  data.tar.gz: 824c943dadf8071ce786129a52e051a61c345a8c6b1cac6e420cdabac0e21360b23d79a273abe6e59ab8403671725dcccd1b34fca979c7c87527643c402946f7
+  metadata.gz: 7779dd21a08bde0e8dc52ee6cc84170811dc59ad13dbc4ee43a46c04ffc41912620c2599964ecc20452432f6159c2367eac0203a7c41bc6fe958dae65da278d1
+  data.tar.gz: 972422ff88ff326053604bf64b15cd0c63360146960ea815c81beb7684dbf535282aa27b8e4b640deec9890d6bb7d27cf6846005b4ac1aabe282d89c5cc5e33c

data/Rakefile

@@ -1,5 +1,5 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 desc "Run specs"
 RSpec::Core::RakeTask.new(:spec)

data/lib/protobuf/active_record/nested_attributes.rb

@@ -16,16 +16,39 @@ module Protobuf
       end
 
       module ClassMethods
-        # :nodoc
+        # :nodoc:
         def accepts_nested_attributes_for(*attr_names)
           attribute_names = attr_names.dup
           attribute_names.extract_options!
+          attribute_names.map!(&:to_s)
 
           super
 
-          self._protobuf_nested_attributes += attribute_names.map { |name| "#{name}_attributes" }
+          self._protobuf_nested_attributes += attribute_names
         end
       end
+
+      # :nodoc:
+      def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
+        if attributes_collection.first.is_a?(::Protobuf::Message)
+          reflection = self.class._reflect_on_association(association_name)
+          attributes_collection = attributes_collection.map do |attributes|
+            reflection.klass.attributes_from_proto(attributes)
+          end
+        end
+
+        super(association_name, attributes_collection)
+      end
+
+      # :nodoc:
+      def assign_nested_attributes_for_one_to_one_association(association_name, attributes)
+        if attributes.is_a?(::Protobuf::Message)
+          reflection = self.class._reflect_on_association(association_name)
+          attributes = reflection.klass.attributes_from_proto(attributes)
+        end
+
+        super(association_name, attributes)
+      end
     end
   end
 end

data/lib/protobuf/active_record/transformation.rb

@@ -33,20 +33,30 @@ module Protobuf
             proto.field?(key) && !field.repeated?
           end
 
-          filtered_attributes = _filtered_attributes + _protobuf_nested_attributes
-          filtered_attributes += _protobuf_attribute_transformers.keys
+          filtered_attributes = _filtered_attributes + _protobuf_attribute_transformers.keys
 
           attribute_fields = filtered_attributes.inject({}) do |hash, column_name|
             symbolized_column = column_name.to_sym
 
-            if fields.has_key?(symbolized_column) ||
-              _protobuf_attribute_transformers.has_key?(symbolized_column)
+            if fields.has_key?(symbolized_column) || _protobuf_attribute_transformers.has_key?(symbolized_column)
               hash[symbolized_column] = fields[symbolized_column]
             end
 
             hash
           end
 
+          _protobuf_nested_attributes.each do |attribute_name|
+            nested_attribute_name = "#{attribute_name}_attributes".to_sym
+            value = if proto.has_field?(nested_attribute_name)
+                      proto.__send__(nested_attribute_name)
+                    elsif proto.has_field?(attribute_name)
+                      proto.__send__(attribute_name)
+                    end
+
+            next unless value
+            attribute_fields[nested_attribute_name] = value
+          end
+
           attribute_fields
         end
 

data/lib/protobuf/active_record/version.rb

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

data/spec/protobuf/active_record/nested_attributes_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+describe Protobuf::ActiveRecord::NestedAttributes do
+  let(:user_message) {
+    UserMessage.new(:name => "foo bar", :email => "foo@test.co", :photos => [{ url: "https://test.co/test.png" }])
+  }
+
+  describe "._filter_attribute_fields", :aggregate_failures => true do
+    it "includes nested attributes" do
+      attribute_fields = User._filter_attribute_fields(user_message)
+      expect(attribute_fields[:photos_attributes]).to eq(user_message.photos)
+    end
+
+    context "when" do
+
+    end
+  end
+
+  describe ".new" do
+    context "when a model accepts nested attributes" do
+      it "transforms nested attributes", :aggregate_failures => true do
+        user_message.photos.each do |photo_message|
+          expect(Photo).to receive(:attributes_from_proto).with(photo_message).and_call_original
+        end
+        User.new(user_message)
+      end
+    end
+  end
+end

data/spec/protobuf/active_record/serialization_spec.rb

@@ -9,7 +9,7 @@ describe Protobuf::ActiveRecord::Serialization do
   let(:protobuf_message) { UserMessage }
 
   describe ".field_from_record" do
-    context "when the given converter is a symbol" do
+    context "when the given transformer is a symbol" do
       before { User.field_from_record :first_name, :extract_first_name }
 
       it "creates a symbol transformer from the converter" do
@@ -17,7 +17,7 @@ describe Protobuf::ActiveRecord::Serialization do
       end
     end
 
-    context "when the given converter is not callable" do
+    context "when the given transformer is not callable" do
       it "raises an exception" do
         expect { User.field_from_record :name, nil }.to raise_exception(Protobuf::ActiveRecord::FieldTransformerError)
       end
@@ -31,9 +31,8 @@ describe Protobuf::ActiveRecord::Serialization do
         User.field_from_record :account_id, callable
       }
 
-      it "adds the given converter to the list of protobuf field transformers", :pending => 'missing expectation?' do
-        User._protobuf_field_transformers[:account_id] = callable
-        fail
+      it "adds the given converter to the list of protobuf field transformers" do
+        expect(User._protobuf_field_transformers[:account_id]).to eq(callable)
       end
     end
   end
@@ -78,26 +77,26 @@ 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 match_array([ :guid, :email, :email_domain, :password, :nullify ])
+          expect(fields).to match_array([ :guid, :email, :email_domain, :password, :nullify, :photos ])
         end
       end
     end
 
     describe "#_filtered_fields" do
       it "returns protobuf fields" do
-        expect(user._filtered_fields).to match_array([ :guid, :name, :email, :email_domain, :password, :nullify ])
+        expect(user._filtered_fields).to match_array([ :guid, :name, :email, :email_domain, :password, :nullify, :photos ])
       end
 
       context "given :deprecated => false" do
         it "filters all deprecated fields" do
           fields = user._filtered_fields(:deprecated => false)
-          expect(fields).to match_array([ :guid, :name, :email, :password, :nullify ])
+          expect(fields).to match_array([ :guid, :name, :email, :password, :nullify, :photos ])
         end
 
         context 'and :include => :email_domain' do
           it 'includes deprecated fields that have been explicitly specified' do
             fields = user._filtered_fields(:deprecated => false, :include => :email_domain)
-            expect(fields).to match_array([ :guid, :name, :email, :email_domain, :password, :nullify ])
+            expect(fields).to match_array([ :guid, :name, :email, :email_domain, :password, :nullify, :photos ])
           end
         end
       end
@@ -155,23 +154,8 @@ describe Protobuf::ActiveRecord::Serialization do
       }
 
       context "when a transformer is defined for the field" do
-        let(:fields_from_record) { { :guid => user.guid, :name => user.name, :email => user.email, :email_domain => 'test.co', :password => nil, :nullify => nil } }
-
         it "gets the field from the transformer" do
-          expect(user.fields_from_record).to eq fields_from_record
-        end
-      end
-
-      context "when a transformer is not defined for the field" do
-        let(:fields_from_record) { { :guid => user.guid, :name => user.name, :email => user.email, :email_domain => nil, :password => nil, :nullify => nil } }
-
-        before {
-          user.to_proto
-          allow(user).to receive(:_protobuf_active_record_serialize_email_domain).and_return(nil)
-        }
-
-        it "returns a hash of protobuf fields that this object has getters for" do
-          expect(user.fields_from_record).to eq fields_from_record
+          expect(user.fields_from_record[:email_domain]).to eq('test.co')
         end
       end
 

data/spec/protobuf/active_record/transformation_spec.rb

@@ -201,14 +201,11 @@ describe Protobuf::ActiveRecord::Transformation do
     context "when the given transformer is callable" do
       let(:callable) { lambda { |proto| nil } }
 
-      before {
-        allow(User).to receive(:_protobuf_attribute_transformers).and_return(Hash.new)
-        User.attribute_from_proto :account_id, callable
-      }
+      before { allow(User).to receive(:_protobuf_attribute_transformers).and_return(Hash.new) }
 
-      it "adds the given converter to the list of protobuf field transformers", :pending => 'missing expectation?' do
-        User._protobuf_attribute_transformers[:account_id] = callable
-        fail
+      it "adds the given converter to the list of protobuf field transformers" do
+        User.attribute_from_proto :account_id, callable
+        expect(User._protobuf_attribute_transformers[:account_id].callable).to eq callable
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,19 +1,19 @@
-require 'rubygems'
-require 'bundler'
+require "rubygems"
+require "bundler"
 
-require 'simplecov'
+require "simplecov"
 SimpleCov.start do
-  add_filter '/spec/'
+  add_filter "/spec/"
 end
 
 Bundler.require(:default, :development, :test)
 
-require 'support/db'
-require 'support/models'
-require 'support/protobuf'
+require "support/db"
+require "support/models"
+require "support/protobuf/messages.pb"
 
-# Silence protobuf's logger
-::Protobuf::Logging.logger.level = ::Logger::FATAL
+# Silence protobuf"s logger
+Protobuf::Logging.logger.level = ::Logger::FATAL
 
 RSpec.configure do |config|
   # Turn deprecation warnings into errors with full backtrace.

data/spec/support/db/setup.rb

@@ -10,6 +10,13 @@ ActiveRecord::Base.connection.tables.each do |table|
 end
 
 ActiveRecord::Schema.define(:version => 1) do
+  create_table :photos do |t|
+    t.string :url
+    t.integer :user_id
+
+    t.timestamps null: false
+  end
+
   create_table :users do |t|
     t.string :guid
     t.string :first_name
@@ -17,6 +24,6 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :email
     t.integer :account_id
 
-    t.timestamps
+    t.timestamps null: false
   end
 end

data/spec/support/definitions/{user.proto → messages.proto}

@@ -1,3 +1,8 @@
+message PhotoMessage {
+  optional string url       = 1;
+  optional int64  user_guid = 2;
+}
+
 message UserMessage {
   optional string guid         = 1;
   optional string name         = 2;
@@ -5,6 +10,7 @@ message UserMessage {
   optional string email_domain = 4 [deprecated = true];
   optional string password     = 5;
   repeated string nullify      = 6;
+  repeated PhotoMessage photos = 7;
 }
 
 message UserSearchMessage {

data/spec/support/models.rb

@@ -1 +1,2 @@
-require 'support/models/user'
+require 'support/models/photo'
+require 'support/models/user'

data/spec/support/models/photo.rb

@@ -0,0 +1,3 @@
+class Photo < ActiveRecord::Base
+  include Protobuf::ActiveRecord::Model
+end

data/spec/support/models/user.rb

@@ -3,9 +3,15 @@ class User < ActiveRecord::Base
 
   attr_accessor :password
 
+  has_many :photos
+
+  accepts_nested_attributes_for :photos
+
   scope :by_guid, lambda { |*guids| where(:guid => guids) }
   scope :by_email, lambda { |*emails| where(:email => emails) }
 
+  protobuf_fields :except => :photos
+
   attribute_from_proto :first_name, :extract_first_name
   attribute_from_proto :last_name, :extract_last_name
   attribute_from_proto :password, lambda { |proto| proto.password! }

data/spec/support/protobuf/{user.pb.rb → messages.pb.rb}

@@ -1,12 +1,15 @@
+# encoding: utf-8
+
 ##
 # This file is auto-generated. DO NOT EDIT!
 #
-require 'protobuf/message'
+require 'protobuf'
 
 
 ##
 # Message Classes
 #
+class PhotoMessage < ::Protobuf::Message; end
 class UserMessage < ::Protobuf::Message; end
 class UserSearchMessage < ::Protobuf::Message; end
 
@@ -14,6 +17,11 @@ class UserSearchMessage < ::Protobuf::Message; end
 ##
 # Message Fields
 #
+class PhotoMessage
+  optional :string, :url, 1
+  optional :int64, :user_guid, 2
+end
+
 class UserMessage
   optional :string, :guid, 1
   optional :string, :name, 2
@@ -21,6 +29,7 @@ class UserMessage
   optional :string, :email_domain, 4, :deprecated => true
   optional :string, :password, 5
   repeated :string, :nullify, 6
+  repeated ::PhotoMessage, :photos, 7
 end
 
 class UserSearchMessage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4.pre
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -216,6 +216,7 @@ files:
 - lib/protobuf/active_record/version.rb
 - protobuf-activerecord.gemspec
 - spec/protobuf/active_record/columns_spec.rb
+- spec/protobuf/active_record/nested_attributes_spec.rb
 - spec/protobuf/active_record/persistence_spec.rb
 - spec/protobuf/active_record/scope_spec.rb
 - spec/protobuf/active_record/serialization_spec.rb
@@ -224,11 +225,11 @@ files:
 - spec/spec_helper.rb
 - spec/support/db.rb
 - spec/support/db/setup.rb
-- spec/support/definitions/user.proto
+- spec/support/definitions/messages.proto
 - spec/support/models.rb
+- spec/support/models/photo.rb
 - spec/support/models/user.rb
-- spec/support/protobuf.rb
-- spec/support/protobuf/user.pb.rb
+- spec/support/protobuf/messages.pb.rb
 homepage: http://github.com/liveh2o/protobuf-activerecord
 licenses:
 - MIT
@@ -244,17 +245,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers integration for Active Record
 test_files:
 - spec/protobuf/active_record/columns_spec.rb
+- spec/protobuf/active_record/nested_attributes_spec.rb
 - spec/protobuf/active_record/persistence_spec.rb
 - spec/protobuf/active_record/scope_spec.rb
 - spec/protobuf/active_record/serialization_spec.rb
@@ -263,8 +265,8 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/db.rb
 - spec/support/db/setup.rb
-- spec/support/definitions/user.proto
+- spec/support/definitions/messages.proto
 - spec/support/models.rb
+- spec/support/models/photo.rb
 - spec/support/models/user.rb
-- spec/support/protobuf.rb
-- spec/support/protobuf/user.pb.rb
+- spec/support/protobuf/messages.pb.rb

data/spec/support/protobuf.rb

@@ -1 +0,0 @@
-require 'support/protobuf/user.pb'