formie 1.0.4 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ef348b6943dc8c20cedb102cffb2bc8ecf911bcaf5a371ac82123c292989821
-  data.tar.gz: 665deeb0be28f935ab48d54bcfa3d014b8ecabbd76c9015703c13153e38ba7ed
+  metadata.gz: ebf7737de8d4afca91ebff32ec0bfb2164f52964e5a4c611fb6957d31576ba70
+  data.tar.gz: 402816d39d77d39b74914fdca1d33d83e47f8ee548324cd314a86fce59806848
 SHA512:
-  metadata.gz: 45f28748bd5c287dbfeaef2687b8fd3dbe37092a1bd8a8c6029a0a29606289f02d1823c1201b446022549fea7836309c4e763b3395632655defb92a631314b13
-  data.tar.gz: 989cc6575837923b9a6484d024f5aed5ae5c1a823b9b455bc765f62f9a397959ce33409f570dc104701a6f5186654892d58015001bf9cd35a0413e29c4771679
+  metadata.gz: 5db6b5b77f7fa7cfdd2370768fa9e5410ae2fcca5d483a9733658f8cff19f716513f1b67245dd9cc52eced89709fa10de8a97eb39a5c273911ebd58a913b7901
+  data.tar.gz: 76a452db8870277aefe56e004ff540149b529df31010aae0d57695126623cfe34eaf09f38f049bfd4a4584e909c68267d8f8f437b24fcb2a339bcbd9041cb866

data/.github/workflows/rake.yml

@@ -1,6 +1,6 @@
+# see also https://github.com/whitequark/parser/blob/master/.github/workflows/test.yml
 name: Rake
 
-#on: [push, pull_request]
 on: [push]
 
 jobs:
@@ -8,17 +8,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-#        os: [ubuntu-latest, macos-latest]
         os: [ubuntu-latest]
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-#        ruby: [2.5, 2.6, 2.7, '3.0', head, jruby, jruby-head, truffleruby, truffleruby-head]
-        ruby: [2.7]
+        ruby: ["2.7", "3.0", "3.2", head]
+        test_command: ["bundle exec rake test"]
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - run: bundle exec rake
+    - name: Bundle install
+      run: |
+        bundle config path /home/runner/bundle
+        bundle install
+        bundle update
+    - run: ${{ matrix.test_command }}

data/.ruby-gemset

@@ -1 +1 @@
-rails-6.1
+rails-7.0

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.2
+ruby-3.2.2

data/Appraisals

@@ -1,20 +1,25 @@
-appraise 'rails-6.1' do
-  gem 'rails', '~> 6.1'
-  gem 'dryer-config', '~> 6.0'
+appraise "rails-7.0" do
+  gem "rails", "~> 7.0"
+  gem "dryer-config", "~> 7.0"
 end
 
-appraise 'rails-6.0' do
-  gem 'rails', '~> 6.0'
+appraise "rails-6.1" do
+  gem "rails", "~> 6.1"
+  gem "dryer-config", "~> 6.0"
 end
 
-#appraise 'rails-5.2' do
+# appraise "rails-6.0" do
+#   gem "rails", "~> 6.0"
+# end
+#
+# appraise 'rails-5.2' do
 #  gem 'rails', '~> 5.2.0'
-#end
+# end
 #
-#appraise 'rails-5.1' do
+# appraise 'rails-5.1' do
 #  gem 'rails', '~> 5.1'
-#end
+# end
 #
-#appraise 'rails-5.0' do
+# appraise 'rails-5.0' do
 #  gem 'rails', '~> 5.0.0'
-#end
+# end

data/Gemfile

@@ -1,12 +1,14 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 gemspec
 
-gem 'rails'
+gem "rails"
 
 group :test do
-  gem 'observr'
-  gem 'rubocop', require: false
-  gem 'simplecov', require: false
-  gem 'capybara'
-  gem 'slim'
+  gem "capybara"
+  gem "observr"
+  gem "ricecream"
+  gem "rubocop", require: false
+  gem "simplecov", require: false
+  gem "slim"
+  gem "spring"
 end

data/Gemfile.lock

@@ -1,208 +1,227 @@
 PATH
   remote: .
   specs:
-    formie (1.0.4)
+    formie (1.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actioncable (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionmailbox (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       mail (>= 2.7.1)
-    actionmailer (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.3.2)
-      actionview (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.4.3)
+      actionview (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actiontext (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionview (7.0.4.3)
+      activesupport (= 7.0.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    activejob (7.0.4.3)
+      activesupport (= 7.0.4.3)
       globalid (>= 0.3.6)
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activestorage (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-      marcel (~> 1.0.0)
-      mini_mime (~> 1.0.2)
-    activesupport (6.1.3.2)
+    activemodel (7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activerecord (7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+    activestorage (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.4.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
     builder (3.2.4)
-    capybara (3.35.3)
+    capybara (3.39.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    combustion (1.3.1)
+    combustion (1.3.7)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
+    date (3.3.3)
     docile (1.4.0)
-    erubi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.10)
+    erubi (1.12.0)
+    globalid (1.1.0)
+      activesupport (>= 5.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.10.0)
+    json (2.6.3)
+    loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.2)
+    matrix (0.4.2)
     method_source (1.0.0)
-    mini_mime (1.0.3)
-    minitest (5.14.4)
-    nio4r (2.5.7)
-    nokogiri (1.11.7-x86_64-linux)
+    mini_mime (1.1.2)
+    minitest (5.18.0)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.9)
+    nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
     observr (1.0.5)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.22.1)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.3.2)
-      actioncable (= 6.1.3.2)
-      actionmailbox (= 6.1.3.2)
-      actionmailer (= 6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actiontext (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    public_suffix (5.0.1)
+    racc (1.6.2)
+    rack (2.2.6.4)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (7.0.4.3)
+      actioncable (= 7.0.4.3)
+      actionmailbox (= 7.0.4.3)
+      actionmailer (= 7.0.4.3)
+      actionpack (= 7.0.4.3)
+      actiontext (= 7.0.4.3)
+      actionview (= 7.0.4.3)
+      activejob (= 7.0.4.3)
+      activemodel (= 7.0.4.3)
+      activerecord (= 7.0.4.3)
+      activestorage (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       bundler (>= 1.15.0)
-      railties (= 6.1.3.2)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.4.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4.3)
+      actionpack (= 7.0.4.3)
+      activesupport (= 7.0.4.3)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
-    rubocop (1.17.0)
+    ricecream (0.2.1)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    slim (4.1.0)
-      temple (>= 0.7.6, < 0.9)
-      tilt (>= 2.0.6, < 2.1)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    temple (0.8.2)
-    thor (1.1.0)
-    tilt (2.0.10)
-    tzinfo (2.0.4)
+    simplecov_json_formatter (0.1.4)
+    slim (5.1.0)
+      temple (~> 0.10.0)
+      tilt (>= 2.0.6, < 2.2)
+    spring (4.1.1)
+    sqlite3 (1.6.2-x86_64-linux)
+    temple (0.10.0)
+    thor (1.2.1)
+    tilt (2.1.0)
+    timeout (0.3.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.4.2)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
   appraisal
-  bundler
   capybara
   combustion
   formie!
   minitest
   observr
   rails
-  rake
+  ricecream
   rubocop
   simplecov
   slim
+  spring
   sqlite3
 
 BUNDLED WITH
-   2.2.17
+   2.4.10

data/MIT-LICENSE

@@ -1,4 +1,6 @@
-Copyright 2011-2021 Dittmar Krall - www.matique.com
+The MIT License (MIT)
+
+Copyright (c) 2011-2023 Dittmar Krall (www.matiq.com)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,5 +1,4 @@
-Formie
-======
+# Formie
 
 [![Gem Version](https://badge.fury.io/rb/formie.svg)](https://badge.fury.io/rb/formie)
 
@@ -15,21 +14,14 @@ In short, Formie is like a helper using the notation of a partial.
 
 Templates handlers are supported as in partials.
 
-
 ## Installation
 
 As usual:
-
-    $ [sudo] gem install formie
-
-or:
-
-    # Gemfile
-    gem 'formie'
-
-    $ bundle
-
-Use 'gem install formie -v 0.7.1' for Rails 3.2.
+```ruby
+# Gemfile
+gem "formie"
+```
+and run "bundle install".
 
 ## Description
 
@@ -42,6 +34,8 @@ Templates for Formie are hosted in:
 Till Rails 5 <formie_path> is 'app/formies'.
 Starting at Rails 6 <formie_path> is 'app/views/formies'.
 
+Version 1.1.0+ is intended for Rails 7
+
 Inside a formie the following locals (as delivered by the
 controller) are available:
 
@@ -51,7 +45,7 @@ controller) are available:
 | args | remainings after extracting options/locals
 | block | block passed to the formie
 | controller_name
-| form | (available inside form_for (similar to fields_for))
+| form | (available inside form_with (similar to fields_for))
 |  form.object
 | params
 
@@ -60,45 +54,55 @@ The controller attributes are available as usual.
 
 To avoid a server restart during development of formies you may add to:
 
-    # app/controllers/application_controller.rb
-
-    before_filter do
-      Formie.reload  if Rails.env.development?
-    end
+```ruby
+# app/controllers/application_controller.rb
 
+before_filter do
+  Formie.reload  if Rails.env.development?
+end
+```
 
-## Examples
+## Examples (see also tests)
 
-    <%= copyright %>
-    <%= back %>
-    <%= show obj: @order %>
+```ruby
+<%= copyright %>
+<%= back %>
+<%= show obj: @order %>
 
-    <%= form_for @order do |f| %>
-      <%= f.l_text_field :who %>
-      <%= f.l_text_field :amount %>
-    <% end %>
+<%= form_with model: Order do |f| %>
+  <%= f.l_text_field :who %>
+  <%= f.l_text_field :amount %>
+<% end %>
+```
 
 In directory <formie_path> :
 
-    # application/copyright.html.erb
-    <div class="copyright"> Copyright (c) 2009 </div>
+```ruby
+# application/copyright.html.erb
+<div class="copyright"> Copyright (c) 2009 </div>
+
+# application/back.html.erb
+<a href="<%= "/#{h(controller_name)}" %>"> Back </a>
+
+# application/show.html.erb
+<a href="<%= "/#{h(controller_name)}/#{obj.id}" %>"> Show </a>
 
-    # application/back.html.erb
-    <a href="<%= "/#{h(controller_name)}" %>"> Back </a>
+# forms/l_text_field.html.erb
+<% field = args.first %>
+<p>
+  <%= form.label field %><br />
+  <%= form.text_field field %>
+</p>
 
-    # application/show.html.erb
-    <a href="<%= "/#{h(controller_name)}/#{obj.id}" %>"> Show </a>
+# templates/hello.slim
+/ a comment
 
-    # forms/l_text_field.html.erb
-    <% field = args.first %>
-    <p>
-      <%= form.label field %><br />
-      <%= form.text_field field %>
-    </p>
+span Hello Slim
+```
 
-    # templates/hello.slim
-    / a comment
+## Miscellaneous
 
-    span Hello Slim
+Copyright (c) 2009-2023 Dittmar Krall (www.matiq.com),
+released under the MIT license:
 
-Copyright (c) 2009-2019 Dittmar Krall, released under the MIT license.
+* https://opensource.org/licenses/MIT

data/Rakefile

@@ -1,10 +1,10 @@
-require 'rake/testtask'
+require "rake/testtask"
 
-desc 'Run the tests.'
+desc "Run the tests."
 Rake::TestTask.new do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = false
 end
 

data/formie.gemspec

@@ -1,33 +1,30 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'formie/version'
+require "formie/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'formie'
-  s.version     = Formie::VERSION
-  s.summary     = 'Formie is like a Rails helper, but uses the notation of a partial.'
+  s.name = "formie"
+  s.version = Formie::VERSION
+  s.summary = "Formie is like a Rails helper, but uses the notation of a partial."
   s.description = <<-'END'
     Formie implements low level template-based Rails helpers. It injects
     the formies into the ActionView module. The form-bounded as well as
     the unbounded templates are supported. Still, the ActionView
     functionality (e.g. text_field) is kept untouched.
   END
-  s.authors     = ['Dittmar Krall']
-  s.email       = ['dittmar.krall@matique.de']
-  s.homepage    = 'http://matique.de'
+  s.authors = ["Dittmar Krall"]
+  s.email = ["dittmar.krall@matiq.com"]
+  s.homepage = "http://matiq.com"
+  s.license = "MIT"
+  s.platform = Gem::Platform::RUBY
 
-  s.license     = 'MIT'
-  s.platform    = Gem::Platform::RUBY
+  s.metadata["source_code_uri"] = "https://github.com/matique/formie"
 
-  s.files         = `git ls-files -z`.split("\x0")
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ['lib']
+  s.files = `git ls-files -z`.split("\x0")
+  s.require_paths = ["lib"]
 
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'appraisal'
-  s.add_development_dependency 'combustion'
-
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency "appraisal"
+  s.add_development_dependency "combustion"
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "sqlite3"
 end

data/gemfiles/rails_6.1.gemfile

@@ -6,11 +6,13 @@ gem "rails", "~> 6.1"
 gem "dryer-config", "~> 6.0"
 
 group :test do
+  gem "capybara"
   gem "observr"
+  gem "ricecream"
   gem "rubocop", require: false
   gem "simplecov", require: false
-  gem "capybara"
   gem "slim"
+  gem "spring"
 end
 
 gemspec path: "../"

data/gemfiles/{rails_6.0.gemfile → rails_7.0.gemfile}

@@ -2,14 +2,17 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0"
+gem "rails", "~> 7.0"
+gem "dryer-config", "~> 7.0"
 
 group :test do
+  gem "capybara"
   gem "observr"
+  gem "ricecream"
   gem "rubocop", require: false
   gem "simplecov", require: false
-  gem "capybara"
   gem "slim"
+  gem "spring"
 end
 
 gemspec path: "../"

data/lib/formie/version.rb

@@ -1,9 +1,11 @@
 # rubocop: disable all
 
 module Formie
-  VERSION = '1.0.4'     # 2021-06-20
-# VERSION = '1.0.3'     # 2020-07-23
-# VERSION = '1.0.0'     # 2019-09-26
-# VERSION = '0.9.16'    # 2019-03-05
-# VERSION = '0.9.14'    # 2019-03-02
+  VERSION = "1.1.1"     # 2023-04-17
+  # VERSION = "1.1.0"     # 2022-12-18
+  # VERSION = "1.0.4"     # 2021-06-20
+  # VERSION = "1.0.3"     # 2020-07-23
+  # VERSION = "1.0.0"     # 2019-09-26
+  # VERSION = "0.9.16"    # 2019-03-05
+  # VERSION = "0.9.14"    # 2019-03-02
 end

data/lib/formie.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'formie/engine'
+require "formie/engine"
 
 module Formie
   Rails6 = Rails.version.to_f >= 6.0
-  PATH = Rails6 ? 'app/views/formies' : 'app/formies'
+  PATH = Rails6 ? "app/views/formies" : "app/formies"
 
   def self.reload
     if Rails6 && !File.directory?("#{Rails.root}/app/views/formies")
@@ -14,8 +14,8 @@ module Formie
     now = Time.now
     @last_update ||= Time.new(0)
     load_formies(::ActionView::Helpers::FormBuilder, "#{PATH}/forms")
-    load_formies(::ActionView::Helpers::TextHelper,  "#{PATH}/application")
-    load_formies(::ActionView::Helpers::TextHelper,  "#{PATH}/templates")
+    load_formies(::ActionView::Helpers::TextHelper, "#{PATH}/application")
+    load_formies(::ActionView::Helpers::TextHelper, "#{PATH}/templates")
     @last_update = now
   end
 
@@ -27,15 +27,15 @@ module Formie
       params = args.extract_options!
       options = {}
       if Rails6
-        options[:template] = path.sub("#{Rails.root}/app/views", '')
+        options[:template] = path.sub("#{Rails.root}/app/views", "")
       else
         options[:file] = path
       end
       options[:locals] = {}
       options[:locals].update params
       options[:locals].update formiename: formiename,
-                block: block, form: self, args: args
-      if defined?(controller) == 'method' &&
+        block: block, form: self, args: args
+      if defined?(controller) == "method" &&
          controller.respond_to?(:render_to_body) # credits to MARS
         controller.render_to_body(options)
       else
@@ -51,8 +51,8 @@ module Formie
     return unless File.exist?(dir)
 
     hsh = {}
-    Dir.glob(File.join(dir, '**', '**')).sort.each { |path|
-      base = File.basename(path).split('.').first
+    Dir.glob(File.join(dir, "**", "**")).sort.each { |path|
+      base = File.basename(path).split(".").first
       hsh[base] = path unless hsh[base]
     }
     hsh.each { |name, path|

data/test/controllers/orders_test.rb

@@ -1,16 +1,14 @@
-require 'test_helper'
+require "test_helper"
 
 class OrdersControllerTest < ActionController::TestCase
-
-  test 'checking formie copyright' do
+  test "formie copyright" do
     get :index
     assert_response :success
-#    assert_not_nil assigns(:orders)
+    #    assert_not_nil assigns(:orders)
     assert_match(/copyright/, response.body)
     assert_match(/Copyright/, response.body)
-    assert_match(/label/    , response.body)
-    assert_match(/input/    , response.body)
-    assert_match(/def/      , response.body)
+    assert_match(/label/, response.body)
+    assert_match(/input/, response.body)
+    assert_match(/def/, response.body)
   end
-
 end

data/test/integration/order_test.rb

@@ -1,36 +1,40 @@
 # http://blog.crowdint.com/2013/06/14/testing-rails-with-minitest.html
 
-require 'test_helper'
+require "test_helper"
 
 describe "Formie" do
   include Capybara::DSL
 
   before do
     Order.delete_all
-    Order.create :name => 'Rumpelstilzchen'
+    Order.create name: "Rumpelstilzchen"
   end
 
-  it 'should display copyright' do
+  it "should display copyright" do
     visit "/orders"
-    assert page.has_content?('Copyright')
+    assert page.has_content?("Copyright")
   end
 
-  it 'should list one order' do
+  it "should list one order" do
     order = Order.all.first
 
     visit "/orders/#{order.id}"
-    assert_equal order.name, page.find('form p input#order_name').value
-    assert_equal 'Hello Slim', page.find('form span').text
+    # using form_with:
+    fnd = 'form p input[name="order[name]"]'
+    assert_equal order.name, page.find(fnd).value
+    # using form_for:
+    # assert_equal order.name, page.find("form p input#order_name").value
+    assert_equal "Hello Slim", page.find("form span").text
   end
 
-  it 'should remove comments in Slim testing full stack' do
+  it "should remove comments in Slim testing full stack" do
     order = Order.all.first
 
     visit "/orders/#{order.id}"
     refute page.has_content?("a comment")
   end
 
-  it 'builtins' do
+  it "builtins" do
     visit "/orders/new"
     assert page.has_content?("action_name new")
     assert page.has_content?("args [123, 456]")
@@ -40,5 +44,4 @@ describe "Formie" do
     assert page.has_content?("form.object Order")
     assert page.has_content?("params new")
   end
-
 end

data/test/internal/app/controllers/application_controller.rb

@@ -2,7 +2,6 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
   before_action do
-    Formie.reload  if 'development' == Rails.env
+    Formie.reload if Rails.env == "development"
   end
-
 end

data/test/internal/app/controllers/orders_controller.rb

@@ -1,5 +1,4 @@
 class OrdersController < ApplicationController
-
   def index
     @orders = Order.all
   end
@@ -9,8 +8,7 @@ class OrdersController < ApplicationController
   end
 
   def show
-    Order.create :name => 'hugo'
+    Order.create name: "hugo"
     @order = Order.find(params[:id])
   end
-
 end

data/test/internal/app/models/order.rb

@@ -1,7 +1,5 @@
 class Order < ApplicationRecord
-
   before_save do |row|
-    row.errors.add :base, 'panic'  if row.name == 'error'
+    row.errors.add :base, "panic" if row.name == "error"
   end
-
 end

data/test/internal/app/views/orders/new.html.erb

@@ -1,3 +1,3 @@
-<%= form_for @order do |f| %>
+<%= form_with model: @order, class: Order do |f| %>
   <%= render 'new', :f => f %>
 <% end %>

data/test/internal/app/views/orders/show.html.erb

@@ -1,3 +1,3 @@
-<%= form_for @order do |f| %>
+<%= form_with model: @order do |f| %>
   <%= render 'form', :f => f %>
 <% end %>

data/test/internal/config/routes.rb

@@ -1,4 +1,4 @@
 Rails.application.routes.draw do
   resources :orders
-  root :to => 'orders#index'
+  root to: "orders#index"
 end

data/test/internal/db/schema.rb

@@ -1,10 +1,8 @@
 ActiveRecord::Schema.define(version: 20141016161801) do
-
   create_table "orders", force: true do |t|
-    t.string   "name"
-    t.string   "qty"
+    t.string "name"
+    t.string "qty"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
-
 end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
-if ENV['COVERAGE']
-  require 'simplecov'
+if ENV["COVERAGE"]
+  require "simplecov"
   SimpleCov.start do
-    add_filter '/test/'
+    add_filter "/test/"
   end
 end
 
@@ -9,7 +9,7 @@ require "combustion"
 Combustion.path = "test/internal"
 Combustion.initialize! :active_record
 
-require 'rails/test_help'
-require 'minitest/autorun'
-require 'minitest/benchmark'
-require 'capybara/rails'
+require "rails/test_help"
+require "minitest/autorun"
+require "minitest/benchmark"
+require "capybara/rails"

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: formie
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.1
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-20 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -100,17 +72,15 @@ description: |2
       the unbounded templates are supported. Still, the ActionView
       functionality (e.g. text_field) is kept untouched.
 email:
-- dittmar.krall@matique.de
+- dittmar.krall@matiq.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
 - ".gitignore"
-- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".watchr"
 - Appraisals
 - Gemfile
 - Gemfile.lock
@@ -119,8 +89,8 @@ files:
 - Rakefile
 - config/initializers/formie.rb
 - formie.gemspec
-- gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/formie.rb
 - lib/formie/engine.rb
 - lib/formie/version.rb
@@ -155,10 +125,11 @@ files:
 - test/internal/db/migrate/20141016161801_create_orders.rb
 - test/internal/db/schema.rb
 - test/test_helper.rb
-homepage: http://matique.de
+homepage: http://matiq.com
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/matique/formie
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -174,39 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Formie is like a Rails helper, but uses the notation of a partial.
-test_files:
-- test/controllers/orders_test.rb
-- test/integration/order_test.rb
-- test/internal/app/assets/config/manifest.js
-- test/internal/app/controllers/application_controller.rb
-- test/internal/app/controllers/orders_controller.rb
-- test/internal/app/formies/application/copyright.html.erb
-- test/internal/app/formies/forms/builtins.html.erb
-- test/internal/app/formies/forms/l_text_field.html.erb
-- test/internal/app/formies/templates/hello.slim
-- test/internal/app/formies/templates/l_text_field.html.erb
-- test/internal/app/formies/templates/labelled.html.erb
-- test/internal/app/models/application_record.rb
-- test/internal/app/models/order.rb
-- test/internal/app/views/formies/application/copyright.html.erb
-- test/internal/app/views/formies/forms/builtins.html.erb
-- test/internal/app/views/formies/forms/l_text_field.html.erb
-- test/internal/app/views/formies/templates/hello.slim
-- test/internal/app/views/formies/templates/l_text_field.html.erb
-- test/internal/app/views/formies/templates/labelled.html.erb
-- test/internal/app/views/layouts/application.html.erb
-- test/internal/app/views/orders/_form.html.erb
-- test/internal/app/views/orders/_new.html.erb
-- test/internal/app/views/orders/index.html.erb
-- test/internal/app/views/orders/new.html.erb
-- test/internal/app/views/orders/show.html.erb
-- test/internal/config/database.yml
-- test/internal/config/routes.rb
-- test/internal/config/secrets.yml
-- test/internal/db/migrate/20141016161801_create_orders.rb
-- test/internal/db/schema.rb
-- test/test_helper.rb
+test_files: []

data/.rubocop.yml

@@ -1,18 +0,0 @@
-inherit_from:
-  - '~/configs/.rubocop.yml'
-
-AllCops:
-  NewCops: enable
-  Include:
-    - 'lib/**/*.rb'
-  Exclude:
-    - 'test/**/*'
-
-Layout/ArgumentAlignment:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false

data/.watchr

@@ -1,48 +0,0 @@
-HH = '#' * 22  unless defined?(HH)
-H = '#' * 5    unless defined?(H)
-
-def usage
-  puts <<-EOS
-  Ctrl-\\ or ctrl-4   Running all tests
-  Ctrl-C             Exit
-  EOS
-end
-
-def run(cmd)
-  puts "#{HH} #{Time.now} #{HH}"
-  puts "#{H} #{cmd}"
-  system "/usr/bin/time --format '#{HH} Elapsed time %E' #{cmd}"
-end
-
-def run_it(type, file)
-  case type
-  when 'test';  run %(bundle exec ruby -I test #{file})
-#  when 'spec';  run %(rspec -X #{file})
-  else;         puts "#{H} unknown type: #{type}, file: #{file}"
-  end
-end
-
-def run_all_tests
-  puts "\n#{HH} Running all tests #{HH}\n"
-  %w[test spec].each { |dir| run "bundle exec rake #{dir}" if  File.exist?(dir) }
-end
-
-def run_matching_files(base)
-  base = base.split('_').first
-  %w[test spec].each { |type|
-    files = Dir["#{type}/**/*.rb"].select { |file| file =~ /#{base}_.*\.rb/ }
-    run_it type, files.join(' ')  unless files.empty?
-  }
-end
-
-%w[test spec].each { |type|
-  watch("#{type}/#{type}_helper\.rb") { run_all_tests }
-  watch('lib/.*\.rb')                 { run_all_tests }
-  watch("#{type}/.*/*_#{type}\.rb")   { |match| run_it type, match[0] }
-}
-
-# Ctrl-\ or ctrl-4
-    Signal.trap('QUIT') { run_all_tests }
-# Ctrl-C
-    Signal.trap('INT')  { abort("Interrupted\n") }
-usage