inline_forms 6.2.12 → 6.3.3

data/app/views/inline_forms/_new.html.erb

@@ -25,7 +25,7 @@
     </div>
   </div>
 
-  <%= form_tag  send(@Klass.to_s.underscore.pluralize + '_path',  :update => @update_span,
+  <%= form_tag  polymorphic_path(@Klass,  :update => @update_span,
                                                                   :parent_class => @parent_class,
                                                                   :parent_id => @parent_id ),
                                                                   :multipart => true, :remote => true, :class  => "edit_form" do -%>
@@ -56,7 +56,7 @@
                   &nbsp;
                 </div>
     <div class='small-11  column' >
-        <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span,
+        <%= link_to( polymorphic_path(@Klass, :update => @update_span,
                                                                       :parent_class => @parent_class,
                                                                       :parent_id => @parent_id,
                                                                       :ul_needed => true ),

data/bin/inline_forms_installer_core.rb

@@ -20,7 +20,10 @@ gem 'jquery-ui-sass-rails'
 gem 'mini_magick'
 gem 'mysql2'
 gem 'paper_trail', git: 'https://github.com/acesuares/paper_trail.git'
-gem 'rails-i18n', :git => 'https://github.com/svenfuchs/rails-i18n.git'  # since https://github.com/svenfuchs/rails-i18n/pull/794 we don't have to maintain 'https://github.com/acesuares/rails-i18n.git' anymore!
+# RubyGems 7.0.x requires railties >= 6, < 8 (works with Rails 6.1). The default branch of
+# https://github.com/svenfuchs/rails-i18n.git targets Rails 8+ (railties >= 8) and breaks bundle
+# resolution next to rails 6.1.3.1. Same approach as the Papiamentu app.
+gem 'rails-i18n', '~> 7.0'
 gem 'rails-jquery-autocomplete'
 gem 'rails', '6.1.3.1'
 gem 'rake'
@@ -32,6 +35,11 @@ gem 'unicorn'
 gem 'validation_hints'
 gem 'will_paginate' #, git: 'https://github.com/acesuares/will_paginate.git'
 
+gem_group :test do
+  # Rails 6.1.3 expects Minitest 5; 6.x breaks railties test runner (run arity, parallelization).
+  gem 'minitest', '~> 5.25'
+end
+
 gem_group :development do
   gem 'capistrano-bundler', require: false
   gem 'capistrano-rails', require: false
@@ -41,7 +49,8 @@ gem_group :development do
   gem 'rvm-capistrano', :require => false
   gem 'rvm1-capistrano3', require: false
   gem 'seed_dump', '~> 0.5.3'
-  gem 'sqlite3'
+  # Rails 6.1 ActiveRecord's sqlite3 adapter requires sqlite3 ~> 1.4; 2.x activates first and breaks.
+  gem 'sqlite3', '~> 1.4'
   gem 'switch_user'
   gem 'thin'
   gem 'yaml_db'
@@ -66,6 +75,12 @@ if ENV['using_sqlite'] == 'true'
     pool: 5
     timeout: 5000
 
+  test:
+    adapter: sqlite3
+    database: db/test.sqlite3
+    pool: 5
+    timeout: 5000
+
   END_DATABASEYML
 else
   create_file "config/database.yml", <<-END_DATABASEYML.strip_heredoc
@@ -333,12 +348,21 @@ append_to_file 'config/initializers/assets.rb',
   'Rails.application.config.assets.precompile += %w[ckeditor/config.js]'
 
 say "- Paper_trail install..."
-generate "paper_trail:install --with-changes --with-mysql"
+# --with-mysql embeds InnoDB options in create_table; that SQL is invalid on SQLite (example app).
+if ENV['using_sqlite'] == 'true'
+  generate "paper_trail:install --with-changes"
+else
+  generate "paper_trail:install --with-changes --with-mysql"
+end
+# paper_trail emits two migrations in one second; the next generator would reuse that timestamp.
+sleep 1
 
 # Create Translations
 say "- Generate models and tables and views for translations..." # TODO Translations need to be done in inline_forms, and then generate a yml file, perhaps
 generate "inline_forms", "InlineFormsLocale name:string inline_forms_translations:belongs_to _enabled:yes _presentation:\#{name}"
+sleep 1 # unique migration timestamps per generator
 generate "inline_forms", "InlineFormsKey name:string inline_forms_translations:has_many inline_forms_translations:associated _enabled:yes _presentation:\#{name}"
+sleep 1
 generate "inline_forms", "InlineFormsTranslation inline_forms_key:belongs_to inline_forms_locale:dropdown value:text interpolations:text is_proc:boolean _presentation:\#{value}"
 # TODO: fix text_area into text_area_without_ckeditor
 sleep 1 # to get unique migration number
@@ -563,9 +587,17 @@ if ENV['install_example'] == 'true'
 
   route "root :to => 'apartments#index'"
 
-  say "\nDone! Now point your browser to http://localhost:3000", :yellow
-  say "\nPress ctlr-C to quit...", :yellow
-  run 'bundle exec rails s'
+  say "- Adding example app regression tests (bundle exec rails test)..."
+  example_tests_root = File.join(GENERATOR_PATH, "lib/installer_templates/example_app_tests")
+  Dir.glob(File.join(example_tests_root, "**", "*.rb")).sort.each do |abs|
+    rel = abs.delete_prefix(example_tests_root + File::SEPARATOR).tr("\\", "/")
+    create_file rel, File.read(abs)
+  end
+
+  say "\nDone! Example app (Photo + Apartment) is ready.", :yellow
+  say "  bundle exec rails test     # example regression tests", :yellow
+  say "  bundle exec rails s        # then http://localhost:3000/apartments", :yellow
+  say "  Log in: #{ENV["email"]} / #{ENV["password"]}", :yellow
 end
 # done!
 say "\nDone! Now make your tables with 'bundle exec rails g inline_forms ...", :yellow

data/inline_forms.gemspec

@@ -23,7 +23,9 @@ Gem::Specification.new do |s|
   s.add_dependency('rvm')
   s.add_dependency('thor')
   s.add_dependency('validation_hints')
-  s.add_dependency('rails', '6.1.3.1')
+  s.add_dependency('rails', '>= 6.1.3.1', '< 7')
   s.add_dependency('rails-i18n')
 
+  s.add_development_dependency("minitest", "~> 5.0")
+
 end

data/lib/inline_forms/form_element_from_callee.rb

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+module InlineForms
+  # Maps +__callee__+ from a +*_show+ helper to the +params[:form_element]+ string
+  # (e.g. +:text_field_show+ → +"text_field"+).
+  def self.form_element_string_from_callee(from_callee)
+    s = from_callee.to_s
+    s = s.sub(/\Ablock in /, "")
+    s.delete_suffix("_show")
+  end
+end

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "6.2.12"
+  VERSION = "6.3.3"
 end

data/lib/inline_forms.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
 require ('inline_forms/version.rb')
+require_relative ('inline_forms/form_element_from_callee')
 # InlineForms is a Rails Engine that let you setup an admin interface quick and
 # easy. Please install it as a gem or include it in your Gemfile.
 module InlineForms
@@ -153,16 +154,3 @@ module InlineForms
   end
 
 end
-
-# make the current method and the calling method available
-#   http://www.ruby-forum.com/topic/75258
-#   supposedly, this is fixed in 1.9
-module Kernel
-  private
-  def this_method
-    caller[0] =~ /`([^']*)'/ and $1
-  end
-  def calling_method
-    caller[1] =~ /`([^']*)'/ and $1
-  end
-end

data/lib/installer_templates/example_app_tests/test/example_app/example_integration_test_case.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Base class for integration tests shipped only with `inline_forms create … --example`.
+# See test/integration/example_app_*_test.rb
+require "test_helper"
+require "devise/test/integration_helpers"
+
+class ExampleAppIntegrationTestCase < ActionDispatch::IntegrationTest
+  include Devise::Test::IntegrationHelpers
+
+  setup do
+    host!("www.example.com")
+    sign_in(example_app_admin_user)
+  end
+
+  private
+
+  def example_app_admin_user
+    @example_app_admin_user ||= begin
+      locale = Locale.find_or_create_by!(name: "en") { |l| l.title = "English" }
+      role = Role.find_or_create_by!(name: "superadmin") { |r| r.description = "Super Admin" }
+      user = User.find_or_initialize_by(email: "admin@example.com")
+      if user.new_record?
+        user.assign_attributes(
+          name: "Admin",
+          password: "admin999",
+          password_confirmation: "admin999",
+          locale: locale
+        )
+        user.save!
+      end
+      user.roles << role unless user.roles.where(id: role.id).exists?
+      user
+    end
+  end
+end

data/lib/installer_templates/example_app_tests/test/integration/example_app_guest_access_test.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "devise/test/integration_helpers"
+
+class ExampleAppGuestAccessTest < ActionDispatch::IntegrationTest
+  include Devise::Test::IntegrationHelpers
+
+  setup { host!("www.example.com") }
+
+  test "apartments index redirects when not signed in" do
+    get apartments_path
+    assert_response :redirect
+    assert_match %r{/auth/users/sign_in}, @response.redirect_url
+  end
+
+  test "root redirects when not signed in" do
+    get root_path
+    assert_response :redirect
+  end
+end

data/lib/installer_templates/example_app_tests/test/integration/example_app_photos_test.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative "../example_app/example_integration_test_case"
+
+class ExampleAppPhotosTest < ExampleAppIntegrationTestCase
+  setup do
+    @apartment = Apartment.create!(name: "Beach", title: "Ocean view")
+  end
+
+  test "photos are not served as standalone html resource" do
+    assert Photo.not_accessible_through_html?
+    assert_raises(ActionController::UnknownFormat) do
+      get photos_path
+    end
+  end
+
+  test "can create a photo for an apartment" do
+    assert_difference("Photo.count", 1) do
+      Photo.create!(name: "Sunset", apartment: @apartment)
+    end
+  end
+end

data/lib/installer_templates/example_app_tests/test/integration/example_app_routing_test.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative "../example_app/example_integration_test_case"
+
+class ExampleAppRoutingTest < ExampleAppIntegrationTestCase
+  test "root routes to apartments index" do
+    get root_path
+    assert_response :success
+  end
+
+  test "apartments index is reachable when signed in" do
+    get apartments_path
+    assert_response :success
+  end
+end

data/lib/installer_templates/example_app_tests/test/models/example_app_apartment_photo_test.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class ExampleAppApartmentPhotoTest < ActiveSupport::TestCase
+  setup do
+    @apartment = Apartment.create!(name: "North", title: "Tower")
+    @photo = Photo.create!(name: "Lobby", apartment: @apartment)
+  end
+
+  test "photo belongs to apartment" do
+    assert_equal @apartment, @photo.apartment
+  end
+
+  test "apartment has many photos" do
+    assert_includes @apartment.photos.to_a, @photo
+  end
+
+  test "photo model hides resource from standalone html crud" do
+    assert Photo.not_accessible_through_html?
+  end
+
+  test "apartment model allows standalone html crud" do
+    assert_not Apartment.not_accessible_through_html?
+  end
+end

data/test/form_element_from_callee_test.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+# Documents the contract between *_show helpers, +__callee__+, and
+# +params[:form_element]+ (used by InlineFormsController#update as +"#{form_element}_update"+).
+class FormElementFromCalleeTest < Minitest::Test
+  def test_symbol_callee_typical_show_method_maps_to_controller_suffix
+    got = InlineForms.form_element_string_from_callee(:text_field_show)
+    assert_equal(
+      "text_field",
+      got,
+      ":text_field_show must become the string \"text_field\" so the edit URL's " \
+      "form_element matches text_field_update / text_field_edit."
+    )
+  end
+
+  def test_string_callee_same_as_symbol
+    got = InlineForms.form_element_string_from_callee("dropdown_with_values_show")
+    assert_equal(
+      "dropdown_with_values",
+      got,
+      "String callee from backtrace-style names must match Symbol behavior."
+    )
+  end
+
+  def test_block_in_prefix_from_nested_call_still_maps_correctly
+    got = InlineForms.form_element_string_from_callee("block in text_field_show")
+    assert_equal(
+      "text_field",
+      got,
+      "When *_show runs inside a block, Ruby may prefix the callee label with " \
+      "\"block in \"; that prefix must be stripped before removing _show."
+    )
+  end
+
+  def test_only_one_trailing_show_suffix_removed
+    got = InlineForms.form_element_string_from_callee(:foo_show)
+    assert_equal(
+      "foo",
+      got,
+      "delete_suffix('_show') must remove only the trailing _show once " \
+      "(not leave \"foo\" with a spurious strip)."
+    )
+  end
+
+  def test_multi_word_element_name_underscores_preserved
+    got = InlineForms.form_element_string_from_callee(:chicas_dropdown_with_family_members_show)
+    assert_equal(
+      "chicas_dropdown_with_family_members",
+      got,
+      "Form element names with underscores must survive unchanged except for _show."
+    )
+  end
+
+  def test_callee_without_show_suffix_is_unchanged_modulo_block_prefix
+    got = InlineForms.form_element_string_from_callee(:already_plain)
+    assert_equal(
+      "already_plain",
+      got,
+      "If someone passes a callee without _show, output is unchanged (minus block prefix)."
+    )
+  end
+
+  def test_nil_callee_yields_empty_string
+    got = InlineForms.form_element_string_from_callee(nil)
+    assert_equal(
+      "",
+      got,
+      "nil.to_s is empty; callers must pass __callee__ from a *_show method."
+    )
+  end
+end

data/test/inline_edit_polymorphic_path_test.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+require "logger"
+require "active_model"
+require "action_dispatch"
+
+# Record double with the same +model_name+ routing key as +resources :articles+
+# (a class nested under Minitest::Test would get +inline_edit_…_article+, not +article+).
+class InlineFormsArticlesRouteDouble
+  include ActiveModel::Model
+  include ActiveModel::Conversion
+
+  attr_accessor :id
+
+  def self.model_name
+    ActiveModel::Name.new(self, nil, "Article")
+  end
+
+  def initialize(id = 1)
+    @id = id
+  end
+
+  def persisted?
+    true
+  end
+
+  def to_param
+    id.to_s
+  end
+end
+
+# Class-only double for +polymorphic_path(Model)+ (collection +articles+).
+class InlineFormsArticleClassRouteDouble
+  def self.model_name
+    ActiveModel::Name.new(self, nil, "Article")
+  end
+end
+
+# Parity between polymorphic URL helpers and named +edit_article_path+,
+# +article_path+, and +articles_path+ for a standard +resources :articles+
+# route (no full Rails app boot).
+class InlineEditPolymorphicPathTest < Minitest::Test
+  def setup
+    @routes = ActionDispatch::Routing::RouteSet.new
+    @routes.draw { resources :articles }
+    routes = @routes
+    holder_class = Class.new do
+      include routes.url_helpers
+    end
+    holder_class.default_url_options = { only_path: true }
+    @holder = holder_class.new
+  end
+
+  def test_edit_polymorphic_path_matches_named_edit_helper
+    article = InlineFormsArticlesRouteDouble.new(42)
+    options = {
+      attribute: "title",
+      form_element: "text_field",
+      update: "field_article_42_title"
+    }
+    poly = @holder.edit_polymorphic_path(article, **options)
+    named = @holder.edit_article_path(article, **options)
+    assert_equal named, poly
+  end
+
+  def test_member_polymorphic_path_matches_article_path
+    article = InlineFormsArticlesRouteDouble.new(7)
+    options = { update: "span", close: true }
+    poly = @holder.polymorphic_path(article, **options)
+    named = @holder.article_path(article, **options)
+    assert_equal named, poly
+  end
+
+  def test_collection_polymorphic_path_matches_articles_path
+    options = { update: "list", parent_class: "Parent", parent_id: "3" }
+    poly = @holder.polymorphic_path(InlineFormsArticleClassRouteDouble, **options)
+    named = @holder.articles_path(**options)
+    assert_equal named, poly
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+
+require "minitest/autorun"
+require "inline_forms/form_element_from_callee"

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 6.2.12
+  version: 6.3.3
 platform: ruby
 authors:
 - Ace Suares
 - Lemuel Boyce
 - Manuel Ortega
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -58,16 +57,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +87,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: Inline Forms aims to ease the setup of forms that provide inline editing.
   The field list can be specified in the model.
 email:
@@ -96,6 +115,7 @@ files:
 - ".document"
 - ".gitignore"
 - ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -110,7 +130,6 @@ files:
 - app/controllers/geo_code_curacao_controller.rb
 - app/controllers/inline_forms_application_controller.rb
 - app/controllers/inline_forms_controller.rb
-- app/helpers/form_elements/absence_list.rb
 - app/helpers/form_elements/audio_field.rb
 - app/helpers/form_elements/check_box.rb
 - app/helpers/form_elements/check_list.rb
@@ -220,7 +239,13 @@ files:
 - lib/generators/templates/test.erb
 - lib/generators/templates/unicorn/production.rb
 - lib/inline_forms.rb
+- lib/inline_forms/form_element_from_callee.rb
 - lib/inline_forms/version.rb
+- lib/installer_templates/example_app_tests/test/example_app/example_integration_test_case.rb
+- lib/installer_templates/example_app_tests/test/integration/example_app_guest_access_test.rb
+- lib/installer_templates/example_app_tests/test/integration/example_app_photos_test.rb
+- lib/installer_templates/example_app_tests/test/integration/example_app_routing_test.rb
+- lib/installer_templates/example_app_tests/test/models/example_app_apartment_photo_test.rb
 - lib/locales/inline_forms.en.yml
 - lib/locales/inline_forms.nl.yml
 - lib/otherstuff/20120310065554_inline_forms_create_view_for_translations.rb
@@ -229,11 +254,13 @@ files:
 - lib/otherstuff/mkrole
 - lib/otherstuff/roles_users.sql
 - lib/vagrant/vagrantbox-inline_forms.zip
+- test/form_element_from_callee_test.rb
+- test/inline_edit_polymorphic_path_test.rb
+- test/test_helper.rb
 homepage: http://github.com/acesuares/inline_forms
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -248,8 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key: 
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Inline editing of forms.
 test_files: []

data/app/helpers/form_elements/absence_list.rb

@@ -1,45 +0,0 @@
-# -*- encoding : utf-8 -*-
-#InlineForms::SPECIAL_COLUMN_TYPES[:absence_list]=:no_migration
-
-# checklist
-def absence_list_show(object, attribute) # the object is the lesson, attribute should be absences???
-  absence_status = { 1 => 'aanwezig', 3 => 'laat met reden', 4 => 'laat' , 5 => 'afwezig met reden', 6 => 'afwezig' }
-  out = '<ul class="absence_list">'
-  out << link_to_inline_edit(object, attribute) if object.send(attribute).empty? # no absences yet
-  object.kids.sort.each do | item | # we need the kids from this lesson.
-
-  out << "<li>"
-    out << "#{item.full_name}: "
-    out << "<br />"
-    out << "<span id='absence_#{Absence.this_lesson_this_kid(object, item).id}_status'>"
-    out << link_to_inline_edit( Absence.this_lesson_this_kid(object, item),
-                                :status,
-                                absence_status[Absence.this_lesson_this_kid(object, item).status],
-                                :dropdown_with_values
-                              )
-    out << '</span>'
-    out << '</li>'
-  end
-  out <<  '</ul>'
-  out.html_safe
-end
-
-def absence_list_edit(object, attribute)
-  # object.send(attribute).build  if object.send(attribute).empty?
-  # values = object.send(attribute).first.class.name.constantize.find(:all) # TODO bring order
-  out = '<div class="edit_form_checklist">'
-  out << '<ul>'
-  item = object.kid
-    out << "<li>"
-    out << item._presentation
-    out << dropdown_with_values_edit(Absence.this_lesson(item).first, :status)
-    out << '</li>'
-  out << '</ul>'
-  out << '</div>'
-  out.html_safe
-end
-
-# def absence_list_update(object, attribute)
-#   params[attribute] ||= {}
-#   object.send(attribute.singularize + '_ids=', params[attribute].keys)
-# end