logstash-filter-mautic 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4989fb37b968f02e249a43e4388a620314a98d3b
-  data.tar.gz: 81ba8474b2407c61c04effb51ebe7779c9b725f5
+  metadata.gz: cf52fc4555ba5c933b512bd7ce008879c510ee65
+  data.tar.gz: 061af245a1fd8efb0fa4f01b323715d4040c9d10
 SHA512:
-  metadata.gz: 82ae3685b774aeb7e4719136aed14ffa4522dde97a8c34ac4ca93dbbc867ba4edb9b759ed92b017618287d7c49b2ff9e7628b0d101399ebddefd4600d52d3aeb
-  data.tar.gz: 7e4d5beea13e819afada5b0624c060285791c97ae6a5e1bba2ea25d6694ebdda58bb4feff4453bda1527cce6b0ed29d1ea05a84902e1f769b2802bcb53c9d888
+  metadata.gz: 875cfc7e091e2a3af3b3c38b2b4968e01303cab7b1a17bdd0f2553ecdacd02797e8cfa8f659619c60049a0cde5c081df1757db491d0805a6347d34a449433d96
+  data.tar.gz: 35c9b6aa5a8c1736131101fb78cfbc4d801b24fa8e26aa67e32e4c5fde922d81f3dba6662649a19377de879cbd72c8a644f74b966baa906eb36d1b5107e68c31

data/DEVELOPER.md

@@ -1,2 +1,8 @@
 # logstash-filter-mautic
 Example filter plugin. This should help bootstrap your effort to write your own filter plugin!
+
+
+```
+bundle exec gem build logstash-filter*
+bundle exec gem push logstash-filter-mautic-*
+```

data/lib/logstash/filters/mautic.rb

@@ -235,7 +235,10 @@ class LogStash::Filters::Mautic < LogStash::Filters::Base
   def processNewUpdateLead(json_data,key)
     parsed_data = newLeadFilter(json_data)
     parsed_data['leadid'] = parsed_data['id'].to_i
+    parsed_data['emailAddress'] = parsed_data['email']
+
     parsed_data.delete('id')
+    parsed_data.delete('email')
 
     if parsed_data['dateIdentified'] != nil
       parsed_data['dateIdentified'] = LogStash::Timestamp.parse_iso8601(parsed_data['dateIdentified'])

data/logstash-filter-mautic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-mautic'
-  s.version         = '0.1'
+  s.version         = '0.2'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Receives Mautic webhook data to view in Elasticsearch"
   s.description = "This plugin lets you get the majority of you Mautic data into Elasticsearch for viewing using Kibana. Just setup a http input for logstash and a filter like so mautic { source => 'message'}. See the GitHub repository for more information"

data/spec/filters/leads_spec.rb

@@ -55,6 +55,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Mautic do
       #insist { subject["points"] } == 25
       expect(subject).to include('leadid')
       expect(subject['leadid']).to eq(80)
+      expect(subject).not_to include('fields')
+
     end
   end  
 
@@ -81,6 +83,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Mautic do
       #insist { subject["points"] } == 25
       expect(subject).to include("firstname")
       expect(subject['firstname']).to eq("New")
+      expect(subject).not_to include('fields')
+
     end
   end
 
@@ -110,7 +114,7 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Mautic do
       expect(subject['mautic_tags'][0]).to eq("test")
       expect(subject['mautic_tags'][1]).to eq("test2")
       expect(subject).not_to include('fields')
-
+      expect(subject).not_to include('fields')
     end
   end
 
@@ -184,6 +188,8 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Mautic do
       expect(subject['ipAddresses'][0]).to eq("123.14.945.113")
       expect(subject['ipAddresses'][1]).to eq("89.14.945.55")
       expect(subject).not_to include('fields')
+      expect(subject).not_to include('fields')
+
 
     end
   end 
@@ -288,6 +294,53 @@ RUBY_ENGINE == "jruby" and describe LogStash::Filters::Mautic do
     }
   },
   "timestamp": "2015-11-12T10:40:19+11:00"
+}'
+    #it "should contain points"
+    sample entered_fields  do
+      #insist { subject["points"] } == 25
+      expect(subject).to include('leadid')
+      expect(subject).not_to include('fields')
+      expect(subject).to include('firstname')
+      expect(subject['leadid']).to eq(25)
+      expect(subject['type']).to eq("lead")
+      expect(subject['firstname']).to eq("test")
+      expect(subject).not_to include('fields')
+
+    end
+  end   
+
+
+    describe "Check changed points" do
+    let(:config) do <<-CONFIG
+      filter {
+        mautic {
+          source => "message"
+        }
+      }
+    CONFIG
+    end
+
+    entered_fields = '{
+  "mautic.lead_points_change": {
+    "lead": {
+      "id": 26,
+      "points": 10,
+      "color": null,
+      "fields": {},
+      "lastActive": "2015-08-26T01:30:35+00:00",
+      "owner": null,
+      "ipAddresses": {
+        "127.0.0.1": []
+      },
+      "dateIdentified": "2015-08-26T01:30:35+00:00",
+      "preferredProfileImage": null
+    },
+    "points": {
+      "old_points": 0,
+      "new_points": 10
+    }
+  },
+  "timestamp": "2015-11-13T15:38:10+11:00"
 }'
     #it "should contain points"
     sample entered_fields  do

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-mautic
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Zac Petterd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,20 +28,22 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-devutils
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 description: This plugin lets you get the majority of you Mautic data into Elasticsearch for viewing using Kibana. Just setup a http input for logstash and a filter like so mautic { source => 'message'}. See the GitHub repository for more information
 email: zac@sproutlabs.com.au
 executables: []