formie 1.0.3 → 1.1.0

data/README.md

@@ -1,8 +1,6 @@
-Formie
-======
+# Formie
 
 [![Gem Version](https://badge.fury.io/rb/formie.svg)](https://badge.fury.io/rb/formie)
-[![Build Status](https://travis-ci.org/matique/formie.svg?branch=master)](https://travis-ci.org/matique/formie)
 
 Tired of programming each HTML tag?
 Are you in search of DRYness for Rails views?
@@ -16,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
 
@@ -43,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:
 
@@ -52,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
 
@@ -61,45 +54,56 @@ 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
+```ruby
+# app/controllers/application_controller.rb
 
-    before_filter do
-      Formie.reload  if Rails.env.development?
-    end
+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-2022 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,33 @@
-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', '~> 13'
-  s.add_development_dependency 'appraisal', '~> 2'
-  s.add_development_dependency 'combustion', '~> 1.1'
+  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', '~> 5'
-  s.add_development_dependency 'sqlite3', '~> 1'
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "sqlite3"
 end

data/gemfiles/{rails_5.1.gemfile → rails_6.1.gemfile}

@@ -2,15 +2,17 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1"
+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 "minitest"
-  gem "capybara"
-  gem "sqlite3", "!= 1.4.0"
   gem "slim"
+  gem "spring"
 end
 
 gemspec path: "../"

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

@@ -2,15 +2,17 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.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 "minitest"
-  gem "capybara"
-  gem "sqlite3", "!= 1.4.0"
   gem "slim"
+  gem "spring"
 end
 
 gemspec path: "../"

data/lib/formie/version.rb

@@ -1,12 +1,10 @@
 # rubocop: disable all
 
 module Formie
-  VERSION = '1.0.3'     # 2020-07-23
-# VERSION = '1.0.2'     # 2020-07-14
-# VERSION = '1.0.1'     # 2020-04-27
-# VERSION = '1.0.0'     # 2019-09-26
-# VERSION = '0.9.16'    # 2019-03-05
-# VERSION = '0.9.15'    # 2019-03-02
-# VERSION = '0.9.14'    # 2019-03-02
-# VERSION = '0.9.13'
+  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"