deep_cloneable_checked 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4e5dde0e5922d0b2eb088d978ac52a98e18d71f1bfd84d0a660d4e9118d6a9f
-  data.tar.gz: d5e02afde0d474a5f9d1059de864899505670d57e93c6c0b91b153474d5f6058
+  metadata.gz: ae5f15517f7b64bd368d8300ea9837609f3d6b1f8f38dde1f3981d5cc421f69c
+  data.tar.gz: ceb59ba3f33a98bd04a452dab32395ee56cd37796b061efb93322541ebc3210e
 SHA512:
-  metadata.gz: 4b355de3f95ba257137c67346fb9144d5d31757a50d5379cf20d0c2e35c3755b160ae400bbbf287196ef03310964aa78bda80ed866accfadac7cff3c3b9a9c23
-  data.tar.gz: 21bc6b8c52a092b392cc032f1396870f7ebb7bab72ed8adc692e49f9ee2f8c5904803a1d3cc64077987c3577f0f66e358d4ff880bfa9bbd9f4b7a9c3cc248b4d
+  metadata.gz: 1952904ebd2460c0f7277123f73db60a40451641a011989257af0f3e053a2e4a07a6459b87792c19e6c1c363082e3519d58f8a3fba92a2e89319e8b37198adf4
+  data.tar.gz: 4e74c7ff8b65d57445ad752581878035845ab52e377585d688485aa5e103950c0d77a7e45ffbe2b0f8188842874691805b71a6b767eaf76b0d7047748a45d798

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+*.log

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deep_cloneable_checked (0.1.0)
+    deep_cloneable_checked (1.0.0)
       deep_cloneable (~> 3.2.0)
 
 GEM
@@ -23,7 +23,7 @@ GEM
     diff-lcs (1.5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
     rake (12.3.3)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)

data/deep_cloneable_checked.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Kaori Kohama", "Tinco Andringa"]
   spec.email         = ["kaori@aeroscan.nl", "tinco@aeroscan.nl"]
 
-  spec.summary       = %q{Use this gem to enforce all associations are explicitly cloned or excluded with deep_clone}
-  spec.description   = %q{Use this gem to enforce all associations are explicitly cloned or excluded with deep_clone}
+  spec.summary       = %q{Use this gem to enforce all associations explicitly cloned with deep_clone}
+  spec.description   = %q{Use this gem to enforce all associations explicitly cloned with deep_clone}
   spec.homepage      = "https://github.com/aeroscan-nl/deep_cloneable_checked"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")

data/lib/deep_cloneable_checked/deep_clone_checked.rb

@@ -1,14 +1,6 @@
 module DeepCloneableChecked
   module DeepCloneChecked
     def deep_clone_checked(options)
-      if options[:include].is_a?(Hash) || options[:include].is_a?(Symbol)
-        options[:include] = [options[:include]]
-      end
-  
-      if options[:exclude].is_a?(Hash) || options[:exclude].is_a?(Symbol)
-        options[:exclude] = [options[:exclude]]
-      end
-  
       missing = validate_clone_check(options)
       
       unless missing.empty?
@@ -19,56 +11,26 @@ module DeepCloneableChecked
     end
   
     def validate_clone_check(options)
-      find_symbol_or_hash = lambda do |options, association_name|
-        
-        result = options.find do |option|
-          if option.is_a? Symbol
-            option.to_s == association_name
-          elsif option.is_a? Hash
-            option[association_name.to_sym]
-          else
-            nil
-          end
-        end
-        result
-      end
-  
       check_missing = lambda do |klass, includes, excludes|
+        includes = DeepCloneableChecked.options_to_hash(includes)
+        excludes = DeepCloneableChecked.options_to_hash(excludes)
         # puts "-----------\n klass: #{klass.name}, includes: #{includes.inspect}, excludes: #{excludes.inspect}"
         associations = klass.reflections
   
         associations.map do |association_name, reflection|
+          next_excludes = excludes[association_name.to_sym]
+          next_includes = includes[association_name.to_sym]
   
-          to_exclude = find_symbol_or_hash[excludes, association_name]
-          if to_exclude.is_a? Symbol
-            next_excludes = []
-          elsif to_exclude.is_a? Array
-            next_excludes = to_exclude
-          elsif to_exclude.nil?
-            next_excludes = []
-          else
-            next_excludes = to_exclude[association_name.to_sym]
-          end
-  
-          inclusion = find_symbol_or_hash[includes, association_name]
-  
-          if inclusion.is_a? Symbol
-            # puts "inclusion: #{inclusion.inspect}, association_name: #{association_name}" 
-            result = check_missing[reflection.klass, [], next_excludes]
-            if !result.blank?
-              # puts "missing from #{reflection.klass.name}, #{association_name}"
-              Hash[association_name.to_sym, result]
-            end
-          elsif inclusion.is_a? Hash
+          if next_includes
             # puts "inclusion: #{inclusion.inspect}, association_name: #{association_name}"
-            result = check_missing[reflection.klass, [inclusion[association_name.to_sym]], next_excludes]
+            result = check_missing[reflection.klass, next_includes, next_excludes]
             if !result.blank?
               # puts "missing from #{reflection.klass.name}, #{association_name}"
               Hash[association_name.to_sym, result]
             end
           else
             # puts "No inclusion for #{association_name}, inclusion: #{inclusion.inspect}, to_exclude: #{to_exclude.inspect}"
-            if to_exclude.is_a? Symbol
+            if next_excludes
               nil
             else
               # puts "No exclusion either"

data/lib/deep_cloneable_checked/utilities.rb

@@ -0,0 +1,24 @@
+module DeepCloneableChecked
+  def self.options_to_hash(options)
+    case options
+    when Hash
+      options
+    when Array
+      options_array_to_hash(options)
+    else
+      options_array_to_hash([options])
+    end
+  end
+
+  def self.options_array_to_hash(options)
+    hash = {}
+    options.each do |o|
+      if o.is_a? Hash
+        hash.deep_merge! o
+      else
+        hash[o] = []
+      end
+    end
+    hash
+  end
+end

data/lib/deep_cloneable_checked/version.rb

@@ -1,3 +1,3 @@
 module DeepCloneableChecked
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/deep_cloneable_checked.rb

@@ -1,11 +1,14 @@
 require "deep_cloneable_checked/version"
 require 'deep_cloneable'
+require 'deep_cloneable_checked/utilities'
 require 'deep_cloneable_checked/deep_clone_checked'
 
 module DeepCloneableChecked
   class MissingAssociationError < StandardError; end
 end
 
-ActiveSupport.on_load :active_record do
-  include DeepCloneableChecked::DeepCloneChecked
+if defined?(ActiveSupport)
+  ActiveSupport.on_load :active_record do
+    include DeepCloneableChecked::DeepCloneChecked
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: deep_cloneable_checked
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kaori Kohama
 - Tinco Andringa
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_cloneable
@@ -25,8 +25,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
-description: Use this gem to enforce all associations are explicitly cloned or excluded
-  with deep_clone
+description: Use this gem to enforce all associations explicitly cloned with deep_clone
 email:
 - kaori@aeroscan.nl
 - tinco@aeroscan.nl
@@ -49,6 +48,7 @@ files:
 - deep_cloneable_checked.gemspec
 - lib/deep_cloneable_checked.rb
 - lib/deep_cloneable_checked/deep_clone_checked.rb
+- lib/deep_cloneable_checked/utilities.rb
 - lib/deep_cloneable_checked/version.rb
 homepage: https://github.com/aeroscan-nl/deep_cloneable_checked
 licenses:
@@ -57,7 +57,7 @@ metadata:
   homepage_uri: https://github.com/aeroscan-nl/deep_cloneable_checked
   source_code_uri: https://github.com/aeroscan-nl/deep_cloneable_checked
   changelog_uri: https://github.com/aeroscan-nl/deep_cloneable_checked/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -72,9 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
-summary: Use this gem to enforce all associations are explicitly cloned or excluded
-  with deep_clone
+summary: Use this gem to enforce all associations explicitly cloned with deep_clone
 test_files: []