From edafcf3bb51a15cae579a1bf988ec13d1bb80c73 Mon Sep 17 00:00:00 2001
From: uu59 <k@uu59.org>
Date: Tue, 29 Jul 2014 11:34:47 +0900
Subject: [PATCH] Fix out_td setting type name

---
 app/models/fluentd/setting/common.rb          |  2 +-
 spec/models/fluentd/setting/in_syslog_spec.rb | 35 ++++++++++++++++++
 spec/models/fluentd/setting/out_td_spec.rb    | 37 +++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 spec/models/fluentd/setting/in_syslog_spec.rb
 create mode 100644 spec/models/fluentd/setting/out_td_spec.rb

diff --git a/app/models/fluentd/setting/common.rb b/app/models/fluentd/setting/common.rb
index 976b749..faadc8e 100644
--- a/app/models/fluentd/setting/common.rb
+++ b/app/models/fluentd/setting/common.rb
@@ -116,7 +116,7 @@ class Fluentd
       def plugin_type_name
         # Fluentd::Setting::OutS3 -> s3
         # Override this method if not above style
-        self.class.to_s.split("::").last.sub(/(In|Out)/, "").downcase
+        try(:plugin_name) || self.class.to_s.split("::").last.sub(/(In|Out)/, "").downcase
       end
 
       def print_if_present(key)
diff --git a/spec/models/fluentd/setting/in_syslog_spec.rb b/spec/models/fluentd/setting/in_syslog_spec.rb
new file mode 100644
index 0000000..c7c3dcc
--- /dev/null
+++ b/spec/models/fluentd/setting/in_syslog_spec.rb
@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Fluentd::Setting::InSyslog do
+  let(:klass) { described_class }
+  let(:instance) { klass.new(valid_attributes) }
+  let(:valid_attributes) {
+    {
+      tag: "foo.bar",
+    }
+  }
+
+  describe "#valid?" do
+    it "should be invalid if tag parameter lacked" do
+      params = valid_attributes.dup
+      params.delete(:tag)
+      klass.new(params).should_not be_valid
+    end
+  end
+
+  describe "#plugin_type_name" do
+    subject { instance.plugin_type_name }
+    it { should == "syslog" }
+  end
+
+  describe "#input_plugin" do
+    it { instance.should be_input_plugin }
+    it { instance.should_not be_output_plugin }
+  end
+
+  describe "#to_config" do
+    subject { instance.to_config }
+    it { should include("type syslog") }
+  end
+end
+
diff --git a/spec/models/fluentd/setting/out_td_spec.rb b/spec/models/fluentd/setting/out_td_spec.rb
new file mode 100644
index 0000000..c2f8234
--- /dev/null
+++ b/spec/models/fluentd/setting/out_td_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Fluentd::Setting::OutTd do
+  let(:klass) { described_class }
+  let(:instance) { klass.new(valid_attributes) }
+  let(:valid_attributes) {
+    {
+      match: "td.*.*",
+      apikey: "APIKEY",
+      auto_create_table: "true",
+    }
+  }
+
+  describe "#valid?" do
+    it "should be invalid if tag parameter lacked" do
+      params = valid_attributes.dup
+      params.delete(:match)
+      klass.new(params).should_not be_valid
+    end
+  end
+
+  describe "#plugin_type_name" do
+    subject { instance.plugin_type_name }
+    it { should == "tdlog" }
+  end
+
+  describe "#input_plugin" do
+    it { instance.should_not be_input_plugin }
+    it { instance.should be_output_plugin }
+  end
+
+  describe "#to_config" do
+    subject { instance.to_config }
+    it { should include("type tdlog") }
+  end
+end
+