string_tools 0.16.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '084549131263f4bead47691b27277aecbbc504d6'
-  data.tar.gz: d8256b2bd745db61a6e7f3a20c70c0debccb70dc
+SHA256:
+  metadata.gz: 210c99c75f04b03ef26c76343f29b29b6325c94d270904a276df3c50e438ef52
+  data.tar.gz: 9a89a82fc8d20d222e67e44bb786941d860341e707bc5945d8867394fc8447e6
 SHA512:
-  metadata.gz: 9409816487699de77f2d7ef3e0bdb5c33fd3cd104c5a8d8a7c2a68ba31e6f71051442fceecbca02a1ad92fd8a226c9441a9535905b5a8f7d5d536d077e82d446
-  data.tar.gz: 81ee9e971dcc3568c67157127634d6412eb12f7d165411dbbc201317e344cdc889590adaa9d72b718a92022b2f19a550f74a197e24533813c5ee443096988aae
+  metadata.gz: c25cd4f6a32ea07a771a8e59e17a3e28e370441065d592989754d5b67b0f79a9a429a8bc79b231aa23b7f7b20b3a76b2461a610d3a410f7f64401b8a6bb49634
+  data.tar.gz: 140e95adee684c86f90e31a3780e4eca0c9110891160278412b5038ed30b533ebb2f1ca3cf2a45981d93632259ba55b98df8a8ef8b16edb1938541e6169b1dca

data/.drone.yml

@@ -23,24 +23,6 @@ spec_step_common: &spec_step_common
   - bundle exec appraisal bundle exec rspec
 
 steps:
-- name: build on ruby2.2
-  image: abakpress/ruby-app:2.2-latest
-  environment:
-    TEST_DB_HOST: postgres
-    TEST_DB_NAME: docker
-    TEST_DB_USERNAME: postgres
-    BUNDLE_PATH: /bundle/2.2
-  <<: *spec_step_common
-
-- name: build on ruby2.3
-  image: abakpress/ruby-app:2.3-latest
-  environment:
-    TEST_DB_HOST: postgres
-    TEST_DB_NAME: docker
-    TEST_DB_USERNAME: postgres
-    BUNDLE_PATH: /bundle/2.3
-  <<: *spec_step_common
-
 - name: build on ruby2.4
   image: abakpress/ruby-app:2.4-latest
   environment:

data/Appraisals

@@ -1,10 +1,4 @@
 # frozen_string_literal: true
-if RUBY_VERSION < '2.4'
-  appraise 'rails4.0' do
-    gem 'actionpack', '~> 4.0.0'
-    gem 'activesupport', '~> 4.0.0'
-  end
-end
 
 appraise 'rails4.2' do
   gem 'actionpack', '~> 4.2.0'

data/CHANGELOG.md

@@ -1,5 +1,17 @@
-# v0.16.0
+# v1.1.0
+
+* 2023-10-16 [8ccb54a](../../commit/8ccb54a) - __(ArtemBorodinEvgenyevich)__ Release v1.1.0 
+* 2023-08-29 [bed389b](../../commit/bed389b) - __(Terentev Aleksey)__ feat: sanitize links in alt of img tag 
+https://jira.railsc.ru/browse/PC4-29908
+
+* 2023-08-11 [7848491](../../commit/7848491) - __(Terentev Aleksey)__ feat: add options for sanitize outer links in css 
+https://jira.railsc.ru/browse/PC4-29908
 
+* 2023-06-15 [503fce2](../../commit/503fce2) - __(Andrew N. Shalaev)__ Release v1.0.0 
+* 2023-06-15 [8e9fa48](../../commit/8e9fa48) - __(Andrew N. Shalaev)__ fix: convert to_utf8 correctly, without hidding errors 
+https://jira.railsc.ru/browse/BPC-22244
+
+* 2023-06-15 [9bc5cf5](../../commit/9bc5cf5) - __(Andrew N. Shalaev)__ fix: up test env 
 * 2021-07-16 [8a3bf46](../../commit/8a3bf46) - __(Andrew N. Shalaev)__ Release v0.16.0 
 * 2021-07-16 [5784a91](../../commit/5784a91) - __(Andrew N. Shalaev)__ feature: add support for ruby v2.4 
 https://jira.railsc.ru/browse/BPC-19154
@@ -91,6 +103,18 @@ https://jira.railsc.ru/browse/PC4-16353
 # v3.0.1
 
 
+# v1.0.0
+
+* 2023-06-15 [8e9fa48](../../commit/8e9fa48) - __(Andrew N. Shalaev)__ fix: convert to_utf8 correctly, without hidding errors 
+https://jira.railsc.ru/browse/BPC-22244
+
+* 2023-06-15 [9bc5cf5](../../commit/9bc5cf5) - __(Andrew N. Shalaev)__ fix: up test env 
+
+# v0.16.0
+
+* 2021-07-16 [5784a91](../../commit/5784a91) - __(Andrew N. Shalaev)__ feature: add support for ruby v2.4 
+https://jira.railsc.ru/browse/BPC-19154
+
 # v0.15.0
 
 * 2020-04-03 [e63c121](../../commit/e63c121) - __(Mikhail Nelaev)__ feature: optionally turn off uri normalization 

data/Gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in string_tools.gemspec
 gemspec
 
-gem 'actionpack', '~> 4.0.13', require: false
+gem 'actionpack', '~> 4.2.0', require: false

data/dip.yml

@@ -1,8 +1,8 @@
 version: '1'
 
 environment:
-  DOCKER_RUBY_VERSION: 2.3
-  RUBY_IMAGE_TAG: 2.3-latest
+  DOCKER_RUBY_VERSION: 2.4
+  RUBY_IMAGE_TAG: 2.4-latest
   COMPOSE_FILE_EXT: development
   RAILS_ENV: test
 

data/lib/string_tools/core_ext/string.rb

@@ -163,32 +163,21 @@ class String
     e
   end
 
-  def to_utf8!
-    self.replace(self.to_utf8)
-  end
-
-  def to_utf8
-    # и так utf
-    return self if is_utf8?
+  def to_utf8(inplace = false)
+    return self if valid_encoding? && is_utf8?
 
-    enc = detect_encoding
+    source_enc = detect_encoding
+    return '' unless source_enc
 
-    # если utf или английские буквы, то тоже ок
-    return self if ['utf-8', 'ascii'].include?(enc)
-
-    # если неизвестная каша, то возвращаем пустую строку
-    return '' if enc.nil?
+    encode_utf8(source_enc, inplace)
+  end
 
-    # иначе пытаемся перекодировать
-    encode 'utf-8', enc, :undef => :replace, :invalid => :replace
-  rescue
-    ''
+  def to_utf8!
+    to_utf8(true)
   end
 
   def to_cp1251
-    encode 'cp1251', :undef => :replace, :invalid => :replace
-  rescue
-    ''
+    encode 'cp1251', undef: :replace, invalid: :replace, replace: ''
   end
 
   def to_cp1251!
@@ -230,6 +219,12 @@ class String
 
   private
 
+  def encode_utf8(source_enc, inplace = false)
+    args = ['utf-8', source_enc, undef: :replace, invalid: :replace, replace: '']
+
+    inplace ? encode!(*args) : encode(*args)
+  end
+
   def surround_with_ansi(ascii_seq)
     "#{ascii_seq}#{protect_escape_of(ascii_seq)}#{ANSI_CLEAR}"
   end

data/lib/string_tools/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module StringTools
-  VERSION = '0.16.0'
+  VERSION = '1.1.0'
 end

data/lib/string_tools.rb

@@ -155,6 +155,11 @@ module StringTools
 
       TAGS_WITHOUT_ATTRIBUTES = %w(b strong i em sup sub ul ol li blockquote br tr u caption thead s).freeze
 
+      # Public: Sanitize string
+      # str - String for sanitize
+      # attrs - Hash, custom attributes, defaults empty hash
+      #   remove_contents - Set of string, tags to be removed
+      #   protocols - Array of string, protocols using in css properties urls
       def sanitize(str, attrs = {})
         # для корректного обрезания utf строчек режем через mb_chars
         # для защиты от перегрузки парсера пропускаем максимум 1 мегабайт текста
@@ -162,6 +167,9 @@ module StringTools
         # длина по символам с перестраховкой, т.к. латинские символы(теги, например) занимают 1 байт
         str = str.mb_chars.slice(0..(2**19)).to_s
 
+        remove_contents = attrs.delete(:remove_contents)
+        protocols = attrs.delete(:protocols) || []
+
         # Мерджим добавочные теги и атрибуты
         attributes = TAGS_WITH_ATTRIBUTES.merge(attrs)
         elements = attributes.keys | TAGS_WITHOUT_ATTRIBUTES
@@ -173,8 +181,8 @@ module StringTools
           str,
           :attributes => attributes,
           :elements => elements,
-          :css => {:properties => Sanitize::Config::RELAXED[:css][:properties]},
-          :remove_contents => %w(style script),
+          :css => {:properties => Sanitize::Config::RELAXED[:css][:properties], protocols: protocols},
+          :remove_contents => remove_contents || Set['style', 'script'],
           :allow_comments => false,
           :transformers => transformers
         )
@@ -191,6 +199,7 @@ module StringTools
           normalize_link node, 'href'
         when 'img'
           normalize_link node, 'src'
+          remove_links node, 'alt'
         end
       end
 
@@ -202,6 +211,14 @@ module StringTools
       rescue Addressable::URI::InvalidURIError
         node.swap node.children
       end
+
+      def remove_links(node, attr_name)
+        return unless node[attr_name]
+
+        node[attr_name] = node[attr_name].gsub(URI::DEFAULT_PARSER.make_regexp, '').squish
+
+        node.remove_attribute(attr_name) if node[attr_name].empty?
+      end
     end
 
     class IframeNormalizer

data/string_tools.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'actionpack', '>= 4.0.13'
-  spec.add_runtime_dependency 'activesupport', '>= 4.0.13'
+  spec.add_runtime_dependency 'actionpack', '>= 4.2.0'
+  spec.add_runtime_dependency 'activesupport', '>= 4.2.0'
   spec.add_runtime_dependency 'rchardet19', '~> 1.3.5'
   spec.add_runtime_dependency 'addressable', '>= 2.3.2'
   spec.add_runtime_dependency 'ru_propisju', '>= 2.1.4'
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'nokogiri'
   spec.add_runtime_dependency 'simpleidn', '>= 0.0.5'
 
-  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'bundler', '~> 1.17.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.4'
   spec.add_development_dependency 'appraisal', '>= 1.0.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: string_tools
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sergey D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rchardet19
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -252,8 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: String Tools