email_reply_trimmer 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae957d1af8aa2d31792525c2eeb9e87ee6343813
-  data.tar.gz: 0c40d729c66e243f8ac86a59bc861909abbeb786
+  metadata.gz: 402d5791ea53b316a7ea2d7a972621060fbb632c
+  data.tar.gz: c8c406d99a009bbf32b9ebef739cc46eaa361cfa
 SHA512:
-  metadata.gz: afe3ca86183de852123dcc52e1ef2303ba947253c35ca41605377582cfb7b21a7c8fae7b6a9240e2fcab7cc14984f545e7a34c814f6a1742f8817a6c45760f3e
-  data.tar.gz: c0a3aafb8b37d12bb5751ca89fa99dfe5a4b07db23597227b102eca3939dfdb95685cd19629c3d818011a5b350fec68db9224748578b98a93096e1bb3dc2201d
+  metadata.gz: 530b38bed9536b989a66146001f7514b54b5b905c6eedce1032d82267cc72f0072bac8483d5ac126d41848ce9963014a5330cfd89f9db4aea62138e7ab5bfc6c
+  data.tar.gz: 721fd78143d81634eefa49a6df73b6565f1a5ea9fae598fc57e67509f988efb7b47de654ab4d16f3b5513799d80b686bd50a5721eb8b383630b1024173b02961

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in email_reply_trimmer.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: .
+  specs:
+    email_reply_trimmer (0.1.7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.3.0)
+    minitest (5.10.3)
+    parallel (1.11.2)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.2.2)
+      rake
+    rake (12.0.0)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    unicode-display_width (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  email_reply_trimmer!
+  minitest (~> 5)
+  rake (~> 12)
+  rubocop (~> 0)
+
+BUNDLED WITH
+   1.16.0.pre.2

data/Rakefile

@@ -6,7 +6,7 @@ def version
   @version ||= File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*['"](?'version'\d+\.\d+\.\d+)['"]/, "version"]
 end
 
-task :default => :test
+task default: :test
 
 require "rake/testtask"
 Rake::TestTask.new(:test)

data/email_reply_trimmer.gemspec

@@ -15,6 +15,10 @@ Gem::Specification.new do |s|
   s.license = "MIT"
 
   s.require_paths = ["lib"]
-  s.files = Dir["**/*"].reject { |path| File.directory?(path) }
+  s.files = Dir["**/*"].reject { |path| File.directory?(path) || path =~ /.*\.gem$/ }
   s.test_files = s.files.select { |path| path =~ /^test\/.+_test\.rb$/ }
+
+  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'minitest', '~> 5'
+  s.add_development_dependency 'rubocop', '~> 0'
 end

data/lib/email_reply_trimmer.rb

@@ -6,7 +6,7 @@ require_relative "email_reply_trimmer/email_header_matcher"
 require_relative "email_reply_trimmer/quote_matcher"
 
 class EmailReplyTrimmer
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 
   DELIMITER    = "d"
   EMBEDDED     = "b"
@@ -26,7 +26,7 @@ class EmailReplyTrimmer
     return TEXT
   end
 
-  def self.trim(text, split=false)
+  def self.trim(text, split = false)
     return if text.nil? || text =~ /\A[[:space:]]*\z/m
 
     # do some cleanup

data/lib/email_reply_trimmer/embedded_email_matcher.rb

@@ -13,25 +13,25 @@ class EmbeddedEmailMatcher
   # At 6/16/2016 08:32 PM, you wrote:
   ON_DATE_SOMEONE_WROTE_REGEXES ||= [
     # Chinese
-    /^[[:blank:]<>-]*在 ((?!\b(在|写道)\b)[\s\S])+?写道[[:blank:].:>-]*$/i,
+    /^[[:blank:]<>-]*在 (?:(?!\b(?>在|写道)\b).)+?写道[[:blank:].:>-]*$/im,
     # Dutch
-    /^[[:blank:]<>-]*Op ((?!\b(Op|het\svolgende\sgeschreven|schreef)\b)[\s\S])+?(het\svolgende\sgeschreven|schreef[^:]+)[[:blank:].:>-]*$/i,
+    /^[[:blank:]<>-]*Op (?:(?!\b(?>Op|het\svolgende\sgeschreven|schreef)\b).)+?(het\svolgende\sgeschreven|schreef[^:]+)[[:blank:].:>-]*$/im,
     # English
-    /^[[:blank:]<>-]*In message ((?!\b(In message|writes)\b)[\s\S])+?writes[[:blank:].:>-]*$/i,
-    /^[[:blank:]<>-]*(On|At) ((?!\b(On|wrote|writes|says|said)\b)[\s\S])+?(wrote|writes|says|said)[[:blank:].:>-]*$/i,
+    /^[[:blank:]<>-]*In message (?:(?!\b(?>In message|writes)\b).)+?writes[[:blank:].:>-]*$/im,
+    /^[[:blank:]<>-]*(On|At) (?:(?!\b(?>On|wrote|writes|says|said)\b).)+?(wrote|writes|says|said)[[:blank:].:>-]*$/im,
     # French
-    /^[[:blank:]<>-]*Le ((?!\b(Le|nous\sa\sdit|a\s+écrit)\b)[\s\S])+?(nous\sa\sdit|a\s+écrit)[[:blank:].:>-]*$/i,
+    /^[[:blank:]<>-]*Le (?:(?!\b(?>Le|nous\sa\sdit|a\s+écrit)\b).)+?(nous\sa\sdit|a\s+écrit)[[:blank:].:>-]*$/im,
     # German
-    /^[[:blank:]<>-]*Am ((?!\b(Am|schrieben\sSie)\b)[\s\S])+?schrieben\sSie[[:blank:].:>-]*$/i,
-    /^[[:blank:]<>-]*Am ((?!\b(Am|geschrieben)\b)[\s\S])+?(geschrieben|schrieb[^:]+)[[:blank:].:>-]*$/i,
+    /^[[:blank:]<>-]*Am (?:(?!\b(?>Am|schrieben\sSie)\b).)+?schrieben\sSie[[:blank:].:>-]*$/im,
+    /^[[:blank:]<>-]*Am (?:(?!\b(?>Am|geschrieben)\b).)+?(geschrieben|schrieb[^:]+)[[:blank:].:>-]*$/im,
     # Italian
-    /^[[:blank:]<>-]*Il ((?!\b(Il|ha\sscritto)\b)[\s\S])+?ha\sscritto[[:blank:].:>-]*$/i,
+    /^[[:blank:]<>-]*Il (?:(?!\b(?>Il|ha\sscritto)\b).)+?ha\sscritto[[:blank:].:>-]*$/im,
     # Polish
-    /^[[:blank:]<>-]*(Dnia|Dňa) ((?!\b(Dnia|Dňa|napisał)\b)[\s\S])+?napisał(\(a\))?[[:blank:].:>-]*$/i,
+    /^[[:blank:]<>-]*(Dnia|Dňa) (?:(?!\b(?>Dnia|Dňa|napisał)\b).)+?napisał(\(a\))?[[:blank:].:>-]*$/im,
     # Portuguese
-    /^[[:blank:]<>-]*Em ((?!\b(Em|escreveu)\b)[\s\S])+?escreveu[[:blank:].:>-]*$/i,
+    /^[[:blank:]<>-]*Em (?:(?!\b(?>Em|escreveu)\b).)+?escreveu[[:blank:].:>-]*$/im,
     # Spanish
-    /^[[:blank:]<>-]*El ((?!\b(El|escribió)\b)[\s\S])+?escribió[[:blank:].:>-]*$/i,
+    /^[[:blank:]<>-]*El (?:(?!\b(?>El|escribió)\b).)+?escribió[[:blank:].:>-]*$/im,
   ]
 
   # Op 10 dec. 2015 18:35 schreef "Arpit Jalan" <info@discourse.org>:
@@ -80,7 +80,6 @@ class EmbeddedEmailMatcher
   # 2016-03-03 17:21 GMT+01:00 Some One
   ISO_DATE_SOMEONE_REGEX = /^[[:blank:]>]*20\d\d-\d\d-\d\d \d\d:\d\d GMT\+\d\d:\d\d [\w[:blank:]]+$/
 
-
   # 2015-10-18 0:17 GMT+03:00 Matt Palmer <info@discourse.org>:
   # 2013/10/2 camilohollanda <info@discourse.org>
   # вт, 5 янв. 2016 г. в 23:39, Erlend Sogge Heggen <info@discourse.org>:

data/test/matchers/does_not_contain_embedded_email.txt

@@ -0,0 +1,5 @@
+> am 09.09.2017 um 21:42 sssssss
+ßßßßßßßß fffffff
+
+> in message from sssssss
+ßßßßßßßß fffffff

data/test/test_email_matcher.rb

@@ -0,0 +1,15 @@
+require "minitest/autorun"
+require "email_reply_trimmer"
+require "timeout"
+
+class TestEmailReplyTrimmer < Minitest::Test
+  def test_does_not_hang_when_no_embedded_email_is_found
+    Timeout.timeout(5) do
+      EmbeddedEmailMatcher.match?(example("does_not_contain_embedded_email.txt"))
+    end
+  end
+
+  def example(filename)
+    File.read("test/matchers/#{filename}").strip
+  end
+end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: email_reply_trimmer
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Régis Hanol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
-dependencies: []
+date: 2017-09-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: EmailReplyTrimmer is a small library to trim replies from plain text
   email.
 email:
@@ -18,6 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -159,6 +203,8 @@ files:
 - test/embedded/embedded_email_german_3.txt
 - test/embedded/embedded_email_spanish_2.txt
 - test/embedded/forwarded_message.txt
+- test/matchers/does_not_contain_embedded_email.txt
+- test/test_email_matcher.rb
 - test/test_email_reply_trimmer.rb
 - test/trimmed/delimiters.txt
 - test/trimmed/dual_embedded.txt
@@ -237,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Library to trim replies from plain text email.