RubyGems - logstash-filter-cache-redis - Versions diffs - 0.2.0 → 0.3.0 - Mend

@@ -48,7 +48,7 @@ module LogStash; module Util
     def self.get(pipeline_id)
       if LogStash::SETTINGS.get("dead_letter_queue.enable")
         return DeadLetterQueueWriter.new(
-          DeadLetterQueueFactory.getWriter(pipeline_id, LogStash::SETTINGS.get("path.dead_letter_queue")))
+          DeadLetterQueueFactory.getWriter(pipeline_id, LogStash::SETTINGS.get("path.dead_letter_queue"), LogStash::SETTINGS.get('dead_letter_queue.max_bytes')))
       else
         return DeadLetterQueueWriter.new(nil)
       end

@@ -92,8 +92,8 @@ class LogStash::Util::SafeURI
   end
   def user
-    if @uri.userInfo
-      @uri.userInfo.split(":")[0]
+    if userinfo
+      userinfo.split(":")[0]
     end
   end
@@ -102,8 +102,8 @@ class LogStash::Util::SafeURI
   end
   def password
-    if @uri.userInfo
-      @uri.userInfo.split(":")[1]
+    if userinfo
+      userinfo.split(":")[1]
     end
   end
@@ -160,7 +160,23 @@ class LogStash::Util::SafeURI
     d
   end
-  def_delegators :@uri, :absolute?, :scheme, :host, :path, :query, :fragment, :userinfo
+  def path
+    @uri.raw_path
+  end
+  def query
+    @uri.raw_query
+  end
+  def fragment
+    @uri.raw_fragment
+  end
+  def userinfo
+    @uri.raw_user_info
+  end
+  def_delegators :@uri, :absolute?, :scheme, :host
   private

@@ -11,4 +11,4 @@
 #       eventually this file should be in the root logstash lib fir and dependencies in logstash-core should be
 #       fixed.
-LOGSTASH_VERSION = "5.5.0"
+LOGSTASH_VERSION = "5.5.1.snapshot1"

@@ -590,15 +590,6 @@ describe LogStash::Event do
   describe "#to_s" do
     let(:timestamp) { LogStash::Timestamp.new }
     let(:event1) { LogStash::Event.new({ "@timestamp" => timestamp, "host" => "foo", "message" => "bar"}) }
-    let(:event2) { LogStash::Event.new({ "host" => "bar", "message" => "foo"}) }
-    it "should cache only one template" do
-      LogStash::StringInterpolation.clear_cache
-      expect {
-        event1.to_s
-        event2.to_s
-      }.to change { LogStash::StringInterpolation.cache_size }.by(1)
-    end
     it "return the string containing the timestamp, the host and the message" do
       expect(event1.to_s).to eq("#{timestamp.to_iso8601} #{event1.get("host")} #{event1.get("message")}")

@@ -16,5 +16,21 @@ module LogStash module Util
         expect(cloned_safe_uri.query).to eq("a=b")
       end
     end
+    describe "handling escapable fields" do
+      let(:user) { "u%20" }
+      let(:password) { "p%20ss" }
+      let(:path) { "/a%20/path" }
+      let(:query) { "a%20query&another=es%3dq" }
+      let(:fragment) { "spacey%20fragment" }
+      subject { LogStash::Util::SafeURI.new("http://#{user}:#{password}@example.net#{path}?#{query}\##{fragment}") }
+      [:user, :password, :path, :query, :fragment].each do |field|
+        it "should not escape the #{field} field" do
+          expected = self.send(field)
+          expect(subject.send(field)).to eq(expected)
+        end
+      end
+    end
   end
 end end

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = LOGSTASH_CORE_PLUGIN_API
-  gem.add_runtime_dependency "logstash-core", "5.5.0"
+  gem.add_runtime_dependency "logstash-core", "5.5.1.snapshot1"
   # Make sure we dont build this gem from a non jruby
   # environment.

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: logstash-core 5.5.0 java lib
+# stub: logstash-core 5.5.1.snapshot1 java lib
 Gem::Specification.new do |s|
   s.name = "logstash-core"
-  s.version = "5.5.0"
+  s.version = "5.5.1.snapshot1"
   s.platform = "java"
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Elastic"]
-  s.date = "2017-06-30"
+  s.date = "2017-07-18"
   s.description = "The core components of logstash, the scalable log and event management tool"
   s.email = ["info@elastic.co"]
   s.homepage = "http://www.elastic.co/guide/en/logstash/current/index.html"

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: logstash-core-plugin-api 2.1.26 java lib
+# stub: logstash-core-plugin-api 2.1.27 java lib
 Gem::Specification.new do |s|
   s.name = "logstash-core-plugin-api"
-  s.version = "2.1.26"
+  s.version = "2.1.27"
   s.platform = "java"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Elastic"]
-  s.date = "2017-07-12"
+  s.date = "2017-07-18"
   s.description = "Logstash plugin API"
   s.email = ["info@elastic.co"]
   s.homepage = "http://www.elastic.co/guide/en/logstash/current/index.html"
@@ -23,11 +23,11 @@ Gem::Specification.new do |s|
     s.specification_version = 4
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<logstash-core>, ["= 5.5.0"])
+      s.add_runtime_dependency(%q<logstash-core>, ["= 5.5.1.snapshot1"])
     else
-      s.add_dependency(%q<logstash-core>, ["= 5.5.0"])
+      s.add_dependency(%q<logstash-core>, ["= 5.5.1.snapshot1"])
     end
   else
-    s.add_dependency(%q<logstash-core>, ["= 5.5.0"])
+    s.add_dependency(%q<logstash-core>, ["= 5.5.1.snapshot1"])
   end
 end

logstash-filter-cache-redis 0.2.0 → 0.3.0