optimism 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01a5d3eb1eeb8bc21e9a623ad9d463fef69cc06ac62ac666e037af72b601e9bd
-  data.tar.gz: ed537ddaca81ef485091adf82b79e7bee0583c0a80fe55c9e73614f10c1308e5
+  metadata.gz: e9ef3c31e6d2b3a6505e1e75ccc288669585e79bac805929c958d6a34158b39f
+  data.tar.gz: a90c0cc4dd2ab94fc8871306b26b9d4384bc7c5311846521ee0f475ab0f8caa5
 SHA512:
-  metadata.gz: 196cff2cf80e4dd60b696f94b06295c860b1c98bd2e16faae8980784347510335f674682ae6eb25f726e5e5d71da7af1f12ad201241f921f7705cfe0439f8211
-  data.tar.gz: b693707d8c5ac6807b70772bce0057b85a014ddc4b5e96bf94168674616808ce3c3003d86ea0842c143d6633cec9b1c3fef139fd4a842d35fe11cd49826d1abf
+  metadata.gz: 192cd07601317a751e09fed5aedcf7eacfaa2efbb3a1bd9c09abb116b9d75a98700ce0e6a185ae08cc3c0a3310b544b8a769e02a83dfb94c80a8abc91c06c87e
+  data.tar.gz: 0373c6ed5264430d53b4c84a0361cddbe5c6e6b084b47a38b8990ea957c94d8210139b4668198ec3c8724bbd1ea709ef9a83c02432eedc3bc68e1a40f8a44d89

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    optimism (0.3.0)
+    optimism (0.3.1)
       cable_ready (>= 4)
       rack (~> 2.0)
       rails (>= 6, >= 5.2)

data/lib/optimism.rb

@@ -57,9 +57,13 @@ module Optimism
     attributes.keys.each do |attribute|
       if attribute.ends_with?("_attributes")
         resource = attribute[0..-12]
-        nested_models = model.send(resource.to_sym)
-        nested_models.each_with_index do |nested, index|
-          process_resource(nested, attributes[attribute][index.to_s], ancestry + [resource, index]) if attributes[attribute].key?(index.to_s)
+        association = model.send(resource.to_sym)
+        if association.respond_to? :each_with_index
+          association.each_with_index do |nested, index|
+            process_resource(nested, attributes[attribute][index.to_s], ancestry + [resource, index]) if attributes[attribute].key?(index.to_s)
+          end
+        else
+          process_resource(association, attributes[attribute], ancestry + [resource])
         end
       else
         process_attribute(model, attribute, ancestry.dup)
@@ -69,7 +73,11 @@ module Optimism
 
   def process_attribute(model, attribute, ancestry)
     resource = ancestry.shift
-    resource += "_#{ancestry.shift}_attributes_#{ancestry.shift}" until ancestry.empty?
+    if ancestry.size == 1
+      resource += "_#{ancestry.shift}_attributes"
+    else
+      resource += "_#{ancestry.shift}_attributes_#{ancestry.shift}" until ancestry.empty?
+    end
     container_selector, error_selector = Optimism.container_selector.sub("RESOURCE", resource).sub("ATTRIBUTE", attribute), Optimism.error_selector.sub("RESOURCE", resource).sub("ATTRIBUTE", attribute)
     if model.errors.any? && model.errors.messages.map(&:first).include?(attribute.to_sym)
       message = "#{model.errors.full_message(attribute.to_sym, model.errors.messages[attribute.to_sym].first)}#{Optimism.suffix}"

data/lib/optimism/version.rb

@@ -1,3 +1,3 @@
 module Optimism
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optimism
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - leastbad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler