formify 0.16.0 → 0.17.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09b226440478b6b89edbee6d137934281da2c347fd48681e5b205eb4039e0582'
-  data.tar.gz: 85399692540ed00fe2f26f88273f300a9a7bdaa1a7c82c95102f3a59b89d8aa2
+  metadata.gz: e6d85707d12681f8344a9b5a8a12fae50ed194fe5c051dcbe6c1ccfc143df843
+  data.tar.gz: a6a565b5acfc240738049529103d90beabdd99f10b841265eb080e32afb50105
 SHA512:
-  metadata.gz: 6646b9167f6ab241864284b64e88b3ec851e4fa7a4c00f08597e53e32bfbdc1a50a084ef65152bfa1ed9796c51f74f276652da618195f4189797fe92784de282
-  data.tar.gz: 3af2ea3e9492d8cd839b2198bb96153fa18b71ce4890e40407cfea4b1a07b3741d3a8d0130e4c94599db6868e502f433adc9350f93fdf4d9f95c0b626f28a626
+  metadata.gz: 7a72509aadd70c77d3d8f23f1ad7c5148c5022658ce2c82db2d1b0020a8d4b36519c2dcaa958721d51aa24e70b6d474b3a24bc5b81a9c8e399888dc8b326f1c3
+  data.tar.gz: 37398a9a1fb561d7d9e9c2467dfdf9d5b61ea4295e3f92803a4a9df1d222a66bacd620aad597a3168c450cdf61c2d0e3433c248b8a9ff51038b2f23618d6489f

data/Gemfile.lock

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

data/README.md

@@ -122,42 +122,36 @@ describe Forms::Widgets::Create, type: :form do
   it { expect(value).to be_a(Widget) } # Model name inferred
 
   context '#bar' do
-    # Attribute: :bar
     it { expect_error_with_missing_attribute(:bar) }
     xit { expect_error_with_attribute_value(:bar, BAR_BAD_VALUE, message: nil) } # :message is optional
     xit { expect_valid_with_attribute_value(:bar, BAR_GOOD_VALUE) }
   end
 
   context '#baz' do
-    # Attribute: :baz
     it { expect_error_with_missing_attribute(:baz) }
     xit { expect_error_with_attribute_value(:baz, BAZ_BAD_VALUE, message: nil) } # :message is optional
     xit { expect_valid_with_attribute_value(:baz, BAZ_GOOD_VALUE) }
   end
 
   context '#created_by' do
-    # Attribute: :created_by
     it { expect_error_with_missing_attribute(:created_by) }
     xit { expect_error_with_attribute_value(:created_by, CREATED_BY_BAD_VALUE, message: nil) } # :message is optional
     xit { expect_valid_with_attribute_value(:created_by, CREATED_BY_GOOD_VALUE) }
   end
 
   context '#foo' do
-    # Attribute: :foo
     it { expect_error_with_missing_attribute(:foo) }
     xit { expect_error_with_attribute_value(:foo, FOO_BAD_VALUE, message: nil) } # :message is optional
     xit { expect_valid_with_attribute_value(:foo, FOO_GOOD_VALUE) }
   end
 
   context '#owner' do
-    # Attribute: :owner
     it { expect_error_with_missing_attribute(:owner) }
     xit { expect_error_with_attribute_value(:owner, OWNER_BAD_VALUE, message: nil) } # :message is optional
     xit { expect_valid_with_attribute_value(:owner, OWNER_GOOD_VALUE) }
   end
 
   context '#owner_attribute' do
-    # Attribute: :owner_attribute
     it { expect_error_with_missing_attribute(:owner_attribute) }
     xit { expect_error_with_attribute_value(:owner_attribute, OWNER_ATTRIBUTE_BAD_VALUE, message: nil) } # :message is optional
     xit { expect_valid_with_attribute_value(:owner_attribute, OWNER_ATTRIBUTE_GOOD_VALUE) }

data/lib/formify/version.rb

@@ -1,3 +1,3 @@
 module Formify
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.17.7'.freeze
 end

data/lib/generators/form/form_generator.rb

@@ -49,8 +49,11 @@ class FormGenerator < Rails::Generators::NamedBase
                         .sort
   end
 
-  def attributes
-    @attributes ||= attributes_and_delegates.keys.sort
+  def attributes_with_delegates
+    @attributes_with_delegates ||= attributes_and_delegates
+      .select { |k, v| v.present? }
+      .keys
+      .sort
   end
 
   def attributes_and_delegates
@@ -69,6 +72,10 @@ class FormGenerator < Rails::Generators::NamedBase
     @collection_name ||= collection.camelcase
   end
 
+  def create?
+    form.downcase.include?('create')
+  end
+
   def delegated_attributes
     @delegated_attributes ||= attributes_and_delegates
       .select { |_k, v| v.sort!.present? }
@@ -109,6 +116,16 @@ class FormGenerator < Rails::Generators::NamedBase
     @pluralize_collection ||= options[:pluralize_collection]
   end
 
+  def return_attribute
+    @return_attribute ||= begin
+      if all_attributes.include?(collection.singularize)
+        collection.singularize
+      else
+        form_attributes.split(':').first
+      end
+    end
+  end
+
   def scopes
     @scopes ||= split_name[0..-3].map(&:underscore)
   end

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

@@ -4,9 +4,9 @@
 class <%= form_name %>
   include Formify::Form
 
-  attr_accessor :<%= attributes.first %><%= ',' if attributes.count > 1 %>
-<% attributes[1..-1].each_with_index do |attr, i| -%>
-                :<%= attr %><%= ',' unless attributes.count - 2 == i %>
+  attr_accessor :<%= attributes_with_delegates.first %><%= ',' if attributes_with_delegates.count > 1 %>
+<% attributes_with_delegates[1..-1].each_with_index do |attr, i| -%>
+                :<%= attr %><%= ',' unless attributes_with_delegates.count - 2 == i %>
 <% end -%>
 
 <% delegated_attributes.each do |to_attr, delegates| -%>
@@ -17,6 +17,8 @@ class <%= form_name %>
                     to: :<%= to_attr %>
 <% end -%>
 
+  before_validation :before_validation_do_something
+
   validates_presence_of :<%= all_attributes.first %><%= ',' if all_attributes.count > 1 %>
 <% all_attributes[1..-1].each_with_index do |attr, i| -%>
                         :<%= attr %><%= ',' unless all_attributes.count - 2 == i %>
@@ -24,7 +26,11 @@ class <%= form_name %>
 
   # validate :validate_something
 
-  initialize_with :<%= attributes.join(', :') %> do |attributes|
+  initialize_with :<%= attributes_with_delegates.join(', :') %> do |attributes|
+<% if create? -%>
+    self.<%= collection.singularize %> ||= <%= inferred_model_name %>.new
+
+<% end -%>
     puts attributes
   end
 
@@ -34,15 +40,21 @@ class <%= form_name %>
     with_advisory_lock_transaction(:foo) do
       validate_or_fail
         .and_then { <%= name.split('/').reverse[0..1].map(&:singularize).join('_').underscore %> }
-        .and_then { success(<%= attributes.first %>) }
+        .and_then { success(<%= return_attribute %>) }
     end
   end
 
   private
 
   def <%= name.split('/').reverse[0..1].map(&:singularize).join('_').underscore %>
+    raise NotImplementedError
+
+    success(<%= return_attribute %>)
   end
 
+  # def before_validation_do_something
+  # end
+
   # def validate_something
   # end
 end

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

@@ -23,7 +23,6 @@ describe Forms::<%= class_name %>, type: :form do
 
 <% all_attributes.each do |attr| -%>
   context '#<%= attr %>' do
-    # Attribute: :<%= attr %>
     it { expect_error_with_missing_attribute(:<%= attr %>) }
     xit { expect_error_with_attribute_value(:<%= attr %>, <%= attr.upcase %>_BAD_VALUE, message: nil) } # :message is optional
     xit { expect_valid_with_attribute_value(:<%= attr %>, <%= attr.upcase %>_GOOD_VALUE) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formify
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.7
 platform: ruby
 authors:
 - Ryan Jackson