formify 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8817447649c9d1d84e70b0dc42c9bc885015b308f770590b7f259d080d17515
-  data.tar.gz: df7070b4016f81f3a4dde7aeb9f03e4f09a316791f0e67eaa144aa3a073d4d3f
+  metadata.gz: 1bd463cb45e56a78846363c509874052ea0b0e172c8dfd4b7015f652dce998c7
+  data.tar.gz: ead9810fb43a0bdad43f919221ed2c964aef6e26fa032898b029ae4998b1e6aa
 SHA512:
-  metadata.gz: e2562f47d7a925553d905ed031c104ecc80e031693c729c9ba8c06e2661ea7bc53c0504bb075c242c341637eb1885353eb0e54444f8ce68206d362f310fea614
-  data.tar.gz: 2f28a0259aa0ba2b75e3b33b0101c1d93a23733fba71bd8c4435094197f213b74f8c583aec7b87fd826dd6437495ac0827fb45ad466f7f886e8a02709044ff34
+  metadata.gz: c8f31a0487e61fcc35ece263d92f90737b0e63e7defb194730a80fb1005695438378cf5b8c8b649715a819a94aa36b81c8fd31b5a552959c456cfc81f220505a
+  data.tar.gz: 7df77eb9274c738e10cc9301cc798a3a815656d18aee60887ea2feb538682f49227608e9e8a917db9e96e975fe7e87325d684f17aba705bd980a820539d90cf6

data/.gitignore

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    formify (0.14.1)
+    formify (0.15.0)
       rails
       resonad
 

data/lib/formify/form.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+
 module Formify
   module Form
     extend ActiveSupport::Concern

data/lib/formify/version.rb

@@ -1,3 +1,3 @@
 module Formify
-  VERSION = '0.14.1'.freeze
+  VERSION = '0.15.0'.freeze
 end

data/lib/generators/form/form_generator.rb

@@ -6,6 +6,17 @@ class FormGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('templates', __dir__)
   # check_class_collision
 
+  argument  :form_attributes,
+            type: :array,
+            required: true,
+            description: 'A list of attributes and their delegates: foo:bar,baz'
+
+  def validate_fixed_attrs
+    return unless duplicate_attributes.any?
+
+    raise "Cannot have duplicate attributes: #{duplicate_attributes.join(', ')}"
+  end
+
   def generate_form
     template 'form.rb', File.join('app/lib/forms', class_path, "#{file_name}.rb")
   end
@@ -16,6 +27,42 @@ class FormGenerator < Rails::Generators::NamedBase
 
   private
 
+  def all_attributes
+    @all_attributes ||= form_attributes
+                        .map { |e| e.split(/:|,/).map(&method(:variablefy)) }
+                        .flatten
+                        .map(&:strip)
+                        .sort
+  end
+
+  def attributes
+    @attributes ||= attributes_and_delegates.keys.sort
+  end
+
+  def attributes_and_delegates
+    @attributes_and_delegates ||= Hash[
+      form_attributes
+        .map { |e| e.split(/:|,/).map(&method(:variablefy)) }
+        .collect { |v| [v[0], v[1..-1]] }
+    ]
+  end
+
+  def delegated_attributes
+    @delegated_attributes ||= attributes_and_delegates
+      .select { |_k, v| v.sort!.present? }
+  end
+
+  def duplicate_attributes
+    @duplicate_attributes ||= all_attributes
+                              .group_by { |e| e }
+                              .select { |_k, v| v.size > 1 }
+                              .map(&:first)
+  end
+
+  def inferred_model_name
+    @inferred_model_name ||= name.split('/')[-2].singularize.camelcase
+  end
+
   def module_namespacing(&block)
     content = capture(&block)
     modules.reverse.each do |mod|
@@ -28,6 +75,10 @@ class FormGenerator < Rails::Generators::NamedBase
     @modules ||= ['Forms'] + name.split('/')[0..-2].map(&:to_s).map(&:camelcase)
   end
 
+  def variablefy(val)
+    val.to_s.underscore
+  end
+
   def wrap_with_module(content, mod)
     content = indent(content).chomp
     "module #{mod}\n#{content}\nend\n"

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

@@ -4,36 +4,44 @@
 class <%= name.split('/').last.to_s.camelcase %>
   include Formify::Form
 
-  # attr_accessor :fixed_attr
+  attr_accessor :<%= attributes.first %><%= ',' if attributes.count > 1 %>
+<% attributes[1..-1].each_with_index do |attr, i| -%>
+                :<%= attr %><%= ',' unless attributes.count - 2 == i %>
+<% end -%>
 
-  # delegate_accessor :bar
-  #                   :baz,
-  #                   to: :fixed_attr
+<% delegated_attributes.each do |to_attr, delegates| -%>
+  delegate_accessor :<%= delegates.first %>,
+<% delegates[1..-1].each_with_index do |attr, i| -%>
+                    :<%= attr %>,
+<% end -%>
+                    to: :<%= to_attr %>
+<% end -%>
 
-  # validates_presence_of :foo
-  #                       :bar,
-  #                       :baz
+  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 %>
+<% end -%>
 
   # validate :validate_something
 
-  # initialize_with :fixed_attr do |attributes|
-  #   puts attributes
-  # end
+  initialize_with :<%= attributes.join(', :') %> do |attributes|
+    puts attributes
+  end
 
   def save
     raise NotImplementedError
 
     with_advisory_lock_transaction(:foo) do
       validate_or_fail
-        .and_then { form_method }
-        .and_then { success(fixed_attr) }
+        .and_then { <%= name.split('/').reverse[0..1].map(&:singularize).join('_').underscore %> }
+        .and_then { success(<%= attributes.first %>) }
     end
   end
 
   private
 
-  # def form_method
-  # end
+  def <%= name.split('/').reverse[0..1].map(&:singularize).join('_').underscore %>
+  end
 
   # def validate_something
   # end

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

@@ -6,12 +6,34 @@ require 'formify/spec_helpers'
 describe Forms::<%= class_name %>, type: :form do
   include Formify::SpecHelpers
 
+  # :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 } }
   let(:attributes) do
     {
-
+<% all_attributes.each_with_index do |attr, i| -%>
+      <%= attr %>: <%= attr.upcase %>_VALUE<%= ',' unless all_attributes.count == (i + 1)%>
+<% end -%>
     }
   end
 
+  it { expect_valid } # Expect the form to be valid
   it { expect(result).to be_success }
-  it { expect(value).to be_a(KLASS) }
+  it { expect(value).to be_a(<%= inferred_model_name %>) } # Model name inferred
+
+  ### START: Attribute Expectations
+
+<% all_attributes.each do |attr| -%>
+  # 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) }
+
+<% end -%>
+  ### END: Attribute Expectations
+
+  # 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

metadata

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