active_record_to_hash 0.6.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9c9d98bbc5b3ed0685b3035223f5341bc53dfb34801cf29a8cb230a25da64a2
-  data.tar.gz: f6c3418611ee57c74110e7476edddff951a79c7b907e989c345fa5914b7671b7
+  metadata.gz: 20265c61f8ff4e0694c84ab3ffaf7b7e18682a3691b96f2d2c308b9e5be3cd4f
+  data.tar.gz: 603bd1960eda432c40686cd7a34ec4ec03c45680f66a6195eb9ab021606832a6
 SHA512:
-  metadata.gz: 9f0722328f1402d5d2f553b3a1dc67d38188d2b3e1222a78cd1939da18adff9c5528a07e0b89c3a0db7c5b5f7bbefbb3e62d193e50ed536fa5b5f728c01822ab
-  data.tar.gz: c19513248e007a10fac4b2e8250d31b0c492e287257191185105cdd466770908c03b576037049a0eeeacdd8ccc8c775f7ad40c75f9710db5206d9358fa9d85e6
+  metadata.gz: 1659acaeb6f1eba556b735690b9f5aa1aabb0a4e19b5a71320e59dbf059a8b9c893a81fb8bef698b68e57a77f142843f025323b86cfb25233b27183cf7135f82
+  data.tar.gz: 60d3a968325e50cb34979f2abbd57ed6f450332ee58fc24d2c2457a9c43839185ea44dae1612e1eeba0f313025b87ddd5483ee8404188f85d5eeb6ebab9b1e12

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError

data/lib/active_record_to_hash/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecordToHash
   module ActiveRecord
     extend ActiveSupport::Concern
@@ -21,6 +23,8 @@ module ActiveRecordToHash
 
         ActiveRecordToHash.handle_with_options(options) do |hash_key, attr_name, child_options|
           child = ActiveRecordToHash.retrieve_child_attribute(self, attr_name, child_options, __callee__)
+          next if child_options[:optional] == true && child.blank?
+
           result[hash_key] = ActiveRecordToHash.handle_alter(child, child_options)
         end
 

data/lib/active_record_to_hash/utilities.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecordToHash
   module_function
 
@@ -18,7 +20,11 @@ module ActiveRecordToHash
   end
 
   def retrieve_child_attribute(record, attr_name, options, callee) # rubocop:disable Metrics/AbcSize
-    return options[:value] if options[:value]
+    if options[:value]
+      return options[:value].call(record) if options[:value].is_a? Proc
+
+      return options[:value]
+    end
 
     args = options[:args] || []
     value = record.public_send(attr_name, *args)

data/lib/active_record_to_hash/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecordToHash
-  VERSION = '0.6.1'.freeze
+  VERSION = '1.2.0'
 end

data/lib/active_record_to_hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecordToHash
   class Railtie < ::Rails::Railtie
     config.active_record_to_hash = ActiveSupport::OrderedOptions.new
@@ -8,7 +10,7 @@ module ActiveRecordToHash
       require 'active_record_to_hash/version'
       require 'active_record_to_hash/utilities'
       require 'active_record_to_hash/active_record'
-      ::ActiveRecord::Base.send(:include, ::ActiveRecordToHash::ActiveRecord)
+      ::ActiveRecord::Base.include ::ActiveRecordToHash::ActiveRecord
     end
   end
 end

data/lib/tasks/active_record_to_hash_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # desc "Explaining what the task does"
 # task :active_record_to_hash do
 #   # Task goes here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_to_hash
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Masamoto Miyata
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-03 00:00:00.000000000 Z
+date: 2022-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 6.1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 6.1.4.4
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -128,48 +128,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.75.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.75.0
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +217,7 @@ homepage: https://github.com/gomo/active_record_to_hash
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,15 +225,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Add the `to_hash` function to active record.
 test_files: []