formie 0.8.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 474f1b2a111d1933ae5c8c35199739089a6ec3c8
-  data.tar.gz: 453cadb69cd50e2d1432a04207efefc5bfe227ac
+  metadata.gz: 19f0dec9cee5de2b1c0654913d3da82378c588a5
+  data.tar.gz: 96de732431ce49bf61e387c86ad9608406ade802
 SHA512:
-  metadata.gz: 175bcf690ad0f4c2fcb844130838345a889a6468af55c0707bd1c60ded48e12c3ef68d08558169b241e9bdfe75bb8e57bc4537906831d3db2ee5fa67c3ba3691
-  data.tar.gz: d7439d5e5be5bb156ae43edcc8d04e4468cf3b9d35524adb45ed9fa2442056e7629eeb2e74db8c4a2290b08ca9672937c53864a6989cd97070c6ff931f6481fd
+  metadata.gz: df6998aaf416df4f4956bb3097868f7eb684ad236a554d1d1cf96d89a724f9722a88df09b1ef36a7728a61703342bde2d311dad070890b4ae19a0170408d5cea
+  data.tar.gz: 16e860161a51802f6b44a58cf0ccf47713992dd2ef9de2461f2b5830ce48ced73607c28b56481d7c485a38242e61397977e2abc443516816c1c075888b7c3dcb

data/.gitignore

@@ -0,0 +1,16 @@
+*.gem
+.bundle
+Gemfile.lock
+gemfiles/*.lock
+coverage/*
+pkg/*
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+/spec/internal/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/spec/internal/log
+log
+tmp

data/.ruby-gemset

@@ -0,0 +1 @@
+rails-5.0

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.3.1

data/.travis.yml

@@ -0,0 +1,30 @@
+language: ruby
+#bundler_args: --without production
+before_install: gem update bundler --no-document
+script: 'bundle exec rake test'
+sudo: false
+
+cache: bundler
+
+rvm:
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
+
+gemfile:
+  - gemfiles/rails5_0.gemfile
+
+notifications:
+  email: false
+
+matrix:
+  exclude:
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails4_2.gemfile
+  include:
+    - rvm: 2.3.3
+      gemfile: gemfiles/rails4_2.gemfile
+    - rvm: 2.2.6
+      gemfile: gemfiles/rails4_2.gemfile
+
+fast_finish: true

data/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in .gemspec
+gemspec
+
+gem 'rails', '~> 5.0.0'

data/MIT-LICENSE

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

@@ -93,4 +93,4 @@ In directory app/formies :
       <%= form.text_field field %>
     </p>
 
-Copyright (c) 2009..2015 Dittmar Krall, released under the MIT license.
+Copyright (c) 2009..2017 Dittmar Krall, released under the MIT license.

data/Rakefile

@@ -1,15 +1,7 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+require "bundler/gem_tasks"
 
 load 'rails/tasks/statistics.rake'
 
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -22,17 +14,3 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task default: :test
-
-
-desc "Clean automatically generated files"
-task :clean do
-  FileUtils.rm_rf "pkg"
-end
-
-desc "Check syntax"
-task :syntax do
-  Dir["**/*.rb"].each do |file|
-    print "#{file}: "
-    system("ruby -c #{file}")
-  end
-end

data/formie.gemspec

@@ -0,0 +1,38 @@
+$:.push File.expand_path('../lib', __FILE__)
+
+require 'formie/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'formie'
+  s.version     = Formie::VERSION
+  s.summary     = 'Formie is like a helper, but uses the notation of a partial.'
+  s.description = <<-'END'
+    Formie implements low level template-based 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.license     = 'MIT'
+  s.platform    = Gem::Platform::RUBY
+
+  s.files         = `git ls-files -z`.split("\x0")
+#  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ['lib']
+
+  s.add_runtime_dependency 'rails'
+
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'slim'
+
+  s.add_development_dependency 'combustion', '0.5.5'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'capybara'
+end

data/gemfiles/rails4_2.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in .gemspec
+gemspec path: '..'
+
+gem 'rails', '~> 4.2'

data/gemfiles/rails5_0.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in .gemspec
+gemspec path: '..'
+
+gem 'rails', '~> 5.0'

data/lib/formie/version.rb

@@ -1,3 +1,3 @@
 module Formie
-  VERSION = '0.8.2'
+  VERSION = '0.9.3'
 end

data/lib/formie.rb

@@ -34,7 +34,7 @@ module Formie
  private
   def self.load_formies(where, dir)
     dir = "#{::Rails.root.to_s}/#{dir}"
-    return  unless File.exists?(dir)
+    return  unless File.exist?(dir)
     Dir.chdir(dir) {|current_dir|
       hsh = {}
       Dir.glob('**/**').sort.each { |path|

data/spec/internal/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+
+end

data/spec/internal/app/models/order.rb

@@ -0,0 +1,7 @@
+class Order < ActiveRecord::Base
+
+  before_save { |row|
+    row.errors.add(:base, 'panic')  if row.name == 'error'
+  }
+
+end

data/spec/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/test.sqlite3

data/spec/internal/db/schema.rb

@@ -0,0 +1,10 @@
+ActiveRecord::Schema.define do
+
+  create_table "orders", force: true do |t|
+    t.string   "name"
+    t.string   "qty"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+end

data/test/controllers/orders_test.rb

@@ -5,12 +5,11 @@ class OrdersControllerTest < ActionController::TestCase
   test 'checking formie copyright' do
     get :index
     assert_response :success
-    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(/copyright/, response.body)
+    assert_match(/Copyright/, response.body)
+    assert_match(/label/    , response.body)
+    assert_match(/input/    , response.body)
+    assert_match(/def/      , response.body)
   end
 
 end

data/test/test_helper.rb

@@ -6,18 +6,10 @@ end
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
+require 'combustion'
+Combustion.initialize! :active_record, :action_controller
+
 require "rails/test_help"
 require 'minitest/autorun'
 require 'capybara/rails'
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-# Load fixtures from the engine
-if ActiveSupport::TestCase.respond_to?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-end
+require 'slim'

metadata

@@ -1,29 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: formie
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Dittmar Krall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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: rake
+  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: slim
+  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: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  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: capybara
+  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'
 description: |2
       Formie implements low level template-based helpers. It injects
       the formies into the ActionView module. The form-bounded as well as
@@ -35,57 +147,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
+- Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - config/initializers/formie.rb
+- formie.gemspec
+- gemfiles/rails4_2.gemfile
+- gemfiles/rails5_0.gemfile
 - lib/formie.rb
-- lib/formie.rb.bak
 - lib/formie/engine.rb
 - lib/formie/version.rb
-- lib/formie/version.rb.bak
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/orders_controller.rb
+- spec/internal/app/formies/application/copyright.html.erb
+- spec/internal/app/formies/forms/builtins.html.erb
+- spec/internal/app/formies/forms/l_text_field.html.erb
+- spec/internal/app/formies/templates/hello.slim
+- spec/internal/app/formies/templates/l_text_field.html.erb
+- spec/internal/app/formies/templates/labelled.html.erb
+- spec/internal/app/models/order.rb
+- spec/internal/app/views/layouts/application.html.erb
+- spec/internal/app/views/orders/_form.html.erb
+- spec/internal/app/views/orders/_new.html.erb
+- spec/internal/app/views/orders/index.html.erb
+- spec/internal/app/views/orders/new.html.erb
+- spec/internal/app/views/orders/show.html.erb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/public/favicon.ico
 - test/controllers/orders_test.rb
-- test/dummy/Rakefile
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/orders_controller.rb
-- test/dummy/app/formies/application/copyright.html.erb
-- test/dummy/app/formies/forms/builtins.html.erb
-- test/dummy/app/formies/forms/l_text_field.html.erb
-- test/dummy/app/formies/templates/hello.slim
-- test/dummy/app/formies/templates/l_text_field.html.erb
-- test/dummy/app/formies/templates/labelled.html.erb
-- test/dummy/app/models/order.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/orders/_form.html.erb
-- test/dummy/app/views/orders/_new.html.erb
-- test/dummy/app/views/orders/index.html.erb
-- test/dummy/app/views/orders/new.html.erb
-- test/dummy/app/views/orders/show.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/db/development.sqlite3
-- test/dummy/db/migrate/20141016161801_create_orders.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
 - test/integration/order_test.rb
 - test/test_helper.rb
 homepage: http://matique.de
@@ -113,48 +209,25 @@ signing_key:
 specification_version: 4
 summary: Formie is like a helper, but uses the notation of a partial.
 test_files:
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/orders_controller.rb
+- spec/internal/app/formies/application/copyright.html.erb
+- spec/internal/app/formies/forms/builtins.html.erb
+- spec/internal/app/formies/forms/l_text_field.html.erb
+- spec/internal/app/formies/templates/hello.slim
+- spec/internal/app/formies/templates/l_text_field.html.erb
+- spec/internal/app/formies/templates/labelled.html.erb
+- spec/internal/app/models/order.rb
+- spec/internal/app/views/layouts/application.html.erb
+- spec/internal/app/views/orders/_form.html.erb
+- spec/internal/app/views/orders/_new.html.erb
+- spec/internal/app/views/orders/index.html.erb
+- spec/internal/app/views/orders/new.html.erb
+- spec/internal/app/views/orders/show.html.erb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/public/favicon.ico
+- test/controllers/orders_test.rb
 - test/integration/order_test.rb
 - test/test_helper.rb
-- test/dummy/Rakefile
-- test/dummy/log/test.log
-- test/dummy/config.ru
-- test/dummy/db/development.sqlite3
-- test/dummy/db/schema.rb
-- test/dummy/db/migrate/20141016161801_create_orders.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/app/formies/application/copyright.html.erb
-- test/dummy/app/formies/forms/builtins.html.erb
-- test/dummy/app/formies/forms/l_text_field.html.erb
-- test/dummy/app/formies/templates/labelled.html.erb
-- test/dummy/app/formies/templates/hello.slim
-- test/dummy/app/formies/templates/l_text_field.html.erb
-- test/dummy/app/models/order.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/orders/show.html.erb
-- test/dummy/app/views/orders/new.html.erb
-- test/dummy/app/views/orders/_form.html.erb
-- test/dummy/app/views/orders/_new.html.erb
-- test/dummy/app/views/orders/index.html.erb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/orders_controller.rb
-- test/dummy/bin/setup
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
-- test/dummy/bin/rails
-- test/dummy/config/environment.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config/locales/en.yml
-- test/dummy/config/application.rb
-- test/dummy/config/routes.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/database.yml
-- test/controllers/orders_test.rb
-has_rdoc: 

data/lib/formie/version.rb.bak

@@ -1,3 +0,0 @@
-module Formie
-  VERSION = '0.8.1'
-end

data/lib/formie.rb.bak

@@ -1,67 +0,0 @@
-require 'formie/engine.rb'
-
-module Formie
-
-  def self.reload
-    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')
-    @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
-      params = args.extract_options!
-      options = {}
-      options[:file] = path
-      options[:locals] = {}
-      options[:locals].update params
-      options[:locals].update :formiename => formiename,
-		:block => block, :form => self, :args => args
-p [11, options]
-      defined?(controller) == 'method' ?
-	controller.render_to_body(options) :
-	@template.render(options)
-    })
-#p "** defined  #{where} #{formiename}"
-  end
-
-
- private
-  def self.load_formies(where, dir)
-    dir = "#{::Rails.root.to_s}/#{dir}"
-    return  unless File.exists?(dir)
-    Dir.chdir(dir) {|current_dir|
-      hsh = {}
-      Dir.glob('**/**').sort.each { |path|
-	base = File.basename(path).split('.').first
-	hsh[base] = path  unless hsh[base]
-      }
-      hsh.each { |name, path|
-	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)
-  end
-end
-
-class ActionView::Helpers::FormBuilder
-  def self.define_formie(name, txt)
-    Formie.define_formie(self, name, txt)
-  end
-end

data/test/dummy/Rakefile

@@ -1,6 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Rails.application.load_tasks

data/test/dummy/app/controllers/application_controller.rb

@@ -1,8 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-
-  before_filter do
-    Formie.reload  if 'development' == Rails.env
-  end
-
-end

data/test/dummy/app/models/order.rb

@@ -1,11 +0,0 @@
-class Order < ActiveRecord::Base
-
-  before_save :before_save_x
-  def before_save_x
-    return true  unless name == 'error'
-
-    self.errors.add :base, 'panic'
-    return false
-  end
-
-end