regexp_trie 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c224ed8fe77a7b37a2c640fe5fc162c768e45a0c5c305e710b31a9b07e4f3efe
-  data.tar.gz: e3a2799dfdef72cda95ae4be4c42f51139c5b9f3c325d480af001939deb5f987
+  metadata.gz: 3b7c0815c1b7b8f4bc6205ddaed11d259531f39bdcf6ac4a08a1edb965019d75
+  data.tar.gz: 9321a016f40fe9ffd441dbcc41068440d2fc1cea4ff49eb1c5efa9e559590113
 SHA512:
-  metadata.gz: c659358d1ee657e8c085e5ea7649b1043876db05a8e14edb9b176e67ffc1af7477813f78d00a07ed402186f82177a2dc11f670a2a1fce0e452d89aec75342b18
-  data.tar.gz: 217b2b2c9d9e16f2547b499668b0402ad9f542a77878c8705cacdb771900641ab24c4935fabf4611803231f1c7d79e1a2f9fef2867a63344315284ce3dc39cc7
+  metadata.gz: b9cba5c7d1a9379061c813e8829c52e2e69915824814d7b156f492a464a6d0bee21b0fbad041263779303104215388a69610cd796f0fe633f143125feb2e9b64
+  data.tar.gz: 7877a5f840407312b18f2d6644ebff0c71f9c0692450c365b953dcb42b4c8e4a45f2cbd5f8583dc6408a39ca521726eb577df8de7054b369c9003b0916589ba6

data/.github/workflows/CI.yml

@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '${{ matrix.ruby-version }}'
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/CHANGES.md

@@ -1,9 +1,14 @@
 Revision history of the RegexpTrie gem
 
-## v1.0.1 - 2018/10/09
+## v1.0.2 - 2018/10/09
 
+* Tested on Ruby v2.5
 * Add `# frozen_string_literal: true` to source files
 
+## v1.0.1 - 2018/10/09
+
+* <del>Add `# frozen_string_literal: true` to source files</del> (<ins>it was not enabled; fixed in v1.0.2</ins>)
+
 ## v1.0.0 - 2016/11/14
 
 - Add a method to get the union pattern as `String`, not as `Regexp`

data/README.md

@@ -1,4 +1,4 @@
-# RegexpTrie [![Build Status](https://travis-ci.org/gfx/ruby-regexp_trie.svg?branch=master)](https://travis-ci.org/gfx/ruby-regexp_trie) [![Gem Version](https://badge.fury.io/rb/regexp_trie.svg)](https://badge.fury.io/rb/regexp_trie)
+# RegexpTrie [![CI](https://github.com/gfx/ruby-regexp_trie/actions/workflows/CI.yml/badge.svg)](https://github.com/gfx/ruby-regexp_trie/actions/workflows/CI.yml) [![Gem Version](https://badge.fury.io/rb/regexp_trie.svg)](https://badge.fury.io/rb/regexp_trie)
 
 ## Synopsis
 

data/lib/regexp_trie/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class RegexpTrie
-  VERSION = "1.0.1"
+  VERSION = "1.0.3"
 end

data/lib/regexp_trie.rb

@@ -1,11 +1,13 @@
-# frozen_string_literal
+# frozen_string_literal: true
 
 require_relative "regexp_trie/version"
 
 class RegexpTrie
 
+  # Factly method to call `new(*strings).to_regexp(option)` in short.
+  #
   # @param [Array<String>] strings Set of patterns
-  # @param [Fixnum,Boolean] option The second argument of Regexp.new()
+  # @param [Integer,Boolean] option The second argument of `Regexp.new()` passed to build a regexp instance
   # @return [Regexp]
   def self.union(*strings, option: nil)
     new(*strings).to_regexp(option)

data/regexp_trie.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'regexp_trie/version'
+# frozen_string_literal: true
+
+require_relative './lib/regexp_trie/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "regexp_trie"
@@ -13,17 +13,20 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Optimized Regexp builder with Trie as a port of Perl's Regexp::Trie}
   spec.homepage      = "https://github.com/gfx/ruby-regexp_trie"
   spec.license       = "MIT"
+  spec.metadata = {
+    "source_code_uri" => "https://github.com/gfx/ruby-regexp_trie",
+    "allowed_push_host" => "https://rubygems.org/"
+  }
 
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|example)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "bundler", ">= 1.11"
+  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "minitest", ">= 5.0"
   spec.add_development_dependency "minitest-power_assert"
   spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: regexp_trie
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - FUJI Goro (gfx)
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/CI.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -96,9 +96,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- example/benchmark.rb
-- example/hatena-keyword-list.csv
-- example/synopsis.rb
 - lib/regexp_trie.rb
 - lib/regexp_trie/version.rb
 - regexp_trie.gemspec
@@ -106,8 +103,9 @@ homepage: https://github.com/gfx/ruby-regexp_trie
 licenses:
 - MIT
 metadata:
+  source_code_uri: https://github.com/gfx/ruby-regexp_trie
   allowed_push_host: https://rubygems.org/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,9 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Optimized Regexp builder with Trie
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.1.7
-  - 2.2.3
-  - 2.3.0
-before_install: gem install bundler

data/example/benchmark.rb

@@ -1,90 +0,0 @@
-#!/usr/bin/env ruby
-require 'benchmark'
-require 'diffy'
-require 'regexp_trie'
-
-keywords = []
-File.open('example/hatena-keyword-list.csv') do |io|
-  io.each do |line|
-    yomi, word = line.split(/\t/)
-    word.strip!
-    unless word.empty?
-      keywords.push(word)
-    end
-  end
-end
-
-puts "build regexp ..."
-
-keywords.sort_by! { |item| -item.length }
-
-rx_raw = Regexp.union(keywords)
-rx_trie = RegexpTrie.union(keywords)
-
-puts "rx_raw:  #{rx_raw.to_s.length}"
-puts "rx_trie: #{rx_trie.to_s.length}"
-
-text = <<'EOS'
-http://blog.livedoor.jp/dankogai/archives/50074802.html
-
-TRIE-Optimized Regexp  [Show on Hatena Bookmark]
-これをPerlで直接使えたらうれしいよね＞おおる
-
-きまぐれ日記: はてなキーワードを高速に付与
-そこで、はてなキーワードを TRIE を使って付与するプログラムを作ってみました。
-というわけで、やってみました。
-
-
-最初はDartsのXSを作ろうとしたのだけど、どうもtemplateばりばりのC++コードとXSは相性が悪い。でもTrieを作るだけなら、Perlでもそこそこ出来るし、実際Regexp::OptimizerやRegexp::Assembleのようなモジュールもある。ただこれらはTrie以外のOptimizeもしてしまうので、ちょっと重たいというわけで、mk_trie_regexp.plというScriptをサクっと書いてみました。
-
-使い方は簡単。/usr/share/dict/wordsのような、一行一語のファイルを引数に指定すると、それに対応した正規表現を吐いてくれます。あとはそれを
-
-my $re = do "keyword.list.rx";
-とかして読み込めばOK。
-
-しかし、はてなのキーワードリストはすでにRegexpとして書かれちゃっているので、これを戻す為にhatena2list.plというscriptも書いときました。
-
-そしてベンチマークを取った結果が以下です。
-
-PowerBook G4 1.67MHz / Mac OS X v10.4
-            (warning: too few iterations for a reliable count)
-          s/iter  comp_raw comp_trie
-comp_raw    4.61        --      -87%
-comp_trie  0.592      679%        --
-           Rate  pm_raw pm_trie
-pm_raw    156/s      --   -100%
-pm_trie 70337/s  44874%      --
-            (warning: too few iterations for a reliable count)
-          s/iter  nm_raw nm_trie
-nm_raw      23.6      --   -100%
-nm_trie 1.57e-02 150763%      --
-Dual Xeon 2.66MHz / FreeBSD 5.4-Stable
-            (warning: too few iterations for a reliable count)
-          s/iter  comp_raw comp_trie
-comp_raw    4.45        --      -90%
-comp_trie  0.465      855%        --
-           Rate  pm_raw pm_trie
-pm_raw    532/s      --    -99%
-pm_trie 92027/s  17197%      --
-            (warning: too few iterations for a reliable count)
-          s/iter  nm_raw nm_trie
-nm_raw      6.91      --   -100%
-nm_trie 1.22e-02  56417%      --
-Darts版ほどとは行きませんが、なかなかPracticalなのではないでしょうか。なんといってもPerlから直接使える--正規表現そのものはRubyでも互換?--のはぐ～でしょう。
-
-Dan the Just Another (Perl|Trie) Hacker
-EOS
-
-unless text.gsub(rx_raw, '*') == text.gsub(rx_trie, '*')
-  puts '!!!differences between Regexp.union() and RegexpTrie.union()!!!'
-  puts Diffy::Diff.new(text.gsub(rx_raw, '*'), text.gsub(rx_trie, '*'))
-end
-
-Benchmark.bm 20 do |r|
-  r.report "Regexp raw" do
-    text.gsub(rx_raw, '*')
-  end
-  r.report "RegexpTrie" do
-    text.gsub(rx_trie, '*')
-  end
-end