formify 0.22.1 → 0.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93fa0eb3fcb3e0606edd50934a3735d162c754a185e4c7370fd9cff62550557e
-  data.tar.gz: 483bf4d0efe4fe84ac5e373440648593d0532abbeb2c21e8b2eee0c1e22944ad
+  metadata.gz: 8c9c91aa13403c65348f1652cbbc302b585217c07954344e62a59b8d312ad62c
+  data.tar.gz: 73c457fae48a9a848c6f830f247d26bf8ed37469aefb25b33153369f83f98c56
 SHA512:
-  metadata.gz: 36eb88fae988cc25a0a49d1c810070efc63933260816d2d10c875b014e7e3d28f3d702aff819244d27cb22b7e83286edf0717ef5c8e0b8b405ccf0763f80005b
-  data.tar.gz: 182fdd8af9058ee0625e0938477d58a9ae9d6d055f0b000c21f939059badfcc064e2213c20a18583eae4ea62bd3a0737e850c9e8a5c3b4b8dc5ef8dc317ceede
+  metadata.gz: 1adbc0904dda3e2275a67af0bd939232e0e23883c1d42d7097a3588c09af37532668b67128074da4a8c0b74b1b30ca2a2b32cea5a354c2eb3e82ea148817681d
+  data.tar.gz: f0eac5d0a2d4e2ed3eeea2ace303d9207f0da5ea31d551f66b38c092ff357b71a2b311d9010f4b77167fc87c62e30be479dffdfa561d8f2ddbc15893e1a56bdf

data/Gemfile.lock

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

data/lib/formify/version.rb

@@ -1,3 +1,3 @@
 module Formify
-  VERSION = '0.22.1'.freeze
+  VERSION = '0.22.2'.freeze
 end

data/lib/generators/form/form_generator.rb

@@ -7,9 +7,10 @@ class FormGenerator < Rails::Generators::NamedBase
   # check_class_collision
 
   argument  :form_attributes,
+            default: [],
+            description: 'A list of attributes and their delegates: foo:bar,baz',
             type: :array,
-            required: true,
-            description: 'A list of attributes and their delegates: foo:bar,baz'
+            required: false
 
   class_option  :pluralize_collection,
                 default: true,
@@ -47,9 +48,11 @@ class FormGenerator < Rails::Generators::NamedBase
   private
 
   def all_attributes
-    @all_attributes ||= flattened_form_attributes
-                        .map(&:strip)
-                        .sort
+    @all_attributes ||= begin
+      ret = flattened_form_attributes
+        .map(&:strip)
+        .sort
+    end
   end
 
   def attributes_with_delegates
@@ -76,14 +79,11 @@ class FormGenerator < Rails::Generators::NamedBase
     form == 'create'
   end
 
-  def create?
-    form == 'create'
-  end
-
   def delegated_attributes
     @delegated_attributes ||= attributes_and_delegates
                               .select { |_k, v| v.sort!.present? }
   end
+
   def destroy_attribute
     @destroy_attribute ||= begin
       if all_attributes.include?(collection.singularize)
@@ -113,7 +113,7 @@ class FormGenerator < Rails::Generators::NamedBase
 
   def factory_bot?
     @factory_bot ||= begin
-      require 'factory-bot'
+      require 'factory_bot'
       FactoryBot.find_definitions
       Class.const_defined?('FactoryBot')
     end
@@ -181,10 +181,8 @@ class FormGenerator < Rails::Generators::NamedBase
       "update_#{collection.singularize}"
     elsif upsert?
       "upsert_#{collection.singularize}"
-    elsif form.include?('_')
-      form
     else
-      "#{form}_#{collection.singularize}"
+      form
     end
   end
 
@@ -208,8 +206,8 @@ class FormGenerator < Rails::Generators::NamedBase
     @return_attribute ||= begin
       if all_attributes.include?(collection.singularize)
         collection.singularize
-      else
-        form_attributes.split(':').first
+      elsif !form_attributes.first.nil?
+        form_attributes.first.split(':').first
       end
     end
   end

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

@@ -3,29 +3,31 @@
 <% module_namespacing do -%>
 class <%= form_name %>
   include Formify::Form
-
+<% if attributes_with_delegates.any? -%>
   attr_accessor :<%= attributes_with_delegates.first %><%= ',' if attributes_with_delegates.count > 1 %>
-<% attributes_with_delegates[1..-1].each_with_index do |attr, i| -%>
+<% (attributes_with_delegates[1..-1] || []).each_with_index do |attr, i| -%>
                 :<%= attr %><%= ',' unless attributes_with_delegates.count - 2 == i %>
 <% end -%>
+<% end -%>
 
 <% delegated_attributes.each do |to_attr, delegates| -%>
   delegate_accessor :<%= delegates.first %>,
-<% delegates[1..-1].each_with_index do |attr, i| -%>
+<% (delegates[1..-1] || []).each_with_index do |attr, i| -%>
                     :<%= attr %>,
 <% end -%>
                     to: :<%= to_attr %>
-<% end -%>
 
+<% end -%>
   # before_validation :before_validation_do_something
-
+<% if all_attributes.any? %>
   validates_presence_of :<%= all_attributes.first %><%= ',' if all_attributes.count > 1 %>
-<% all_attributes[1..-1].each_with_index do |attr, i| -%>
+<% (all_attributes[1..-1] || []).each_with_index do |attr, i| -%>
                         :<%= attr %><%= ',' unless all_attributes.count - 2 == i %>
+<% end -%>
 <% end -%>
 
   # validate :validate_something
-
+<% if all_attributes.any? %>
   initialize_with :<%= attributes_with_delegates.join(', :') %> do |attributes|
 <% if create? -%>
     self.<%= method_attribute %> ||= <%= inferred_model_name %>.new
@@ -39,12 +41,15 @@ class <%= form_name %>
     puts attributes
 <% end -%>
   end
+<% end -%>
 
   def save
     with_advisory_lock_transaction(<%= lock_key.join(', ') %>) do
       validate_or_fail
         .and_then { <%= method_name %> }
+<% unless return_attribute.nil? -%>
         .and_then { success(<%= return_attribute %>) }
+<% end -%>
     end
   end
 
@@ -59,7 +64,11 @@ class <%= form_name %>
     raise NotImplementedError
 
 <% end -%>
+<% if return_attribute.nil? -%>
+    success
+<% else -%>
     success(<%= return_attribute %>)
+<% end -%>
   end
 
   # def before_validation_do_something

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

@@ -6,6 +6,7 @@ require 'formify/spec_helpers'
 describe Forms::<%= class_name %>, type: :form do
   include Formify::SpecHelpers
 
+<% if all_attributes.any? %>
 <% all_attributes.each do |attr| -%>
 <% if factory_bot? && factory?(attr) -%>
   let(:<%= attr %>) { FactoryBot.create(:<%= attr %>) }
@@ -14,11 +15,13 @@ describe Forms::<%= class_name %>, type: :form do
 <% end -%>
 <% end -%>
 
+<% end -%>
 <% if spec_comments? -%>
   # :attributes is used to initialize the form.
   # These values should result in a valid form.
   # You can override these in blocks or use let(:attributes_override) { { foo: bar } }
 <% end -%>
+<% if all_attributes.any? %>
   let(:attributes) do
     {
 <% all_attributes.each_with_index do |attr, i| -%>
@@ -27,11 +30,12 @@ describe Forms::<%= class_name %>, type: :form do
     }
   end
 
+<% 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 %>
-
 <% all_attributes.each do |attr| -%>
+
   describe '#<%= attr %>' do
     it { expect_error_with_missing_attribute(:<%= attr %>) }
     xit { expect_error_with_attribute_value(:<%= attr %>, <%= attr.upcase %>_BAD_VALUE, message: nil) } # :message is optional
@@ -40,6 +44,7 @@ describe Forms::<%= class_name %>, type: :form do
 
 <% end -%>
 <% if spec_comments? -%>
+
   # Other Expectation Helpers
   # xit { expect_error_message(message) }
   # xit { expect_error_with_attribute(attribute) }

metadata

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