string_tools 0.15.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 337a46e1015523315103711f4b61d556fc5cd71b
-  data.tar.gz: 0e9327ad9c3387224ce1d63282691d3952b140b1
+SHA256:
+  metadata.gz: 2512a1b983589c7d296ca42a9931209e01b5df52ca1c8e303886cade92c44e04
+  data.tar.gz: 3cea7ab525f3d9e0bf3630f22831634639a13b03cd8fb62a9895f48e59333a00
 SHA512:
-  metadata.gz: 5650229f42d09b51761304d2e61f1706ff174d4b78da527af8376eb0a470b37ed4b578bcc678e500803496a43bcd3507adad640b63a596b8d46b3ccf7380936f
-  data.tar.gz: '09742bdb78ef01ed2dc7b24969b18820268896b30d15c620be2c041768a11ceb69eeb3b7cdd2f37a5a7b339fa37c39c3458a15ebc81fd6d5538ede2ff465d8e9'
+  metadata.gz: 0abeee9ce1ea2830119b0c8e3c2d1949ceb85c9a78b50bf57d84eda95d29fa27f3257610292152b15c456ae952e5daf24968b5b48a585103164f4bc84da01674
+  data.tar.gz: 7e27bd1d98036d5340a2a53693ffaa832e0fd24f52365578f95114e7cadebc9da2dae5ca7ad71b2ceef64bb969424a0c2e0a27038d4a8bf1bebaf4eedd584c30

data/.drone.yml

@@ -1,32 +1,46 @@
-build:
-  test:
-    image: abakpress/dind-testing
-    pull: true
-    privileged: true
-    volumes:
-      - /home/data/drone/images:/images
-      - /home/data/drone/gems:/bundle
-      - /home/data/drone/key_cache:/ssh_keys
-    environment:
-      - COMPOSE_FILE_EXT=drone
-      - RUBY_IMAGE_TAG=2.2-latest
-    commands:
-      - wrapdocker docker -v
+---
+kind: pipeline
+type: docker
+name: build
 
-      - fetch-images
-        --image whilp/ssh-agent
-        --image abakpress/ruby-app:$RUBY_IMAGE_TAG
+volumes:
+  - name: bundle
+    host:
+      path: /home/data/drone/gems
+  - name: rubygems
+    host:
+      path: /home/data/drone/rubygems
 
-      - dip ssh add -T -v /ssh_keys -k /ssh_keys/id_rsa
-      - dip provision
-      - dip rspec
+spec_step_common: &spec_step_common
+  pull: if-not-exists
+  volumes:
+  - name: bundle
+    path: /bundle
+  commands:
+  - rm -fr Gemfile.lock gemfiles/
+  - bundle install -j 5
+  - bundle exec appraisal install
+  - bundle exec appraisal bundle exec rspec
 
-  release:
-    image: abakpress/gem-publication
-    pull: true
-    when:
-      event: push
-    volumes:
-      - /home/data/drone/rubygems:/root/.gem
-    commands:
-      - release-gem --public
+steps:
+- name: build on ruby2.4
+  image: abakpress/ruby-app:2.4-latest
+  environment:
+    TEST_DB_HOST: postgres
+    TEST_DB_NAME: docker
+    TEST_DB_USERNAME: postgres
+    BUNDLE_PATH: /bundle/2.4
+  <<: *spec_step_common
+
+- name: release
+  image: abakpress/gem-publication:latest
+  pull: if-not-exists
+  when:
+    event: push
+    branch: master
+    status: success
+  volumes:
+  - name: rubygems
+    path: /root/.gem
+  commands:
+    - release-gem --public

data/Appraisals

@@ -1,12 +1,4 @@
-appraise 'rails4.0' do
-  gem 'actionpack', '~> 4.0.0'
-  gem 'activesupport', '~> 4.0.0'
-end
-
-appraise 'rails4.1' do
-  gem 'actionpack', '~> 4.1.0'
-  gem 'activesupport', '~> 4.1.0'
-end
+# frozen_string_literal: true
 
 appraise 'rails4.2' do
   gem 'actionpack', '~> 4.2.0'

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-# v0.15.0
+# v1.0.0
+
+* 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
 
 * 2020-05-13 [19cb127](../../commit/19cb127) - __(TamarinEA)__ Release 0.15.0 
 * 2020-04-03 [e63c121](../../commit/e63c121) - __(Mikhail Nelaev)__ feature: optionally turn off uri normalization 
@@ -87,6 +96,16 @@ https://jira.railsc.ru/browse/PC4-16353
 # v3.0.1
 
 
+# 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 
+https://jira.railsc.ru/browse/GOODS-2219
+
 # v0.14.0
 
 * 2019-09-23 [f495195](../../commit/f495195) - __(TamarinEA)__ feature: use nokogiri for strip tags 

data/Gemfile

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

data/Rakefile

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require "bundler/gem_tasks"

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'string_tools'

data/dip.yml

@@ -1,8 +1,8 @@
 version: '1'
 
 environment:
-  DOCKER_RUBY_VERSION: 2.2
-  RUBY_IMAGE_TAG: 2.2-latest
+  DOCKER_RUBY_VERSION: 2.4
+  RUBY_IMAGE_TAG: 2.4-latest
   COMPOSE_FILE_EXT: development
   RAILS_ENV: test
 
@@ -33,9 +33,10 @@ interaction:
 
   clean:
     service: app
-    command: rm -f Gemfile.lock gemfiles/*.gemfile.*
+    command: rm -rf Gemfile.lock gemfiles
 
 provision:
   - docker volume create --name bundler_data
+  - dip clean
   - dip bundle install
   - dip appraisal install

data/lib/string_tools/core_ext/string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rchardet19'
 require 'addressable/uri'
 require 'active_support/core_ext/module'
@@ -154,7 +155,7 @@ class String
     end
   end
 
-  WIN_1251_ENCODING = 'windows-1251'.freeze
+  WIN_1251_ENCODING = 'windows-1251'
   # shorthand
   def detect_encoding
     e = ::CharDet.detect(self)["encoding"]
@@ -162,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!
@@ -229,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/html.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 require 'nokogiri'
 require 'addressable/uri'
 require 'simpleidn'
@@ -44,7 +45,7 @@ module StringTools
       doc = Nokogiri::HTML::DocumentFragment.parse(html)
       scrubber = LinksRemoveScrubber.new(options)
 
-      doc.css('a'.freeze).each { |node| scrubber.call node }
+      doc.css('a').each { |node| scrubber.call node }
 
       if scrubber.done_changes?
         doc.children.map { |node| node.serialize HTML_SERIALIZE_OPTIONS }.join
@@ -78,7 +79,7 @@ module StringTools
       end
 
       def whitelisted?(domain)
-        host_parts = domain.split('.'.freeze)
+        host_parts = domain.split('.')
         host = host_parts[-1] # com, ru ...
         (host_parts.length - 2).downto(0) do |i|
           subdomain = host_parts[i]

data/lib/string_tools/string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module StringTools
   class String
     TRUE_VALUES = %w(1 t T true TRUE on ON).to_set

data/lib/string_tools/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module StringTools
-  VERSION = '0.15.0'.freeze
+  VERSION = '1.0.0'
 end

data/lib/string_tools.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 require 'string_tools/version'
 require 'ru_propisju'
 require 'sanitize'
@@ -186,10 +187,10 @@ module StringTools
       def call(env)
         node = env[:node]
         case node.name
-        when 'a'.freeze
-          normalize_link node, 'href'.freeze
-        when 'img'.freeze
-          normalize_link node, 'src'.freeze
+        when 'a'
+          normalize_link node, 'href'
+        when 'img'
+          normalize_link node, 'src'
         end
       end
 
@@ -229,7 +230,7 @@ module StringTools
     # Сумма в рублях прописью. Кол-во копеек выводится всегда. Первая буква заглавная
     def rublej_propisju(amount)
       kop = (amount.divmod(1)[1]*100).round
-      result = RuPropisju.rublej(amount.to_i).capitalize
+      result = RuPropisju.rublej(amount.to_i).capitalize.dup
       result << " %.2d " % kop
       result << RuPropisju.choose_plural(kop, 'копейка', 'копейки', 'копеек')
     end

data/string_tools.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'string_tools/version'
@@ -19,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', '>= 3.1.12'
-  spec.add_runtime_dependency 'activesupport', '>= 3.1.12'
+  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'
@@ -28,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.15.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sergey D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        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