act-fluent-logger-rails 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 382b857b60708db6ced95368595c63fa63bc291a
-  data.tar.gz: 7f2c0caf20ee49f6f8000b83e800487f4e45ea3d
+  metadata.gz: 05832e487b4b706c45c60c718b8af8df70727b3e
+  data.tar.gz: d8060a8d22b973a64f2f88deb36e94bb32a2f165
 SHA512:
-  metadata.gz: e5333ee6ae4aab328703c8c830561f7bca082d2659b03811a4b336a1069d9f9eaaf13bba02b0f1528ee9f1ebf4c754435dc34ce2fc468da6241269f311a183df
-  data.tar.gz: 60d510bc4309db8eb01b70ac0d8b8ee27f5c5dbfc212f1c5ebff61ce94230204e009a7c16e09d98e5b92c5164f48d5309a4033ffe41ddd39d5008c0d236072cf
+  metadata.gz: 852f2e62bb26f23d128cf7bb85827561c2e51828a7029e1b05ec77d79bbcaf57fabdf188026b0c917708ab7ab412fcf71283c439e6448631f0a988f2de1f7cc3
+  data.tar.gz: 4b2e65c18ba75b62cfbd9d06ab1bab3ff958d306e618d08d7c3dc2bcc8ae96f24ede8f249266c833c9b6c398922ffdf4928c4ee7737a11026041c9e888d0b3e1

data/.gitignore

@@ -17,3 +17,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.1.3 / April 11 2013
+## 0.1.4 / July 18 2014
+
+ * Enable to use EVN['FLUENTD_URL']
+
+## 0.1.3 / April 11 2014
 
  * Rails 4.1.0
 

data/README.md

@@ -54,6 +54,10 @@ create config/fluent-logger.yml
       tag:           'foo'
       messages_type: 'string'
 
+or set an environment variable FLUENTD_URL
+
+    http://fluentd.example.com:42442/foo?messages_type=string
+
  * fluent_host: The host name of Fluentd.
  * fluent_port: The port number of Fluentd.
  * tag: The tag of the Fluentd event.

data/act-fluent-logger-rails.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rspec"
   gem.add_runtime_dependency "fluent-logger"
-  gem.add_runtime_dependency "rails", "~> 4.1.0"
+  gem.add_runtime_dependency "rails", ">= 3.2.0", "< 5.0"
 end

data/lib/act-fluent-logger-rails/logger.rb

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 require 'fluent-logger'
+require 'active_support/core_ext'
+require 'uri'
+require 'cgi'
 
 module ActFluentLoggerRails
 
@@ -10,7 +13,11 @@ module ActFluentLoggerRails
 
     def self.new(config_file: Rails.root.join("config", "fluent-logger.yml"), log_tags: {})
       Rails.application.config.log_tags = [ ->(request) { request } ] unless log_tags.empty?
-      fluent_config = YAML.load(ERB.new(config_file.read).result)[Rails.env]
+      fluent_config = if ENV["FLUENTD_URL"]
+                        self.parse_url(ENV["FLUENTD_URL"])
+                      else
+                        YAML.load(ERB.new(config_file.read).result)[Rails.env]
+                      end
       settings = {
         tag:  fluent_config['tag'],
         host: fluent_config['fluent_host'],
@@ -23,6 +30,18 @@ module ActFluentLoggerRails
       logger.extend self
     end
 
+    def self.parse_url(fluentd_url)
+      uri = URI.parse fluentd_url
+      params = CGI.parse uri.query
+
+      {
+        host: uri.host,
+        port: uri.port,
+        tag: uri.path[1..-1],
+        messages_type: params["messages_type"].try(:first)
+      }.stringify_keys
+    end
+
     def tagged(*tags)
       @request = tags[0][0]
       yield self

data/lib/act-fluent-logger-rails/version.rb

@@ -1,3 +1,3 @@
 module ActFluentLoggerRails
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/logger_spec.rb

@@ -64,4 +64,16 @@ EOF
                                      foo: 'foo_value'
                                    } ]])
   end
+
+  describe "use ENV['FLUENTD_URL']" do
+    let(:fluentd_url) { "http://fluentd.example.com:42442/hoge?messages_type=string" }
+
+    describe ".parse_url" do
+      subject { described_class.parse_url(fluentd_url) }
+      it { expect(subject['tag']).to eq 'hoge' }
+      it { expect(subject['host']).to eq 'fluentd.example.com' }
+      it { expect(subject['port']).to eq 42442 }
+      it { expect(subject['messages_type']).to eq 'string' }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: act-fluent-logger-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - TAHARA Yoshinori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -42,16 +42,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.0'
 description: Fluent logger
 email:
 - read.eval.print@gmail.com
@@ -60,7 +66,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt

data/.ruby-version

@@ -1 +0,0 @@
-2.0.0-p195