narou 2.8.3.1 → 2.9.0

data/lib/web/public/resources/sprintf.js

@@ -0,0 +1,245 @@
+/* globals window, exports, define */
+
+(function(window) {
+    'use strict'
+
+    var re = {
+        not_string: /[^s]/,
+        not_bool: /[^t]/,
+        not_type: /[^T]/,
+        not_primitive: /[^v]/,
+        number: /[diefg]/,
+        numeric_arg: /bcdiefguxX/,
+        json: /[j]/,
+        not_json: /[^j]/,
+        text: /^[^\x25]+/,
+        modulo: /^\x25{2}/,
+        placeholder: /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijostTuvxX])/,
+        key: /^([a-z_][a-z_\d]*)/i,
+        key_access: /^\.([a-z_][a-z_\d]*)/i,
+        index_access: /^\[(\d+)\]/,
+        sign: /^[\+\-]/
+    }
+
+    function sprintf() {
+        var key = arguments[0], cache = sprintf.cache
+        if (!(cache[key] && cache.hasOwnProperty(key))) {
+            cache[key] = sprintf.parse(key)
+        }
+        return sprintf.format.call(null, cache[key], arguments)
+    }
+
+    sprintf.format = function(parse_tree, argv) {
+        var cursor = 1, tree_length = parse_tree.length, node_type = '', arg, output = [], i, k, match, pad, pad_character, pad_length, is_positive = true, sign = ''
+        for (i = 0; i < tree_length; i++) {
+            node_type = get_type(parse_tree[i])
+            if (node_type === 'string') {
+                output[output.length] = parse_tree[i]
+            }
+            else if (node_type === 'array') {
+                match = parse_tree[i] // convenience purposes only
+                if (match[2]) { // keyword argument
+                    arg = argv[cursor]
+                    for (k = 0; k < match[2].length; k++) {
+                        if (!arg.hasOwnProperty(match[2][k])) {
+                            throw new Error(sprintf('[sprintf] property "%s" does not exist', match[2][k]))
+                        }
+                        arg = arg[match[2][k]]
+                    }
+                }
+                else if (match[1]) { // positional argument (explicit)
+                    arg = argv[match[1]]
+                }
+                else { // positional argument (implicit)
+                    arg = argv[cursor++]
+                }
+
+                if (re.not_type.test(match[8]) && re.not_primitive.test(match[8]) && get_type(arg) == 'function') {
+                    arg = arg()
+                }
+
+                if (re.numeric_arg.test(match[8]) && (get_type(arg) != 'number' && isNaN(arg))) {
+                    throw new TypeError(sprintf("[sprintf] expecting number but found %s", get_type(arg)))
+                }
+
+                if (re.number.test(match[8])) {
+                    is_positive = arg >= 0
+                }
+
+                switch (match[8]) {
+                    case 'b':
+                        arg = parseInt(arg, 10).toString(2)
+                    break
+                    case 'c':
+                        arg = String.fromCharCode(parseInt(arg, 10))
+                    break
+                    case 'd':
+                    case 'i':
+                        arg = parseInt(arg, 10)
+                    break
+                    case 'j':
+                        arg = JSON.stringify(arg, null, match[6] ? parseInt(match[6]) : 0)
+                    break
+                    case 'e':
+                        arg = match[7] ? parseFloat(arg).toExponential(match[7]) : parseFloat(arg).toExponential()
+                    break
+                    case 'f':
+                        arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg)
+                    break
+                    case 'g':
+                        arg = match[7] ? parseFloat(arg).toPrecision(match[7]) : parseFloat(arg)
+                    break
+                    case 'o':
+                        arg = arg.toString(8)
+                    break
+                    case 's':
+                        arg = String(arg)
+                        arg = (match[7] ? arg.substring(0, match[7]) : arg)
+                    break
+                    case 't':
+                        arg = String(!!arg)
+                        arg = (match[7] ? arg.substring(0, match[7]) : arg)
+                    break
+                    case 'T':
+                        arg = get_type(arg)
+                        arg = (match[7] ? arg.substring(0, match[7]) : arg)
+                    break
+                    case 'u':
+                        arg = parseInt(arg, 10) >>> 0
+                    break
+                    case 'v':
+                        arg = arg.valueOf()
+                        arg = (match[7] ? arg.substring(0, match[7]) : arg)
+                    break
+                    case 'x':
+                        arg = parseInt(arg, 10).toString(16)
+                    break
+                    case 'X':
+                        arg = parseInt(arg, 10).toString(16).toUpperCase()
+                    break
+                }
+                if (re.json.test(match[8])) {
+                    output[output.length] = arg
+                }
+                else {
+                    if (re.number.test(match[8]) && (!is_positive || match[3])) {
+                        sign = is_positive ? '+' : '-'
+                        arg = arg.toString().replace(re.sign, '')
+                    }
+                    else {
+                        sign = ''
+                    }
+                    pad_character = match[4] ? match[4] === '0' ? '0' : match[4].charAt(1) : ' '
+                    pad_length = match[6] - (sign + arg).length
+                    pad = match[6] ? (pad_length > 0 ? str_repeat(pad_character, pad_length) : '') : ''
+                    output[output.length] = match[5] ? sign + arg + pad : (pad_character === '0' ? sign + pad + arg : pad + sign + arg)
+                }
+            }
+        }
+        return output.join('')
+    }
+
+    sprintf.cache = {}
+
+    sprintf.parse = function(fmt) {
+        var _fmt = fmt, match = [], parse_tree = [], arg_names = 0
+        while (_fmt) {
+            if ((match = re.text.exec(_fmt)) !== null) {
+                parse_tree[parse_tree.length] = match[0]
+            }
+            else if ((match = re.modulo.exec(_fmt)) !== null) {
+                parse_tree[parse_tree.length] = '%'
+            }
+            else if ((match = re.placeholder.exec(_fmt)) !== null) {
+                if (match[2]) {
+                    arg_names |= 1
+                    var field_list = [], replacement_field = match[2], field_match = []
+                    if ((field_match = re.key.exec(replacement_field)) !== null) {
+                        field_list[field_list.length] = field_match[1]
+                        while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') {
+                            if ((field_match = re.key_access.exec(replacement_field)) !== null) {
+                                field_list[field_list.length] = field_match[1]
+                            }
+                            else if ((field_match = re.index_access.exec(replacement_field)) !== null) {
+                                field_list[field_list.length] = field_match[1]
+                            }
+                            else {
+                                throw new SyntaxError("[sprintf] failed to parse named argument key")
+                            }
+                        }
+                    }
+                    else {
+                        throw new SyntaxError("[sprintf] failed to parse named argument key")
+                    }
+                    match[2] = field_list
+                }
+                else {
+                    arg_names |= 2
+                }
+                if (arg_names === 3) {
+                    throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported")
+                }
+                parse_tree[parse_tree.length] = match
+            }
+            else {
+                throw new SyntaxError("[sprintf] unexpected placeholder")
+            }
+            _fmt = _fmt.substring(match[0].length)
+        }
+        return parse_tree
+    }
+
+    var vsprintf = function(fmt, argv, _argv) {
+        _argv = (argv || []).slice(0)
+        _argv.splice(0, 0, fmt)
+        return sprintf.apply(null, _argv)
+    }
+
+    /**
+     * helpers
+     */
+    function get_type(variable) {
+        if (typeof variable === 'number') {
+            return 'number'
+        }
+        else if (typeof variable === 'string') {
+            return 'string'
+        }
+        else {
+            return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase()
+        }
+    }
+
+    var preformattedPadding = {
+        '0': ['', '0', '00', '000', '0000', '00000', '000000', '0000000'],
+        ' ': ['', ' ', '  ', '   ', '    ', '     ', '      ', '       '],
+        '_': ['', '_', '__', '___', '____', '_____', '______', '_______'],
+    }
+    function str_repeat(input, multiplier) {
+        if (multiplier >= 0 && multiplier <= 7 && preformattedPadding[input]) {
+            return preformattedPadding[input][multiplier]
+        }
+        return Array(multiplier + 1).join(input)
+    }
+
+    /**
+     * export to either browser or node.js
+     */
+    if (typeof exports !== 'undefined') {
+        exports.sprintf = sprintf
+        exports.vsprintf = vsprintf
+    }
+    else {
+        window.sprintf = sprintf
+        window.vsprintf = vsprintf
+
+        if (typeof define === 'function' && define.amd) {
+            define(function() {
+                return {
+                    sprintf: sprintf,
+                    vsprintf: vsprintf
+                }
+            })
+        }
+    }
+})(typeof window === 'undefined' ? this : window);

data/lib/web/pushserver.rb

@@ -19,7 +19,7 @@ module Narou
     attr_reader :accepted_domains, :connections
 
     def accepted_domains=(domains)
-      @accepted_domains = domains.kind_of?(Array) ? domains : [domains]
+      @accepted_domains = Array(domains)
     end
 
     def initialize
@@ -100,12 +100,23 @@ module Narou
       # echo 以外のイベントは履歴に保存しない
       message = data[:echo]
       if message
-        @history.push(message)
-        @history.shift
+        stack_to_history(message)
       end
     rescue JSON::GeneratorError => e
       STDERR.puts $@.shift + ": #{e.message} (#{e.class})"
     end
+
+    def stack_to_history(message)
+      if message == "." && @history[-1] =~ /\A\.+\z/
+        # 進行中を表す .... の出力でヒストリーが消費されるのを防ぐため、
+        # 連続した . は一つにまとめる
+        @history[-1] << "."
+      else
+        @history.push(message)
+        @history.shift
+      end
+    end
+
   end
 end
 

data/lib/web/views/_about.haml

@@ -0,0 +1,188 @@
+:javascript
+  +function() {
+    var action = new Narou.Action;
+
+    function getCurrentVersion() {
+      var dfd = jQuery.Deferred();
+      $.ajax({
+        type: "GET",
+        url: "/api/version/current.json",
+        dataType: "json",
+        success: function(json) {
+          $("#current-version").text(json.version);
+          dfd.resolve(json.version);
+        },
+        error: function() {
+          dfd.reject();
+        }
+      });
+      return dfd;
+    }
+
+    function getLatestVersion() {
+      var dfd = jQuery.Deferred();
+      $.ajax({
+        type: "GET",
+        url: "/api/version/latest.json",
+        dataType: "json",
+        success: function(json) {
+          $("#latest-version").text(json.version);
+          dfd.resolve(json.version);
+        },
+        error: function() {
+          dfd.reject();
+        }
+      });
+      return dfd;
+    }
+
+    function updateButtonHandler() {
+      var dfd = jQuery.Deferred();
+      $("#version-update-button").one("click", function(e) {
+        e.preventDefault();
+        $(this).hide();
+        $("#fail-update-system").hide();
+        dfd.resolve();
+      });
+      return dfd;
+    }
+
+    function callUpdateSystem() {
+      var dfd = jQuery.Deferred();
+      $("#version-updating").show();
+      $("#gem-result-log").hide();
+      action.updateSystem(function(result, log) {
+        $("#version-updating").hide();
+        $("#gem-result-log").text(log);
+        if (result == "success")
+          dfd.resolve();
+        else
+          dfd.reject(result);
+      });
+      return dfd;
+    }
+
+    function rebootButtonHandler() {
+      $("#gem-result-log").addClass("large").show();
+      $("#reboot-button")
+        .show()
+        .on("click", function(e) {
+          action.rebootDialog();
+        });
+    }
+
+    function failUpdateSystem(result) {
+      if (result == "failure") {
+        $("#fail-update-system").show();
+        $("#gem-result-log").show();
+        updateSysmteProcess();
+      }
+      else if (result == "nothing") {
+        $("#nothing-to-update").show();
+      }
+    }
+
+    function updateSysmteProcess() {
+      $("#version-update-button").show();
+      updateButtonHandler()
+      .then(callUpdateSystem)
+      .then(rebootButtonHandler)
+      .fail(failUpdateSystem);
+    }
+
+    $result = $("#result-of-version-checking");
+    $result.children("div").hide();
+
+    $("#version-update-button").hide();
+    $("#reboot-button").hide();
+    $("#version-updating").hide();
+    $("#fail-update-system").hide();
+    $("#nothing-to-update").hide();
+    $("#gem-result-log").hide();
+
+    action.checkUpdatedSystem({
+      // まだgemのアップデートは行われていないので、バージョンチェックからはじめる
+      not_updated: function() {
+        $result.children(".checking").show();
+
+        $.when(
+          getCurrentVersion(),
+          getLatestVersion()
+        )
+        .done(function(current_version, latest_version) {
+          $result.children(".checking").hide();
+          if (latest_version > current_version) {
+            $("#latest-version").text(latest_version);
+            $result.children(".need-an-update").show();
+          }
+          else {
+            $result.children(".version-is-latest").show();
+          }
+        })
+        .fail(function() {
+          $result.children(".checking").hide();
+          $result.children(".error").show();
+        });
+
+        updateSysmteProcess();
+      },
+
+      // すでにgemをアップデート済みなので、再起動ボタンを最初から表示する
+      already_updated: function(log) {
+        $result.children(".need-an-update").show();
+        $("#latest-version-found").hide();
+        $("#reboot-button").show();
+        $("#gem-result-log").text(log);
+        rebootButtonHandler();
+      }
+    });
+
+  }();
+
+%div.link-to-changelog-in-about
+  %a.btn.btn-default.btn-sm(href="https://github.com/whiteleaf7/narou/blob/master/ChangeLog.md" target="_blank")
+    更新履歴
+    %span.glyphicon.glyphicon-new-window
+
+%div(style="text-align:center")
+  %h1
+    %strong Narou.rb
+  %div
+    Version #{@narourb_version}
+  %div
+    Copyright 2013 whiteleaf. All rights reserved.
+  #result-of-version-checking(style="margin-top:10px")
+    .checking
+      %span.rotate-progress
+        %span.icon
+        %span.text アップデートを確認しています...
+    .version-is-latest
+      %p
+        %span.glyphicon.glyphicon-thumbs-up.text-primary
+        Narou.rb は最新版です。
+    .need-an-update
+      %p
+        %span#latest-version-found
+          %span.glyphicon.glyphicon-exclamation-sign.text-primary
+          新しいバージョン(<span id="latest-version"></span>)が見つかりました。<br>
+        %a#version-update-button.btn.btn-primary.btn-sm
+          %b Narou.rb を更新する
+        %span#version-updating
+          %span.rotate-progress
+            %span.icon
+            %span.text 更新しています。
+        %a#reboot-button.btn.btn-success.btn-sm
+          %b 再起動して更新を反映する
+        %span#nothing-to-update.text-success
+          Narou.rb はすでに最新版です。
+      %p#fail-update-system.text-danger
+        Narou.rb の更新に失敗しました。
+    .error
+      %span.text-danger
+        最新バージョンの取得に失敗しました。
+
+  %pre#gem-result-log.log-box
+
+  .well.well-sm(style="font-size:80%; margin-top: 10px")
+    #{@ruby_version}<br>
+    #{env["HTTP_USER_AGENT"]}