string_splitter 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e73d7818b793f4c8dcbba35afb97045428085f17c07df328875383b2d162818
-  data.tar.gz: 6a15e18b265779aeaf5d8b18c5e13d70299ed7abbc52da815e2cee46419ce9a1
+  metadata.gz: ce843d4e98a02b464296d78d6be21f9fd7ce179b8156889f799280594250072c
+  data.tar.gz: 4a378aaa5c951224b3091c3e1bf5d55c5a61f6c5395f9cf820ba008b6b1b7af6
 SHA512:
-  metadata.gz: dee0e70311f3718d0f7b68f77b56c657e137c8a658905ddc58f4fbef536b80071dced6a9836d0ad531b93e15c16c5f25ec42965f02a0a1e016de179b133bf746
-  data.tar.gz: 72a237dd80e3e06aad4a5bcc4545e6ea4d3d8167beb9afa6b502d964d510857947fe6071a88ded9f83df77a54da059c97abc1b3e70d8c14a03c8b77b0a01a675
+  metadata.gz: 68f9104ab3c5145322e5027814062a52692e854240a47df3e456d3a5d5c04f213a7875741aa00c6dd7bd5abb71e48f9e09b3d9dc5eb9bb488ef314849952c277
+  data.tar.gz: b2cdb8d72ef41459085580192db7e2792025ed16a84bda7a27b82e148bcd40eddb9b9fe2b5b866d9417085b8560905e1667516db843cd57aa8712639462766f9

data/CHANGELOG.md

@@ -1,10 +1,16 @@
+## 0.5.0 - 2018-06-26
+
+- don't treat string delimiters as patterns
+- add a `reject`/`exclude` option which rejects splits at the specified positions
+- add a `select` alias for `at`
+
 ## 0.4.0 - 2018-06-24
 
 - **breaking change**: remove the `offset` alias for `split.index`
 
 ## 0.3.1 - 2018-06-24
 
-- remove trailing empty field when the separator is empty (#1)
+- remove trailing empty field when the separator is empty ([#1](https://github.com/chocolateboy/string_splitter/issues/1))
 
 ## 0.3.0 - 2018-06-23
 

data/README.md

@@ -179,7 +179,7 @@ ss.split(line, at: [1..5, 8])
 
 # VERSION
 
-0.4.0
+0.5.0
 
 # SEE ALSO
 

data/lib/string_splitter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class StringSplitter
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/string_splitter.rb

@@ -12,7 +12,7 @@ require 'values'
 # These enhancements allow splits to handle many cases that otherwise require bigger
 # guns e.g. regex matching or parsing.
 class StringSplitter
-  ACCEPT = ->(_split) { true }
+  ACCEPT_ALL = ->(_split) { true }
   DEFAULT_DELIMITER = /\s+/
   NO_SPLITS = []
 
@@ -38,8 +38,22 @@ class StringSplitter
 
   attr_reader :default_delimiter, :include_captures, :remove_empty, :spread_captures
 
-  def split(string, delimiter = @default_delimiter, at: nil, &block)
-    result, block, splits, count, index = split_common(string, delimiter, at, block)
+  def split(
+    string,
+    delimiter = @default_delimiter,
+    at: nil,
+    select: at,
+    exclude: nil,
+    reject: exclude,
+    &block
+  )
+    result, block, splits, count, index = split_common(
+      string: string,
+      delimiter: delimiter,
+      select: select,
+      reject: reject,
+      block: block
+    )
 
     splits.each do |split|
       split = Split.with(split.merge({ index: (index += 1), count: count }))
@@ -66,8 +80,22 @@ class StringSplitter
 
   alias lsplit split
 
-  def rsplit(string, delimiter = @default_delimiter, at: nil, &block)
-    result, block, splits, count, index = split_common(string, delimiter, at, block)
+  def rsplit(
+    string,
+    delimiter = @default_delimiter,
+    at: nil,
+    select: at,
+    exclude: nil,
+    reject: exclude,
+    &block
+  )
+    result, block, splits, count, index = split_common(
+      string: string,
+      delimiter: delimiter,
+      select: select,
+      reject: reject,
+      block: block
+    )
 
     splits.reverse!.each do |split|
       split = Split.with(split.merge({ index: (index += 1), count: count }))
@@ -129,19 +157,31 @@ class StringSplitter
   end
 
   # setup common to both split methods
-  def split_common(string, delimiter, at, block)
+  def split_common(string:, delimiter:, select:, reject:, block:)
     unless (match = string.match(delimiter))
       result = (@remove_empty && string.empty?) ? [] : [string]
       return [result, block, NO_SPLITS, 0, -1]
     end
 
+    select = Array(select)
+    reject = Array(reject)
+
+    if !reject.empty?
+      positions = reject
+      action = :reject
+    elsif !select.empty?
+      positions = select
+      action = :select
+    end
+
     ncaptures = match.captures.length
+    delimiter = Regexp.quote(delimiter) if delimiter.is_a?(String)
     delimiter = increment_backrefs(delimiter, ncaptures)
     parts = string.split(/(#{delimiter})/, -1)
     remove_trailing_empty_field!(parts, ncaptures)
     result, splits = splits_for(parts, ncaptures)
     count = splits.length
-    block ||= at ? match_positions(at, count) : ACCEPT
+    block ||= positions ? match_positions(positions, action, count) : ACCEPT_ALL
 
     [result, block, splits, count, -1]
   end
@@ -218,7 +258,7 @@ class StringSplitter
     parts.pop(count)
   end
 
-  def match_positions(positions, nsplits)
+  def match_positions(positions, action, nsplits)
     positions = Array(positions).map do |position|
       if position.is_a?(Integer) && position.negative?
         # translate negative indices to 1-based non-negative indices e.g:
@@ -242,8 +282,10 @@ class StringSplitter
       end
     end
 
+    match = action == :select
+
     lambda do |split|
-      case split.position when *positions then true else false end
+      case split.position when *positions then match else !match end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: string_splitter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - chocolateboy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: values