formify 0.23.3 → 0.23.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d387f14adee1aab5ba2f626904abe5fc20eee18f8c6d82c0968970d45850ea5d
-  data.tar.gz: 9b42bb3728eacc41ed335b072cb7ff62674b8962c0a88a89b7b807e178751fcd
+  metadata.gz: b8ec24756e4113f41b073fae53bea2727af37448702997cb7300ad998e711892
+  data.tar.gz: 67a4b6381c4d1f450aa5d4f4f8d129503ab9ac8ae5f3295a10439ef9d8f5fe98
 SHA512:
-  metadata.gz: a4370591ee00cd01b5326083af40b14e68782cff2372a6d07976f9e1dbac031ed1650f83a078c8b27a6e72e4f4e8b3888cb617f24b936af142ecd6f9266beb61
-  data.tar.gz: 64f08ef88b34e267d7e85c2caf7c6db5426ec06e9232a75607b66b51e8266aa67136c79187b1685813aade23ba194ef8eba8e47a819c4b2f37a0a06ec607b1fd
+  metadata.gz: e4247a9ffe03b3ada26969f4aeedb22581fb42e7eb6980a06c3ac8fb32c2317c7a48e1c365c8a9a403077dad6efac8cb3c77f5c4243161e1c77895762c9bf15c
+  data.tar.gz: 52e1920e659391229a66c0b26e01426d433a84fc508ab39c0b2152028479e0916652a9481170bd0268b461eeddb79f4cdcba69770f5bf19d3ced1c5d8fc55589

data/.gitignore

@@ -49,4 +49,5 @@ build-iPhoneSimulator/
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
 
-.rspec_status
+.rspec_status
+.DS_Store

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    formify (0.23.3)
+    formify (0.23.4)
       rails
       resonad
       with_advisory_lock
@@ -9,63 +9,63 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.2.1)
-      actionpack (= 6.0.2.1)
+    actioncable (6.0.2.2)
+      actionpack (= 6.0.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actionmailbox (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activejob (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
+      activestorage (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      actionview (= 6.0.2.1)
-      activejob (= 6.0.2.1)
+    actionmailer (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.1)
-      actionview (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actiontext (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
+      activestorage (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.2.1)
-      activesupport (= 6.0.2.1)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.2.1)
-      activesupport (= 6.0.2.1)
+    activejob (6.0.2.2)
+      activesupport (= 6.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord (6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activestorage (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activerecord (6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activestorage (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activejob (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
       marcel (~> 0.3.1)
-    activesupport (6.0.2.1)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -88,40 +88,40 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     nio4r (2.5.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    rack (2.1.2)
+    rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.2.1)
-      actioncable (= 6.0.2.1)
-      actionmailbox (= 6.0.2.1)
-      actionmailer (= 6.0.2.1)
-      actionpack (= 6.0.2.1)
-      actiontext (= 6.0.2.1)
-      actionview (= 6.0.2.1)
-      activejob (= 6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activerecord (= 6.0.2.1)
-      activestorage (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    rails (6.0.2.2)
+      actioncable (= 6.0.2.2)
+      actionmailbox (= 6.0.2.2)
+      actionmailer (= 6.0.2.2)
+      actionpack (= 6.0.2.2)
+      actiontext (= 6.0.2.2)
+      actionview (= 6.0.2.2)
+      activejob (= 6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activerecord (= 6.0.2.2)
+      activestorage (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       bundler (>= 1.3.0)
-      railties (= 6.0.2.1)
+      railties (= 6.0.2.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.2.1)
-      actionpack (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -164,7 +164,7 @@ GEM
     websocket-extensions (0.1.4)
     with_advisory_lock (4.6.0)
       activerecord (>= 4.2)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

data/lib/formify/controller_helpers.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Formify
+  module ControllerHelpers # :nodoc:
+    extend ActiveSupport::Concern
+
+    included do
+      def redirect_to_with_flash(*args, **keywords)
+        keywords.slice(%i[danger info success]).each do |k, v|
+          flash[k] = v
+        end
+
+        Rails.logger.info "Redirecting to: #{args.first}"
+
+        super(*args, **keywords)
+      end
+
+      def render_form_result(form:, on_failure: nil, on_success: nil, result:)
+        if result.success?
+          if form.translation_success.present?
+            flash[:success] = form.translation_success
+          end
+          on_success.call(result) if on_success.present?
+        elsif on_failure.is_a?(Proc)
+          flash[:danger] = result.error.message
+          on_failure.call(result) if on_failure.present?
+        else
+          flash.now[:danger] = result.error.message
+          render on_failure
+        end
+
+        yield(result) if block_given?
+      end
+
+      def save_and_render_form(form:, on_failure: nil, on_success: nil, &block)
+        render_form_result(
+          form: form,
+          on_failure: on_failure,
+          on_success: on_success,
+          result: form.save,
+          &block
+        )
+      end
+    end
+  end
+end

data/lib/formify/version.rb

@@ -1,3 +1,3 @@
 module Formify
-  VERSION = '0.23.3'.freeze
+  VERSION = '0.23.4'.freeze
 end

data/lib/generators/form/form_generator.rb

@@ -49,12 +49,22 @@ class FormGenerator < Rails::Generators::NamedBase
 
   def all_attributes
     @all_attributes ||= begin
-      ret = flattened_form_attributes
+      flattened_form_attributes
         .map(&:strip)
         .sort
     end
   end
 
+  def all_attributes_to_pass
+    @all_attributes_to_pass ||= begin
+      ret = flattened_form_attributes
+            .map(&:strip)
+            .sort
+      ret.delete(first_attribute) if create?
+      ret
+    end
+  end
+
   def attributes_with_delegates
     @attributes_with_delegates ||= attributes_and_delegates.keys.sort
   end

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

@@ -24,8 +24,8 @@ describe Forms::<%= class_name %>, type: :form do
 <% if all_attributes.any? %>
   let(:attributes) do
     {
-<% all_attributes.each_with_index do |attr, i| -%>
-      <%= attr %>: <%= attr %><%= ',' unless all_attributes.count == (i + 1)%>
+<% all_attributes_to_pass.each_with_index do |attr, i| -%>
+      <%= attr %>: <%= attr %><%= ',' unless all_attributes_to_pass.count == (i + 1)%>
 <% end -%>
     }
   end
@@ -34,10 +34,14 @@ describe Forms::<%= class_name %>, type: :form do
   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| -%>
+  it { expect(value.<%= attr %>).to eq(<%= attr %>)}
+<% end -%>
 <% all_attributes.each do |attr| -%>
 
   describe '#<%= attr %>' do
     it { expect_error_with_missing_attribute(:<%= attr %>) }
+    it { expect_error_with_attribute_value(:<%= attr %>, nil) }
     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) }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formify
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.23.4
 platform: ruby
 authors:
 - Ryan Jackson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-01 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ files:
 - bin/setup
 - formify.gemspec
 - lib/formify.rb
+- lib/formify/controller_helpers.rb
 - lib/formify/errors/form_error.rb
 - lib/formify/errors/validation_error.rb
 - lib/formify/form.rb