protobuf-activerecord 6.1.0 → 7.1.0

data/lib/protobuf/active_record/transformation.rb

@@ -35,23 +35,21 @@ module Protobuf
 
           filtered_attributes = _filtered_attributes + _protobuf_attribute_transformers.keys
 
-          attribute_fields = filtered_attributes.inject({}) do |hash, column_name|
+          attribute_fields = filtered_attributes.each_with_object({}) do |column_name, hash|
             symbolized_column = column_name.to_sym
 
             if fields.key?(symbolized_column) || _protobuf_attribute_transformers.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
+            nested_attribute_name = :"#{attribute_name}_attributes"
             value = if proto.field?(nested_attribute_name)
-                      proto.__send__(nested_attribute_name)
-                    elsif proto.field?(attribute_name)
-                      proto.__send__(attribute_name)
-                    end
+              proto.__send__(nested_attribute_name)
+            elsif proto.field?(attribute_name)
+              proto.__send__(attribute_name)
+            end
 
             next unless value
             attribute_fields[nested_attribute_name] = value
@@ -64,7 +62,7 @@ module Protobuf
         #
         # :nodoc:
         def _filtered_attributes
-          return self.attribute_names
+          attribute_names
         end
 
         # :nodoc:
@@ -72,18 +70,19 @@ module Protobuf
           return nil if value.nil?
           return value unless _protobuf_date_datetime_time_or_timestamp_column?(key)
 
-          value = case
-                  when _protobuf_datetime_column?(key) then
-                    convert_int64_to_datetime(value)
-                  when _protobuf_timestamp_column?(key) then
-                    convert_int64_to_time(value)
-                  when _protobuf_time_column?(key) then
-                    convert_int64_to_time(value)
-                  when _protobuf_date_column?(key) then
-                    convert_int64_to_date(value)
-                  end
-
-          return value
+          if _protobuf_datetime_column?(key)
+
+            convert_int64_to_datetime(value)
+          elsif _protobuf_timestamp_column?(key)
+
+            convert_int64_to_time(value)
+          elsif _protobuf_time_column?(key)
+
+            convert_int64_to_time(value)
+          elsif _protobuf_date_column?(key)
+
+            convert_int64_to_date(value)
+          end
         end
 
         # Define an attribute transformation from protobuf. Accepts a Symbol,
@@ -113,7 +112,7 @@ module Protobuf
           symbol_or_block = args.first || block
 
           if symbol_or_block.is_a?(Symbol)
-            callable = lambda { |value| self.__send__(symbol_or_block, value) }
+            callable = lambda { |value| __send__(symbol_or_block, value) }
           else
             raise AttributeTransformerError unless symbol_or_block.respond_to?(:call)
             callable = symbol_or_block
@@ -138,7 +137,7 @@ module Protobuf
         def attributes_from_proto(proto)
           attribute_fields = _filter_attribute_fields(proto)
 
-          attributes = attribute_fields.inject({}) do |hash, (key, value)|
+          attributes = attribute_fields.each_with_object({}) do |(key, value), hash|
             if _protobuf_attribute_transformers.key?(key)
               transformer = _protobuf_attribute_transformers[key]
               attribute = transformer.call(proto)
@@ -147,8 +146,6 @@ module Protobuf
             else
               hash[key] = _protobuf_convert_fields_to_attributes(key, value)
             end
-
-            hash
           end
 
           return attributes unless proto.field?(:nullify) && proto.nullify.is_a?(Array)

data/lib/protobuf/active_record/transformer.rb

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

data/lib/protobuf/active_record/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module ActiveRecord
-    VERSION = "6.1.0"
+    VERSION = "7.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-activerecord
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Adam Hutchison
-autorequire:
-bindir: bin
+autorequire: 
+bindir: exe
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -80,132 +80,6 @@ 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: 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
-    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: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.0
-- !ruby/object:Gem::Dependency
-  name: rspec-pride
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: pry-nav
-  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: simplecov
-  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: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  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'
 description: Provides the ability to create Active Record objects from Protocol Buffer
   messages and vice versa.
 email:
@@ -214,11 +88,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
-- Gemfile
+- ".standard.yml"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -240,27 +114,14 @@ files:
 - lib/protobuf/active_record/transformer.rb
 - lib/protobuf/active_record/validations.rb
 - 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
-- spec/protobuf/active_record/transformation_spec.rb
-- spec/protobuf/active_record/transformer_spec.rb
-- spec/spec_helper.rb
-- spec/support/db.rb
-- spec/support/db/setup.rb
-- spec/support/definitions/messages.proto
-- spec/support/models.rb
-- spec/support/models/photo.rb
-- spec/support/models/user.rb
-- spec/support/protobuf/messages.pb.rb
 homepage: http://github.com/liveh2o/protobuf-activerecord
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  homepage_uri: http://github.com/liveh2o/protobuf-activerecord
+  source_code_uri: http://github.com/liveh2o/protobuf-activerecord
+  changelog_uri: http://github.com/liveh2o/protobuf-activerecord/blob/main/CHANGELOG.md
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -268,30 +129,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.4.22
+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
-- spec/protobuf/active_record/transformation_spec.rb
-- spec/protobuf/active_record/transformer_spec.rb
-- spec/spec_helper.rb
-- spec/support/db.rb
-- spec/support/db/setup.rb
-- spec/support/definitions/messages.proto
-- spec/support/models.rb
-- spec/support/models/photo.rb
-- spec/support/models/user.rb
-- spec/support/protobuf/messages.pb.rb
+test_files: []

data/.gitignore

@@ -1,12 +0,0 @@
-*.db
-*.gem
-.DS_Store
-.bundle
-.config
-.rvmrc
-.yardoc
-.ruby-*
-Gemfile.lock
-coverage
-pkg/*
-tmp

data/.travis.yml

@@ -1,4 +0,0 @@
----
-language: ruby
-rvm:
-  - 2.5

data/Gemfile

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

data/protobuf-activerecord.gemspec

@@ -1,43 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "protobuf/active_record/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "protobuf-activerecord"
-  spec.version       = Protobuf::ActiveRecord::VERSION
-  spec.authors       = ["Adam Hutchison"]
-  spec.email         = ["liveh2o@gmail.com"]
-  spec.homepage      = "http://github.com/liveh2o/protobuf-activerecord"
-  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($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"]
-
-  ##
-  # Dependencies
-  #
-  spec.add_dependency "activerecord", "~> 6.1.0"
-  spec.add_dependency "activesupport", "~> 6.1.0"
-  spec.add_dependency "concurrent-ruby"
-  spec.add_dependency "heredity", ">= 0.1.1"
-  spec.add_dependency "protobuf", ">= 3.0"
-
-  ##
-  # 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"
-  spec.add_development_dependency "pry-nav"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "sqlite3", ">= 1.4"
-  spec.add_development_dependency "timecop"
-end

data/spec/protobuf/active_record/columns_spec.rb

@@ -1,100 +0,0 @@
-require "spec_helper"
-
-describe Protobuf::ActiveRecord::Columns do
-  describe "._protobuf_map_columns" do
-    context "when the class has a table" do
-      let(:expected_column_names) {
-        User.columns.inject({}) do |hash, column|
-          hash[column.name.to_sym] = column
-          hash
-        end
-      }
-
-      let(:expected_column_types) {
-        User.columns.inject({}) do |hash, column|
-          hash[column.type.to_sym] ||= ::Set.new
-          hash[column.type.to_sym] << column.name.to_sym
-          hash
-        end
-      }
-
-      it "maps columns by name" do
-        expect(User._protobuf_columns).to eq expected_column_names
-      end
-
-      it "maps column names by column type" do
-        expected_column_types.each do |expected_column_type, value|
-          expect(User._protobuf_column_types).to include expected_column_type => value
-        end
-      end
-    end
-  end
-
-  context "column type predicates" do
-    before { allow(User).to receive(:_protobuf_column_types).and_return({}) }
-
-    describe "._protobuf_date_column?" do
-      before { User._protobuf_column_types[:date] = [:foo_date] }
-
-      context "when the column type is :date" do
-        it "is true" do
-          expect(User._protobuf_date_column?(:foo_date)).to be true
-        end
-      end
-
-      context "when the column type is not :date" do
-        it "is false" do
-          expect(User._protobuf_date_column?(:bar_date)).to be false
-        end
-      end
-    end
-
-    describe "._protobuf_datetime_column?" do
-      before { User._protobuf_column_types[:datetime] = [:foo_datetime] }
-
-      context "when the column type is :datetime" do
-        it "is true" do
-          expect(User._protobuf_datetime_column?(:foo_datetime)).to be true
-        end
-      end
-
-      context "when the column type is not :datetime" do
-        it "is false" do
-          expect(User._protobuf_datetime_column?(:bar_datetime)).to be false
-        end
-      end
-    end
-
-    describe "._protobuf_time_column?" do
-      before { User._protobuf_column_types[:time] = [:foo_time] }
-
-      context "when the column type is :time" do
-        it "is true" do
-          expect(User._protobuf_time_column?(:foo_time)).to be true
-        end
-      end
-
-      context "when the column type is not :time" do
-        it "is false" do
-          expect(User._protobuf_time_column?(:bar_time)).to be false
-        end
-      end
-    end
-
-    describe "._protobuf_timestamp_column?" do
-      before { User._protobuf_column_types[:timestamp] = [:foo_timestamp] }
-
-      context "when the column type is :timestamp" do
-        it "is true" do
-          expect(User._protobuf_timestamp_column?(:foo_timestamp)).to be true
-        end
-      end
-
-      context "when the column type is not :timestamp" do
-        it "is false" do
-          expect(User._protobuf_timestamp_column?(:bar_timestamp)).to be false
-        end
-      end
-    end
-  end
-end

data/spec/protobuf/active_record/nested_attributes_spec.rb

@@ -1,28 +0,0 @@
-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/persistence_spec.rb

@@ -1,70 +0,0 @@
-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(:proto) { UserMessage.new(proto_hash) }
-
-  describe ".create" do
-    it "accepts a protobuf message" do
-      expect_any_instance_of(User).to receive(:save)
-      User.create(proto)
-    end
-
-    it "accepts a hash" do
-      expect_any_instance_of(User).to receive(:save)
-      User.create(user_attributes)
-    end
-  end
-
-  describe ".create!" do
-    it "accepts a protobuf message" do
-      expect_any_instance_of(User).to receive(:save!)
-      User.create!(proto)
-    end
-
-    it "accepts a hash" do
-      expect_any_instance_of(User).to receive(:save!)
-      User.create!(user_attributes)
-    end
-  end
-
-  describe "#assign_attributes" do
-    let(:user) { ::User.new }
-
-    it "accepts a protobuf message" do
-      user.assign_attributes(proto)
-      expect(user.changed?).to be true
-    end
-
-    it "accepts a hash" do
-      user.assign_attributes(user_attributes)
-      expect(user.changed?).to be true
-    end
-  end
-
-  describe "#update" do
-    it "accepts a protobuf message" do
-      expect_any_instance_of(User).to receive(:save)
-      user.update(proto)
-    end
-
-    it "accepts a hash" do
-      expect_any_instance_of(User).to receive(:save)
-      user.update(user_attributes)
-    end
-  end
-
-  describe "#update!" do
-    it "accepts a protobuf message" do
-      expect_any_instance_of(User).to receive(:save!)
-      user.update!(proto)
-    end
-
-    it "accepts a hash" do
-      expect_any_instance_of(User).to receive(:save!)
-      user.update!(user_attributes)
-    end
-  end
-end