forme 1.11.0 → 2.1.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forme
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -172,13 +172,12 @@ files:
 - lib/forme.rb
 - lib/forme/bs3.rb
 - lib/forme/erb.rb
-- lib/forme/erb_form.rb
 - lib/forme/form.rb
 - lib/forme/input.rb
 - lib/forme/rails.rb
 - lib/forme/raw.rb
-- lib/forme/sinatra.rb
 - lib/forme/tag.rb
+- lib/forme/template.rb
 - lib/forme/transformers/error_handler.rb
 - lib/forme/transformers/formatter.rb
 - lib/forme/transformers/helper.rb
@@ -188,6 +187,7 @@ files:
 - lib/forme/transformers/wrapper.rb
 - lib/forme/version.rb
 - lib/roda/plugins/forme.rb
+- lib/roda/plugins/forme_erubi_capture.rb
 - lib/roda/plugins/forme_route_csrf.rb
 - lib/roda/plugins/forme_set.rb
 - lib/sequel/plugins/forme.rb
@@ -198,6 +198,7 @@ files:
 - spec/bs3_sequel_plugin_spec.rb
 - spec/bs3_spec.rb
 - spec/erb_helper.rb
+- spec/erubi_capture_helper.rb
 - spec/forme_coverage.rb
 - spec/forme_spec.rb
 - spec/rails_integration_spec.rb
@@ -207,6 +208,7 @@ files:
 - spec/sequel_i18n_plugin_spec.rb
 - spec/sequel_plugin_spec.rb
 - spec/sequel_set_plugin_spec.rb
+- spec/shared_erb_specs.rb
 - spec/sinatra_integration_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/jeremyevans/forme
@@ -216,7 +218,7 @@ metadata:
   bug_tracker_uri: https://github.com/jeremyevans/forme/issues
   changelog_uri: http://forme.jeremyevans.net/files/CHANGELOG.html
   documentation_uri: http://forme.jeremyevans.net
-  mailing_list_uri: https://groups.google.com/forum/#!forum/ruby-forme
+  mailing_list_uri: https://github.com/jeremyevans/forme/discussions
   source_code_uri: https://github.com/jeremyevans/forme
 post_install_message: 
 rdoc_options:
@@ -233,14 +235,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: HTML forms library

data/lib/forme/erb_form.rb

@@ -1,74 +0,0 @@
-# frozen-string-literal: true
-
-require 'forme'
-
-module Forme
-  module ERB 
-    # Subclass used when using Forme ERB integration.
-    # Handles integrating into the view template so that
-    # methods with blocks can inject strings into the output.
-    class Form < ::Forme::Form
-      # Template output object, where serialized output gets
-      # injected.
-      attr_reader :output
-
-      # Set the template output object when initializing.
-      def initialize(*)
-        super
-        @output = @opts[:output] ? @opts[:output] : String.new
-      end
-
-      # Serialize the tag and inject it into the output.
-      def emit(tag)
-        output << tag.to_s
-      end
-
-      # Capture the inside of the inputs, injecting it into the template
-      # if a block is given, or returning it as a string if not.
-      def inputs(*a, &block)
-        if block
-          capture(block){super}
-        else
-          capture{super}
-        end
-      end
-
-      # Capture the inside of the form, injecting it into the template if
-      # a block is given, or returning it as a string if not.
-      def form(*a, &block)
-        if block
-          capture(block){super}
-        else
-          super
-        end
-      end
-
-      # If a block is given, inject an opening tag into the
-      # output, inject any given children into the output, yield to the
-      # block, inject a closing tag into the output.
-      # If a block is not given, just return the tag created.
-      def tag(type, attr={}, children=[], &block)
-        tag = _tag(type, attr, children)
-        if block
-          capture(block) do
-            emit(serialize_open(tag))
-            Array(tag.children).each{|c| emit(c)}
-            yield self
-            emit(serialize_close(tag))
-          end
-        else
-          tag
-        end
-      end
-
-      def capture(block=String.new) # :nodoc:
-        buf_was, @output = @output, block.is_a?(Proc) ? (eval("@_out_buf", block.binding) || @output) : block
-        yield
-        ret = @output
-        @output = buf_was
-        ret
-      end
-    end
-  end
-end
-

data/lib/forme/sinatra.rb

@@ -1,17 +0,0 @@
-# frozen-string-literal: true
-
-require 'forme/erb'
-
-module Forme
-  # For backwards compatibility only.  New code should
-  # require 'forme/erb' and include the Forme::ERB::Helper
-  # class:
-  #
-  #   helpers Forme::ERB::Helper
-  module Sinatra
-    ERB = Forme::ERB::Helper
-    Erubis = ERB
-    Form = Forme::ERB::Form
-    HIDDEN_TAGS = Forme::ERB::HIDDEN_TAGS
-  end
-end