formify 0.17.11 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92290bd077f34427d7c3fae643e120c50f755e03a4b963c207fb9ae577b55943
-  data.tar.gz: bc297f0e277b6a95d97505e14006bb1a04a8e3a5575d520b5460e7a74ca5b525
+  metadata.gz: 5af8a8ef17424640f0c17ab10db57a3d33583502d782735f25105f86137af652
+  data.tar.gz: b5e92fbef6b454208e670d5e4b62c6e88700256a81720857c45c6a70603680b5
 SHA512:
-  metadata.gz: 4591c40b0b78d043982d6eaa1bf9a00b5ca594cb0c960d4d784965a6b65973a9aa395383637aecfa671735da9a3ee128cb417a6284d529ef2a9a818d73e539f6
-  data.tar.gz: 769ab8597e36f6a1eaaaee557ef466298bdbd6944a1ce70f75a7c51a4344c559d06a4baca31b7961ec6e914ea6842572b41733e8f561cfbd8a28993c00ac4609
+  metadata.gz: f831d099c2c6e6322bce4f2d560510068118912d6659e4d6653706cc1160f103759609e04fa7bc54a468cf4bf5b06d0c89c2705e30744c7bf47301dbc38e1d89
+  data.tar.gz: b841eebd0201d2523a1ffab9d356fb1b2c931b90d4f82a67d5868c4307fc8e86d7c1cb25abd013eb1fcf9868dbbdf6c64d62a604194291dfffa6c1303d31991b

data/Gemfile.lock

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

data/lib/formify/version.rb

@@ -1,3 +1,3 @@
 module Formify
-  VERSION = '0.17.11'.freeze
+  VERSION = '0.18.0'.freeze
 end

data/lib/generators/form/form_generator.rb

@@ -16,6 +16,11 @@ class FormGenerator < Rails::Generators::NamedBase
                 description: 'Disable naming convention transformations like forcing plural collections',
                 type: :boolean
 
+  class_option  :spec_comments,
+                default: true,
+                description: 'Set to false to not include any comments in generated specs.',
+                type: :boolean
+
   def transform_naming
     return unless pluralize_collection?
 
@@ -85,6 +90,18 @@ class FormGenerator < Rails::Generators::NamedBase
                               .map(&:first)
   end
 
+  def factory?(attr)
+    factories.include?(attr.to_sym)
+  end
+
+  def factory_bot?
+    @factory_bot = Class.const_defined?(FactoryBot)
+  end
+
+  def factories
+    @factories ||= FactoryBot.factories.map(&:name)
+  end
+
   def form
     @form ||= name.split('/').last.to_s.underscore
   end
@@ -131,6 +148,10 @@ class FormGenerator < Rails::Generators::NamedBase
     @scope_names ||= scopes.map(&:camelcase)
   end
 
+  def spec_comments?
+    @spec_comments ||= options[:spec_comments]
+  end
+
   def split_name
     @split_name ||= name.split('/')
   end

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

@@ -6,20 +6,30 @@ require 'formify/spec_helpers'
 describe Forms::<%= class_name %>, type: :form do
   include Formify::SpecHelpers
 
+<% all_attributes.each do |attr| -%>
+<% if factory_bot? && factory?(attr) -%>
+  let(:<%= attr %>) { FacotryBot.create(<%= attr %>) }
+<% else -%>
+  let(:<%= attr %>) { <%= attr.upcase %>_VALUE }
+<% 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 -%>
   let(:attributes) do
     {
 <% all_attributes.each_with_index do |attr, i| -%>
-      <%= attr %>: <%= attr.upcase %>_VALUE<%= ',' unless all_attributes.count == (i + 1)%>
+      <%= attr %>: <%= attr %><%= ',' unless all_attributes.count == (i + 1)%>
 <% end -%>
     }
   end
 
-  it { expect_valid } # Expect the form to be valid
+  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 %>) } # Model name inferred
+  it { expect(value).to be_a(<%= inferred_model_name %>) }<% if spec_comments? -%> # Model name inferred<% end -%>
 
 <% all_attributes.each do |attr| -%>
   describe '#<%= attr %>' do
@@ -29,8 +39,10 @@ describe Forms::<%= class_name %>, type: :form do
   end
 
 <% end -%>
+<% if spec_comments? -%>
   # Other Expectation Helpers
   # xit { expect_error_message(message) }
   # xit { expect_error_with_attribute(attribute) }
   # xit { expect_not_valid(attribute: nil, message: nil) } # :attribute and :message are optional
+<% end -%>
 end

metadata

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