formie 0.9.16 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bd1c4a0803bfaf95a1d5081a7bd8570f5151a59ab3f405af2b5fbdc1f76e1f2
-  data.tar.gz: db3e558713bb68bdfe22559aac032ea52f0895bf6b0597e08b1c34b91dd4eb4e
+  metadata.gz: f549e073b8de681eddff1ad40c41872f63ed92f69ee365a8425a64438837ed7b
+  data.tar.gz: 89061cdce94b4f76ff3c10c2a814a6a7f66e4d2ee88c53364d1f7999c1c54eaf
 SHA512:
-  metadata.gz: d1d41acf311878f52e1f7b90518c5518ef99036bc3a828a2d3a1287f5dcdaa56be845d9f3e90e1b1f051bb4f61befca179495a6c4799b7e845c7b466cd6dc905
-  data.tar.gz: e8f47dfa74a537053611abf009ea0ec908924bae4e1d1ba8c371595f149e827bc7d7258eac8989326f68ea894edb16e0c4bc1e32098e26d4a932fd20bd9c6faa
+  metadata.gz: 458c621e7acb2413926cc3070a77edf58d0d96e418e800553ab9f1d5215a7bf89b3af28e0d1ade853ad400945986d64902f403828bcbb0a3dda410b7b5d05846
+  data.tar.gz: 02f57fe42549d4e63359b17e2f519d299fd94e0f5216fc30f88101540057fdf4fa2b2315d8062b98c7fc98a6024fad900745fb0643137b29904116e9d8263923

data/.ruby-gemset

@@ -1 +1 @@
-rails-5.2
+rails-6.0

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.1
+ruby-2.6.4

data/.travis.yml

@@ -6,7 +6,9 @@ bundler_args: --without production
 script: 'bundle exec rake test'
 
 rvm:
-  - 2.6.1
+  - 2.6.4
+#  - 2.6.3
+#  - 2.6.1
 #  - 2.5.1
 #  - 2.5.0
 #  - 2.4.1  # tested
@@ -15,7 +17,8 @@ rvm:
 #  - 2.2.6  # tested
 
 gemfile:
-  - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
+#  - gemfiles/rails_5.2.gemfile
 #  - gemfiles/rails_5.1.gemfile
 #  - gemfiles/rails_5.0.gemfile
 

data/.watchr

@@ -16,9 +16,9 @@ end
 
 def run_it(type, file)
   case type
-#  when 'test';  run %Q{ruby -I"lib:test" -rubygems #{file}}
-  when 'test';  run %Q{rails test #{file}}
-  when 'spec';  run %Q{rspec -X #{file}}
+  when 'test';  run %Q{ruby -I"lib:test" -r rubygems #{file}}
+#  when 'test';  run %Q{rails test #{file}}
+#  when 'spec';  run %Q{rspec -X #{file}}
   else;         puts "#{H} unknown type: #{type}, file: #{file}"
   end
 end

data/Appraisals

@@ -1,3 +1,7 @@
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0'
+end
+
 appraise 'rails-5.2' do
   gem 'rails', '~> 5.2.0'
 end

data/Gemfile

@@ -6,7 +6,5 @@ gem 'rails'
 group :test do
   gem 'observr'
   gem 'capybara'
-  gem 'sqlite3', '!= 1.4.0'
-#  gem 'sqlite3'
   gem 'slim'
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012-2018 Dittmar Krall - http://matique.de
+Copyright 2012-2019 Dittmar Krall - http://matique.de
 
 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:
@@ -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,8 @@ In directory app/formies :
       <%= form.text_field field %>
     </p>
 
-Copyright (c) 2009..2018 Dittmar Krall, released under the MIT license.
+    # templates/hello.slim
+    span Hello Slim
+    # a comment
+
+Copyright (c) 2009-2019 Dittmar Krall, released under the MIT license.

data/Rakefile

@@ -1,23 +1,6 @@
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 
-
-=begin
-## in particular, make db task available, but in vane
-# https://github.com/pat/combustion/issues/13
-require "rails"
-require "combustion"
-require "active_record/railtie"
-#Bundler.require :default, Rails.env
-
-
-Bundler.require
-#require "combustion"
-#Combustion.initialize!
-Combustion::Application.load_tasks
-=end
-
-
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|

data/formie.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake', '~> 12'
   s.add_development_dependency 'appraisal', '~> 2'
-  s.add_development_dependency 'combustion', '~> 0'
+  s.add_development_dependency 'combustion', '~> 1.1'
 
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'simplecov'

data/gemfiles/rails_6.0.gemfile

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

data/lib/formie.rb

@@ -2,12 +2,19 @@ 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')
+    self.load_formies(::ActionView::Helpers::FormBuilder, "#{PATH}/forms")
+    self.load_formies(::ActionView::Helpers::TextHelper,  "#{PATH}/application")
+    self.load_formies(::ActionView::Helpers::TextHelper,  "#{PATH}/templates")
     @last_update = now
   end
 
@@ -18,7 +25,11 @@ module Formie
 #p "** called #{where} #{formiename}", args, block
       params = args.extract_options!
       options = {}
-      options[:file] = path
+      unless Rails6
+        options[:file] = path
+      else
+        options[:template] = path.sub("#{Rails.root}/app/views", "")
+      end
       options[:locals] = {}
       options[:locals].update params
       options[:locals].update :formiename => formiename,

data/lib/formie/version.rb

@@ -1,5 +1,6 @@
 module Formie
-  VERSION = '0.9.16'    # 2019-03-05
+  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'

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/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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formie
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 1.0.0
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ 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
@@ -136,6 +136,7 @@ files:
 - 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
@@ -151,6 +152,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
@@ -182,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Formie is like a Rails helper, but uses the notation of a partial.
@@ -199,6 +206,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