textoken 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf70d771ada2f8b5edaec1b2f6b4c97a4efa563a
-  data.tar.gz: eead0c387504164a302e687fa5858b1bf270d972
+  metadata.gz: 80a781929cd70c8b3dc465e584c52e03a0a741ae
+  data.tar.gz: dddb77f4f78bef3e14fb337ffddc8552791e5375
 SHA512:
-  metadata.gz: 13f3ff9bd02f7b57954e791ea0c068c3c1b529d7056a7067fa66100c0992e1299cfa0e897a7b27522fa557dfbb6290b2191bf8654a366df38ceb209a30ae9c7f
-  data.tar.gz: d691c3914c7cb78dd396d80d9b8524e2d5e1b3e2786a8518da1558c13916937b59692f29b7723e963aa935c5e42e764c608e9c80d5d7e1b705a1d331e3dfd2c7
+  metadata.gz: a710083d4674593e17d811413d3439785a206d8c38ef69c6b4b30ea03db1d63e03a97590b3bd00e2f07181c748f0f4592c1ec9d705365f84d7b8665f3f46b571
+  data.tar.gz: 9c93000700578a98cf0348afe3356622b8e740d7f97511e55710d3cf71b3a4e642628969f1391ded74f64714d2717d9492d2a493ae6568fc7f13748ff2002ea5

data/lib/textoken/options/exclude.rb

@@ -2,27 +2,14 @@ module Textoken
   # This option object excludes words in text via matching regexp
   # Non-excluded words pushed to findings array
   class Exclude
-    attr_reader :regexps, :findings
-
-    def priority
-      1
-    end
-
-    def initialize(values)
-      @regexps  = Searcher.new(values).regexps
-      @findings = Findings.new
-    end
+    include ConditionalOption
 
     # base.text is raw tokens splitted with ' '
     # values are Regexps array to search
     # base.findings, Findings object for pushing matching tokens
     def tokenize(base)
-      regexps.each do |r|
-        base.text.each_with_index do |t, i|
-          findings.push(i, t) unless t.match(r)
-        end
-      end
-      findings.result
+      @base = base
+      tokenize_if { |word, regexp| !word.match(regexp) }
     end
   end
 end

data/lib/textoken/options/exclude_regexp.rb

@@ -0,0 +1,7 @@
+module Textoken
+  # This class is responsible of searching text with user given
+  # regexp value, and exclude findings from the result
+  class ExcludeRegexp < Exclude
+    include RegexpOption
+  end
+end

data/lib/textoken/options/less_than.rb

@@ -2,31 +2,17 @@ module Textoken
   # This option object picks words in text with less than length
   # of the option value
   class LessThan
-    attr_reader :number, :findings
-
-    def priority
-      2
-    end
-
-    def initialize(value)
-      check_value(value)
-      @number = value
-      @findings = Findings.new
-    end
+    include NumericOption
 
     def tokenize(base)
-      base.text.each_with_index do |w, i|
-        findings.push(i, w) if w.length < number
-      end
-      findings.result
+      @base = base
+      tokenize_if { |word| word.length < number }
     end
 
     private
 
-    def check_value(value)
-      return if value.class == Fixnum && value > 1
-      Textoken.type_err "value #{value} is not permitted for
-        less_than option it has to be 2 at least."
+    def validate_option_value(value)
+      validate { value.class == Fixnum && value > 1 }
     end
   end
 end

data/lib/textoken/options/modules/conditional_option.rb

@@ -0,0 +1,24 @@
+module Textoken
+  # This module will be shared in options like, only and exclude
+  module ConditionalOption
+    attr_reader :regexps, :findings, :base
+
+    def priority
+      1
+    end
+
+    def initialize(values)
+      @regexps  = Searcher.new(values).regexps
+      @findings = Findings.new
+    end
+
+    def tokenize_if(&block)
+      regexps.each do |r|
+        base.text.each_with_index do |w, i|
+          findings.push(i, w) if block.call(w, r)
+        end
+      end
+      findings.result
+    end
+  end
+end

data/lib/textoken/options/modules/numeric_option.rb

@@ -0,0 +1,29 @@
+module Textoken
+  # This module will be shared in options like, more_than and less_than
+  module NumericOption
+    attr_reader :number, :findings, :base
+
+    def priority
+      2
+    end
+
+    def initialize(value)
+      validate_option_value(value)
+      @number = value
+      @findings = Findings.new
+    end
+
+    def tokenize_if(&code)
+      base.text.each_with_index do |w, i|
+        findings.push(i, w) if code.call(w)
+      end
+      findings.result
+    end
+
+    def validate(&code)
+      return if code.call
+      Textoken.expression_err "value #{number} is not permitted for
+        #{self.class.name} option."
+    end
+  end
+end

data/lib/textoken/options/modules/regexp_option.rb

@@ -0,0 +1,11 @@
+module Textoken
+  # This module will be shared in options like, only_regexp and exclude_regexp
+  module RegexpOption
+    include ConditionalOption
+
+    def initialize(value)
+      @regexps  = [Regexp.new(value)]
+      @findings = Findings.new
+    end
+  end
+end

data/lib/textoken/options/more_than.rb

@@ -2,31 +2,17 @@ module Textoken
   # This option object picks words in text with more than length
   # of the option value
   class MoreThan
-    attr_reader :number, :findings
-
-    def priority
-      2
-    end
-
-    def initialize(value)
-      check_value(value)
-      @number   = value
-      @findings = Findings.new
-    end
+    include NumericOption
 
     def tokenize(base)
-      base.text.each_with_index do |w, i|
-        findings.push(i, w) if w.length > number
-      end
-      findings.result
+      @base = base
+      tokenize_if { |word| word.length > number }
     end
 
     private
 
-    def check_value(value)
-      return if value.class == Fixnum && value >= 0
-      Textoken.type_err "value #{value} is not permitted for
-        more_than option it has to be 0 at least."
+    def validate_option_value(value)
+      validate { value.class == Fixnum && value >= 0 }
     end
   end
 end

data/lib/textoken/options/only.rb

@@ -2,27 +2,14 @@ module Textoken
   # This option object selects words in text via matching regexp
   # regexp should be defined in option_values.yml
   class Only
-    attr_reader :regexps, :findings
-
-    def priority
-      1
-    end
-
-    def initialize(values)
-      @regexps = Searcher.new(values).regexps
-      @findings = Findings.new
-    end
+    include ConditionalOption
 
     # base.text is raw tokens splitted with ' '
     # values are Regexps array to search
     # base.findings, Findings object for pushing matching tokens
     def tokenize(base)
-      regexps.each do |r|
-        base.text.each_with_index do |t, i|
-          findings.push(i, t) if t.match(r)
-        end
-      end
-      findings.result
+      @base = base
+      tokenize_if { |word, regexp| word.match(regexp) }
     end
   end
 end

data/lib/textoken/options/only_regexp.rb

@@ -0,0 +1,7 @@
+module Textoken
+  # This class is responsible of searching text with user given
+  # regexp value, and add findings to the result
+  class OnlyRegexp < Only
+    include RegexpOption
+  end
+end

data/lib/textoken/version.rb

@@ -1,3 +1,3 @@
 module Textoken
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/textoken.rb

@@ -9,10 +9,15 @@ require 'textoken/findings'
 require 'textoken/tokenizer'
 require 'textoken/scanner'
 
+require 'textoken/options/modules/numeric_option'
+require 'textoken/options/modules/conditional_option'
+require 'textoken/options/modules/regexp_option'
 require 'textoken/options/less_than'
 require 'textoken/options/more_than'
 require 'textoken/options/only'
 require 'textoken/options/exclude'
+require 'textoken/options/only_regexp'
+require 'textoken/options/exclude_regexp'
 
 require 'textoken/factories/option_factory'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textoken
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mehmet Cetin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -75,9 +75,14 @@ files:
 - lib/textoken/findings.rb
 - lib/textoken/options.rb
 - lib/textoken/options/exclude.rb
+- lib/textoken/options/exclude_regexp.rb
 - lib/textoken/options/less_than.rb
+- lib/textoken/options/modules/conditional_option.rb
+- lib/textoken/options/modules/numeric_option.rb
+- lib/textoken/options/modules/regexp_option.rb
 - lib/textoken/options/more_than.rb
 - lib/textoken/options/only.rb
+- lib/textoken/options/only_regexp.rb
 - lib/textoken/regexps/option_values.yml
 - lib/textoken/scanner.rb
 - lib/textoken/searcher.rb