object_attorney 2.2.10 → 2.2.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDAxYWFmNjYzNmRjNTFhYzlkMzg3YTQ4ODdkOTBhZWQ1ZTU4MmQxMg==
+    ZDNjNTU1NmM2MDhkZmIwODRlMjE1ZjhmMmRiYzI5ODFlMzFlZDIxMg==
   data.tar.gz: !binary |-
-    Y2UzMDRjMWY2NmM5Y2RkOTZlZDg2MjFiYzBhOGQ5MDlmMjFkNjVmYQ==
+    MjQ0NGYyYjg1NmRhMzY1NGVjZGFiZGYzODk1NGQyMTJjMWJkMzFhNg==
 SHA512:
   metadata.gz: !binary |-
-    NjRkMDgwZmVkZTM3MzNjMjIwMzY4MWUwMTE1ZDQzYjRmZTgyYzNlNWRhNjJk
-    NGIwOTk1OWVmMjhlZDEyYzJmYTQxYTFjZDZjN2E1Njg5YjQwMGFjMDFkNjQx
-    ZDI1NGRjMzkwZWM0NzkxOGMzNzMyNWQ3N2YzZjA3Yzg3YTk2YTM=
+    NTMyNDA4MDY3N2UyZDJmMDgxNzU5OWQ1N2JhNWZlOWRiN2Q2YzE1MDg2MTQ4
+    OGMzNmE0ZTgwZjEyNzc2YjU4ZjFjOWI0ODEzYzdiMDNmODI4N2VlYjI3NDk3
+    ZWNmYTc0MmRkODdmYzFhNTEzOTM1MzdkNTM0OGQ0NWViODg1ZGU=
   data.tar.gz: !binary |-
-    NWJkZjBiYmEzNWEyNjM3NWMxNzZhYWRkYjA4NDc5MDc0ZDQyMTNiZjJmMDdk
-    ZTcyZDA3YWM0MWY2OWViNGU1ZDNlYTRmNGIxMDhkNjlkMGExYTVjMzkxZWI3
-    NWZiMjMyZjA3NjFhOTk5ZTRkNGRkZmNlYWFiYWMyYmFkZTRjOTk=
+    ZmZhZmRmZjNlODA1YzkyMzQ5MzcyNGQzODRkNWM3ZTZlNjJkN2JkZTdkOWFl
+    ZDdhZDc2ZjcyYzdiMDc4ODkxZjdiZWI0MjNhODljNWYyOTRlOTMwMzdkMDk2
+    NzlkOTc3NGI0NDkxNTBjYjVhYzdhNjJiZGVlYWY0N2EyMTg3YmY=

data/lib/object_attorney/helpers.rb

@@ -7,6 +7,11 @@ module ObjectAttorney
     def is_integer?(string)
       string.match(/^(\d)+$/)
     end
+    
+    def singularize(class_name)
+      class_name = class_name.to_s
+      plural?(class_name) ? class_name.singularize : class_name
+    end
 
     def plural?(string)
       string = string.to_s

data/lib/object_attorney/nested_objects.rb

@@ -126,7 +126,7 @@ module ObjectAttorney
         nested_object.assign_attributes(attributes_without_destroy(attributes))
         mark_for_destruction_if_necessary(nested_object, attributes)
       else
-        nested_object = send("build_#{nested_object_name.to_s.singularize}", attributes_without_destroy(attributes))
+        nested_object = send("build_#{Helpers.singularize(nested_object_name)}", attributes_without_destroy(attributes))
         mark_for_destruction_if_necessary(nested_object, attributes)
       end
 
@@ -157,7 +157,7 @@ module ObjectAttorney
       (send("#{nested_object_name}_attributes") || {}).values.each do |attributes|
         next if attributes["id"].present? || attributes[:id].present?
 
-        new_nested_object = send("build_#{nested_object_name.to_s.singularize}", attributes_without_destroy(attributes))
+        new_nested_object = send("build_#{Helpers.singularize(nested_object_name)}", attributes_without_destroy(attributes))
         next unless new_nested_object
 
         mark_for_destruction_if_necessary(new_nested_object, attributes)

data/lib/object_attorney/reflection.rb

@@ -18,7 +18,7 @@ module ObjectAttorney
     end
 
     def single_name
-      @single_name ||= options[:single_name] || single_name_default
+      @single_name ||= options[:single_name] || Helpers.singularize(name)
     end
 
     def plural_name
@@ -27,11 +27,6 @@ module ObjectAttorney
 
     private ################################# private
 
-    def single_name_default
-      class_name = name.to_s
-      Helpers.plural?(class_name) ? class_name.singularize : class_name
-    end
-
     def klass_default(class_name)
       if Helpers.plural?(class_name)
         class_name.to_s.singularize.camelize

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "2.2.10"
+  VERSION = "2.2.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.11
 platform: ruby
 authors:
 - João Gonçalves