dap 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e61f8a06c9943ff97add1aea2ba408fa821d5a79
-  data.tar.gz: 307b216fcf7d20ffed3e744bbe30256acfe97296
+  metadata.gz: 8cd019aba689251f56e3ec08abb75533f3fe8eac
+  data.tar.gz: 75ce91184b5c8e1320acb557c009607530c6be17
 SHA512:
-  metadata.gz: 1a17a8311b1d22742203dc4013c95141366f94db7304297cbaf68b29c61e6d5403271075846f3d10392df9a37cd4b947e5d1bb8726a01bc8a3d5286b79cc19a1
-  data.tar.gz: f2bc20c97078b307bf2a469beb1f2652d5a640f1d9e542ec3a1dd040f9bc4049f54379b691b4d16ab510b43721547580dd27b7f3e1c8cb09a40a087e2c6b35f0
+  metadata.gz: 3a1f4d012a8b452f0671c0a262aa06b0f0f5787d9aba133e79f5389ad9bf5fb9e8c8c16df51201e0014410e711d29f5984f0599407944ccfbabc27b79a7bd27c
+  data.tar.gz: 996ff5f0efae982df396c29d1bad7c1b3a9a69cb97f451bbb65c09ec6589a7dc7f7bfca018ff971d7c9060b60211c9a0f1a6c7a000ba548ab6dd35681e5896eb

data/lib/dap/filter/simple.rb

@@ -369,15 +369,15 @@ class FilterSplitArray
   end
 end
 
-class FilterFieldSplitLine
+class FilterFieldSplit
   include Base
   def process(doc)
     self.opts.each_pair do |k,v|
       if doc.has_key?(k)
-        lcount = 1
-        doc[k].to_s.split(/\n/).each do |line|
-          doc.merge!({ "#{k}.f#{lcount}" => line })
-          lcount += 1
+        count = 1
+        doc[k].to_s.split(Regexp.new(v)).each do |thing|
+          doc.merge!({ "#{k}.f#{count}" => thing })
+          count += 1
         end
       end
     end
@@ -385,51 +385,33 @@ class FilterFieldSplitLine
   end
 end
 
-class FilterFieldSplitWord
-  include Base
-  def process(doc)
-    self.opts.each_pair do |k,v|
-      if doc.has_key?(k)
-        wcount = 1
-        doc[k].to_s.split(/\W/).each do |word|
-          doc.merge!({ "#{k}.f#{wcount}" => word })
-          wcount += 1
-        end
-      end
-    end
-   [ doc ]
+class FilterFieldSplitLine < FilterFieldSplit
+  def initialize(args)
+    super(args.map { |arg| "#{arg}=\\n" } )
   end
 end
 
-class FilterFieldSplitTab
-  include Base
-  def process(doc)
-    self.opts.each_pair do |k,v|
-      if doc.has_key?(k)
-        wcount = 1
-        doc[k].to_s.split(/\t/).each do |word|
-          doc.merge!({ "#{k}.f#{wcount}" => word })
-          wcount += 1
-        end
-      end
-    end
-   [ doc ]
+class FilterFieldSplitWord < FilterFieldSplit
+  def initialize(args)
+    super(args.map { |arg| "#{arg}=\\W" } )
   end
 end
 
-class FilterFieldSplitComma
-  include Base
-  def process(doc)
-    self.opts.each_pair do |k,v|
-      if doc.has_key?(k)
-        wcount = 1
-        doc[k].to_s.split(/,/).each do |word|
-          doc.merge!({ "#{k}.f#{wcount}" => word })
-          wcount += 1
-        end
-      end
-    end
-   [ doc ]
+class FilterFieldSplitTab < FilterFieldSplit
+  def initialize(args)
+    super(args.map { |arg| "#{arg}=\\t" } )
+  end
+end
+
+class FilterFieldSplitComma < FilterFieldSplit
+  def initialize(args)
+    super(args.map { |arg| "#{arg}=," } )
+  end
+end
+
+class FilterFieldSplitPeriod < FilterFieldSplit
+  def initialize(args)
+    super(args.map { |arg| "#{arg}=\\." } )
   end
 end
 

data/lib/dap/version.rb

@@ -1,3 +1,3 @@
 module Dap
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/dap/filter/simple_filter_spec.rb

@@ -144,3 +144,45 @@ describe Dap::Filter::FilterTransform do
     end
   end
 end
+
+describe Dap::Filter::FilterFieldSplit do
+  describe '.process' do
+
+    let(:filter) { described_class.new(["value=\\."]) }
+
+    context 'splitting on regex boundary' do
+      let(:process) { filter.process({"value" => "foo.bar.baf"}) }
+      it 'splits correctly' do
+        expect(process).to eq([{"value" => "foo.bar.baf", "value.f1" => "foo", "value.f2" => "bar", "value.f3" => "baf"}])
+      end
+    end
+  end
+end
+
+describe Dap::Filter::FilterFieldSplitPeriod do
+  describe '.process' do
+
+    let(:filter) { described_class.new(["value"]) }
+
+    context 'splitting on period boundary' do
+      let(:process) { filter.process({"value" => "foo.bar.baf"}) }
+      it 'splits correctly' do
+        expect(process).to eq([{"value" => "foo.bar.baf", "value.f1" => "foo", "value.f2" => "bar", "value.f3" => "baf"}])
+      end
+    end
+  end
+end
+
+describe Dap::Filter::FilterFieldSplitLine do
+  describe '.process' do
+
+    let(:filter) { described_class.new(["value"]) }
+
+    context 'splitting on newline boundary' do
+      let(:process) { filter.process({"value" => "foo\nbar\nbaf"}) }
+      it 'splits correctly' do
+        expect(process).to eq([{"value" => "foo\nbar\nbaf", "value.f1" => "foo", "value.f2" => "bar", "value.f3" => "baf"}])
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dap
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec