protobuf-activerecord 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0baf0983fc1d7f24b7269e151478bea798a8f1193037541df17a8818b2ba455
-  data.tar.gz: d5f4537f6c7d8967d268435f88872f5f1632ba6ca1fdfd318917a349aaef1879
+  metadata.gz: c25dac0d341a98ef1a2063256abf9d20b2752f58280dfe32bd45a4e273fec2d0
+  data.tar.gz: 77d0019eb2a66d0938beb272b773354f1d4fe55faf0b1390c908a44092dd4937
 SHA512:
-  metadata.gz: 6d20b5632121f432b90ab19b52bee9ccd75c39ad8473e3b8f97ecbf87bf8d84297581b64a5b6831050f9dea1a4b7b553e30431049cb186dd8be35f12b045fdcc
-  data.tar.gz: a32ced82a52061de22ac52f236df76f35c38870edf8b28693d2a4ae2d093274684a3224fcc181b893a0bf214f65319fe29a73410caf2316b2357694b05052cb9
+  metadata.gz: 0febfd5d96839e78688ad1b9700a07063f37a1b6f3f9f8e0e8d643a65541192f88d36c6fb8cd28b219539d9c3a02e67cf57f6e5bfc5f7e3846f9c5aff3b79c39
+  data.tar.gz: b534f6c7b313dac85bf4002f425d29e3be14b027ddbba2ea4b8be7b9e0187bfe400b327593d961f7c6b73276e5a6ebd08163473236c1f811a2746881f764a5d8

data/.rubocop.yml

@@ -0,0 +1,28 @@
+# Styles are inherited from Mad Rubocop
+
+inherit_gem:
+  mad_rubocop: .rubocop.yml
+
+# Styles that are modified from the defaults
+AllCops:
+  TargetRubyVersion: 2.5
+  Exclude:
+    - "**/*.pb.rb"
+
+Style/BlockDelimiters:
+  Description: >-
+                Avoid using {...} for multi-line blocks (multiline chaining is always ugly).
+                Prefer {...} over do...end for single-line blocks.
+  Exclude:
+    - "spec/**/*"
+
+Style/HashSyntax:
+  Description: >-
+                 Prefer Ruby 1.8 hash syntax { :a => 1, :b => 2 } over 1.9 syntax { a: 1, b: 2 }.
+  EnforcedStyle: hash_rockets
+  Exclude:
+    - "Gemfile"
+
+Layout/SpaceAroundOperators:
+  Exclude:
+    - "*.gemspec"

data/.travis.yml

@@ -1,8 +1,5 @@
 ---
 language: ruby
 rvm:
-  - 2.2.2
-#  - jruby
-sudo: false
-# uncomment this line if your project needs to run something other than `rake`:
-# script: bundle exec rspec spec
+  - 2.3
+  - jruby

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in protobuf-activerecord.gemspec
 gemspec

data/Rakefile

@@ -1,20 +1,24 @@
 require "bundler/gem_tasks"
+require "protobuf/tasks"
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
+
+desc "Run cops"
+::RuboCop::RakeTask.new(:rubocop)
 
 desc "Run specs"
-RSpec::Core::RakeTask.new(:spec)
+::RSpec::Core::RakeTask.new(:spec)
 
-desc "Run specs (default)"
-task :default => :spec
+desc "Run cops and specs (default)"
+task :default => [:rubocop, :spec]
 
 desc "Remove protobuf definitions that have been compiled"
 task :clean do
-  FileUtils.rm(Dir.glob("spec/support/protobuf/**/*.proto"))
+  ::FileUtils.rm(Dir.glob("spec/support/protobuf/**/*.proto"))
   puts "Cleaned"
 end
 
 desc "Compile spec/support protobuf definitions"
 task :compile, [] => :clean do
-  cmd = "protoc --ruby_out=spec/support/protobuf --proto_path=spec/support/definitions spec/support/definitions/*.proto"
-  sh(cmd)
+  ::Rake::Task["protobuf:compile"].invoke("", "spec/support/definitions", "spec/support/protobuf")
 end

data/lib/protobuf-activerecord.rb

@@ -1,22 +1,23 @@
-require 'active_record'
-require 'active_support/concern'
-require 'heredity'
-require 'protobuf'
+# rubocop:disable Naming/FileName
+require "active_record"
+require "active_support/concern"
+require "heredity"
+require "protobuf"
 
 # To support Rails 4 apps that use Mass-Assignment Security, attempt to
 # load the protected_attributes gem. If it's not present, move along...
 begin
-  require 'protected_attributes'
-rescue LoadError
+  require "protected_attributes"
+rescue LoadError # rubocop:disable Lint/HandleExceptions
   # These aren't the droids you're looking for... move along.
 end
 
-require 'protobuf/active_record/config'
-require 'protobuf/active_record/middleware/connection_management'
-require 'protobuf/active_record/middleware/connection_management_async'
-require 'protobuf/active_record/middleware/query_cache'
-require 'protobuf/active_record/model'
-require 'protobuf/active_record/version'
+require "protobuf/active_record/config"
+require "protobuf/active_record/middleware/connection_management"
+require "protobuf/active_record/middleware/connection_management_async"
+require "protobuf/active_record/middleware/query_cache"
+require "protobuf/active_record/model"
+require "protobuf/active_record/version"
 
 module Protobuf
   module ActiveRecord
@@ -29,4 +30,5 @@ module Protobuf
   end
 end
 
-require 'protobuf/active_record/railtie' if defined?(Rails)
+require "protobuf/active_record/railtie" if defined?(Rails)
+# rubocop:enable Naming/FileName

data/lib/protobuf/active_record/attribute_methods.rb

@@ -1,4 +1,4 @@
-require 'active_support/concern'
+require "active_support/concern"
 
 module Protobuf
   module ActiveRecord
@@ -22,7 +22,7 @@ module Protobuf
           end
         end
 
-        def fetch_field_alias_from_record(attribute, field_aliasd)
+        def fetch_field_alias_from_record(attribute, _field_aliasd)
           lambda do |record|
             value = record.__send__(field_alias)
 

data/lib/protobuf/active_record/columns.rb

@@ -1,6 +1,6 @@
-require 'set'
-require 'active_support/concern'
-require 'thread'
+require "set"
+require "active_support/concern"
+require "thread"
 
 module Protobuf
   module ActiveRecord
@@ -63,7 +63,7 @@ module Protobuf
             return if _protobuf_mapped_columns?
 
             @_protobuf_columns = {}
-            @_protobuf_column_types = ::Hash.new { |h,k| h[k] = ::Set.new }
+            @_protobuf_column_types = ::Hash.new { |h, k| h[k] = ::Set.new }
             @_protobuf_date_datetime_time_or_timestamp_column = ::Set.new
 
             columns.map do |column|

data/lib/protobuf/active_record/mass_assignment_security.rb

@@ -1,6 +1,6 @@
-require 'active_support/concern'
-require 'protobuf/active_record/mass_assignment_security/persistence'
-require 'protobuf/active_record/mass_assignment_security/transformation'
+require "active_support/concern"
+require "protobuf/active_record/mass_assignment_security/persistence"
+require "protobuf/active_record/mass_assignment_security/transformation"
 
 module Protobuf
   module ActiveRecord

data/lib/protobuf/active_record/mass_assignment_security/persistence.rb

@@ -1,4 +1,4 @@
-require 'active_support/concern'
+require "active_support/concern"
 
 module Protobuf
   module ActiveRecord
@@ -8,14 +8,14 @@ module Protobuf
 
         module ClassMethods
           # :nodoc:
-          def create(attributes, options = {}, &block)
+          def create(attributes, options = {})
             attributes = attributes_from_proto(attributes) if attributes.is_a?(::Protobuf::Message)
 
             super(attributes, options)
           end
 
           # :nodoc:
-          def create!(attributes, options = {}, &block)
+          def create!(attributes, options = {})
             attributes = attributes_from_proto(attributes) if attributes.is_a?(::Protobuf::Message)
 
             super(attributes, options)

data/lib/protobuf/active_record/mass_assignment_security/transformation.rb

@@ -1,4 +1,4 @@
-require 'active_support/concern'
+require "active_support/concern"
 
 module Protobuf
   module ActiveRecord

data/lib/protobuf/active_record/middleware/connection_management_async.rb

@@ -12,10 +12,11 @@ module Protobuf
             START_MUTEX.synchronize do
               return if timed_task_started.true?
 
-              timed_task = ::Concurrent::TimerTask.new(
-                             :execution_interval => ::Protobuf::ActiveRecord.config.connection_reaping_interval,
-                             :timeout_interval => ::Protobuf::ActiveRecord.config.connection_reaping_timeout_interval) do
-
+              args = {
+                :execution_interval => ::Protobuf::ActiveRecord.config.connection_reaping_interval,
+                :timeout_interval => ::Protobuf::ActiveRecord.config.connection_reaping_timeout_interval
+              }
+              timed_task = ::Concurrent::TimerTask.new(args) do
                 ::ActiveRecord::Base.clear_active_connections!
               end
 
@@ -37,6 +38,8 @@ module Protobuf
           @app = app
         end
 
+        # rubocop:disable Lint/DuplicateMethods
+        # rubocop:disable Lint/NestedMethodDefinition
         def call(env)
           def call(env)
             ::ActiveRecord::Base.connection_pool.with_connection do
@@ -47,6 +50,8 @@ module Protobuf
           self.class.start_timed_task!
           call(env)
         end
+        # rubocop:enable Lint/NestedMethodDefinition
+        # rubocop:enable Lint/DuplicateMethods
 
         timed_task_started
       end

data/lib/protobuf/active_record/model.rb

@@ -1,13 +1,13 @@
-require 'protobuf/active_record/attribute_methods'
-require 'protobuf/active_record/columns'
-require 'protobuf/active_record/errors'
-require 'protobuf/active_record/mass_assignment_security'
-require 'protobuf/active_record/nested_attributes'
-require 'protobuf/active_record/persistence'
-require 'protobuf/active_record/scope'
-require 'protobuf/active_record/serialization'
-require 'protobuf/active_record/transformation'
-require 'protobuf/active_record/validations'
+require "protobuf/active_record/attribute_methods"
+require "protobuf/active_record/columns"
+require "protobuf/active_record/errors"
+require "protobuf/active_record/mass_assignment_security"
+require "protobuf/active_record/nested_attributes"
+require "protobuf/active_record/persistence"
+require "protobuf/active_record/scope"
+require "protobuf/active_record/serialization"
+require "protobuf/active_record/transformation"
+require "protobuf/active_record/validations"
 
 module Protobuf
   module ActiveRecord

data/lib/protobuf/active_record/persistence.rb

@@ -1,4 +1,4 @@
-require 'active_support/concern'
+require "active_support/concern"
 
 module Protobuf
   module ActiveRecord

data/lib/protobuf/active_record/scope.rb

@@ -1,4 +1,4 @@
-require 'active_support/concern'
+require "active_support/concern"
 
 module Protobuf
   module ActiveRecord
@@ -73,7 +73,7 @@ module Protobuf
             end
           end
 
-          values = [ value ].flatten
+          values = [value].flatten
           values.map!(&:to_i) if proto.class.get_field(field, true).enum?
           values
         end

data/lib/protobuf/active_record/serialization.rb

@@ -1,5 +1,5 @@
-require 'set'
-require 'active_support/concern'
+require "set"
+require "active_support/concern"
 
 module Protobuf
   module ActiveRecord
@@ -13,10 +13,6 @@ module Protobuf
                       :_protobuf_field_options,
                       :protobuf_message
         end
-
-        private :_protobuf_field_symbol_transformers
-        private :_protobuf_field_transformers
-        private :_protobuf_message
       end
 
       module ClassMethods
@@ -169,8 +165,6 @@ module Protobuf
 
             if value
               value.to_time(:utc).to_i
-            else
-              nil
             end
           rescue NameError # Has happened when field is not on model or ignored from db
             return nil
@@ -185,11 +179,7 @@ module Protobuf
           def call(selph)
             value = selph.__send__(@field)
 
-            if value
-              value.to_i
-            else
-              nil
-            end
+            value&.to_i
           rescue NameError # Has happened when field is not on model or ignored from db
             return nil
           end
@@ -227,14 +217,15 @@ module Protobuf
         end
 
         class NilMethodCaller
-          def initialize; end
+          def initialize
+          end
 
-          def call(selph)
+          def call(_selph)
             nil
           end
         end
 
-        def _protobuf_nil_object(field)
+        def _protobuf_nil_object(_field)
           NilMethodCaller.new
         end
 
@@ -250,7 +241,7 @@ module Protobuf
         end
 
         def _protobuf_symbol_transformer_object(field)
-          FieldSymbolTransformerCaller.new(self, _protobuf_symbol_transformer_object[field])
+          FieldSymbolTransformerCaller.new(self, _protobuf_field_symbol_transformers[field])
         end
       end
 
@@ -259,8 +250,8 @@ module Protobuf
         options = _normalize_options(options)
 
         fields = _filtered_fields(options)
-        fields &= [ options[:only] ].flatten if options[:only].present?
-        fields -= [ options[:except] ].flatten if options[:except].present?
+        fields &= [options[:only]].flatten if options[:only].present?
+        fields -= [options[:except]].flatten if options[:except].present?
 
         fields
       end
@@ -312,7 +303,7 @@ module Protobuf
 
         # Already flattened / compacted / uniqued ... unless we must include
         if options[:include].present?
-          field_attributes.concat([ options[:include] ].flatten)
+          field_attributes.concat([options[:include]].flatten)
           field_attributes.compact!
           field_attributes.uniq!
         end
@@ -336,9 +327,9 @@ module Protobuf
       def _protobuf_field_objects(field)
         self.class._protobuf_field_objects[field] ||= begin
           case
-          when _protobuf_field_symbol_transformers.has_key?(field) then
+          when _protobuf_field_symbol_transformers.key?(field) then
             self.class._protobuf_symbol_transformer_object(field)
-          when _protobuf_field_transformers.has_key?(field) then
+          when _protobuf_field_transformers.key?(field) then
             self.class._protobuf_field_transformer_object(field)
           when respond_to?(field) then
             if _is_collection_association?(field)
@@ -369,7 +360,7 @@ module Protobuf
 
       # :nodoc:
       def to_proto(options = {})
-        raise MessageNotDefined.new(self.class) if _protobuf_message.nil?
+        raise MessageNotDefined, self.class if _protobuf_message.nil?
 
         fields = self.fields_from_record(options)
         _protobuf_message.new(fields)

data/lib/protobuf/active_record/transformation.rb

@@ -1,6 +1,6 @@
-require 'active_support/concern'
-require 'heredity/inheritable_class_instance_variables'
-require 'protobuf/active_record/transformer'
+require "active_support/concern"
+require "heredity/inheritable_class_instance_variables"
+require "protobuf/active_record/transformer"
 
 module Protobuf
   module ActiveRecord
@@ -28,7 +28,7 @@ module Protobuf
         # :nodoc:
         def _filter_attribute_fields(proto)
           fields = proto.to_hash
-          fields.select! do |key, value|
+          fields.select! do |key, _value|
             field = proto.class.get_field(key, true)
             proto.field?(key) && !field.repeated?
           end
@@ -38,7 +38,7 @@ module Protobuf
           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.key?(symbolized_column) || _protobuf_attribute_transformers.key?(symbolized_column)
               hash[symbolized_column] = fields[symbolized_column]
             end
 
@@ -47,9 +47,9 @@ module Protobuf
 
           _protobuf_nested_attributes.each do |attribute_name|
             nested_attribute_name = "#{attribute_name}_attributes".to_sym
-            value = if proto.has_field?(nested_attribute_name)
+            value = if proto.field?(nested_attribute_name)
                       proto.__send__(nested_attribute_name)
-                    elsif proto.has_field?(attribute_name)
+                    elsif proto.field?(attribute_name)
                       proto.__send__(attribute_name)
                     end
 
@@ -121,7 +121,7 @@ module Protobuf
 
           if options[:nullify_on]
             field = protobuf_message.get_field(:nullify)
-            unless field && field.is_a?(::Protobuf::Field::StringField) && field.repeated?
+            unless field&.is_a?(::Protobuf::Field::StringField) && field&.repeated?
               ::Protobuf::Logging.logger.warn "Message: #{protobuf_message} is not compatible with :nullify_on option"
             end
           end
@@ -130,7 +130,6 @@ module Protobuf
           _protobuf_attribute_transformers[attribute.to_sym] = transformer
         end
 
-
         # Creates a hash of attributes from a given protobuf message.
         #
         # It converts and transforms field values using the field converters and
@@ -140,7 +139,7 @@ module Protobuf
           attribute_fields = _filter_attribute_fields(proto)
 
           attributes = attribute_fields.inject({}) do |hash, (key, value)|
-            if _protobuf_attribute_transformers.has_key?(key)
+            if _protobuf_attribute_transformers.key?(key)
               transformer = _protobuf_attribute_transformers[key]
               attribute = transformer.call(proto)
               hash[key] = attribute unless attribute.nil?

data/lib/protobuf/active_record/transformer.rb

@@ -8,9 +8,7 @@ module Protobuf
         @options = options
       end
 
-      def call(proto)
-        callable.call(proto)
-      end
+      delegate :call, :to => :callable
 
       def nullify?(proto)
         return false unless options[:nullify_on]

data/lib/protobuf/active_record/validations.rb

@@ -1,4 +1,4 @@
-require 'active_support/concern'
+require "active_support/concern"
 
 module Protobuf
   module ActiveRecord
@@ -40,4 +40,4 @@ module Protobuf
       end
     end
   end
-end
+end

data/lib/protobuf/active_record/version.rb

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

data/protobuf-activerecord.gemspec

@@ -1,7 +1,8 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'protobuf/active_record/version'
+require "protobuf/active_record/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "protobuf-activerecord"
@@ -9,12 +10,12 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Adam Hutchison"]
   spec.email         = ["liveh2o@gmail.com"]
   spec.homepage      = "http://github.com/liveh2o/protobuf-activerecord"
-  spec.summary       = %q{Google Protocol Buffers integration for Active Record}
-  spec.description   = %q{Provides the ability to create Active Record objects from Protocol Buffer messages and vice versa.}
-  spec.license       = 'MIT'
+  spec.summary       = "Google Protocol Buffers integration for Active Record"
+  spec.description   = "Provides the ability to create Active Record objects from Protocol Buffer messages and vice versa."
+  spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.executables   = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
@@ -31,6 +32,7 @@ Gem::Specification.new do |spec|
   # Development dependencies
   #
   spec.add_development_dependency "benchmark-ips"
+  spec.add_development_dependency "mad_rubocop"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ">= 3.3.0"
   spec.add_development_dependency "rspec-pride", ">= 3.1.0"

data/spec/protobuf/active_record/columns_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Protobuf::ActiveRecord::Columns do
   describe "._protobuf_map_columns" do
@@ -31,10 +31,10 @@ describe Protobuf::ActiveRecord::Columns do
   end
 
   context "column type predicates" do
-    before { allow(User).to receive(:_protobuf_column_types).and_return(Hash.new) }
+    before { allow(User).to receive(:_protobuf_column_types).and_return({}) }
 
     describe "._protobuf_date_column?" do
-      before { User._protobuf_column_types[:date] = [ :foo_date ] }
+      before { User._protobuf_column_types[:date] = [:foo_date] }
 
       context "when the column type is :date" do
         it "is true" do
@@ -50,7 +50,7 @@ describe Protobuf::ActiveRecord::Columns do
     end
 
     describe "._protobuf_datetime_column?" do
-      before { User._protobuf_column_types[:datetime] = [ :foo_datetime ] }
+      before { User._protobuf_column_types[:datetime] = [:foo_datetime] }
 
       context "when the column type is :datetime" do
         it "is true" do
@@ -66,7 +66,7 @@ describe Protobuf::ActiveRecord::Columns do
     end
 
     describe "._protobuf_time_column?" do
-      before { User._protobuf_column_types[:time] = [ :foo_time ] }
+      before { User._protobuf_column_types[:time] = [:foo_time] }
 
       context "when the column type is :time" do
         it "is true" do
@@ -82,7 +82,7 @@ describe Protobuf::ActiveRecord::Columns do
     end
 
     describe "._protobuf_timestamp_column?" do
-      before { User._protobuf_column_types[:timestamp] = [ :foo_timestamp ] }
+      before { User._protobuf_column_types[:timestamp] = [:foo_timestamp] }
 
       context "when the column type is :timestamp" do
         it "is true" do

data/spec/protobuf/active_record/nested_attributes_spec.rb

@@ -2,7 +2,7 @@ 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" }])
+    UserMessage.new(:name => "foo bar", :email => "foo@test.co", :photos => [{ :url => "https://test.co/test.png" }])
   }
 
   describe "._filter_attribute_fields", :aggregate_failures => true do
@@ -12,7 +12,6 @@ describe Protobuf::ActiveRecord::NestedAttributes do
     end
 
     context "when" do
-
     end
   end
 

data/spec/protobuf/active_record/persistence_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Protobuf::ActiveRecord::Persistence do
   let(:user) { User.new(user_attributes) }
-  let(:user_attributes) { { :first_name => 'foo', :last_name => 'bar', :email => 'foo@test.co' } }
-  let(:proto_hash) { { :name => 'foo bar', :email => 'foo@test.co' } }
+  let(:user_attributes) { { :first_name => "foo", :last_name => "bar", :email => "foo@test.co" } }
+  let(:proto_hash) { { :name => "foo bar", :email => "foo@test.co" } }
   let(:proto) { UserMessage.new(proto_hash) }
 
   describe ".create" do

data/spec/protobuf/active_record/scope_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Protobuf::ActiveRecord::Scope do
   before do
@@ -12,16 +12,15 @@ describe Protobuf::ActiveRecord::Scope do
     User.instance_variable_set("@_upsert_keys", [])
   end
 
-
   describe ".search_scope" do
     let(:request) { UserSearchMessage.new(:guid => ["foo"], :email => ["foo@test.co"]) }
 
     before {
-      allow(User).to receive(:searchable_field_parsers).and_return({ :email => proc { |val| val } })
+      allow(User).to receive(:searchable_field_parsers).and_return(:email => proc { |val| val })
     }
 
     it "builds scopes for searchable fields" do
-      allow(User).to receive(:searchable_fields).and_return({ :email =>  :by_email })
+      allow(User).to receive(:searchable_fields).and_return(:email => :by_email)
       expect(User.search_scope(request)).to eq User.by_email("foo@test.co")
     end
 
@@ -33,7 +32,7 @@ describe Protobuf::ActiveRecord::Scope do
       let(:request) { UserSearchMessage.new(:email => ["foo@test.co"]) }
 
       it "doesn't build a scope from that field" do
-        allow(User).to receive(:searchable_fields).and_return({ :email =>  :by_email })
+        allow(User).to receive(:searchable_fields).and_return(:email => :by_email)
         expect(User.search_scope(request)).to eq User.by_email("foo@test.co")
       end
     end
@@ -42,7 +41,7 @@ describe Protobuf::ActiveRecord::Scope do
       let(:request) { UserSearchMessage.new(:email => ["foo@test.co"]) }
 
       it "raises an exception" do
-        allow(User).to receive(:searchable_fields).and_return({ :email =>  :by_hullabaloo })
+        allow(User).to receive(:searchable_fields).and_return(:email => :by_hullabaloo)
         expect { User.search_scope(request) }.to raise_exception(/undefined method .*by_hullabaloo/i)
       end
     end
@@ -92,7 +91,7 @@ describe Protobuf::ActiveRecord::Scope do
       let(:proto) { UserSearchMessage.new(:guid => ["foo"]) }
 
       context "and the parser does not respond to :to_sym" do
-        let(:parser) { double('parser') }
+        let(:parser) { double("parser") }
 
         it "passes the value to the parser" do
           expect(parser).to receive(:call).with(["foo"])

data/spec/protobuf/active_record/serialization_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 # Used to test calling #to_proto when no protobuf message is configured.
 class UnconfiguredUser
@@ -24,10 +24,10 @@ describe Protobuf::ActiveRecord::Serialization do
     end
 
     context "when the given transformer is callable" do
-      let(:callable) { lambda { |proto| nil } }
+      let(:callable) { lambda { |_proto| nil } }
 
       before {
-        allow(User).to receive(:_protobuf_field_transformers).and_return(Hash.new)
+        allow(User).to receive(:_protobuf_field_transformers).and_return({})
         User.field_from_record :account_id, callable
       }
 
@@ -61,7 +61,7 @@ describe Protobuf::ActiveRecord::Serialization do
   end
 
   context "when protobuf_message is defined" do
-    let(:attributes) { Hash.new }
+    let(:attributes) { {} }
     let(:user) { User.new(attributes) }
 
     before { User.protobuf_message(protobuf_message) }
@@ -70,40 +70,48 @@ describe Protobuf::ActiveRecord::Serialization do
       context "when options has :only" do
         it "only returns the given field(s)" do
           fields = user._filter_field_attributes(:only => :name)
-          expect(fields).to eq [ :name ]
+          expect(fields).to eq [:name]
         end
       end
 
       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, :photos ])
+          expect(fields).to match_array(
+            [:guid, :email, :email_domain, :password, :nullify, :photos, :created_at, :updated_at]
+          )
         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, :photos ])
+        expect(user._filtered_fields).to match_array(
+          [:guid, :name, :email, :email_domain, :password, :nullify, :photos, :created_at, :updated_at]
+        )
       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, :photos ])
+          expect(fields).to match_array(
+            [:guid, :name, :email, :password, :nullify, :photos, :created_at, :updated_at]
+          )
         end
 
-        context 'and :include => :email_domain' do
-          it 'includes deprecated fields that have been explicitly specified' do
+        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, :photos ])
+            expect(fields).to match_array(
+              [:guid, :name, :email, :email_domain, :password, :nullify, :photos, :created_at, :updated_at]
+            )
           end
         end
       end
     end
 
     describe "#_normalize_options" do
-      let(:options) { { :only => [ :name ] } }
+      let(:options) { { :only => [:name] } }
 
       context "given empty options" do
         before { User.protobuf_message(protobuf_message, options) }
@@ -132,7 +140,7 @@ describe Protobuf::ActiveRecord::Serialization do
       end
 
       context "given options with :except" do
-        let(:options) { { :except => [ :name ] } }
+        let(:options) { { :except => [:name] } }
 
         before { User.protobuf_message(protobuf_message, {}) }
 
@@ -155,7 +163,7 @@ describe Protobuf::ActiveRecord::Serialization do
 
       context "when a transformer is defined for the field" do
         it "gets the field from the transformer" do
-          expect(user.fields_from_record[:email_domain]).to eq('test.co')
+          expect(user.fields_from_record[:email_domain]).to eq("test.co")
         end
       end
 

data/spec/protobuf/active_record/transformation_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Protobuf::ActiveRecord::Transformation do
   let(:user) { User.new(user_attributes) }
-  let(:user_attributes) { { :first_name => 'foo', :last_name => 'bar', :email => 'foo@test.co' } }
-  let(:proto_hash) { { :name => 'foo bar', :email => 'foo@test.co' } }
+  let(:user_attributes) { { :first_name => "foo", :last_name => "bar", :email => "foo@test.co" } }
+  let(:proto_hash) { { :name => "foo bar", :email => "foo@test.co" } }
   let(:proto) { UserMessage.new(proto_hash) }
 
   describe "._filter_attribute_fields" do
@@ -14,18 +14,18 @@ describe Protobuf::ActiveRecord::Transformation do
 
     it "filters repeated fields" do
       attribute_fields = User._filter_attribute_fields(proto)
-      expect(attribute_fields.has_key?(:tags)).to be false
+      expect(attribute_fields.key?(:tags)).to be false
     end
 
     it "includes attributes that aren't fields, but have attribute transformers" do
-      allow(User).to receive(:_protobuf_attribute_transformers).and_return({ :account_id => :fetch_account_id })
+      allow(User).to receive(:_protobuf_attribute_transformers).and_return(:account_id => :fetch_account_id)
       attribute_fields = User._filter_attribute_fields(proto)
-      expect(attribute_fields.has_key?(:account_id)).to be true
+      expect(attribute_fields.key?(:account_id)).to be true
     end
 
     it "includes fields that aren't attributes, but have attribute transformers" do
       attribute_fields = User._filter_attribute_fields(proto)
-      expect(attribute_fields.has_key?(:password)).to be true
+      expect(attribute_fields.key?(:password)).to be true
     end
   end
 
@@ -108,7 +108,7 @@ describe Protobuf::ActiveRecord::Transformation do
   end
 
   describe ".attributes_from_proto" do
-    let(:callable) { lambda { |proto| 1 } }
+    let(:callable) { lambda { |_proto| 1 } }
     let(:transformer) { ::Protobuf::ActiveRecord::Transformer.new(callable) }
 
     context "when a transformer is defined for the attribute" do
@@ -119,12 +119,12 @@ describe Protobuf::ActiveRecord::Transformation do
     end
 
     context "when a transformer is a callable that returns nil" do
-      let(:callable) { lambda { |proto| nil } }
+      let(:callable) { lambda { |_proto| nil } }
 
       before do
         transformers = User._protobuf_attribute_transformers
         allow(User).to receive(:_protobuf_attribute_transformers).and_return(
-          {:account_id => transformer}.merge(transformers)
+          { :account_id => transformer }.merge(transformers)
         )
       end
 
@@ -134,15 +134,15 @@ describe Protobuf::ActiveRecord::Transformation do
       end
     end
 
-    context 'when the transformer has a nullify_on option' do
-      let(:callable) { lambda { |proto| nil } }
+    context "when the transformer has a nullify_on option" do
+      let(:callable) { lambda { |_proto| nil } }
       let(:transformer) { ::Protobuf::ActiveRecord::Transformer.new(callable, :nullify_on => :account_id) }
-      let(:proto_hash) { { :name => 'foo bar', :email => 'foo@test.co', :nullify => [:account_id] } }
+      let(:proto_hash) { { :name => "foo bar", :email => "foo@test.co", :nullify => [:account_id] } }
 
       before do
         transformers = User._protobuf_attribute_transformers
         allow(User).to receive(:_protobuf_attribute_transformers).and_return(
-          {:account_id => transformer}.merge(transformers)
+          { :account_id => transformer }.merge(transformers)
         )
       end
 
@@ -156,7 +156,7 @@ describe Protobuf::ActiveRecord::Transformation do
       before do
         transformers = User._protobuf_attribute_transformers
         allow(User).to receive(:_protobuf_attribute_transformers).and_return(
-          {:account_id => transformer}.merge(transformers)
+          { :account_id => transformer }.merge(transformers)
         )
       end
 
@@ -168,7 +168,7 @@ describe Protobuf::ActiveRecord::Transformation do
 
     context "when a transformer is not defined for the attribute" do
       before {
-        allow(User).to receive(:_protobuf_convert_fields_to_attributes) do |key, value|
+        allow(User).to receive(:_protobuf_convert_fields_to_attributes) do |_key, value|
           value
         end
       }
@@ -182,7 +182,7 @@ describe Protobuf::ActiveRecord::Transformation do
 
   describe ".attribute_from_proto" do
     context "when the given transformer is a symbol" do
-      let(:callable) { lambda { |value| User.__send__(:extract_first_name) } }
+      let(:callable) { lambda { |_value| User.__send__(:extract_first_name) } }
 
       before { User.attribute_from_proto :first_name, :extract_first_name }
 
@@ -199,9 +199,9 @@ describe Protobuf::ActiveRecord::Transformation do
     end
 
     context "when the given transformer is callable" do
-      let(:callable) { lambda { |proto| nil } }
+      let(:callable) { lambda { |_proto| nil } }
 
-      before { allow(User).to receive(:_protobuf_attribute_transformers).and_return(Hash.new) }
+      before { allow(User).to receive(:_protobuf_attribute_transformers).and_return({}) }
 
       it "adds the given converter to the list of protobuf field transformers" do
         User.attribute_from_proto :account_id, callable

data/spec/protobuf/active_record/transformer_spec.rb

@@ -1,39 +1,39 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe ::Protobuf::ActiveRecord::Transformer do
   let(:callable) { lambda { |proto| proto.name } }
-  let(:proto) { ::UserMessage.new(:name => 'test', :nullify => ['name']) }
+  let(:proto) { ::UserMessage.new(:name => "test", :nullify => ["name"]) }
   let(:options) { {} }
 
   subject { described_class.new(callable, options) }
 
-  describe '#call' do
-    it 'calls the callable' do
+  describe "#call" do
+    it "calls the callable" do
       result = subject.call(proto)
-      expect(result).to eq('test')
+      expect(result).to eq("test")
     end
   end
 
-  describe '#nullify?' do
-    context 'no nullify_on set' do
-      it 'returns false' do
+  describe "#nullify?" do
+    context "no nullify_on set" do
+      it "returns false" do
         expect(subject.nullify?(proto)).to eq(false)
       end
     end
 
-    context 'nullify_on name' do
+    context "nullify_on name" do
       let(:options) { { :nullify_on => :name } }
 
-      context 'invalid message' do
+      context "invalid message" do
         let(:proto) { ::UserSearchMessage.new }
 
-        it 'returns false' do
+        it "returns false" do
           expect(subject.nullify?(proto)).to eq(false)
         end
       end
 
-      context 'valid message' do
-        it 'returns true' do
+      context "valid message" do
+        it "returns true" do
           expect(subject.nullify?(proto)).to eq(true)
         end
       end

data/spec/support/db.rb

@@ -1 +1 @@
-require 'support/db/setup'
+require "support/db/setup"

data/spec/support/db/setup.rb

@@ -1,4 +1,4 @@
-require 'active_record'
+require "active_record"
 
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",
@@ -14,7 +14,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :url
     t.integer :user_id
 
-    t.timestamps null: false
+    t.timestamps :null => false
   end
 
   create_table :users do |t|
@@ -24,6 +24,6 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :email
     t.integer :account_id
 
-    t.timestamps null: false
+    t.timestamps :null => false
   end
 end

data/spec/support/definitions/messages.proto

@@ -1,16 +1,20 @@
+syntax = "proto3";
+
 message PhotoMessage {
-  optional string url       = 1;
-  optional int64  user_guid = 2;
+  string url       = 1;
+  int64  user_guid = 2;
 }
 
 message UserMessage {
-  optional string guid         = 1;
-  optional string name         = 2;
-  optional string email        = 3;
-  optional string email_domain = 4 [deprecated = true];
-  optional string password     = 5;
+  string guid         = 1;
+  string name         = 2;
+  string email        = 3;
+  string email_domain = 4 [deprecated = true];
+  string password     = 5;
   repeated string nullify      = 6;
   repeated PhotoMessage photos = 7;
+  int64 created_at = 8;
+  int64 updated_at = 9;
 }
 
 message UserSearchMessage {

data/spec/support/models.rb

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

data/spec/support/models/user.rb

@@ -16,7 +16,8 @@ class User < ActiveRecord::Base
   attribute_from_proto :last_name, :extract_last_name
   attribute_from_proto :password, lambda { |proto| proto.password! }
 
-  field_from_record :email_domain, lambda { |record| record.email.split('@').last }
+  field_from_record :email_domain, lambda { |record| record.email.split("@").last }
+  field_from_record :password, :password_transformer
 
   def self.extract_first_name(proto)
     if proto.field?(:name)
@@ -37,6 +38,11 @@ class User < ActiveRecord::Base
     last_name
   end
 
+  def self.password_transformer(user)
+    # Simple way to test field transformers that call methods
+    user.password
+  end
+
   def token
     "key"
   end

data/spec/support/protobuf/messages.pb.rb

@@ -30,6 +30,8 @@ class UserMessage
   optional :string, :password, 5
   repeated :string, :nullify, 6
   repeated ::PhotoMessage, :photos, 7
+  optional :int64, :created_at, 8
+  optional :int64, :updated_at, 9
 end
 
 class UserSearchMessage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mad_rubocop
+  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
@@ -202,6 +216,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -263,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers integration for Active Record