better_html 1.0.15 → 2.0.1

data/lib/better_html/tree/attribute.rb

@@ -1,19 +1,23 @@
-require 'ast'
+# frozen_string_literal: true
+
+require "ast"
 
 module BetterHtml
   module Tree
     class Attribute
       attr_reader :node, :name_node, :equal_node, :value_node
 
+      class << self
+        def from_node(node)
+          new(node)
+        end
+      end
+
       def initialize(node)
         @node = node
         @name_node, @equal_node, @value_node = *node if @node.type == :attribute
       end
 
-      def self.from_node(node)
-        new(node)
-      end
-
       def erb?
         @node.type == :erb
       end
@@ -27,7 +31,7 @@ module BetterHtml
       end
 
       def value
-        parts = value_node.to_a.reject{ |node| node.is_a?(::AST::Node) && node.type == :quote }
+        parts = value_node.to_a.reject { |node| node.is_a?(::AST::Node) && node.type == :quote }
         parts.map { |s| s.is_a?(::AST::Node) ? s.loc.source : CGI.unescapeHTML(s) }.join
       end
     end

data/lib/better_html/tree/attributes_list.rb

@@ -1,14 +1,18 @@
-require 'better_html/tree/attribute'
+# frozen_string_literal: true
+
+require "better_html/tree/attribute"
 
 module BetterHtml
   module Tree
     class AttributesList
-      def initialize(list)
-        @list = list || []
+      class << self
+        def from_nodes(nodes)
+          new(nodes&.map { |node| Tree::Attribute.from_node(node) })
+        end
       end
 
-      def self.from_nodes(nodes)
-        new(nodes&.map { |node| Tree::Attribute.from_node(node) })
+      def initialize(list)
+        @list = list || []
       end
 
       def [](name)

data/lib/better_html/tree/tag.rb

@@ -1,20 +1,24 @@
-require 'better_html/tree/attributes_list'
-require 'better_html/ast/iterator'
+# frozen_string_literal: true
+
+require "better_html/tree/attributes_list"
+require "better_html/ast/iterator"
 
 module BetterHtml
   module Tree
     class Tag
       attr_reader :node, :start_solidus, :name_node, :attributes_node, :end_solidus
 
+      class << self
+        def from_node(node)
+          new(node)
+        end
+      end
+
       def initialize(node)
         @node = node
         @start_solidus, @name_node, @attributes_node, @end_solidus = *node
       end
 
-      def self.from_node(node)
-        new(node)
-      end
-
       def loc
         @node.loc
       end

data/lib/better_html/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BetterHtml
-  VERSION = "1.0.15"
+  VERSION = "2.0.1"
 end

data/lib/better_html.rb

@@ -1,25 +1,27 @@
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/class/attribute_accessors'
+# frozen_string_literal: true
+
+require "active_support/core_ext/hash/keys"
+require "active_support/core_ext/module/delegation"
+require "active_support/core_ext/class/attribute_accessors"
 
 module BetterHtml
-  def self.configure
-    yield config if block_given?
-  end
+  class << self
+    attr_writer :config
 
-  def self.config
-    @config ||= Config.new
-  end
+    def config
+      @config ||= Config.new
+    end
 
-  def self.config=(new_config)
-    @config = new_config
+    def configure
+      yield config if block_given?
+    end
   end
 end
 
-require 'better_html/version'
-require 'better_html/config'
-require 'better_html/helpers'
-require 'better_html/errors'
-require 'better_html/html_attributes'
+require "better_html/version"
+require "better_html/config"
+require "better_html/helpers"
+require "better_html/errors"
+require "better_html/html_attributes"
 
-require 'better_html/railtie' if defined?(Rails)
+require "better_html/railtie" if defined?(Rails)

data/lib/tasks/better_html_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # desc "Explaining what the task does"
 # task :better_html do
 #   # Task goes here

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: better_html
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 2.0.1
 platform: ruby
 authors:
 - Francois Chagnon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ast
+  name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: erubi
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: ast
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: actionview
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -94,50 +94,44 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: html_tokenizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 description: Better HTML for Rails. Provides sane html helpers that make it easier
   to do the right thing.
 email:
-- francois.chagnon@shopify.com
+- ruby@shopify.com
 executables: []
-extensions: []
+extensions:
+- ext/better_html_ext/extconf.rb
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - Rakefile
+- ext/better_html_ext/better_html.h
+- ext/better_html_ext/extconf.rb
+- ext/better_html_ext/html_tokenizer.c
+- ext/better_html_ext/html_tokenizer.h
+- ext/better_html_ext/parser.c
+- ext/better_html_ext/parser.h
+- ext/better_html_ext/tokenizer.c
+- ext/better_html_ext/tokenizer.h
 - lib/better_html.rb
 - lib/better_html/ast/iterator.rb
 - lib/better_html/ast/node.rb
 - lib/better_html/better_erb.rb
 - lib/better_html/better_erb/erubi_implementation.rb
-- lib/better_html/better_erb/erubis_implementation.rb
 - lib/better_html/better_erb/runtime_checks.rb
 - lib/better_html/better_erb/validated_output_buffer.rb
 - lib/better_html/config.rb
@@ -168,64 +162,13 @@ files:
 - lib/better_html/tree/tag.rb
 - lib/better_html/version.rb
 - lib/tasks/better_html_tasks.rake
-- test/better_html/better_erb/implementation_test.rb
-- test/better_html/errors_test.rb
-- test/better_html/helpers_test.rb
-- test/better_html/parser_test.rb
-- test/better_html/test_helper/ruby_node_test.rb
-- test/better_html/test_helper/safe_erb/allowed_script_type_test.rb
-- test/better_html/test_helper/safe_erb/no_javascript_tag_helper_test.rb
-- test/better_html/test_helper/safe_erb/no_statements_test.rb
-- test/better_html/test_helper/safe_erb/script_interpolation_test.rb
-- test/better_html/test_helper/safe_erb/tag_interpolation_test.rb
-- test/better_html/test_helper/safe_lodash_tester_test.rb
-- test/better_html/tokenizer/html_erb_test.rb
-- test/better_html/tokenizer/html_lodash_test.rb
-- test/better_html/tokenizer/location_test.rb
-- test/better_html/tokenizer/token_array_test.rb
-- test/better_html/tokenizer/token_test.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.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/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.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/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/test_helper.rb
 homepage: https://github.com/Shopify/better-html
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/Shopify/better-html/issues
   changelog_uri: https://github.com/Shopify/better-html/releases
-  source_code_uri: https://github.com/Shopify/better-html/tree/v1.0.15
+  source_code_uri: https://github.com/Shopify/better-html/tree/v2.0.1
   allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
@@ -235,66 +178,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Better HTML for Rails.
-test_files:
-- test/test_helper.rb
-- test/better_html/helpers_test.rb
-- test/better_html/better_erb/implementation_test.rb
-- test/better_html/errors_test.rb
-- test/better_html/parser_test.rb
-- test/better_html/tokenizer/token_array_test.rb
-- test/better_html/tokenizer/token_test.rb
-- test/better_html/tokenizer/html_lodash_test.rb
-- test/better_html/tokenizer/location_test.rb
-- test/better_html/tokenizer/html_erb_test.rb
-- test/better_html/test_helper/safe_erb/script_interpolation_test.rb
-- test/better_html/test_helper/safe_erb/allowed_script_type_test.rb
-- test/better_html/test_helper/safe_erb/no_javascript_tag_helper_test.rb
-- test/better_html/test_helper/safe_erb/no_statements_test.rb
-- test/better_html/test_helper/safe_erb/tag_interpolation_test.rb
-- test/better_html/test_helper/ruby_node_test.rb
-- test/better_html/test_helper/safe_lodash_tester_test.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/bin/bundle
-- test/dummy/bin/rake
-- test/dummy/bin/rails
-- test/dummy/bin/setup
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/backtrace_silencers.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/mime_types.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config/application.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/routes.rb
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/422.html
-- test/dummy/public/404.html
-- test/dummy/Rakefile
-- test/dummy/config.ru
-- test/dummy/README.rdoc
+test_files: []

data/lib/better_html/better_erb/erubis_implementation.rb

@@ -1,44 +0,0 @@
-require 'action_view'
-require_relative 'runtime_checks'
-
-class BetterHtml::BetterErb
-  class ErubisImplementation < ActionView::Template::Handlers::Erubis
-    include RuntimeChecks
-
-    def add_text(src, text)
-      return if text.empty?
-
-      if text == "\n"
-        @parser.parse("\n")
-        @newline_pending += 1
-      else
-        src << "@output_buffer.safe_append='"
-        src << "\n" * @newline_pending if @newline_pending > 0
-        src << escape_text(text)
-        src << "'.freeze;"
-
-        @parser.parse(text) do |*args|
-          check_token(*args)
-        end
-
-        @newline_pending = 0
-      end
-    end
-
-    def add_expr_literal(src, code)
-      add_expr_auto_escaped(src, code, true)
-    end
-
-    def add_expr_escaped(src, code)
-      add_expr_auto_escaped(src, code, false)
-    end
-
-    def add_stmt(src, code)
-      flush_newline_if_pending(src)
-
-      block_check(src, "<%#{code}%>")
-      @parser.append_placeholder(code)
-      super
-    end
-  end
-end