formie 0.9.11 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d0ecea9d4cb08edcb6d0835029d4bdb4435a4a66
-  data.tar.gz: 75d419e1df16150b5acfc7a2a5e2eb4f00766ed2
+SHA256:
+  metadata.gz: 11eb2cab3c397141a12277050a9c6e507085371a6683e8aad32d5e9ead345606
+  data.tar.gz: 346d67c443b127c37da3d99c7e722e5be39e87f153fefa6257cca6fc2705df42
 SHA512:
-  metadata.gz: b1ce8683076ee6b8acf30c8b3e6cea38af76e83fac9f48a82884c11c1f5b6a132948422db57f8e84c89d675e0a7ee5010a821fc8f068f36f04a09365ffbceb27
-  data.tar.gz: 8706ba87d94d19a89d21301b9ea4114a9751c58636f3ffdaaac6a36a65c31868d4835051666226212f85dfd6cc449522011544b9b31d4b4a540f08881004540c
+  metadata.gz: be8b57e6ab2141b5368b27a5adfb62755ff8fed7940ff6f6bbd34b500b34d34122933ecb0984b15048633bac5c3ca9b911b6dc972ec1bdba03a1531c5806bbc9
+  data.tar.gz: 0d122795334bb074b70417c270e2475379aed3794bed5aaec4a45b419636ff790e09ee346e497931586b94780ea58cb3952725f3fd02ad9378512837684edbfb

data/.gitignore

@@ -1,12 +1,13 @@
 .bundle/
 coverage/
-pkg/
-test/internal/db/*.sqlite3
 
 *.gem
 *.log
 *.lock
+*.sqlite3
 **/*.gem
 **/*.log
 **/*.lock
+**/*.sqlite3
+
 test/internal/tmp/

data/.rubocop.yml

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

data/.ruby-gemset

@@ -1 +1 @@
-rails-5.1
+rails-6.0

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.1
+ruby-2.6.6

data/.travis.yml

@@ -2,18 +2,27 @@ language: ruby
 sudo: false
 
 bundler_args: --without production
-before_install: gem update bundler --no-document
+#before_install: gem update bundler --no-document
 script: 'bundle exec rake test'
 
 rvm:
-  - 2.4.1
-  - 2.4.0
+  - 2.6.6
+#  - 2.6.5
+#  - 2.6.4
+#  - 2.6.3
+#  - 2.6.1
+#  - 2.5.1
+#  - 2.5.0
+#  - 2.4.1  # tested
+#  - 2.4.0  # tested
 #  - 2.3.3  # tested
 #  - 2.2.6  # tested
 
 gemfile:
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_6.0.gemfile
+#  - gemfiles/rails_5.2.gemfile
+#  - gemfiles/rails_5.1.gemfile
+#  - gemfiles/rails_5.0.gemfile
 
 matrix:
 #  exclude:
@@ -25,4 +34,3 @@ matrix:
 
 notifications:
   email: false
-fast_finish: true

data/.watchr

@@ -16,34 +16,30 @@ end
 
 def run_it(type, file)
   case type
-  when 'test';  run %Q{ruby -I"lib:test" -rubygems #{file}}
-  when 'spec';  run %Q{rspec -X #{file}}
+  when 'test';  run %(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 "rake #{dir} RAILS_ENV=test"  if  File.exists?(dir) }
+  %w[test spec].each { |dir| run "rake #{dir}" if  File.exist?(dir) }
 end
 
 def run_matching_files(base)
   base = base.split('_').first
-  %w{test spec}.each { |type|
+  %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|
+%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] }
 }
-%w{rb erb haml slim}.each { |type|
-  watch("app/.*/.*\.#{type}") { |m|
-    run_matching_files("#{m[0].split('/').at(2).split('.').first}")
-  }
-}
 
 # Ctrl-\ or ctrl-4
     Signal.trap('QUIT') { run_all_tests }

data/Appraisals

@@ -1,9 +1,15 @@
-appraise 'rails-5.0' do
-  gem 'rails', '~> 5.0.0'
-  gem 'dryer-config', '~> 5.0.0'
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0'
 end
 
-appraise 'rails-5.1' do
-  gem 'rails', '~> 5.1'
-  gem 'dryer-config', '~> 5.1'
+appraise 'rails-5.2' do
+  gem 'rails', '~> 5.2.0'
 end
+
+#appraise 'rails-5.1' do
+#  gem 'rails', '~> 5.1'
+#end
+#
+#appraise 'rails-5.0' do
+#  gem 'rails', '~> 5.0.0'
+#end

data/Gemfile

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

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012-2017 Dittmar Krall - http://matique.de
+Copyright 2011-2020 Dittmar Krall - www.matique.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

@@ -4,8 +4,9 @@ Formie
 [![Gem Version](https://badge.fury.io/rb/formie.svg)](https://badge.fury.io/rb/formie)
 [![Build Status](https://travis-ci.org/matique/formie.png?branch=master)](https://travis-ci.org/matique/formie)
 
-Tired of programming each HTML tag? Are you in search of DRYness for Rails
-views? May be Formie can help you.
+Tired of programming each HTML tag?
+Are you in search of DRYness for Rails views?
+May be Formie can help you.
 
 Formie implements low level template-based helpers.
 It injects the formies into the ActionView module.
@@ -35,9 +36,12 @@ Use 'gem install formie -v 0.7.1' for Rails 3.2.
 
 Templates for Formie are hosted in:
 
-- app/formies/forms       (bounded to form)
-- app/formies/application (free standing)
-- app/formies/templates   (free standing)
+- <formie_path>/forms       (bounded to form)
+- <formie_path>/application (free standing)
+- <formie_path>/templates   (free standing)
+
+Till Rails 5 <formie_path> is 'app/formies'.
+Starting at Rails 6 <formie_path> is 'app/views/formies'.
 
 Inside a formie the following locals (as delivered by the
 controller) are available:
@@ -60,7 +64,7 @@ To avoid a server restart during development of formies you may add to:
     # app/controllers/application_controller.rb
 
     before_filter do
-      Formie.reload  if 'development' == Rails.env
+      Formie.reload  if Rails.env.development?
     end
 
 
@@ -75,7 +79,7 @@ To avoid a server restart during development of formies you may add to:
       <%= f.l_text_field :amount %>
     <% end %>
 
-In directory app/formies :
+In directory <formie_path> :
 
     # application/copyright.html.erb
     <div class="copyright"> Copyright (c) 2009 </div>
@@ -93,4 +97,9 @@ In directory app/formies :
       <%= form.text_field field %>
     </p>
 
-Copyright (c) 2009..2017 Dittmar Krall, released under the MIT license.
+    # templates/hello.slim
+    / a comment
+
+    span Hello Slim
+
+Copyright (c) 2009-2019 Dittmar Krall, released under the MIT license.

data/Rakefile

@@ -1,8 +1,7 @@
-require 'bundler/setup'
-
 require 'rake/testtask'
 
-Rake::TestTask.new(:test) do |t|
+desc 'Run the tests.'
+Rake::TestTask.new do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'

data/formie.gemspec

@@ -24,7 +24,10 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'bundler', '~> 1'
-  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'rake', '~> 13'
   s.add_development_dependency 'appraisal', '~> 2'
-  s.add_development_dependency 'combustion', '~> 0'
+  s.add_development_dependency 'combustion', '~> 1.1'
+
+  s.add_development_dependency 'minitest', '~> 5'
+  s.add_development_dependency 'sqlite3', '~> 1'
 end

data/gemfiles/rails_5.0.gemfile

@@ -3,14 +3,13 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0.0"
-gem "dryer-config", "~> 5.0.0"
 
 group :test do
   gem "observr"
   gem "simplecov", require: false
   gem "minitest"
   gem "capybara"
-  gem "sqlite3"
+  gem "sqlite3", "!= 1.4.0"
   gem "slim"
 end
 

data/gemfiles/rails_5.1.gemfile

@@ -3,14 +3,13 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.1"
-gem "dryer-config", "~> 5.1"
 
 group :test do
   gem "observr"
   gem "simplecov", require: false
   gem "minitest"
   gem "capybara"
-  gem "sqlite3"
+  gem "sqlite3", "!= 1.4.0"
   gem "slim"
 end
 

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+
+group :test do
+  gem "observr"
+  gem "capybara"
+  gem "slim"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+
+group :test do
+  gem "observr"
+  gem "capybara"
+  gem "slim"
+end
+
+gemspec path: "../"

data/lib/formie.rb

@@ -1,57 +1,68 @@
+# frozen_string_literal: true
+
 require 'formie/engine.rb'
 
 module Formie
+  Rails6 = Rails.version.to_f >= 6.0
+  PATH = Rails6 ? 'app/views/formies' : 'app/formies'
 
   def self.reload
+    if Rails6 && !File.directory?("#{Rails.root}/app/views/formies")
+      raise 'Formies must be located in "app/views/formies" since Rails 6'
+    end
+
     now = Time.now
     @last_update ||= Time.new(0)
-    self.load_formies(::ActionView::Helpers::FormBuilder, 'app/formies/forms')
-    self.load_formies(::ActionView::Helpers::TextHelper,  'app/formies/application')
-    self.load_formies(::ActionView::Helpers::TextHelper,  'app/formies/templates')
+    load_formies(::ActionView::Helpers::FormBuilder, "#{PATH}/forms")
+    load_formies(::ActionView::Helpers::TextHelper,  "#{PATH}/application")
+    load_formies(::ActionView::Helpers::TextHelper,  "#{PATH}/templates")
     @last_update = now
   end
 
   def self.define_formie(where, name, path)
     formiename = name
 
-    where.send(:define_method, formiename, lambda {|*args, &block|
-#p "** called #{where} #{formiename}", args, block
+    where.send(:define_method, formiename, lambda { |*args, &block|
+      # p "** called #{where} #{formiename}", args, block
       params = args.extract_options!
       options = {}
-      options[:file] = path
+      if Rails6
+        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
-      defined?(controller) == 'method' ?
-	controller.render_to_body(options) :
-	@template.render(options)
+      options[:locals].update formiename: formiename,
+                block: block, form: self, args: args
+      if defined?(controller) == 'method'
+        controller.render_to_body(options)
+      else
+        @template.render(options)
+      end
     })
-#p "** defined  #{where} #{formiename}"
+    # p "** defined  #{where} #{formiename}"
   end
 
-
- private
   def self.load_formies(where, dir)
- # avoid Dir.chdir (not thread safe)
+    # avoid Dir.chdir (not thread safe)
     dir = File.join Rails.root, dir
-    return  unless File.exist?(dir)
+    return unless File.exist?(dir)
+
     hsh = {}
-    Dir.glob(File.join(dir,'**','**')).sort.each { |path|
+    Dir.glob(File.join(dir, '**', '**')).sort.each { |path|
       base = File.basename(path).split('.').first
-      hsh[base] = path  unless hsh[base]
+      hsh[base] = path unless hsh[base]
     }
     hsh.each { |name, path|
-      next  if File.new(path).mtime < @last_update
+      next if File.new(path).mtime < @last_update
 
       x = File.expand_path(File.dirname(path))
       where.define_formie name, File.join(x, name)
     }
   end
-
 end
 
-
 module ActionView::Helpers::TextHelper
   def self.define_formie(name, txt)
     Formie.define_formie(self, name, txt)

data/lib/formie/engine.rb

@@ -1,5 +1,6 @@
+# rubocop: disable all
+
 module Formie
   class Engine < Rails::Engine
-    require 'slim'
   end
 end

data/lib/formie/version.rb

@@ -1,3 +1,11 @@
+# rubocop: disable all
+
 module Formie
-  VERSION = '0.9.11'
+  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'
 end

data/test/integration/order_test.rb

@@ -23,6 +23,13 @@ describe "Formie" do
     assert_equal 'Hello Slim', page.find('form span').text
   end
 
+  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
     visit "/orders/new"
     assert page.has_content?("action_name new")

data/test/internal/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//= link_tree ../images

data/test/internal/app/formies/templates/hello.slim

@@ -1 +1,3 @@
+/ a comment
+
 span Hello Slim

data/test/internal/app/views/formies/application/copyright.html.erb

@@ -0,0 +1,3 @@
+<% year ||= args.first || Time.now.year %>
+
+<div class="copyright"> Copyright (c) <%= year %> </div>

data/test/internal/app/views/formies/forms/builtins.html.erb

@@ -0,0 +1,7 @@
+action_name <%= action_name %> <br/>
+args <%= args %> <br/>
+block <%= block.call(3) %> <br/>
+controller_name <%= controller_name %> <br/>
+form <%= form.class.name %> <br/>
+form.object <%= form.object.class.name %> <br/>
+params <%= params[:action] %> <br/>

data/test/internal/app/views/formies/forms/l_text_field.html.erb

@@ -0,0 +1,4 @@
+<p>
+  <%= form.label args.first %><br />
+  <%= form.text_field args.first %>
+</p>

data/test/internal/app/views/formies/templates/hello.slim

@@ -0,0 +1,3 @@
+/ a comment
+
+span Hello Slim

data/test/internal/app/views/formies/templates/l_text_field.html.erb

@@ -0,0 +1,2 @@
+<% field = args.first %>
+<%= labelled field, text_field_tag(field) %>

data/test/internal/app/views/formies/templates/labelled.html.erb

@@ -0,0 +1,4 @@
+<p>
+  <label> <%= args[0] %> </label>
+  <%= args[1] %>
+</p>

data/test/test_helper.rb

@@ -1,7 +1,9 @@
-#require 'simplecov'
-#SimpleCov.start do
-#  add_filter '/test/'
-#end
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/test/'
+  end
+end
 
 require "combustion"
 Combustion.path = "test/internal"
@@ -9,11 +11,5 @@ Combustion.initialize! :all
 
 require 'rails/test_help'
 require 'minitest/autorun'
+require 'minitest/benchmark'
 require 'capybara/rails'
-
-#class ActiveSupport::TestCase
-#  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
-#  fixtures :all
-#
-#  # Add more helper methods to be used by all tests here...
-#end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formie
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 1.0.2
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-20 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: |2
       Formie implements low level template-based Rails helpers. It injects
       the formies into the ActionView module. The form-bounded as well as
@@ -78,12 +106,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - ".watchr"
 - Appraisals
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -92,11 +122,14 @@ files:
 - gemfiles/rails4_2.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/formie.rb
 - lib/formie/engine.rb
 - lib/formie/version.rb
 - 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
@@ -107,6 +140,12 @@ files:
 - 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
@@ -138,14 +177,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.8
 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
@@ -156,6 +195,12 @@ test_files:
 - 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