better_html 1.0.11 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5a62a4416eaa383372a21c1b8f90494d681ad7ca
-  data.tar.gz: bf03706d26596c0b03bec716d2b55f35324221b3
+SHA256:
+  metadata.gz: e8dc392542e380b0d3cb63c331cf0524f1b016f15fb99c907e8fd951fb22eae7
+  data.tar.gz: 3393a92593172019c1180c9ca3ed8dc81c9c043954b9d0a221dd82dcd399f8dd
 SHA512:
-  metadata.gz: 8ede71b45ba3cc636f1d77e76eab6e22eb539014a4fe049e9f91796bb3efc7c8c8d6629f6b2cb8f6a80738a26a892d39341b0c578b28d222a353b945f18266ac
-  data.tar.gz: 788384054b7e79a080dda17b7cbb3658e14ba1034849ca855fe9e144ac47126246631984ab509c986515e82a063133a647bf94b5f3986b0b3bf8aebb40ffbeaf
+  metadata.gz: d47ab514dcb80da8a3392dd933f4f51ccd88aa538c06fa94d325c8146c4f70250c0e57573d86ed726c58127591a9907f19183e5c640218bcadf5b09e724a83ef
+  data.tar.gz: e9d3f1534fa3f9dfad8ff0f2290bf09b9b4b221584c28cb5bc3ec67663cbe739d86d281b544d002eb1666c7772e1f0bb9bd7c67026807cf2719af661bf93cc71

data/lib/better_html/better_erb.rb

@@ -27,27 +27,28 @@ class BetterHtml::BetterErb
 
   module ConditionalImplementation
 
-    def call(template)
-      generate(template)
+    def call(template, source = nil)
+      generate(template, source)
     end
 
     private
 
-    def generate(template)
+    def generate(template, source)
       # First, convert to BINARY, so in case the encoding is
       # wrong, we can still find an encoding tag
       # (<%# encoding %>) inside the String using a regular
       # expression
 
+      source ||= template.source
       filename = template.identifier.split("/").last
       exts = filename.split(".")
       exts = exts[1..exts.length].join(".")
-      template_source = template.source.dup.force_encoding(Encoding::ASCII_8BIT)
+      template_source = source.dup.force_encoding(Encoding::ASCII_8BIT)
 
       erb = template_source.gsub(ActionView::Template::Handlers::ERB::ENCODING_TAG, '')
       encoding = $2
 
-      erb.force_encoding valid_encoding(template.source.dup, encoding)
+      erb.force_encoding valid_encoding(source.dup, encoding)
 
       # Always make sure we return a String in the default_internal
       erb.encode!
@@ -56,9 +57,14 @@ class BetterHtml::BetterErb
       klass = BetterHtml::BetterErb.content_types[exts] unless excluded_template
       klass ||= self.class.erb_implementation
 
+      escape = if ActionView::VERSION::MAJOR <= 5
+        self.class.escape_whitelist.include?(template.type)
+      else
+        self.class.escape_ignore_list.include?(template.type)
+      end
       generator = klass.new(
         erb,
-        :escape => (self.class.escape_whitelist.include? template.type),
+        :escape => escape,
         :trim => (self.class.erb_trim_mode == "-")
       )
       generator.validate! if generator.respond_to?(:validate!)

data/lib/better_html/config.rb

@@ -4,14 +4,14 @@ module BetterHtml
   class Config
     include SmartProperties
 
-    property :partial_tag_name_pattern, default: /\A[a-z0-9\-\:]+\z/
-    property :partial_attribute_name_pattern, default: /\A[a-zA-Z0-9\-\:]+\z/
+    property :partial_tag_name_pattern, default: -> { /\A[a-z0-9\-\:]+\z/ }
+    property :partial_attribute_name_pattern, default: -> { /\A[a-zA-Z0-9\-\:]+\z/ }
     property :allow_single_quoted_attributes, default: true
     property :allow_unquoted_attributes, default: false
-    property :javascript_safe_methods, default: ['to_json']
-    property :javascript_attribute_names, default: [/\Aon/i]
+    property :javascript_safe_methods, default: -> { ['to_json'] }
+    property :javascript_attribute_names, default: -> { [/\Aon/i] }
     property :template_exclusion_filter
-    property :lodash_safe_javascript_expression, default: [/\AJSON\.stringify\(/]
+    property :lodash_safe_javascript_expression, default: -> { [/\AJSON\.stringify\(/] }
 
     def javascript_attribute_name?(name)
       javascript_attribute_names.any?{ |other| other === name.to_s }

data/lib/better_html/test_helper/ruby_node.rb

@@ -1,3 +1,4 @@
+require 'better_html/parser'
 require 'parser/current'
 
 module BetterHtml

data/lib/better_html/test_helper/safe_erb_tester.rb

@@ -39,7 +39,7 @@ EOF
         options[:template_language] ||= :html
         buffer = ::Parser::Source::Buffer.new(options[:filename] || '(buffer)')
         buffer.source = data
-        parser = BetterHtml::Parser.new(buffer, options)
+        parser = BetterHtml::Parser.new(buffer, **options)
 
         tester_classes = [
           SafeErb::NoStatements,
@@ -52,7 +52,7 @@ EOF
         end
 
         testers = tester_classes.map do |tester_klass|
-          tester = tester_klass.new(parser)
+          tester_klass.new(parser)
         end
         testers.each(&:validate)
         errors = testers.map(&:errors).flatten

data/lib/better_html/test_helper/safe_lodash_tester.rb

@@ -1,6 +1,7 @@
 require 'better_html/test_helper/safety_error'
 require 'better_html/ast/iterator'
 require 'better_html/tree/tag'
+require 'better_html/parser'
 
 module BetterHtml
   module TestHelper

data/lib/better_html/tokenizer/base_erb.rb

@@ -49,20 +49,20 @@ module BetterHtml
       def add_erb_tokens(ltrim, indicator, code, rtrim)
         pos = current_position
 
-        token = add_token(:erb_begin, pos, pos + 2)
+        add_token(:erb_begin, pos, pos + 2)
         pos += 2
 
         if ltrim
-          token = add_token(:trim, pos, pos + ltrim.length)
+          add_token(:trim, pos, pos + ltrim.length)
           pos += ltrim.length
         end
 
         if indicator
-          token = add_token(:indicator, pos, pos + indicator.length)
+          add_token(:indicator, pos, pos + indicator.length)
           pos += indicator.length
         end
 
-        token = add_token(:code, pos, pos + code.length)
+        add_token(:code, pos, pos + code.length)
         pos += code.length
 
         if rtrim
@@ -70,7 +70,7 @@ module BetterHtml
           pos += rtrim.length
         end
 
-        token = add_token(:erb_end, pos, pos + 2)
+        add_token(:erb_end, pos, pos + 2)
       end
 
       def add_token(type, begin_pos, end_pos)

data/lib/better_html/tokenizer/html_lodash.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require 'html_tokenizer'
 require_relative 'token'
 require_relative 'location'
 

data/lib/better_html/version.rb

@@ -1,3 +1,3 @@
 module BetterHtml
-  VERSION = "1.0.11"
+  VERSION = "1.0.16"
 end

data/test/better_html/test_helper/safe_erb/allowed_script_type_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'better_html/parser'
 require 'better_html/test_helper/safe_erb/allowed_script_type'
 
 module BetterHtml

data/test/better_html/test_helper/safe_erb/no_statements_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'better_html/parser'
 require 'better_html/test_helper/safe_erb/no_statements'
 
 module BetterHtml

data/test/better_html/tokenizer/token_array_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'active_support/core_ext/array/access'
 require 'better_html/tokenizer/token'
 require 'better_html/tokenizer/location'
 require 'better_html/tokenizer/token_array'

data/test/test_helper.rb

@@ -1,7 +1,6 @@
 require "active_support"
 require "minitest/autorun"
 require 'better_html'
-require 'better_html/parser'
 
 # Filter out Minitest backtrace while allowing backtrace from other libraries
 # to be shown.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_html
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.16
 platform: ruby
 authors:
 - Francois Chagnon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -222,7 +222,11 @@ files:
 homepage: https://github.com/Shopify/better-html
 licenses:
 - MIT
-metadata: {}
+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.16
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -238,60 +242,59 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Better HTML for Rails.
 test_files:
-- test/dummy/public/404.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/config.ru
-- test/dummy/bin/setup
-- test/dummy/bin/rake
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/README.rdoc
-- test/dummy/config/database.yml
+- test/better_html/errors_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/script_interpolation_test.rb
+- test/better_html/test_helper/safe_erb/tag_interpolation_test.rb
+- test/better_html/test_helper/safe_erb/no_statements_test.rb
+- test/better_html/test_helper/safe_lodash_tester_test.rb
+- test/better_html/better_erb/implementation_test.rb
+- test/better_html/tokenizer/location_test.rb
+- test/better_html/tokenizer/token_test.rb
+- test/better_html/tokenizer/token_array_test.rb
+- test/better_html/tokenizer/html_lodash_test.rb
+- test/better_html/tokenizer/html_erb_test.rb
+- test/better_html/parser_test.rb
+- test/better_html/helpers_test.rb
+- test/test_helper.rb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config/secrets.yml
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/locales/en.yml
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/database.yml
 - test/dummy/config/environment.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/boot.rb
 - test/dummy/config/application.rb
-- test/dummy/config/routes.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/javascripts/application.js
+- test/dummy/config.ru
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
 - test/dummy/Rakefile
-- test/test_helper.rb
-- test/better_html/helpers_test.rb
-- test/better_html/errors_test.rb
-- test/better_html/parser_test.rb
-- test/better_html/better_erb/implementation_test.rb
-- test/better_html/test_helper/safe_erb/script_interpolation_test.rb
-- test/better_html/test_helper/safe_erb/no_javascript_tag_helper_test.rb
-- test/better_html/test_helper/safe_erb/tag_interpolation_test.rb
-- test/better_html/test_helper/safe_erb/no_statements_test.rb
-- test/better_html/test_helper/safe_erb/allowed_script_type_test.rb
-- test/better_html/test_helper/ruby_node_test.rb
-- test/better_html/test_helper/safe_lodash_tester_test.rb
-- test/better_html/tokenizer/location_test.rb
-- test/better_html/tokenizer/html_lodash_test.rb
-- test/better_html/tokenizer/html_erb_test.rb
-- test/better_html/tokenizer/token_array_test.rb
-- test/better_html/tokenizer/token_test.rb
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/500.html
+- test/dummy/README.rdoc