active_record_to_hash 0.6.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e8bbf44746f19ae03204f3238d41433e302883bc243765972a1a069ab005845
-  data.tar.gz: a83790ab70b421afc22c71439e7ea98e00998268eba7853eb2310269039b9920
+  metadata.gz: d58db5d3bc83a1c3d5aeacc76b93c4a74170cd56f4ccce73a7c2fbda1c231bad
+  data.tar.gz: a386699d79c74de0ea5a1f6446544ac90a61c56b355abff1bb17b40c1f1a1f52
 SHA512:
-  metadata.gz: fe083b2d28d5751e5ca19cabf36cd4d8b82c17e88a6e9c703c0d56dfe16ea8b0f46eeed46629f06c11cfd2fbd684b3c9bfc22c1608f44545c4542287b53f6892
-  data.tar.gz: 178ba98dee7b6e7a9865cb998a21f99b2860affbf5553677971a079726370aa1d8af625ee62821d390b1e53178b8de446af97eed177aac9ef91f657eda7fbc49
+  metadata.gz: 9131d35e459532105d66f8144d73c152a6f0a66f1f1e366ddfdbacd34b6ee223c1b6457ce03682be00323db915ed09eadabda846ad5056c7aaac61b0e8e1dfca
+  data.tar.gz: 5ca180e0781e2bad5bfc98a697394ee44d6c9ab87a8222e81bc25041810af1df57cd291962a9f3529edee7ae3c8c63e92e17ca6ff27c2654f7699d5a5defc06d

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

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)
@@ -31,11 +37,11 @@ module ActiveRecordToHash
     ActiveRecordToHash.to_a(options[:scope]).each do |scope|
       value = ActiveRecordToHash.call_scope(value, scope)
     end
-    return value.public_send(callee, options.except(:alter)) if value.is_a? ::ActiveRecord::Base
+    return value.public_send(callee, options.except(:alter)) if value.is_a? ::ActiveRecordToHash::ActiveRecord
 
     if value.is_a?(Array) || value.is_a?(::ActiveRecord::Relation)
       return value.map do |obj|
-        next obj.public_send(callee, options.except(:alter)) if obj.is_a? ::ActiveRecord::Base
+        next obj.public_send(callee, options.except(:alter)) if obj.is_a? ::ActiveRecordToHash::ActiveRecord
 
         obj
       end

data/lib/active_record_to_hash/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecordToHash
-  VERSION = '0.6.0'.freeze
+  VERSION = '1.1.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.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Masamoto Miyata
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2022-07-21 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: []