fluentd-ui 0.3.0 → 0.3.1

data/app/models/fluentd/setting/out_forward.rb

@@ -65,6 +65,29 @@ class Fluentd
           result
         end
       end
+
+      def self.initial_params
+        {
+          secondary: {
+            "0" => {
+              type: "file",
+            }
+          }
+        }
+      end
+
+      def common_options
+        [
+          :match, :server, :secondary,
+        ]
+      end
+
+      def advanced_options
+        [
+          :send_timeout, :recover_wait, :heartbeat_type, :heartbeat_interval,
+          :phi_threshold, :hard_timeout,
+        ]
+      end
     end
   end
 end

data/app/models/fluentd/setting/out_mongo.rb

@@ -30,6 +30,29 @@ class Fluentd
           errors.add(:collection, :blank) 
         end
       end
+
+      def self.initial_params
+        {
+          host: "127.0.0.1",
+          port: 27017,
+          capped: true,
+          capped_size: "100m",
+        }
+      end
+
+      def common_options
+        [
+          :match, :host, :port, :database, :collection,
+          :tag_mapped, :user, :password,
+        ]
+      end
+
+      def advanced_options
+        [
+          :capped, :capped_size, :capped_max, :buffer_type, :buffer_queue_limit, :buffer_chunk_limit,
+          :flush_interval, :retry_wait, :retry_limit, :max_retry_wait, :num_threads,
+        ]
+      end
     end
   end
 end

data/app/models/fluentd/setting/out_s3.rb

@@ -24,6 +24,31 @@ class Fluentd
 
       validates :match, presence: true
       validates :s3_bucket, presence: true
+
+      def self.initial_params
+        {
+          s3_endpoint: "s3-us-west-1.amazonaws.com",
+          output_tag: true,
+          output_time: true,
+          use_ssl: true,
+        }
+      end
+
+      def common_options
+        [
+          :match, :aws_key_id, :aws_sec_key,
+          :s3_endpoint, :s3_bucket, :use_ssl, :path,
+        ]
+      end
+
+      def advanced_options
+        [
+          :format, :output_tag, :output_time, :include_time_key, :time_key, :delimiter, :label_delimiter,
+          :utc, :time_slice_format, :time_slice_wait, :store_as, :proxy_uri,
+          :buffer_type, :buffer_queue_limit, :buffer_chunk_limit, :flush_interval,
+          :retry_wait, :retry_limit, :max_retry_wait, :num_threads,
+        ]
+      end
     end
   end
 end

data/app/models/fluentd/setting/out_td.rb

@@ -21,6 +21,27 @@ class Fluentd
       def plugin_name
         "tdlog"
       end
+
+      def self.initial_params
+        {
+          buffer_type: "file",
+          buffer_path: "/var/log/td-agent/buffer/td",
+          auto_create_table: true,
+          match: "td.*.*",
+        }
+      end
+
+      def common_options
+        [
+          :match, :apikey, :auto_create_table, :database, :table,
+        ]
+      end
+
+      def advanced_options
+        [
+          :flush_interval, :buffer_type, :buffer_path,
+        ]
+      end
     end
   end
 end

data/app/views/shared/settings/_form.html.haml

@@ -0,0 +1,17 @@
+= render "shared/setting_errors"
+
+- # NOTE: plugin_setting_form_action_url is defined at SettingConcern
+= form_for(@setting, url: plugin_setting_form_action_url(@fluentd), html: {class: "ignore-rails-error-div"}) do |f|
+  - @setting.common_options.each do |key|
+    = field(f, key)
+
+  - if @setting.advanced_options.present?
+    .well.well-sm
+      %h4{"data-toggle" => "collapse", "href" => "#advanced-setting"}
+        = icon('fa-caret-down')
+        = t('terms.advanced_setting')
+      #advanced-setting.collapse
+        - @setting.advanced_options.each do |key|
+          = field(f, key)
+  = f.submit t('fluentd.common.finish'), class: "btn btn-lg btn-primary pull-right"
+

data/app/views/shared/settings/show.html.haml

@@ -0,0 +1,6 @@
+- page_title t("fluentd.settings.#{target_plugin_name}.show.page_title")
+
+.well
+  = raw t("fluentd.settings.#{target_plugin_name}.option_guide")
+
+= render "shared/settings/form"

data/fluentd-ui.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fluentd", "~> 0.10.51"
-  spec.add_dependency 'rails', '4.1.4'
+  spec.add_dependency "fluentd", "~> 0.10.56"
+  spec.add_dependency 'rails', '~> 4.1.7'
   spec.add_dependency 'sucker_punch', "~> 1.0.5"
   spec.add_dependency 'addressable'
   spec.add_dependency "font-awesome-rails"

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/tasks/dep.rake

@@ -0,0 +1,59 @@
+namespace :dep do
+  desc "list dependency gems order by less referenced"
+  task :list do
+    require "set"
+    deps = Set.new
+    context = false
+    current_parent  = false
+    versions = {
+      "bundler" => "1.7.4" # bundler version does not appear in Gemfile.lock
+    }
+    skip_gems = %w(fluentd)
+    lock_file = "Gemfile.production.lock"
+    unless ENV["SKIP_BUNDLE_INSTALL"]
+      system("bundle install --gemfile Gemfile.production", out: STDERR) # ensure lock file is up to date
+    end
+
+    File.open(lock_file).each_line do |line|
+      # GEM
+      #   remote: https://rubygems.org/
+      #   specs:
+      #     foo_gem (0.1.2)
+      #       foo_dep1 (>= 1.0.0)
+      #       foo_dep2
+      #     bar_gem (1.2.1)
+      #       bar_dep1
+      #       ...
+      #   ...
+      if line == "  specs:\n"
+        context = true
+        next
+      end
+      gem_name = line[/[^ \n]+/, 0] # "    foo_gem (0.1.2)\n" => "foo_gem"
+      if line.match(/^ {4}[^ ]/)    # "    foo_gem (0.1.2)"
+        if skip_gems.include?(gem_name)
+          current_parent = nil
+          next
+        end
+        current_parent = gem_name
+        versions[current_parent] = line[/\((.*?)\)/, 1] # foobar (1.2.3) => 1.2.3
+        next
+      elsif line.match(/^ {6}[^ ]/) # "      foo_dep1 (>= 1.0.0)"
+        next if skip_gems.include?(gem_name)
+        next if current_parent.blank?
+        deps.add([current_parent, gem_name])
+      else
+        context = false
+      end
+    end
+    rank = {}
+    deps.to_a.each do |(parent, child)|
+      rank[parent] ||= 0
+      rank[child] ||= 0
+      rank[parent] += 1
+    end
+    rank.to_a.sort_by {|(name, score)| score }.each do |(name, score)|
+      puts %Q|download "#{name}", "#{versions[name]}"|
+    end
+  end
+end

data/vendor/assets/javascripts/bower/vue/.bower.json

@@ -1,6 +1,6 @@
 {
   "name": "vue",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "main": "dist/vue.js",
   "description": "Simple, Fast & Composable MVVM for building interative interfaces",
   "authors": [
@@ -17,11 +17,11 @@
     "*.md"
   ],
   "homepage": "https://github.com/yyx990803/vue",
-  "_release": "0.10.5",
+  "_release": "0.10.6",
   "_resolution": {
     "type": "version",
-    "tag": "v0.10.5",
-    "commit": "fe996b388971b014279b1f90df26ef95d8b00f05"
+    "tag": "v0.10.6",
+    "commit": "cf37f7efd6d63c0aa46b50c624816e645ddd7edd"
   },
   "_source": "git://github.com/yyx990803/vue.git",
   "_target": "~0.10.0",

data/vendor/assets/javascripts/bower/vue/dist/vue.js

@@ -1,5 +1,5 @@
 /*
- Vue.js v0.10.5
+ Vue.js v0.10.6
  (c) 2014 Evan You
  License: MIT
 */
@@ -213,12 +213,14 @@ var config      = require('./config'),
     ViewModel   = require('./viewmodel'),
     utils       = require('./utils'),
     makeHash    = utils.hash,
-    assetTypes  = ['directive', 'filter', 'partial', 'effect', 'component']
-
-// require these so Browserify can catch them
-// so they can be used in Vue.require
-require('./observer')
-require('./transition')
+    assetTypes  = ['directive', 'filter', 'partial', 'effect', 'component'],
+    // Internal modules that are exposed for plugins
+    pluginAPI   = {
+        utils: utils,
+        config: config,
+        transition: require('./transition'),
+        observer: require('./observer')
+    }
 
 ViewModel.options = config.globalAssets = {
     directives  : require('./directives'),
@@ -239,7 +241,7 @@ assetTypes.forEach(function (type) {
         }
         if (!value) return hash[id]
         if (type === 'partial') {
-            value = utils.toFragment(value)
+            value = utils.parseTemplateOption(value)
         } else if (type === 'component') {
             value = utils.toConstructor(value)
         } else if (type === 'filter') {
@@ -294,8 +296,8 @@ ViewModel.use = function (plugin) {
 /**
  *  Expose internal modules for plugins
  */
-ViewModel.require = function (path) {
-    return require('./' + path)
+ViewModel.require = function (module) {
+    return pluginAPI[module]
 }
 
 ViewModel.extend = extend
@@ -551,6 +553,11 @@ var utils = module.exports = {
      */
     toFragment: require('./fragment'),
 
+    /**
+     *  Parse the various types of template options
+     */
+    parseTemplateOption: require('./template-parser.js'),
+
     /**
      *  get a value from an object keypath
      */
@@ -745,7 +752,7 @@ var utils = module.exports = {
         }
         if (partials) {
             for (key in partials) {
-                partials[key] = utils.toFragment(partials[key])
+                partials[key] = utils.parseTemplateOption(partials[key])
             }
         }
         if (filters) {
@@ -754,7 +761,7 @@ var utils = module.exports = {
             }
         }
         if (template) {
-            options.template = utils.toFragment(template)
+            options.template = utils.parseTemplateOption(template)
         }
     },
 
@@ -872,29 +879,12 @@ map.rect = [1, '<svg xmlns="http://www.w3.org/2000/svg" version="1.1">','</svg>'
 
 var TAG_RE = /<([\w:]+)/
 
-module.exports = function (template) {
-
-    if (typeof template !== 'string') {
-        return template
-    }
-
-    // template by ID
-    if (template.charAt(0) === '#') {
-        var templateNode = document.getElementById(template.slice(1))
-        if (!templateNode) return
-        // if its a template tag and the browser supports it,
-        // its content is already a document fragment!
-        if (templateNode.tagName === 'TEMPLATE' && templateNode.content) {
-            return templateNode.content
-        }
-        template = templateNode.innerHTML
-    }
-
+module.exports = function (templateString) {
     var frag = document.createDocumentFragment(),
-        m = TAG_RE.exec(template)
+        m = TAG_RE.exec(templateString)
     // text only
     if (!m) {
-        frag.appendChild(document.createTextNode(template))
+        frag.appendChild(document.createTextNode(templateString))
         return frag
     }
 
@@ -905,7 +895,7 @@ module.exports = function (template) {
         suffix = wrap[2],
         node = document.createElement('div')
 
-    node.innerHTML = prefix + template.trim() + suffix
+    node.innerHTML = prefix + templateString.trim() + suffix
     while (depth--) node = node.lastChild
 
     // one element
@@ -1983,7 +1973,8 @@ var Compiler   = require('./compiler'),
  *  and a few reserved methods
  */
 function ViewModel (options) {
-    // just compile. options are passed directly to compiler
+    // compile if options passed, if false return. options are passed directly to compiler
+    if (options === false) return
     new Compiler(this, options)
 }
 
@@ -1991,6 +1982,15 @@ function ViewModel (options) {
 // so it can be stringified/looped through as raw data
 var VMProto = ViewModel.prototype
 
+/**
+ *  init allows config compilation after instantiation:
+ *    var a = new Vue(false)
+ *    a.init(config)
+ */
+def(VMProto, '$init', function (options) {
+    new Compiler(this, options)
+})
+
 /**
  *  Convenience function to get a value from
  *  a keypath
@@ -2048,8 +2048,8 @@ def(VMProto, '$unwatch', function (key, callback) {
 /**
  *  unbind everything, remove everything
  */
-def(VMProto, '$destroy', function () {
-    this.$compiler.destroy()
+def(VMProto, '$destroy', function (noRemove) {
+    this.$compiler.destroy(noRemove)
 })
 
 /**
@@ -2145,6 +2145,7 @@ function query (el) {
 }
 
 module.exports = ViewModel
+
 });
 require.register("vue/src/binding.js", function(exports, require, module){
 var Batcher        = require('./batcher'),
@@ -3150,6 +3151,55 @@ exports.eval = function (exp, compiler, data) {
     }
     return res
 }
+});
+require.register("vue/src/template-parser.js", function(exports, require, module){
+var toFragment = require('./fragment');
+
+/**
+ * Parses a template string or node and normalizes it into a
+ * a node that can be used as a partial of a template option
+ *
+ * Possible values include
+ * id selector: '#some-template-id'
+ * template string: '<div><span>my template</span></div>'
+ * DocumentFragment object
+ * Node object of type Template
+ */
+module.exports = function(template) {
+    var templateNode;
+
+    if (template instanceof window.DocumentFragment) {
+        // if the template is already a document fragment -- do nothing
+        return template
+    }
+
+    if (typeof template === 'string') {
+        // template by ID
+        if (template.charAt(0) === '#') {
+            templateNode = document.getElementById(template.slice(1))
+            if (!templateNode) return
+        } else {
+            return toFragment(template)
+        }
+    } else if (template.nodeType) {
+        templateNode = template
+    } else {
+        return
+    }
+
+    // if its a template tag and the browser supports it,
+    // its content is already a document fragment!
+    if (templateNode.tagName === 'TEMPLATE' && templateNode.content) {
+        return templateNode.content
+    }
+
+    if (templateNode.tagName === 'SCRIPT') {
+        return toFragment(templateNode.innerHTML)
+    }
+
+    return toFragment(templateNode.outerHTML);
+}
+
 });
 require.register("vue/src/text-parser.js", function(exports, require, module){
 var openChar        = '{',
@@ -3354,6 +3404,7 @@ filters.lowercase = function (value) {
  *  12345 => $12,345.00
  */
 filters.currency = function (value, sign) {
+    value = parseFloat(value)
     if (!value && value !== 0) return ''
     sign = sign || '$'
     var s = Math.floor(value).toString(),
@@ -4271,7 +4322,9 @@ module.exports = {
         var el = this.iframeBind
             ? this.el.contentWindow
             : this.el
-        el.removeEventListener(this.arg, this.handler)
+        if (this.handler) {
+            el.removeEventListener(this.arg, this.handler)
+        }
     },
 
     unbind: function () {
@@ -4571,13 +4624,19 @@ module.exports = {
     },
 
     update: function (value) {
-        var prop = this.prop
+        var prop = this.prop,
+            isImportant
+        /* jshint eqeqeq: true */
+        // cast possible numbers/booleans into strings
+        if (value != null) value += ''
         if (prop) {
-            var isImportant = value.slice(-10) === '!important'
-                ? 'important'
-                : ''
-            if (isImportant) {
-                value = value.slice(0, -10).trim()
+            if (value) {
+                isImportant = value.slice(-10) === '!important'
+                    ? 'important'
+                    : ''
+                if (isImportant) {
+                    value = value.slice(0, -10).trim()
+                }
             }
             this.el.style.setProperty(prop, value, isImportant)
             if (this.prefixed) {