smalruby-editor 0.2.6-x86-mingw32 → 0.2.7-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0308bc419593393d51bcce9547673fbcc0b5ed3
-  data.tar.gz: aa382026fe99b6c342f0aff7eae107085474521e
+  metadata.gz: 2906e65f6e5a7dd431aab158ba136ee31c42d6b8
+  data.tar.gz: c46114528c968865b0e7a2a9f96654bb9d010477
 SHA512:
-  metadata.gz: 2410112d07fe0337b0616d6e3ce1af3b18131dca7417b1fcb5f25a87153a41a053ac5f4cc92412bf8166fb0e1d664de1243b2667ab430666ccf3a561c711d846
-  data.tar.gz: 0d7cc833ca452cb96863279dea9be3a91a9b8deeaceccbde3744a966a09b1d1fcfe9d2af9c0812c0b1f7677a131f5fc5019d27ffb2c36f5d8bd0a3b6f582de06
+  metadata.gz: 73e7359cbff76793fdfb6c664c59ece116d199e48895bd9ac99d502211720a4762fd026eddb3b7865e37ecb54c58b82f9336f7ea8e425fb1d3b61565efdb733c
+  data.tar.gz: 45a48cc7f92a847cf82f3d7b109f4d9fdd930f6d7db843dfb5943ac542aa51018f51f24f591afa57d309080749c7f663a18b5e29c260ee19664e8e6f29ad3d29

data/.rubocop.yml

@@ -5,6 +5,7 @@ AllCops:
     - spec/fixtures/**
     - vendor/*
     - work/*
+  RunRailsCops: true
 
 # 日本語でのコメントを許可する
 AsciiComments:
@@ -45,3 +46,7 @@ IfUnlessModifier:
 # this is not important for me.
 StringLiterals:
   Enabled: false
+
+# I think 'unless' is too bad.
+FavorUnlessOverNegatedIf:
+  Enabled: false

data/Guardfile

@@ -13,6 +13,8 @@ ignore(TEMPFILE_BY_EMACS)
 
 group :red_green_refactor, halt_on_fail: true do
   guard :rubocop, all_on_start: false do
+    ignore(%r{^db/(?:schema|seeds)\.rb$})
+
     watch(%r{.+\.rb$})
     watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
   end

data/app/assets/javascripts/blocks/hardware.js.coffee.erb

@@ -66,7 +66,7 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  Blockly.Ruby.definitions_['init_hardware'] = 'init_hardware'
+  Blockly.Ruby.definitions_['prepare__init_hardware'] = 'init_hardware'
   ''
 
 # 「LED」サブジャンル

data/app/assets/javascripts/fix_blockly.js.erb

@@ -36,56 +36,6 @@ Blockly.Toolbox.TreeNode.prototype.onMouseDown = function(e) {
 Blockly.Blocks.math.HUE = <%= SmalrubyEditor::COLORS[:operators] %>;
 Blockly.Blocks.texts.HUE = <%= SmalrubyEditor::COLORS[:operators] %>;
 
-// blockly/core/field_textinput.js
-Blockly.FieldTextInput.prototype.showEditorOrig_ =
-  Blockly.FieldTextInput.prototype.showEditor_;
-Blockly.FieldTextInput.prototype.showEditor_ = function(opt_quietInput) {
-  Blockly.FieldTextInput.prototype.showEditorOrig_.apply(this, arguments);
-  var htmlInput = Blockly.FieldTextInput.htmlInput_;
-  htmlInput.onKeyDownWrapper_ =
-      Blockly.bindEvent_(htmlInput, 'keydown', this, this.onHtmlInputChange2_);
-};
-
-Blockly.FieldTextInput.prototype.onHtmlInputChange_ = function(e) {
-  var htmlInput = Blockly.FieldTextInput.htmlInput_;
-  if (e.keyCode != 27) {
-    // Update source block.
-    var text = htmlInput.value;
-    if (text !== htmlInput.oldValue_) {
-      htmlInput.oldValue_ = text;
-      this.setText(text);
-      this.validate_();
-    } else if (goog.userAgent.WEBKIT) {
-      // Cursor key.  Render the source block to show the caret moving.
-      // Chrome only (version 26, OS X).
-      this.sourceBlock_.render();
-    }
-  }
-};
-
-Blockly.FieldTextInput.prototype.onHtmlInputChange2_ = function(e) {
-  var htmlInput = Blockly.FieldTextInput.htmlInput_;
-  if (e.keyCode == 13) {
-    // Enter
-    Blockly.WidgetDiv.hide();
-  } else if (e.keyCode == 27) {
-    // Esc
-    this.setText(htmlInput.defaultValue);
-    Blockly.WidgetDiv.hide();
-  }
-};
-
-Blockly.FieldTextInput.prototype.widgetDisposeOrig_ =
-  Blockly.FieldTextInput.prototype.widgetDispose_;
-Blockly.FieldTextInput.prototype.widgetDispose_ = function() {
-  var thisField = this;
-  return function() {
-    Blockly.FieldTextInput.prototype.widgetDisposeOrig_.call(thisField);
-    var htmlInput = Blockly.FieldTextInput.htmlInput_;
-    Blockly.unbindEvent_(htmlInput.onKeyDownWrapper_);
-  };
-};
-
 // blockly/core/names.js
 Blockly.Names.prototype.safeName_ = function(name) {
   if (!name) {

data/app/assets/javascripts/generators/ruby.js.coffee.erb

@@ -47,11 +47,11 @@ Blockly.Ruby.init = ->
     else
       @variableDB_.reset()
 
-    @definitions_['require_smalruby'] = 'require "smalruby"'
+    @definitions_['require__smalruby'] = 'require "smalruby"'
     @definitions_['receiver_stack'] = ['main']
     @definitions_['character_stack'] = []
 
-    if Smalruby.isEnabled('auto_init_hardware')
+    if Smalruby.isEnabled('enabled_auto_init_hardware')
       @definitions_['init_hardware'] = 'init_hardware'
 
 Blockly.Ruby.defineCharacter = (c) ->
@@ -154,23 +154,31 @@ Blockly.Ruby.characterEvent_ = (block, bodyName, name, arg = null) ->
 
 Blockly.Ruby.finish = (code) ->
   requires = []
+  prepares = []
   definitions = []
   for name of Blockly.Ruby.definitions_
     do (name) ->
       def = Blockly.Ruby.definitions_[name]
       if _.isString(def)
-        if def.match(/^require\s*('\S+'|"\S+")/)
+        if name.match(/^require__/)
           requires.push(def)
+        else if name.match(/^prepare__/)
+          prepares.push(def)
         else
           definitions.push(def)
 
-  if definitions.length == 0 && code.length == 0
+  if prepares.length == 0 && definitions.length == 0 && code.length == 0
     return ''
 
   allDefs = requires.join('\n') + '\n\n'
+
+  if prepares.length > 0
+    allDefs += prepares.join('\n') + '\n\n'
+
   if definitions.length > 0
     allDefs += definitions.join('\n')
       .replace(/\n\n+/g, '\n\n').replace(/\n*$/, '\n')
+
   allDefs + code
 
 Blockly.Ruby.scrubNakedValue = (line) ->
@@ -213,3 +221,9 @@ Blockly.Ruby.scrub_ = (block, code) ->
   nextBlock = block.nextConnection && block.nextConnection.targetBlock()
   nextCode = this.blockToCode(nextBlock)
   commentCode + code + nextCode
+
+Blockly.Ruby.blockToCode_ = Blockly.Ruby.blockToCode
+Blockly.Ruby.blockToCode = (block) ->
+  if block && !block.disabled && block.type.match(/^hardware_/)
+    @definitions_['prepare__init_hardware'] = 'init_hardware'
+  @blockToCode_(block)

data/app/assets/javascripts/models/source_code.js

@@ -22,7 +22,7 @@ Smalruby.SourceCode = Backbone.Model.extend({
       }
       else {
         if (window.blockMode) {
-          var data = Blockly.Ruby.workspaceToCode();
+          var data = Blockly.Ruby.workspaceToCode(Blockly.getMainWorkspace());
         }
         else {
           var data = window.textEditor.getSession().getDocument().getValue();

data/app/assets/javascripts/msg/en_us.js

@@ -17,6 +17,7 @@ Blockly.Msg.COMMON_TURN_LEFT = 'turn left';
 Blockly.Msg.COMMON_TURN_RIGHT = 'turn right';
 Blockly.Msg.COMMON_STOP = 'stop';
 Blockly.Msg.COMMON_ERROR = 'Error';
+Blockly.Msg.COMMON_PROCESSING = 'Processing...';
 
 
 // colour name

data/app/assets/javascripts/msg/ja.js

@@ -8,6 +8,9 @@ goog.require('Blockly.Msg');
  * to message files.
  */
 
+// fixed original messages
+Blockly.Msg.DUPLICATE_BLOCK = "コピー";
+
 // common
 Blockly.Msg.COMMON_TURN_ON = 'オンにする';
 Blockly.Msg.COMMON_TURN_OFF = 'オフにする';
@@ -17,6 +20,7 @@ Blockly.Msg.COMMON_TURN_LEFT = '左に曲げる';
 Blockly.Msg.COMMON_TURN_RIGHT = '右に曲げる';
 Blockly.Msg.COMMON_STOP = '止める';
 Blockly.Msg.COMMON_ERROR = 'エラー';
+Blockly.Msg.COMMON_PROCESSING = '処理中...';
 
 
 // colour name

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

@@ -35,7 +35,7 @@ window.Smalruby =
   Collections: {}
   Views: {}
   Routers: {}
-  Features: []
+  Preferences: {}
 
   username: null
 
@@ -66,6 +66,8 @@ window.Smalruby =
       el: $('#load-modal')
     @Views.ResetModalView = new Smalruby.ResetModalView
       el: $('#reset-modal')
+    @Views.PreferenceModalView = new Smalruby.PreferenceModalView
+      el: $('#preference-modal')
 
     Smalruby.downloading = false
     window.onbeforeunload = (event) ->
@@ -82,10 +84,13 @@ window.Smalruby =
       path: '/blockly/'
       toolbox: document.getElementById('toolbox')
       trashcan: true
+      comments: false
+
+    @hideEmptyCategory()
 
     @blocklyFirst = true
     @blocklyLoading = false
-    Blockly.addChangeListener =>
+    Blockly.getMainWorkspace().addChangeListener =>
       Smalruby.changedAfterTranslating = true
 
       # HACK: Blocklyを初期化後に一回だけChangeListenerが呼び出させれ
@@ -106,7 +111,6 @@ window.Smalruby =
     textEditor.setTheme('ace/theme/clouds')
     textEditor.setShowInvisibles(true)
     textEditor.gotoLine(0, 0)
-    textEditor.setReadOnly(@isEnabled('readonly_ruby_mode'))
     textEditor.on 'change', (e) =>
       unless @translating
         window.changed = true
@@ -195,11 +199,51 @@ window.Smalruby =
       @Views.CharacterSelectorView.addBlock_(c)
       window.changed = false
 
-  isEnabled: (feature) ->
-    @Features.indexOf(feature) != -1
+  setPreferences: (preferences) ->
+    @Preferences = preferences
+    window.textEditor.setReadOnly(@isEnabled('enabled_readonly_ruby_mode'))
+    if @isEnabled('disabled_new_character')
+      $('#add-character-item').hide()
+    else
+      $('#add-character-item').show()
+    @changedAfterTranslating = true
+    @reloadToolbox()
+
+  isEnabled: (name) ->
+    @Preferences[name] == true || @Preferences[name] == 'true' || @Preferences[name] == '1'
+
+  reloadToolbox: ->
+    $('body').block
+      message: <%= bm('common.processing') %>
+
+    unblock = =>
+      $('body').unblock()
+      null # HACK: if return unblock(), does not call fail().
+    dfr = $.Deferred()
+    $.ajax
+      url: '/toolbox'
+      type: 'GET'
+      success: (data, textStatus, jqXHR) -> dfr.resolve(data)
+      error: dfr.reject
+    dfr.promise()
+      .then (data) =>
+        Blockly.updateToolbox(data)
+        @hideEmptyCategory()
+      .then(unblock, unblock)
+      .fail =>
+        errorMessage(<%= bm('.error') %>)
+
+  hideEmptyCategory: ->
+    i = 1
+    for node in Blockly.getMainWorkspace().options.languageTree.childNodes
+      do (node) =>
+        if node.tagName
+          if node.getElementsByTagName('block').length == 0 && node.getAttribute('custom') == null
+            $("div.blocklyTreeRoot > div:nth-child(2) > div:nth-child(#{i})[aria-level=\"1\"]").hide()
+          i++
 
 $(document).ready ->
   Smalruby.initialize()
 
-  if Smalruby.username == null && Smalruby.isEnabled('must_signin')
+  if Smalruby.username == null && Smalruby.isEnabled('enabled_must_signin')
     Smalruby.Views.SigninModalView.render()

data/app/assets/javascripts/views/main_menu_view.js.coffee.erb

@@ -17,6 +17,7 @@ Smalruby.MainMenuView = Backbone.View.extend
     'click #save-button': 'onSave'
     'click #check-button': 'onCheck'
     'click #reset-button': 'onReset'
+    'click #preference-button': 'onPreference'
     'click #signin-button': 'onSignin'
     'click #signout-button': 'onSignout'
     'click #username-button': 'onUsername'
@@ -35,6 +36,9 @@ Smalruby.MainMenuView = Backbone.View.extend
       done: (e, data) =>
         @load(data.result.source_code)
 
+    # HACK: if don't do below, can't open submenu on Chromium on Raspberry Pi
+    $('.dropdown-toggle').dropdown()
+
   onBlockMode: (e) ->
     e.preventDefault()
 
@@ -78,7 +82,7 @@ Smalruby.MainMenuView = Backbone.View.extend
 
     return unless Smalruby.changedAfterTranslating
 
-    data = Blockly.Ruby.workspaceToCode()
+    data = Blockly.Ruby.workspaceToCode(Blockly.getMainWorkspace())
     Smalruby.translating = true
     window.textEditor.getSession().getDocument().setValue(data)
     Smalruby.translating = false
@@ -256,6 +260,11 @@ Smalruby.MainMenuView = Backbone.View.extend
       Smalruby.reset()
     true
 
+  onPreference: (e) ->
+    e.preventDefault()
+
+    Smalruby.Views.PreferenceModalView.render()
+
   onSignin: (e) ->
     e.preventDefault()
 
@@ -270,14 +279,15 @@ Smalruby.MainMenuView = Backbone.View.extend
     })
       .then(
         (data) ->
+          Smalruby.setPreferences(data)
           Smalruby.username = null
           $('#signin-button').show()
-          $('#signout-button').hide()
+          $('.signed-in-menu').hide()
           $('#username-label').text('')
           $('#username-button').hide()
           successMessage(<%= bm('.signout_succeeded') %>)
 
-          if Smalruby.isEnabled('must_signin')
+          if Smalruby.isEnabled('enabled_must_signin')
             Smalruby.Views.SigninModalView.render()
         ->
           errorMessage(<%= bm('.signout_error') %>)
@@ -364,7 +374,7 @@ Smalruby.MainMenuView = Backbone.View.extend
         filename = filename.replace(/(\.rb)?\.xml$/, '.rb')
         Smalruby.blocklyLoading = true
         Smalruby.loadXml(info.data)
-        info.data = Blockly.Ruby.workspaceToCode()
+        info.data = Blockly.Ruby.workspaceToCode(Blockly.getMainWorkspace())
       else
         Smalruby.Collections.CharacterSet.reset()
         Blockly.mainWorkspace.clear()

data/app/assets/javascripts/views/preference_modal_view.js.coffee.erb

@@ -0,0 +1,71 @@
+<%
+  require 'smalruby_editor'
+  require 'smalruby_editor/blockly_message_helper'
+%>
+
+# preference dialog view
+Smalruby.PreferenceModalView = Backbone.View.extend
+  events:
+    'click #preference-modal-ok-button': 'onOk'
+    'change #user_preferences_toolbox_name': 'renderToolboxPreferences'
+
+  #initialize: ->
+  #  # no-op
+
+  render: ->
+    @$el.find('.modal-body').block
+      message: null
+
+    unblock = =>
+      @$el.find('.modal-body').unblock()
+      null # HACK: if return unblock(), does not call fail().
+
+    @$el.modal
+      backdrop: 'static'
+    @$el.modal('show')
+
+    dfr = $.Deferred()
+    $.ajax
+      url: 'preferences'
+      type: 'GET'
+      cache: false
+      success: (data, textStatus, jqXHR) -> dfr.resolve(data)
+      error: dfr.reject
+    dfr.promise()
+      .then (data) =>
+        $('#preference-modal-content').replaceWith(data)
+        @renderToolboxPreferences()
+      .then(unblock, unblock)
+      .fail =>
+        @$el.modal('hide')
+        errorMessage(<%= bm('.error') %>)
+
+  onOk: ->
+    @$el.block
+      message: <%= bm('common.processing') %>
+
+    unblock = =>
+      @$el.unblock()
+      null # HACK: if return unblock(), does not call fail().
+
+    form = @$el.find('form')
+    dfr = $.Deferred()
+    $.ajax
+      url: form.attr('action')
+      data: form.serialize()
+      type: 'POST'
+      success: (data, textStatus, jqXHR) -> dfr.resolve(data)
+      error: dfr.reject
+    dfr.promise()
+      .then (data) =>
+        Smalruby.setPreferences(data)
+      .then(unblock, unblock)
+      .done =>
+        @$el.modal('hide')
+      .fail =>
+        errorMessage(<%= bm('.error') %>)
+
+  renderToolboxPreferences: ->
+    @$el.find('.toolbox_preferences').hide()
+    toolboxName = $('#user_preferences_toolbox_name').val() || 'default'
+    @$el.find(".toolbox_preferences.#{toolboxName}").show()

data/app/assets/javascripts/views/signin_modal_view.js.coffee.erb

@@ -27,10 +27,11 @@ Smalruby.SigninModalView = Backbone.View.extend
       $.post('/sessions/', { username: username })
         .then(
           (data) ->
-            Smalruby.username = data
+            Smalruby.setPreferences(data)
+            Smalruby.username = username
             $('#signin-button').hide()
-            $('#signout-button').show()
-            $('#username-label').text(data)
+            $('.signed-in-menu').show()
+            $('#username-label').text(username)
             $('#username-button').show()
             successMessage(<%= bm('.signed_in') %>)
             new $.Deferred().resolve().promise()
@@ -39,5 +40,5 @@ Smalruby.SigninModalView = Backbone.View.extend
             new $.Deferred().resolve().promise()
         )
         .done =>
-          if Smalruby.username != null || !Smalruby.isEnabled('must_signin')
+          if Smalruby.username != null || !Smalruby.isEnabled('enabled_must_signin')
             @$el.modal('hide')