smalruby-editor 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c69e2a88e97ff7653534ce1a531162647e698b2a
-  data.tar.gz: b452e1815cc8320ec63e761b6cda8edeb1db1b57
+  metadata.gz: b37c640353e2bd15d4b820cdc21bbd89ad3e8cb2
+  data.tar.gz: 6101e70c546314f4b878cb621a92b0c1dd2df654
 SHA512:
-  metadata.gz: a964c4d0563850e93a14b96a7a345682ce19daeeca42b53eb6a47f017c3df279aabb255936b08ca0dc0b6074869a92e28267f13df345b25a32c094951445ca38
-  data.tar.gz: 9f1535ed24a5ecd35a2f0a9dda7bb2779e023cd04476dd52227c4823dd69c0afe6b1fc118dc0bcc156c03d1af6a1227bd7a33a1c6e7213146deb36b305a75dfb
+  metadata.gz: 43da2382861dc2b6fd3166e605e7ba7fe1f25331c4bc86791a194ef616c0d29f93f4b9fe01b011b6203c3e7f04820a73ddc6752f233f42b27da08e3569d62254
+  data.tar.gz: f3646f30ca01d17ffea8584bd36c29a972089b45a7f33e81c3d221b4d6ab07db0ccfc0e9baa522b93c91e7f7afdad8528d13a78e99a1b98fc37b50e215be39fb

data/app/assets/javascripts/editor.js.coffee.erb

@@ -19,7 +19,7 @@ errorMessage = (msg, selector = '#messages') ->
     .append('<h4><i class="icon-exclamation-sign"></i>エラー</h4>')
     .append(msg)
   $(selector).append(html)
-  html.fadeIn('fast')
+  html.fadeIn('slow')
 
 $ ->
   saving = false
@@ -47,7 +47,6 @@ $ ->
       $('#filename').focus()
     else
       afterSave = ->
-        saving = true
         changed = false
         successMessage('セーブしました')
 
@@ -84,19 +83,21 @@ $ ->
             type: 'DELETE'
             dataType: 'json'
             success: (data, textStatus, jqXHR) ->
-              if data.source_code.error && confirm("前に#{filename}という名前でセーブしているけど本当にセーブしますか？\nセーブすると前に作成したプログラムは消えてしまうよ！")
-                $.ajax
-                  url: '/source_codes/write'
-                  type: 'DELETE'
-                  data:
-                    force: true
-                  dataType: 'json'
-                  success: (data, textStatus, jqXHR) ->
-                    afterSave()
+              if data.source_code.error
+                if confirm("前に#{filename}という名前でセーブしているけど本当にセーブしますか？\nセーブすると前に作成したプログラムは消えてしまうよ！")
+                  $.ajax
+                    url: '/source_codes/write?force=1'
+                    type: 'DELETE'
+                    dataType: 'json'
+                    success: (data, textStatus, jqXHR) ->
+                      afterSave()
+                else
+                  successMessage('セーブをキャンセルしました')
               else
                 afterSave()
           <% else %>
           afterSave()
+          saving = true
           $('#download-link').click()
           <% end %>
 

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
 module SmalrubyEditor
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/public/assets/{application-eff4fb09a71dae23dc9b3962bcd44fa8.js → application-ba0c47b4699119d7c75b88c4eef30e9a.js}

@@ -396,49 +396,78 @@
 
 })( jQuery );
 (function() {
-  var CSRFToken, anchoredLink, browserCompatibleDocumentParser, browserIsntBuggy, browserSupportsPushState, cacheCurrentPage, cacheSize, changePage, constrainPageCacheTo, createDocument, crossOriginLink, currentState, executeScriptTags, extractLink, extractTitleAndBody, fetchHistory, fetchReplacement, handleClick, ignoreClick, initializeTurbolinks, installClickHandlerLast, loadedAssets, noTurbolink, nonHtmlLink, nonStandardClick, pageCache, pageChangePrevented, pagesCached, processResponse, recallScrollPosition, referer, reflectNewUrl, reflectRedirectedUrl, rememberCurrentState, rememberCurrentUrl, removeHash, removeNoscriptTags, requestMethod, requestMethodIsSafe, resetScrollPosition, targetLink, triggerEvent, visit, xhr, _ref,
-    __hasProp = {}.hasOwnProperty,
-    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+  var CSRFToken, allowLinkExtensions, anchoredLink, browserCompatibleDocumentParser, browserIsntBuggy, browserSupportsCustomEvents, browserSupportsPushState, browserSupportsTurbolinks, cacheCurrentPage, cacheSize, changePage, constrainPageCacheTo, createDocument, crossOriginLink, currentState, enableTransitionCache, executeScriptTags, extractLink, extractTitleAndBody, fetch, fetchHistory, fetchReplacement, handleClick, historyStateIsDefined, htmlExtensions, ignoreClick, initializeTurbolinks, installClickHandlerLast, installDocumentReadyPageEventTriggers, installHistoryChangeHandler, installJqueryAjaxSuccessPageUpdateTrigger, loadedAssets, noTurbolink, nonHtmlLink, nonStandardClick, pageCache, pageChangePrevented, pagesCached, popCookie, processResponse, recallScrollPosition, referer, reflectNewUrl, reflectRedirectedUrl, rememberCurrentState, rememberCurrentUrl, rememberReferer, removeHash, removeHashForIE10compatiblity, removeNoscriptTags, requestMethodIsSafe, resetScrollPosition, targetLink, transitionCacheEnabled, transitionCacheFor, triggerEvent, visit, xhr, _ref,
+    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
+    __slice = [].slice;
+
+  pageCache = {};
 
   cacheSize = 10;
 
-  currentState = null;
+  transitionCacheEnabled = false;
 
-  referer = null;
+  currentState = null;
 
   loadedAssets = null;
 
-  pageCache = {};
+  htmlExtensions = ['html'];
 
-  createDocument = null;
+  referer = null;
 
-  requestMethod = ((_ref = document.cookie.match(/request_method=(\w+)/)) != null ? _ref[1].toUpperCase() : void 0) || '';
+  createDocument = null;
 
   xhr = null;
 
-  fetchReplacement = function(url) {
-    var safeUrl;
-    triggerEvent('page:fetch');
-    safeUrl = removeHash(url);
+  fetch = function(url) {
+    var cachedPage;
+    rememberReferer();
+    cacheCurrentPage();
+    reflectNewUrl(url);
+    if (transitionCacheEnabled && (cachedPage = transitionCacheFor(url))) {
+      fetchHistory(cachedPage);
+      return fetchReplacement(url);
+    } else {
+      return fetchReplacement(url, resetScrollPosition);
+    }
+  };
+
+  transitionCacheFor = function(url) {
+    var cachedPage;
+    cachedPage = pageCache[url];
+    if (cachedPage && !cachedPage.transitionCacheDisabled) {
+      return cachedPage;
+    }
+  };
+
+  enableTransitionCache = function(enable) {
+    if (enable == null) {
+      enable = true;
+    }
+    return transitionCacheEnabled = enable;
+  };
+
+  fetchReplacement = function(url, onLoadFunction) {
+    var _this = this;
+    if (onLoadFunction == null) {
+      onLoadFunction = function() {};
+    }
+    triggerEvent('page:fetch', {
+      url: url
+    });
     if (xhr != null) {
       xhr.abort();
     }
     xhr = new XMLHttpRequest;
-    xhr.open('GET', safeUrl, true);
+    xhr.open('GET', removeHashForIE10compatiblity(url), true);
     xhr.setRequestHeader('Accept', 'text/html, application/xhtml+xml, application/xml');
     xhr.setRequestHeader('X-XHR-Referer', referer);
     xhr.onload = function() {
       var doc;
       triggerEvent('page:receive');
       if (doc = processResponse()) {
-        reflectNewUrl(url);
         changePage.apply(null, extractTitleAndBody(doc));
         reflectRedirectedUrl();
-        if (document.location.hash) {
-          document.location.href = document.location.href;
-        } else {
-          resetScrollPosition();
-        }
+        onLoadFunction();
         return triggerEvent('page:load');
       } else {
         return document.location.href = url;
@@ -447,34 +476,30 @@
     xhr.onloadend = function() {
       return xhr = null;
     };
-    xhr.onabort = function() {
-      return rememberCurrentUrl();
-    };
     xhr.onerror = function() {
       return document.location.href = url;
     };
     return xhr.send();
   };
 
-  fetchHistory = function(position) {
-    var page;
-    cacheCurrentPage();
-    page = pageCache[position];
+  fetchHistory = function(cachedPage) {
     if (xhr != null) {
       xhr.abort();
     }
-    changePage(page.title, page.body);
-    recallScrollPosition(page);
+    changePage(cachedPage.title, cachedPage.body);
+    recallScrollPosition(cachedPage);
     return triggerEvent('page:restore');
   };
 
   cacheCurrentPage = function() {
-    pageCache[currentState.position] = {
+    pageCache[currentState.url] = {
       url: document.location.href,
       body: document.body,
       title: document.title,
       positionY: window.pageYOffset,
-      positionX: window.pageXOffset
+      positionX: window.pageXOffset,
+      cachedAt: new Date().getTime(),
+      transitionCacheDisabled: document.querySelector('[data-no-transition-cache]') != null
     };
     return constrainPageCacheTo(cacheSize);
   };
@@ -489,14 +514,23 @@
   };
 
   constrainPageCacheTo = function(limit) {
-    var key, value;
-    for (key in pageCache) {
-      if (!__hasProp.call(pageCache, key)) continue;
-      value = pageCache[key];
-      if (key <= currentState.position - limit) {
-        pageCache[key] = null;
+    var cacheTimesRecentFirst, key, pageCacheKeys, _i, _len, _results;
+    pageCacheKeys = Object.keys(pageCache);
+    cacheTimesRecentFirst = pageCacheKeys.map(function(url) {
+      return pageCache[url].cachedAt;
+    }).sort(function(a, b) {
+      return b - a;
+    });
+    _results = [];
+    for (_i = 0, _len = pageCacheKeys.length; _i < _len; _i++) {
+      key = pageCacheKeys[_i];
+      if (!(pageCache[key].cachedAt <= cacheTimesRecentFirst[limit])) {
+        continue;
       }
+      triggerEvent('page:expire', pageCache[key]);
+      _results.push(delete pageCache[key]);
     }
+    return _results;
   };
 
   changePage = function(title, body, csrfToken, runScripts) {
@@ -505,26 +539,26 @@
     if (csrfToken != null) {
       CSRFToken.update(csrfToken);
     }
-    removeNoscriptTags();
     if (runScripts) {
       executeScriptTags();
     }
     currentState = window.history.state;
-    return triggerEvent('page:change');
+    triggerEvent('page:change');
+    return triggerEvent('page:update');
   };
 
   executeScriptTags = function() {
-    var attr, copy, nextSibling, parentNode, script, scripts, _i, _j, _len, _len1, _ref1, _ref2;
+    var attr, copy, nextSibling, parentNode, script, scripts, _i, _j, _len, _len1, _ref, _ref1;
     scripts = Array.prototype.slice.call(document.body.querySelectorAll('script:not([data-turbolinks-eval="false"])'));
     for (_i = 0, _len = scripts.length; _i < _len; _i++) {
       script = scripts[_i];
-      if (!((_ref1 = script.type) === '' || _ref1 === 'text/javascript')) {
+      if (!((_ref = script.type) === '' || _ref === 'text/javascript')) {
         continue;
       }
       copy = document.createElement('script');
-      _ref2 = script.attributes;
-      for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
-        attr = _ref2[_j];
+      _ref1 = script.attributes;
+      for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+        attr = _ref1[_j];
         copy.setAttribute(attr.name, attr.value);
       }
       copy.appendChild(document.createTextNode(script.innerHTML));
@@ -534,20 +568,16 @@
     }
   };
 
-  removeNoscriptTags = function() {
-    var noscript, noscriptTags, _i, _len;
-    noscriptTags = Array.prototype.slice.call(document.body.getElementsByTagName('noscript'));
-    for (_i = 0, _len = noscriptTags.length; _i < _len; _i++) {
-      noscript = noscriptTags[_i];
-      noscript.parentNode.removeChild(noscript);
-    }
+  removeNoscriptTags = function(node) {
+    node.innerHTML = node.innerHTML.replace(/<noscript[\S\s]*?<\/noscript>/ig, '');
+    return node;
   };
 
   reflectNewUrl = function(url) {
     if (url !== referer) {
       return window.history.pushState({
         turbolinks: true,
-        position: currentState.position + 1
+        url: url
       }, '', url);
     }
   };
@@ -560,10 +590,14 @@
     }
   };
 
+  rememberReferer = function() {
+    return referer = document.location.href;
+  };
+
   rememberCurrentUrl = function() {
     return window.history.replaceState({
       turbolinks: true,
-      position: Date.now()
+      url: document.location.href
     }, '', document.location.href);
   };
 
@@ -576,7 +610,15 @@
   };
 
   resetScrollPosition = function() {
-    return window.scrollTo(0, 0);
+    if (document.location.hash) {
+      return document.location.href = document.location.href;
+    } else {
+      return window.scrollTo(0, 0);
+    }
+  };
+
+  removeHashForIE10compatiblity = function(url) {
+    return removeHash(url);
   };
 
   removeHash = function(url) {
@@ -589,9 +631,19 @@
     return link.href.replace(link.hash, '');
   };
 
-  triggerEvent = function(name) {
+  popCookie = function(name) {
+    var value, _ref;
+    value = ((_ref = document.cookie.match(new RegExp(name + "=(\\w+)"))) != null ? _ref[1].toUpperCase() : void 0) || '';
+    document.cookie = name + '=; expires=Thu, 01-Jan-70 00:00:01 GMT; path=/';
+    return value;
+  };
+
+  triggerEvent = function(name, data) {
     var event;
     event = document.createEvent('Events');
+    if (data) {
+      event.data = data;
+    }
     event.initEvent(name, true, true);
     return document.dispatchEvent(event);
   };
@@ -603,18 +655,18 @@
   processResponse = function() {
     var assetsChanged, clientOrServerError, doc, extractTrackAssets, intersection, validContent;
     clientOrServerError = function() {
-      var _ref1;
-      return (400 <= (_ref1 = xhr.status) && _ref1 < 600);
+      var _ref;
+      return (400 <= (_ref = xhr.status) && _ref < 600);
     };
     validContent = function() {
       return xhr.getResponseHeader('Content-Type').match(/^(?:text\/html|application\/xhtml\+xml|application\/xml)(?:;|$)/);
     };
     extractTrackAssets = function(doc) {
-      var node, _i, _len, _ref1, _results;
-      _ref1 = doc.head.childNodes;
+      var node, _i, _len, _ref, _results;
+      _ref = doc.head.childNodes;
       _results = [];
-      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-        node = _ref1[_i];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        node = _ref[_i];
         if ((typeof node.getAttribute === "function" ? node.getAttribute('data-turbolinks-track') : void 0) != null) {
           _results.push(node.getAttribute('src') || node.getAttribute('href'));
         }
@@ -628,9 +680,9 @@
       return fetchedAssets.length !== loadedAssets.length || intersection(fetchedAssets, loadedAssets).length !== loadedAssets.length;
     };
     intersection = function(a, b) {
-      var value, _i, _len, _ref1, _results;
+      var value, _i, _len, _ref, _results;
       if (a.length > b.length) {
-        _ref1 = [b, a], a = _ref1[0], b = _ref1[1];
+        _ref = [b, a], a = _ref[0], b = _ref[1];
       }
       _results = [];
       for (_i = 0, _len = a.length; _i < _len; _i++) {
@@ -652,7 +704,7 @@
   extractTitleAndBody = function(doc) {
     var title;
     title = doc.querySelector('title');
-    return [title != null ? title.textContent : void 0, doc.body, CSRFToken.get(doc).token, 'runScripts'];
+    return [title != null ? title.textContent : void 0, removeNoscriptTags(doc.body), CSRFToken.get(doc).token, 'runScripts'];
   };
 
   CSRFToken = {
@@ -676,7 +728,7 @@
   };
 
   browserCompatibleDocumentParser = function() {
-    var createDocumentUsingDOM, createDocumentUsingParser, createDocumentUsingWrite, e, testDoc, _ref1;
+    var createDocumentUsingDOM, createDocumentUsingParser, createDocumentUsingWrite, e, testDoc, _ref;
     createDocumentUsingParser = function(html) {
       return (new DOMParser).parseFromString(html, 'text/html');
     };
@@ -704,7 +756,7 @@
       testDoc = createDocumentUsingDOM('<html><body><p>test');
       return createDocumentUsingDOM;
     } finally {
-      if ((testDoc != null ? (_ref1 = testDoc.body) != null ? _ref1.childNodes.length : void 0 : void 0) !== 1) {
+      if ((testDoc != null ? (_ref = testDoc.body) != null ? _ref.childNodes.length : void 0 : void 0) !== 1) {
         return createDocumentUsingWrite;
       }
     }
@@ -750,7 +802,7 @@
   nonHtmlLink = function(link) {
     var url;
     url = removeHash(link);
-    return url.match(/\.[a-z]+(\?.*)?$/g) && !url.match(/\.html?(\?.*)?$/g);
+    return url.match(/\.[a-z]+(\?.*)?$/g) && !url.match(new RegExp("\\.(?:" + (htmlExtensions.join('|')) + ")?(\\?.*)?$", 'g'));
   };
 
   noTurbolink = function(link) {
@@ -774,36 +826,73 @@
     return crossOriginLink(link) || anchoredLink(link) || nonHtmlLink(link) || noTurbolink(link) || targetLink(link) || nonStandardClick(event);
   };
 
+  allowLinkExtensions = function() {
+    var extension, extensions, _i, _len;
+    extensions = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+    for (_i = 0, _len = extensions.length; _i < _len; _i++) {
+      extension = extensions[_i];
+      htmlExtensions.push(extension);
+    }
+    return htmlExtensions;
+  };
+
+  installDocumentReadyPageEventTriggers = function() {
+    return document.addEventListener('DOMContentLoaded', (function() {
+      triggerEvent('page:change');
+      return triggerEvent('page:update');
+    }), true);
+  };
+
+  installJqueryAjaxSuccessPageUpdateTrigger = function() {
+    if (typeof jQuery !== 'undefined') {
+      return jQuery(document).on('ajaxSuccess', function(event, xhr, settings) {
+        if (!jQuery.trim(xhr.responseText)) {
+          return;
+        }
+        return triggerEvent('page:update');
+      });
+    }
+  };
+
+  installHistoryChangeHandler = function(event) {
+    var cachedPage, _ref;
+    if ((_ref = event.state) != null ? _ref.turbolinks : void 0) {
+      if (cachedPage = pageCache[event.state.url]) {
+        cacheCurrentPage();
+        return fetchHistory(cachedPage);
+      } else {
+        return visit(event.target.location.href);
+      }
+    }
+  };
+
   initializeTurbolinks = function() {
     rememberCurrentUrl();
     rememberCurrentState();
     createDocument = browserCompatibleDocumentParser();
     document.addEventListener('click', installClickHandlerLast, true);
-    return window.addEventListener('popstate', function(event) {
-      var state;
-      state = event.state;
-      if (state != null ? state.turbolinks : void 0) {
-        if (pageCache[state.position]) {
-          return fetchHistory(state.position);
-        } else {
-          return visit(event.target.location.href);
-        }
-      }
-    }, false);
+    return window.addEventListener('popstate', installHistoryChangeHandler, false);
   };
 
-  browserSupportsPushState = window.history && window.history.pushState && window.history.replaceState && window.history.state !== void 0;
+  historyStateIsDefined = window.history.state !== void 0 || navigator.userAgent.match(/Firefox\/26/);
+
+  browserSupportsPushState = window.history && window.history.pushState && window.history.replaceState && historyStateIsDefined;
 
   browserIsntBuggy = !navigator.userAgent.match(/CriOS\//);
 
-  requestMethodIsSafe = requestMethod === 'GET' || requestMethod === '';
+  requestMethodIsSafe = (_ref = popCookie('request_method')) === 'GET' || _ref === '';
 
-  if (browserSupportsPushState && browserIsntBuggy && requestMethodIsSafe) {
-    visit = function(url) {
-      referer = document.location.href;
-      cacheCurrentPage();
-      return fetchReplacement(url);
-    };
+  browserSupportsTurbolinks = browserSupportsPushState && browserIsntBuggy && requestMethodIsSafe;
+
+  browserSupportsCustomEvents = document.addEventListener && document.createEvent;
+
+  if (browserSupportsCustomEvents) {
+    installDocumentReadyPageEventTriggers();
+    installJqueryAjaxSuccessPageUpdateTrigger();
+  }
+
+  if (browserSupportsTurbolinks) {
+    visit = fetch;
     initializeTurbolinks();
   } else {
     visit = function(url) {
@@ -813,7 +902,10 @@
 
   this.Turbolinks = {
     visit: visit,
-    pagesCached: pagesCached
+    pagesCached: pagesCached,
+    enableTransitionCache: enableTransitionCache,
+    allowLinkExtensions: allowLinkExtensions,
+    supported: browserSupportsTurbolinks
   };
 
 }).call(this);
@@ -5095,7 +5187,7 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
     }
     html = $('<div class="alert alert-error" style="display: none">').append('<button type="button" class="close" data-dismiss="alert">×</button>').append('<h4><i class="icon-exclamation-sign"></i>エラー</h4>').append(msg);
     $(selector).append(html);
-    return html.fadeIn('fast');
+    return html.fadeIn('slow');
   };
 
   $(function() {
@@ -5122,7 +5214,6 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
         return $('#filename').focus();
       } else {
         afterSave = function() {
-          saving = true;
           changed = false;
           successMessage('セーブしました');
           return $.ajax({
@@ -5172,18 +5263,19 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
               type: 'DELETE',
               dataType: 'json',
               success: function(data, textStatus, jqXHR) {
-                if (data.source_code.error && confirm("前に" + filename + "という名前でセーブしているけど本当にセーブしますか？\nセーブすると前に作成したプログラムは消えてしまうよ！")) {
-                  return $.ajax({
-                    url: '/source_codes/write',
-                    type: 'DELETE',
-                    data: {
-                      force: true
-                    },
-                    dataType: 'json',
-                    success: function(data, textStatus, jqXHR) {
-                      return afterSave();
-                    }
-                  });
+                if (data.source_code.error) {
+                  if (confirm("前に" + filename + "という名前でセーブしているけど本当にセーブしますか？\nセーブすると前に作成したプログラムは消えてしまうよ！")) {
+                    return $.ajax({
+                      url: '/source_codes/write?force=1',
+                      type: 'DELETE',
+                      dataType: 'json',
+                      success: function(data, textStatus, jqXHR) {
+                        return afterSave();
+                      }
+                    });
+                  } else {
+                    return successMessage('セーブをキャンセルしました');
+                  }
                 } else {
                   return afterSave();
                 }

data/public/assets/manifest-3bcabf5c85a81c33c1c52b6bf869bb16.json

@@ -1 +1 @@
-{"files":{"favicon-c7ae857bb9d06de8742ae2d337157e83.ico":{"logical_path":"favicon.ico","mtime":"2013-11-25T21:05:22+09:00","size":16398,"digest":"c7ae857bb9d06de8742ae2d337157e83"},"application-13c48477888bb9c50ee5d1ba2193890f.js":{"logical_path":"application.js","mtime":"2014-01-11T14:04:20+09:00","size":601007,"digest":"13c48477888bb9c50ee5d1ba2193890f"},"application-f51ea0e777d97f12a8ce84308f31eb57.css":{"logical_path":"application.css","mtime":"2013-12-24T10:25:38+09:00","size":104182,"digest":"f51ea0e777d97f12a8ce84308f31eb57"},"loading-e8e6dd7833131c92a6c3b9c8ccc6a6ac.gif":{"logical_path":"loading.gif","mtime":"2014-01-03T14:44:55+09:00","size":3897,"digest":"e8e6dd7833131c92a6c3b9c8ccc6a6ac"},"progressbar-82023a146fba2a0f6d925629ed2b09c5.gif":{"logical_path":"progressbar.gif","mtime":"2014-01-03T14:44:55+09:00","size":3323,"digest":"82023a146fba2a0f6d925629ed2b09c5"},"application-a50281f6a3e2eef79882cacb6d107c26.js":{"logical_path":"application.js","mtime":"2014-01-13T17:53:01+09:00","size":600793,"digest":"a50281f6a3e2eef79882cacb6d107c26"},"application-eff4fb09a71dae23dc9b3962bcd44fa8.js":{"logical_path":"application.js","mtime":"2014-01-15T23:08:51+09:00","size":600764,"digest":"eff4fb09a71dae23dc9b3962bcd44fa8"}},"assets":{"favicon.ico":"favicon-c7ae857bb9d06de8742ae2d337157e83.ico","application.js":"application-eff4fb09a71dae23dc9b3962bcd44fa8.js","application.css":"application-f51ea0e777d97f12a8ce84308f31eb57.css","loading.gif":"loading-e8e6dd7833131c92a6c3b9c8ccc6a6ac.gif","progressbar.gif":"progressbar-82023a146fba2a0f6d925629ed2b09c5.gif"}}
+{"files":{"favicon-c7ae857bb9d06de8742ae2d337157e83.ico":{"logical_path":"favicon.ico","mtime":"2013-11-25T21:05:22+09:00","size":16398,"digest":"c7ae857bb9d06de8742ae2d337157e83"},"application-13c48477888bb9c50ee5d1ba2193890f.js":{"logical_path":"application.js","mtime":"2014-01-11T14:04:20+09:00","size":601007,"digest":"13c48477888bb9c50ee5d1ba2193890f"},"application-f51ea0e777d97f12a8ce84308f31eb57.css":{"logical_path":"application.css","mtime":"2014-01-21T01:58:55+09:00","size":104182,"digest":"f51ea0e777d97f12a8ce84308f31eb57"},"loading-e8e6dd7833131c92a6c3b9c8ccc6a6ac.gif":{"logical_path":"loading.gif","mtime":"2014-01-03T14:44:55+09:00","size":3897,"digest":"e8e6dd7833131c92a6c3b9c8ccc6a6ac"},"progressbar-82023a146fba2a0f6d925629ed2b09c5.gif":{"logical_path":"progressbar.gif","mtime":"2014-01-03T14:44:55+09:00","size":3323,"digest":"82023a146fba2a0f6d925629ed2b09c5"},"application-a50281f6a3e2eef79882cacb6d107c26.js":{"logical_path":"application.js","mtime":"2014-01-13T17:53:01+09:00","size":600793,"digest":"a50281f6a3e2eef79882cacb6d107c26"},"application-eff4fb09a71dae23dc9b3962bcd44fa8.js":{"logical_path":"application.js","mtime":"2014-01-15T23:08:51+09:00","size":600764,"digest":"eff4fb09a71dae23dc9b3962bcd44fa8"},"application-c3ceffcb1cbe2098c7caaa15f8e518c9.js":{"logical_path":"application.js","mtime":"2014-01-20T22:08:05+09:00","size":600858,"digest":"c3ceffcb1cbe2098c7caaa15f8e518c9"},"application-e4088c39fcdcc35e9a5037118afb59e7.js":{"logical_path":"application.js","mtime":"2014-01-20T22:27:19+09:00","size":600833,"digest":"e4088c39fcdcc35e9a5037118afb59e7"},"application-ba0c47b4699119d7c75b88c4eef30e9a.js":{"logical_path":"application.js","mtime":"2014-01-21T01:58:55+09:00","size":603960,"digest":"ba0c47b4699119d7c75b88c4eef30e9a"}},"assets":{"favicon.ico":"favicon-c7ae857bb9d06de8742ae2d337157e83.ico","application.js":"application-ba0c47b4699119d7c75b88c4eef30e9a.js","application.css":"application-f51ea0e777d97f12a8ce84308f31eb57.css","loading.gif":"loading-e8e6dd7833131c92a6c3b9c8ccc6a6ac.gif","progressbar.gif":"progressbar-82023a146fba2a0f6d925629ed2b09c5.gif"}}

data/spec/acceptance/standalone/save.feature

@@ -15,7 +15,7 @@
     かつ ホームディレクトリの "01.rb" の内容が "puts 'Hello, World!'" であること
     かつ "メッセージ" に "セーブしました" を含むこと
 
-  シナリオ: ローカルマシンに同じ名前のプログラムがある状態でセーブボタンを押す
+  シナリオ: ローカルマシンに同じ名前のプログラムがある状態でセーブボタンを押して上書き保存する
     前提 "エディタ" 画面を表示する
     かつ ホームディレクトリに "puts 'Hello, World!'" という内容の "01.rb" が存在する
     かつ テキストエディタに "n = 0" を入力済みである
@@ -23,10 +23,23 @@
 
     もし "セーブボタン" をクリックする
     かつ JavaScriptによるリクエストが終わるまで待つ
+    かつ JavaScriptによるリクエストが終わるまで待つ
 
     ならば 確認メッセージ "前に01.rbという名前でセーブしているけど本当にセーブしますか？\nセーブすると前に作成したプログラムは消えてしまうよ！" を表示すること
-    かつ ホームディレクトリの "01.rb" の内容が "puts 'Hello, World!'" であること
+    かつ "メッセージ" に "セーブしました" を含むこと
+    かつ ホームディレクトリの "01.rb" の内容が "n = 0" であること
 
-    もし JavaScriptによるリクエストが終わるまで待つ
+  シナリオ: ローカルマシンに同じ名前のプログラムがある状態でセーブボタンを押すが、キャンセルして上書き保存をしない
+    前提 "エディタ" 画面を表示する
+    かつ ホームディレクトリに "puts 'Hello, World!'" という内容の "01.rb" が存在する
+    かつ テキストエディタに "n = 0" を入力済みである
+    かつ プログラムの名前に "01.rb" を指定する
+    かつ 確認ダイアログをキャンセルするようにしておく
 
-    ならば "メッセージ" に "セーブしました" を含むこと
+    もし "セーブボタン" をクリックする
+    かつ JavaScriptによるリクエストが終わるまで待つ
+    かつ JavaScriptによるリクエストが終わるまで待つ
+
+    ならば 確認メッセージ "前に01.rbという名前でセーブしているけど本当にセーブしますか？\nセーブすると前に作成したプログラムは消えてしまうよ！" を表示すること
+    かつ "メッセージ" に "セーブをキャンセルしました" を含むこと
+    かつ ホームディレクトリの "01.rb" の内容が "puts 'Hello, World!'" であること

data/spec/steps/text_editor_steps.rb

@@ -4,12 +4,13 @@ step ':name にアクセスする' do |name|
   visit NAME_INFO[name][:path]
 
   if poltergeist?
+    page.execute_script('window.confirmResult = true')
     page.execute_script(<<-JS)
       if (window.confirmMsg == undefined) {
         window.confirmMsg = null;
         window.confirm = function(msg) {
           window.confirmMsg = msg;
-          return true;
+          return window.confirmResult;
         }
       }
     JS
@@ -128,6 +129,10 @@ step '警告ダイアログの :name ボタンをクリックする' do |name|
   end
 end
 
+step '確認ダイアログをキャンセルするようにしておく' do
+  page.execute_script('window.confirmResult = false') if poltergeist?
+end
+
 step '確認メッセージ :message を表示すること' do |message|
   message.gsub!('\n', "\n")
   if poltergeist?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby-editor
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -361,8 +361,8 @@ files:
 - spec/turnip_helper.rb
 - vendor/assets/javascripts/.keep
 - vendor/assets/stylesheets/.keep
-- public/assets/application-eff4fb09a71dae23dc9b3962bcd44fa8.js
-- public/assets/application-eff4fb09a71dae23dc9b3962bcd44fa8.js.gz
+- public/assets/application-ba0c47b4699119d7c75b88c4eef30e9a.js
+- public/assets/application-ba0c47b4699119d7c75b88c4eef30e9a.js.gz
 - public/assets/application-f51ea0e777d97f12a8ce84308f31eb57.css
 - public/assets/application-f51ea0e777d97f12a8ce84308f31eb57.css.gz
 - public/assets/favicon-c7ae857bb9d06de8742ae2d337157e83.ico