smalruby-editor 0.1.5-x86-mingw32 → 0.1.6-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 541270ea861d18cc79f609be0ab035b2509ae55a
-  data.tar.gz: 22ec8448c52b4c22b6d6cf1fa02d78a95da75a47
+  metadata.gz: 53e0d4cc07184d7d779bce31a30099140c72d191
+  data.tar.gz: ee93d3bd4b1a53590e2d0fb0af8d95851de81736
 SHA512:
-  metadata.gz: f25ca7ea2a48da978c223198e7780471e6a06f1c48af12924d7105e0d63f7debdc521bd5232d16ac7ffeaaa623d90f8eff7987f349f9a8be9c55f29944332de6
-  data.tar.gz: ee108b11160c979eedede301dcf2c25ec8083ad8bf6e390c59c8f7ccb041bc141f59b85216f5dced272c891129b87280fa5ada955c9891b0fd64c955e89b29e7
+  metadata.gz: 998812bd17c0f42e82fac22a223219082807267f674e06158c50365ae88d1d325efd7f6a0a8364d6ca80ac4839708d7892201e2a94201cb46ad2016097b9a869
+  data.tar.gz: 540eb8e5125b96e2ae2ae8f2500dc2b76a9ef6d541e0a51efc7d63ce9c8b73abdbbbcb9575da2d0d69c47a4fdb8f5907023c0099388ff02febfbf32bbfe8eaff

data/.gitignore

@@ -22,4 +22,5 @@
 /.env
 /coverage
 /pkg
-/features
+/features
+/demos/*.xml

data/.rubocop.yml

@@ -22,3 +22,11 @@ EndOfLine:
 # diffが少なくなるためハッシュや配列の最後のカンマは許可する
 TrailingComma:
   Enabled: false
+
+# デフォルトの10は短すぎる。80x25を基準として1画面に収まる長さとした。
+MethodLength:
+  Max: 25
+
+# デフォルトの100は短すぎる。なんとなく250行とした。
+ClassLength:
+  Max: 250

data/README.rdoc

@@ -8,6 +8,9 @@
 
 The smalruby-editor is a visual programming editor that can create a Ruby script by combining individual blocks similar to Scratch. It can also enter the program as better than Scratch.
 
+* DEMO: http://smalruby.herokuapp.com/demo/
+* DEMO(Arduino): http://smalruby.herokuapp.com/demo/rgb_led_anode/
+
 The smalruby-editor is a part of the Smalruby Project.
 
 The Smalruby(smɔ́ːrúːbi) Project will provide a Ruby learning environment for middle school students from the upper grades of elementary school. The goal of this project is to achieve software and community sites such as the {Scratch}[http://scratch.mit.edu/] in Ruby. The Scratch has experience as educational programming environment can be used in elementary school. This project consists of the following elements.

data/app/assets/javascripts/application.js

@@ -35,4 +35,3 @@
 //= require_tree ./generators
 //= require ./blocks/field_character
 //= require_tree ./blocks
-//= require ./ruby_mode

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

@@ -39,7 +39,10 @@ Smalruby.SourceCode = Backbone.Model.extend
     action += '?force=1' if force
     @delete_(action)
 
-  post_: (action) ->
+  toBlocks: ->
+    @post_('to_blocks', 'html')
+
+  post_: (action, dataType = 'json') ->
     dfr = $.Deferred()
     $.ajax
       url: "/source_codes/#{action}"
@@ -48,7 +51,7 @@ Smalruby.SourceCode = Backbone.Model.extend
         source_code:
           filename: @get('filename')
           data: @get('data')
-      dataType: 'json'
+      dataType: dataType
       success: (data, textStatus, jqXHR) -> dfr.resolve(data)
       error: dfr.reject
     dfr.promise()

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

@@ -11,6 +11,7 @@ window.successMessage = (title, msg = '', selector = '#messages') ->
   html.fadeIn('slow')
     .delay(3000)
     .fadeOut('slow')
+  return
 
 window.errorMessage = (msg, selector = '#messages') ->
   html = $('<div class="alert alert-error" style="display: none">')
@@ -19,6 +20,7 @@ window.errorMessage = (msg, selector = '#messages') ->
     .append(msg)
   $(selector).append(html)
   html.fadeIn('slow')
+  return
 
 window.Smalruby =
   Models: {}
@@ -43,17 +45,6 @@ window.Smalruby =
     @Views.CharacterModalView = new Smalruby.CharacterModalView
       el: $('#character-modal')
 
-    $('a[data-toggle="tab"]').on 'shown', (e) ->
-      if $(e.target).attr('href') == '#block-tab'
-        window.blockMode = true
-      else
-        window.blockMode = false
-        data = Blockly.Ruby.workspaceToCode()
-        if $.trim(data).length > 0
-          window.textEditor.getSession().getDocument().setValue(data)
-          window.textEditor.moveCursorTo(0, 0)
-        window.textEditor.focus()
-
     Smalruby.downloading = false
     window.onbeforeunload = (event) ->
       if !Smalruby.downloading && window.changed
@@ -75,6 +66,8 @@ window.Smalruby =
     @blocklyFirst = true
     @blocklyLoading = false
     Blockly.addChangeListener =>
+      Smalruby.changedAfterTranslating = true
+
       # HACK: Blocklyを初期化後に一回だけChangeListenerが呼び出させれ
       # る。ここではそれを無視している。
       if @blocklyFirst
@@ -89,6 +82,20 @@ window.Smalruby =
 
       window.changed = true
 
+    window.textEditor = textEditor = ace.edit('text-editor')
+    textEditor.setTheme('ace/theme/clouds')
+    textEditor.setShowInvisibles(true)
+    textEditor.gotoLine(0, 0)
+    textEditor.on 'change', (e) =>
+      unless @translating
+        window.changed = true
+        Smalruby.changedAfterTranslating = true
+
+    session = textEditor.getSession()
+    session.setMode('ace/mode/ruby')
+    session.setTabSize(2)
+    session.setUseSoftTabs(true)
+
   loadXml: (data, workspace = Blockly.mainWorkspace) ->
     xml = Blockly.Xml.textToDom(data)
     workspace.clear()

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

@@ -3,6 +3,8 @@ Smalruby.MainMenuView = Backbone.View.extend
   el: '#main-menu'
 
   events:
+    'click #block-mode-button': 'onBlockMode'
+    'click #ruby-mode-button': 'onRubyMode'
     'click #run-button': 'onRun'
     'click #download-button': 'onDownload'
     'click #load-button': 'onLoad'
@@ -29,6 +31,7 @@ Smalruby.MainMenuView = Backbone.View.extend
           filename = info.filename
           if filename.match(/\.xml$/)
             unless window.blockMode
+              window.blockMode = true
               $('#tabs a[href="#block-tab"]').tab('show')
 
             filename = filename.replace(/(\.rb)?\.xml$/, '.rb')
@@ -40,6 +43,7 @@ Smalruby.MainMenuView = Backbone.View.extend
             Blockly.mainWorkspace.clear()
 
             if window.blockMode
+              window.blockMode = false
               $('#tabs a[href="#ruby-tab"]').tab('show')
               window.textEditor.focus()
 
@@ -48,8 +52,60 @@ Smalruby.MainMenuView = Backbone.View.extend
           window.textEditor.moveCursorTo(0, 0)
           # TODO: window.changed -> Smalruby.Models.SourceCode.changed
           window.changed = false
+          Smalruby.changedAfterTranslating = true
           window.successMessage('ロードしました')
 
+  onBlockMode: (e) ->
+    e.preventDefault()
+
+    return if window.blockMode
+
+    unless Smalruby.changedAfterTranslating
+      window.blockMode = true
+      $('#tabs a[href="#block-tab"]').tab('show')
+      return
+
+    @blockUI
+      title:
+        """
+        <i class="icon-filter"></i>
+        プログラムの変換中
+        """
+      message: 'プログラムをブロックに変換しています。'
+
+    sourceCode = new Smalruby.SourceCode()
+    sourceCode.toBlocks()
+      .then (data) ->
+        window.blockMode = true
+        $('#tabs a[href="#block-tab"]').tab('show')
+        if data.length > 0
+          Smalruby.blocklyLoading = true
+          Smalruby.translating = true
+          Smalruby.loadXml(data)
+          Smalruby.translating = false
+          Smalruby.changedAfterTranslating = false
+      .then(@unblockUI, @unblockUI)
+      .fail ->
+        window.errorMessage('ブロックへの変換に失敗しました')
+
+  onRubyMode: (e) ->
+    e.preventDefault()
+
+    return unless window.blockMode
+
+    window.blockMode = false
+    $('#tabs a[href="#ruby-tab"]').tab('show')
+
+    return unless Smalruby.changedAfterTranslating
+
+    data = Blockly.Ruby.workspaceToCode()
+    Smalruby.translating = true
+    window.textEditor.getSession().getDocument().setValue(data)
+    Smalruby.translating = false
+    Smalruby.changedAfterTranslating = false
+    window.textEditor.moveCursorTo(0, 0)
+    window.textEditor.focus()
+
   onRun: (e) ->
     e.preventDefault()
 
@@ -68,55 +124,40 @@ Smalruby.MainMenuView = Backbone.View.extend
         Escキーを押すとプログラムが終わります。
         """
 
-    failedFunc = ->
-      $.unblockUI()
-      errorMessage('プログラムを実行できませんでした')
-
+    errorMsg = 'プログラムを実行できませんでした'
     sourceCode.save2()
-      .done (data) ->
+      .then (data) ->
         sourceCode.write()
-          .done (data) ->
-            afterSave = ->
-              Smalruby.savedFilename = sourceCode.get('filename')
-              window.changed = false
-              sourceCode.check()
-                .done (data) ->
-                  if data.length > 0
-                    failedFunc()
-                    for errorInfo in data
-                      do (errorInfo) ->
-                        msg = "#{errorInfo.row}行"
-                        if errorInfo.column > 0
-                          msg += "、#{errorInfo.column}文字"
-                        window.errorMessage(msg + ": #{errorInfo.message}")
-                  else
-                    sourceCode.run()
-                      .done (data) ->
-                        $.unblockUI()
-                        if data.length > 0
-                          for errorInfo in data
-                            do (errorInfo) ->
-                              msg = "#{errorInfo.row}行"
-                              if errorInfo.column > 0
-                                msg += "、#{errorInfo.column}文字"
-                              errorMessage(msg + ": #{errorInfo.message}")
-
-                      .fail -> failedFunc()
-
-                .fail -> failedFunc()
-
-            if data.source_code.error
-              if sourceCode.get('filename') == Smalruby.savedFilename ||
-                 confirm("前に#{sourceCode.get('filename')}という名前でセーブしているけど本当にセーブしますか？\nセーブすると前に作成したプログラムは消えてしまうよ！")
-                sourceCode.write(true)
-                  .done (data) ->
-                    afterSave()
-              else
-                failedFunc()
-            else
-              afterSave()
-          .fail -> failedFunc()
-      .fail -> failedFunc()
+      .then (data) =>
+        @confirmOverwrite_.call @, data, sourceCode, ->
+          errorMsg = 'プログラムの実行をキャンセルしました'
+      .then ->
+        Smalruby.savedFilename = sourceCode.get('filename')
+        window.changed = false
+        sourceCode.check()
+      .then (data) ->
+        if data.length > 0
+          for errorInfo in data
+            do (errorInfo) ->
+              msg = "#{errorInfo.row}行"
+              if errorInfo.column > 0
+                msg += "、#{errorInfo.column}文字"
+              window.errorMessage(msg + ": #{errorInfo.message}")
+          $.Deferred().reject().promise()
+      .then ->
+        sourceCode.run()
+      .then (data) ->
+        if data.length > 0
+          for errorInfo in data
+            do (errorInfo) ->
+              msg = "#{errorInfo.row}行"
+              if errorInfo.column > 0
+                msg += "、#{errorInfo.column}文字"
+              errorMessage(msg + ": #{errorInfo.message}")
+          $.Deferred().reject().promise()
+      .then(@unblockUI, @unblockUI)
+      .fail ->
+        errorMessage(errorMsg)
 
   onDownload: (e) ->
     e.preventDefault()
@@ -137,14 +178,13 @@ Smalruby.MainMenuView = Backbone.View.extend
         """
 
     sourceCode.save2()
-      .done (data) ->
-        $.unblockUI()
+      .then (data) ->
         window.changed = false
         window.successMessage('ダウンロードしました')
         Smalruby.downloading = true
         $('#download-link').click()
+      .then(@unblockUI, @unblockUI)
       .fail ->
-        $.unblockUI()
         window.errorMessage('ダウンロードできませんでした')
 
   onLoad: (e) ->
@@ -182,33 +222,20 @@ Smalruby.MainMenuView = Backbone.View.extend
         プログラムはホームディレクトリにセーブします。<br>
         """
 
-    failedFunc = ->
-      $.unblockUI()
-      window.errorMessage('セーブできませんでした')
-
+    errorMsg = 'セーブできませんでした'
     sourceCode.save2()
-      .done (data) ->
+      .then (data) ->
         sourceCode.write()
-          .done (data) ->
-            afterSave = ->
-              $.unblockUI()
-              Smalruby.savedFilename = sourceCode.get('filename')
-              window.changed = false
-              window.successMessage('セーブしました')
-
-            if data.source_code.error
-              if sourceCode.get('filename') == Smalruby.savedFilename ||
-                 confirm("前に#{sourceCode.get('filename')}という名前でセーブしているけど本当にセーブしますか？\nセーブすると前に作成したプログラムは消えてしまうよ！")
-                sourceCode.write(true)
-                  .done (data) ->
-                    afterSave()
-              else
-                $.unblockUI()
-                window.successMessage('セーブをキャンセルしました')
-            else
-              afterSave()
-          .fail -> failedFunc()
-      .fail -> failedFunc()
+      .then (data) =>
+        @confirmOverwrite_.call @, data, sourceCode, ->
+          errorMsg = 'セーブをキャンセルしました'
+      .then(@unblockUI, @unblockUI)
+      .done ->
+        Smalruby.savedFilename = sourceCode.get('filename')
+        window.changed = false
+        window.successMessage('セーブしました')
+      .fail ->
+        window.errorMessage(errorMsg)
 
   onCheck: (e) ->
     e.preventDefault()
@@ -230,8 +257,7 @@ Smalruby.MainMenuView = Backbone.View.extend
         """
 
     sourceCode.check()
-      .done (data) ->
-        $.unblockUI()
+      .then (data) ->
         if data.length == 0
           window.successMessage('チェックしました', 'ただし、プログラムを動かすとエラーが見つかるかもしれません。')
         else
@@ -241,8 +267,8 @@ Smalruby.MainMenuView = Backbone.View.extend
               if errorInfo.column > 0
                 msg += "、#{errorInfo.column}文字"
               window.errorMessage(msg + ": #{errorInfo.message}")
+      .then(@unblockUI, @unblockUI)
       .fail ->
-        $.unblockUI()
         errorMessage('チェックできませんでした')
 
   onReset: (e) ->
@@ -259,22 +285,54 @@ Smalruby.MainMenuView = Backbone.View.extend
     sourceCode
 
   blockUI: (options) ->
-    $.blockUI
-      message:
+    message = ''
+    if options.title
+      message +=
         """
         <h3>
           #{options.title}
         </h3>
-        <blockquote>
+        """
+
+    if options.message || options.notice
+      part = ''
+      if options.message
+        part +=
+          """
           <p>
             #{options.message}
           </p>
+          """
+      if options.notice
+        part +=
+          """
           <small>
             #{options.notice}
           </small>
+          """
+
+      message +=
+        """
+        <blockquote>
+          #{part}
         </blockquote>
         """
+
+    $.blockUI
+      message: message
       css:
         border: 'none'
         'text-align': 'left'
         'padding-left': '2em'
+
+  unblockUI: ->
+    $.unblockUI()
+
+  confirmOverwrite_: (data, sourceCode, canceled = $.noop) ->
+    if data.source_code.error
+      if sourceCode.get('filename') == Smalruby.savedFilename ||
+         confirm("前に#{sourceCode.get('filename')}という名前でセーブしているけど本当にセーブしますか？\nセーブすると前に作成したプログラムは消えてしまうよ！")
+        sourceCode.write(true)
+      else
+        canceled.call()
+        $.Deferred().reject().promise()

data/app/controllers/source_codes_controller.rb

@@ -57,6 +57,13 @@ class SourceCodesController < ApplicationController
     render json: source_code.run(path)
   end
 
+  def to_blocks
+    source_code = SourceCode.new(source_code_params)
+    render text: source_code.to_blocks
+  rescue
+    head :bad_request
+  end
+
   private
 
   def check_whether_standalone