formify 0.18.2 → 0.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19a6baa487ba12e6ff7c6a49bd3406673517279eeb4579bf7f47995e3982c684
-  data.tar.gz: 4b9666f6b57a47605326591f34157f2d389732c77099203e08860338b4ff5f27
+  metadata.gz: f09550331400ffb9b540f2be6bc0228eade98c38352374cdf8e841579e528293
+  data.tar.gz: 10722046e10c1cc0260aa6d7e1a97df1c3c6413ffb5acef283a73eac24557f07
 SHA512:
-  metadata.gz: 2e18be345eb6ffc2f0eb0f6e2ad1ec23f6e06080149c01d90c4968816349aeadbd8de657d0ffb13529c9165b56247b5b01ad7800322922e8d653140b08741984
-  data.tar.gz: 5480c9f399b71d80730c72d4114e6c8b9c620888b37199f98351881cde0977c3451293d863e4d7db93ef4034fa4d2c37c0c86812638e54fce93b4b65f635f230
+  metadata.gz: 89da3a1e960d23ed6693f1a1eae3a538280cad97d41aca420592cdc60431a9c9a17969058fb3baab323570c5483bf1e3a34572e0033b2073b8a4ab576641dd87
+  data.tar.gz: 6b73750147ba2353700dc2c66c714cae5503bcb2c87f1129a96582d6ad0f422dea78ab7f128d13079fe2b6b4f91659a49e4d2e3fe95a6e53d6c2a8028aeb64f5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    formify (0.18.2)
+    formify (0.21.4)
       rails
       resonad
       with_advisory_lock

data/lib/formify/version.rb

@@ -1,3 +1,3 @@
 module Formify
-  VERSION = '0.18.2'.freeze
+  VERSION = '0.21.4'.freeze
 end

data/lib/generators/form/form_generator.rb

@@ -47,9 +47,7 @@ class FormGenerator < Rails::Generators::NamedBase
   private
 
   def all_attributes
-    @all_attributes ||= form_attributes
-                        .map { |e| e.split(/:|,/).map(&method(:variablefy)) }
-                        .flatten
+    @all_attributes ||= flattened_form_attributes
                         .map(&:strip)
                         .sort
   end
@@ -61,8 +59,8 @@ class FormGenerator < Rails::Generators::NamedBase
   def attributes_and_delegates
     @attributes_and_delegates ||= Hash[
       form_attributes
-        .map { |e| e.split(/:|,/).map(&method(:variablefy)) }
-        .collect { |v| [v[0], v[1..-1]] }
+                                  .map { |e| e.split(/:|,/).map(&method(:variablefy)) }
+                                  .collect { |v| [v[0], v[1..-1]] }
     ]
   end
 
@@ -75,12 +73,29 @@ class FormGenerator < Rails::Generators::NamedBase
   end
 
   def create?
-    form.downcase.include?('create')
+    form == 'create'
+  end
+
+  def create?
+    form == 'create'
   end
 
   def delegated_attributes
     @delegated_attributes ||= attributes_and_delegates
-      .select { |_k, v| v.sort!.present? }
+                              .select { |_k, v| v.sort!.present? }
+  end
+  def destroy_attribute
+    @destroy_attribute ||= begin
+      if all_attributes.include?(collection.singularize)
+        collection.singularize
+      else
+        first_attribute
+      end
+    end
+  end
+
+  def destroy?
+    form == 'destroy'
   end
 
   def duplicate_attributes
@@ -102,8 +117,19 @@ class FormGenerator < Rails::Generators::NamedBase
     @factories ||= FactoryBot.factories.map(&:name)
   end
 
+  def first_attribute
+    @first_attribute ||= flattened_form_attributes.first
+  end
+
+  def flattened_form_attributes
+    @flattened_form_attributes ||= form_attributes
+                                   .map { |e| e.split(/:|,/) }
+                                   .flatten
+                                   .map(&method(:variablefy))
+  end
+
   def form
-    @form ||= name.split('/').last.to_s.underscore
+    @form ||= variablefy(name.split('/').last)
   end
 
   def form_name
@@ -114,6 +140,42 @@ class FormGenerator < Rails::Generators::NamedBase
     @inferred_model_name ||= collection.singularize.camelcase
   end
 
+  def lock_key
+    if create?
+      [":#{collection}", ':create']
+    elsif update?
+      [":#{collection}", method_attribute.to_s]
+    elsif upsert?
+      [":#{collection}", method_attribute.to_s]
+    else
+      ['LOCK_KEY']
+    end
+  end
+
+  def method_attribute
+    @method_attribute ||= begin
+      if all_attributes.include?(collection.singularize)
+        collection.singularize
+      else
+        first_attribute
+      end
+    end
+  end
+
+  def method_name
+    if create?
+      "create_#{collection.singularize}"
+    elsif update?
+      "update_#{collection.singularize}"
+    elsif upsert?
+      "upsert_#{collection.singularize}"
+    elsif form.include?('_')
+      form
+    else
+      "#{form}_#{collection.singularize}"
+    end
+  end
+
   def module_namespacing(&block)
     content = capture(&block)
     modules.reverse.each do |mod|
@@ -166,6 +228,24 @@ class FormGenerator < Rails::Generators::NamedBase
     end
   end
 
+  def update?
+    form == 'update'
+  end
+
+  def upsert?
+    form == 'upsert'
+  end
+
+  def upsert_delegates
+    @upsert_delegates ||= begin
+      if delegated_attributes.key?(method_attribute)
+        delegated_attributes[method_attribute]
+      else
+        []
+      end
+    end
+  end
+
   def variablefy(val)
     val.to_s.underscore
   end

data/lib/generators/form/templates/form.rb.tt

@@ -28,27 +28,37 @@ class <%= form_name %>
 
   initialize_with :<%= attributes_with_delegates.join(', :') %> do |attributes|
 <% if create? -%>
-    self.<%= collection.singularize %> ||= <%= inferred_model_name %>.new
-
+    self.<%= method_attribute %> ||= <%= inferred_model_name %>.new
+<% elsif upsert? -%>
+  self.<%= method_attribute %> ||= <%= inferred_model_name %>.find_or_initialize_by(
+<% upsert_delegates.each_with_index do |attr, i| -%>
+    <%= attr %>: attributes[:<%= attr %>]<%= ',' unless upsert_delegates.count - 2 == i %>
 <% end -%>
+  )
+<% else -%>
     puts attributes
+<% end -%>
   end
 
   def save
-    raise NotImplementedError
-
-    with_advisory_lock_transaction(:foo) do
+    with_advisory_lock_transaction(<%= lock_key.join(', ') %>) do
       validate_or_fail
-        .and_then { <%= name.split('/').reverse[0..1].map(&:singularize).join('_').underscore %> }
+        .and_then { <%= method_name %> }
         .and_then { success(<%= return_attribute %>) }
     end
   end
 
   private
 
-  def <%= name.split('/').reverse[0..1].map(&:singularize).join('_').underscore %>
+  def <%= method_name %>
+<% if create? || upsert? || update? -%>
+    <%= method_attribute %>.save!
+<% elsif destroy? -%>
+    <%= method_attribute %>.destroy!
+<% else -%>
     raise NotImplementedError
 
+<% end -%>
     success(<%= return_attribute %>)
   end
 

data/lib/generators/form/templates/form_spec.rb.tt

@@ -8,7 +8,7 @@ describe Forms::<%= class_name %>, type: :form do
 
 <% all_attributes.each do |attr| -%>
 <% if factory_bot? && factory?(attr) -%>
-  let(:<%= attr %>) { FacotryBot.create(<%= attr %>) }
+  let(:<%= attr %>) { FactoryBot.create(:<%= attr %>) }
 <% else -%>
   let(:<%= attr %>) { <%= attr.upcase %>_VALUE }
 <% end -%>
@@ -27,9 +27,9 @@ describe Forms::<%= class_name %>, type: :form do
     }
   end
 
-  it { expect_valid }<% if spec_comments? -%> # Expect the form to be valid<% end -%>
+  it { expect_valid }<% if spec_comments? -%> # Expect the form to be valid<% end %>
   it { expect(result).to be_success }
-  it { expect(value).to be_a(<%= inferred_model_name %>) }<% if spec_comments? -%> # Model name inferred<% end -%>
+  it { expect(value).to be_a(<%= inferred_model_name %>) }<% if spec_comments? -%> # Model name inferred<% end %>
 
 <% all_attributes.each do |attr| -%>
   describe '#<%= attr %>' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formify
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.21.4
 platform: ruby
 authors:
 - Ryan Jackson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2019-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler