formie 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f549e073b8de681eddff1ad40c41872f63ed92f69ee365a8425a64438837ed7b
-  data.tar.gz: 89061cdce94b4f76ff3c10c2a814a6a7f66e4d2ee88c53364d1f7999c1c54eaf
+  metadata.gz: 11eb2cab3c397141a12277050a9c6e507085371a6683e8aad32d5e9ead345606
+  data.tar.gz: 346d67c443b127c37da3d99c7e722e5be39e87f153fefa6257cca6fc2705df42
 SHA512:
-  metadata.gz: 458c621e7acb2413926cc3070a77edf58d0d96e418e800553ab9f1d5215a7bf89b3af28e0d1ade853ad400945986d64902f403828bcbb0a3dda410b7b5d05846
-  data.tar.gz: 02f57fe42549d4e63359b17e2f519d299fd94e0f5216fc30f88101540057fdf4fa2b2315d8062b98c7fc98a6024fad900745fb0643137b29904116e9d8263923
+  metadata.gz: be8b57e6ab2141b5368b27a5adfb62755ff8fed7940ff6f6bbd34b500b34d34122933ecb0984b15048633bac5c3ca9b911b6dc972ec1bdba03a1531c5806bbc9
+  data.tar.gz: 0d122795334bb074b70417c270e2475379aed3794bed5aaec4a45b419636ff790e09ee346e497931586b94780ea58cb3952725f3fd02ad9378512837684edbfb

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

@@ -1 +1 @@
-ruby-2.6.4
+ruby-2.6.6

data/.travis.yml

@@ -6,7 +6,9 @@ bundler_args: --without production
 script: 'bundle exec rake test'
 
 rvm:
-  - 2.6.4
+  - 2.6.6
+#  - 2.6.5
+#  - 2.6.4
 #  - 2.6.3
 #  - 2.6.1
 #  - 2.5.1

data/.watchr

@@ -16,35 +16,30 @@ end
 
 def run_it(type, file)
   case type
-  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}}
+  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/Gemfile

@@ -5,6 +5,8 @@ gem 'rails'
 
 group :test do
   gem 'observr'
+  gem 'rubocop', require: false
+  gem 'simplecov', require: false
   gem 'capybara'
   gem 'slim'
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012-2019 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

@@ -98,7 +98,8 @@ In directory  :
     </p>
 
     # templates/hello.slim
+    / a comment
+
     span Hello Slim
-    # a comment
 
 Copyright (c) 2009-2019 Dittmar Krall, released under the MIT license.

data/Rakefile

@@ -1,9 +1,7 @@
-require 'bundler/setup'
-Bundler::GemHelper.install_tasks
-
 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

@@ -23,13 +23,11 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'bundler', '~> 1'
+  s.add_development_dependency 'rake', '~> 13'
   s.add_development_dependency 'appraisal', '~> 2'
   s.add_development_dependency 'combustion', '~> 1.1'
 
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'sqlite3'
-
+  s.add_development_dependency 'minitest', '~> 5'
+  s.add_development_dependency 'sqlite3', '~> 1'
 end

data/gemfiles/rails_5.2.gemfile

@@ -7,7 +7,6 @@ gem "rails", "~> 5.2.0"
 group :test do
   gem "observr"
   gem "capybara"
-  gem "sqlite3", "!= 1.4.0"
   gem "slim"
 end
 

data/gemfiles/rails_6.0.gemfile

@@ -7,7 +7,6 @@ gem "rails", "~> 6.0.0"
 group :test do
   gem "observr"
   gem "capybara"
-  gem "sqlite3", "!= 1.4.0"
   gem "slim"
 end
 

data/lib/formie.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'formie/engine.rb'
 
 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")
@@ -12,57 +13,56 @@ module Formie
 
     now = Time.now
     @last_update ||= Time.new(0)
-    self.load_formies(::ActionView::Helpers::FormBuilder, "#{PATH}/forms")
-    self.load_formies(::ActionView::Helpers::TextHelper,  "#{PATH}/application")
-    self.load_formies(::ActionView::Helpers::TextHelper,  "#{PATH}/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 = {}
-      unless Rails6
-        options[:file] = path
+      if Rails6
+        options[:template] = path.sub("#{Rails.root}/app/views", '')
       else
-        options[:template] = path.sub("#{Rails.root}/app/views", "")
+        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,3 +1,5 @@
+# rubocop: disable all
+
 module Formie
   class Engine < Rails::Engine
   end

data/lib/formie/version.rb

@@ -1,7 +1,11 @@
+# rubocop: disable all
+
 module Formie
-  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.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/internal/app/assets/config/manifest.js

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

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,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: formie
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     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
@@ -70,44 +70,30 @@ dependencies:
   name: minitest
   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: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        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
@@ -120,6 +106,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
@@ -142,6 +129,7 @@ files:
 - 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
@@ -189,13 +177,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+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