logstash-core 1.5.0.rc3.snapshot6-java → 1.5.0.rc4-java

data/spec/util/json_spec.rb

@@ -0,0 +1,97 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/json"
+require "logstash/environment"
+require "logstash/util"
+
+describe LogStash::Json do
+
+  let(:hash)   {{"a" => 1}}
+  let(:json_hash)   {"{\"a\":1}"}
+
+  let(:string) {"foobar"}
+  let(:json_string) {"\"foobar\""}
+
+  let(:array)  {["foo", "bar"]}
+  let(:json_array)  {"[\"foo\",\"bar\"]"}
+
+  let(:multi) {
+    [
+      {:ruby => "foo bar baz", :json => "\"foo bar baz\""},
+      {:ruby => "1", :json => "\"1\""},
+      {:ruby => {"a" => true}, :json => "{\"a\":true}"},
+      {:ruby => {"a" => nil}, :json => "{\"a\":null}"},
+      {:ruby => ["a", "b"], :json => "[\"a\",\"b\"]"},
+      {:ruby => [1, 2], :json => "[1,2]"},
+      {:ruby => [1, nil], :json => "[1,null]"},
+      {:ruby => {"a" => [1, 2]}, :json => "{\"a\":[1,2]}"},
+      {:ruby => {"a" => {"b" => 2}}, :json => "{\"a\":{\"b\":2}}"},
+      # {:ruby => , :json => },
+    ]
+  }
+
+  if LogStash::Environment.jruby?
+
+    ### JRuby specific
+
+    context "jruby deserialize" do
+      it "should respond to load and deserialize object" do
+        expect(JrJackson::Raw).to receive(:parse_raw).with(json_hash).and_call_original
+        expect(LogStash::Json.load(json_hash)).to eql(hash)
+      end
+    end
+
+    context "jruby serialize" do
+      it "should respond to dump and serialize object" do
+        expect(JrJackson::Json).to receive(:dump).with(string).and_call_original
+        expect(LogStash::Json.dump(string)).to eql(json_string)
+      end
+
+      it "should call JrJackson::Raw.generate for Hash" do
+        expect(JrJackson::Raw).to receive(:generate).with(hash).and_call_original
+        expect(LogStash::Json.dump(hash)).to eql(json_hash)
+      end
+
+      it "should call JrJackson::Raw.generate for Array" do
+        expect(JrJackson::Raw).to receive(:generate).with(array).and_call_original
+        expect(LogStash::Json.dump(array)).to eql(json_array)
+      end
+
+    end
+
+  else
+
+    ### MRI specific
+
+    it "should respond to load and deserialize object on mri" do
+      expect(Oj).to receive(:load).with(json).and_call_original
+      expect(LogStash::Json.load(json)).to eql(hash)
+    end
+
+    it "should respond to dump and serialize object on mri" do
+      expect(Oj).to receive(:dump).with(hash, anything).and_call_original
+      expect(LogStash::Json.dump(hash)).to eql(json)
+    end
+  end
+
+  ### non specific
+
+  it "should correctly deserialize" do
+    multi.each do |test|
+      # because JrJackson in :raw mode uses Java::JavaUtil::LinkedHashMap and
+      # Java::JavaUtil::ArrayList, we must cast to compare.
+      # other than that, they quack like their Ruby equivalent
+      expect(LogStash::Util.normalize(LogStash::Json.load(test[:json]))).to eql(test[:ruby])
+    end
+  end
+
+  it "should correctly serialize" do
+    multi.each do |test|
+      expect(LogStash::Json.dump(test[:ruby])).to eql(test[:json])
+    end
+  end
+
+  it "should raise Json::ParserError on invalid json" do
+    expect{LogStash::Json.load("abc")}.to raise_error LogStash::Json::ParserError
+  end
+end

data/spec/util/plugin_version_spec.rb

@@ -0,0 +1,48 @@
+require "spec_helper"
+require "logstash/util/plugin_version"
+
+describe LogStash::Util::PluginVersion do
+  subject { LogStash::Util::PluginVersion }
+
+  context "#find_version!" do
+    it 'raises an PluginNoVersionError if we cant find the plugin in the gem path' do
+      dummy_name ='this-character-doesnt-exist-in-the-marvel-universe'
+      expect { subject.find_version!(dummy_name) }.to raise_error(LogStash::PluginNoVersionError)
+    end
+
+    it 'returns the version of the gem' do
+      expect { subject.find_version!('bundler') }.not_to raise_error
+    end
+  end
+
+  context "#new" do
+    it 'accepts a Gem::Version instance as argument' do
+      version = Gem::Version.new('1.0.1')
+      expect(subject.new(version).to_s).to eq(version.to_s)
+    end
+
+    it 'accepts an array for defining the version' do
+      version = subject.new(1, 0, 2)
+      expect(version.to_s).to eq('1.0.2')
+    end
+  end
+
+  context "When comparing instances" do
+    it 'allow to check if the version is newer or older' do
+      old_version = subject.new(0, 1, 0)
+      new_version = subject.new(1, 0, 1)
+
+      expect(old_version).to be < new_version
+      expect(old_version).to be <= new_version
+      expect(new_version).to be > old_version
+      expect(new_version).to be >= old_version
+    end
+
+    it 'return true if the version are equal' do
+      version1 = subject.new(0, 1, 0)
+      version2 = subject.new(0, 1, 0)
+
+      expect(version1).to eq(version2)
+    end
+  end
+end

data/spec/util_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+require "logstash/util"
+
+describe LogStash::Util do
+
+  context "stringify_keys" do
+    it "should convert hash symbol keys to strings" do
+      expect(LogStash::Util.stringify_symbols({:a => 1, "b" => 2})).to eq({"a" => 1, "b" => 2})
+    end
+
+    it "should keep non symbolic hash keys as is" do
+      expect(LogStash::Util.stringify_symbols({1 => 1, 2.0 => 2})).to eq({1 => 1, 2.0 => 2})
+    end
+
+    it "should convert inner hash keys to strings" do
+      expect(LogStash::Util.stringify_symbols({:a => 1, "b" => {:c => 3}})).to eq({"a" => 1, "b" => {"c" => 3}})
+      expect(LogStash::Util.stringify_symbols([:a, 1, "b", {:c => 3}])).to eq(["a", 1, "b", {"c" => 3}])
+    end
+
+    it "should convert hash symbol values to strings" do
+      expect(LogStash::Util.stringify_symbols({:a => :a, "b" => :b})).to eq({"a" => "a", "b" => "b"})
+    end
+
+    it "should convert array symbol values to strings" do
+      expect(LogStash::Util.stringify_symbols([1, :a])).to eq([1, "a"])
+    end
+
+    it "should convert innner array symbol values to strings" do
+      expect(LogStash::Util.stringify_symbols({:a => [1, :b]})).to eq({"a" => [1, "b"]})
+      expect(LogStash::Util.stringify_symbols([:a, [1, :b]])).to eq(["a", [1, "b"]])
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 1.5.0.rc3.snapshot6
+  version: 1.5.0.rc4
 platform: java
 authors:
 - Jordan Sissel
@@ -10,18 +10,18 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
   prerelease: false
@@ -30,70 +30,70 @@ dependencies:
   name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.19
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.19
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: clamp
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.5
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.5
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: filesize
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.4
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: treetop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -111,101 +111,31 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: ftw
+  name: minitar
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.40
+        version: 0.5.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.40
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rack
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: minitar
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: file-dependencies
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.5.4
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: jrjackson
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.8
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.8
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -214,66 +144,24 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: ci_reporter
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.9.3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.9.3
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
@@ -287,10 +175,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/logstash-event.rb
-- lib/logstash.rb
+- lib/logstash-core.rb
 - lib/logstash/agent.rb
-- lib/logstash/bundler.rb
 - lib/logstash/codecs/base.rb
 - lib/logstash/config/config_ast.rb
 - lib/logstash/config/file.rb
@@ -301,7 +187,6 @@ files:
 - lib/logstash/errors.rb
 - lib/logstash/event.rb
 - lib/logstash/filters/base.rb
-- lib/logstash/gemfile.rb
 - lib/logstash/inputs/base.rb
 - lib/logstash/inputs/threadable.rb
 - lib/logstash/java_integration.rb
@@ -318,14 +203,6 @@ files:
 - lib/logstash/patches/rubygems.rb
 - lib/logstash/pipeline.rb
 - lib/logstash/plugin.rb
-- lib/logstash/pluginmanager.rb
-- lib/logstash/pluginmanager/command.rb
-- lib/logstash/pluginmanager/install.rb
-- lib/logstash/pluginmanager/list.rb
-- lib/logstash/pluginmanager/main.rb
-- lib/logstash/pluginmanager/uninstall.rb
-- lib/logstash/pluginmanager/update.rb
-- lib/logstash/pluginmanager/util.rb
 - lib/logstash/program.rb
 - lib/logstash/runner.rb
 - lib/logstash/sized_queue.rb
@@ -345,6 +222,30 @@ files:
 - lib/logstash/util/socket_peer.rb
 - lib/logstash/version.rb
 - locales/en.yml
+- logstash-core.gemspec
+- spec/core/conditionals_spec.rb
+- spec/core/config_mixin_spec.rb
+- spec/core/config_spec.rb
+- spec/core/environment_spec.rb
+- spec/core/event_spec.rb
+- spec/core/pipeline_spec.rb
+- spec/core/plugin_spec.rb
+- spec/core/runner_spec.rb
+- spec/core/timestamp_spec.rb
+- spec/filters/base_spec.rb
+- spec/inputs/base_spec.rb
+- spec/lib/logstash/bundler_spec.rb
+- spec/lib/logstash/java_integration_spec.rb
+- spec/logstash/agent_spec.rb
+- spec/outputs/base_spec.rb
+- spec/spec_helper.rb
+- spec/util/accessors_spec.rb
+- spec/util/charset_spec.rb
+- spec/util/fieldeval_spec.rb
+- spec/util/gemfile_spec.rb
+- spec/util/json_spec.rb
+- spec/util/plugin_version_spec.rb
+- spec/util_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -369,4 +270,27 @@ rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: logstash-core - The core components of logstash
-test_files: []
+test_files:
+- spec/core/conditionals_spec.rb
+- spec/core/config_mixin_spec.rb
+- spec/core/config_spec.rb
+- spec/core/environment_spec.rb
+- spec/core/event_spec.rb
+- spec/core/pipeline_spec.rb
+- spec/core/plugin_spec.rb
+- spec/core/runner_spec.rb
+- spec/core/timestamp_spec.rb
+- spec/filters/base_spec.rb
+- spec/inputs/base_spec.rb
+- spec/lib/logstash/bundler_spec.rb
+- spec/lib/logstash/java_integration_spec.rb
+- spec/logstash/agent_spec.rb
+- spec/outputs/base_spec.rb
+- spec/spec_helper.rb
+- spec/util/accessors_spec.rb
+- spec/util/charset_spec.rb
+- spec/util/fieldeval_spec.rb
+- spec/util/gemfile_spec.rb
+- spec/util/json_spec.rb
+- spec/util/plugin_version_spec.rb
+- spec/util_spec.rb