smalruby-editor 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d087dfab3de1065ee3040747f53713dc2ef207c
-  data.tar.gz: 189e16f336d05a06abc08cef8f26b8fbadabedff
+  metadata.gz: 1ec9963fe6c59d88b5083a8dc61c2c44ef6ce6b9
+  data.tar.gz: fd979fa5452fedb4a8510610cd2e826f5fe42b3d
 SHA512:
-  metadata.gz: 5eebcd0351f76e5dff3339bd949f63c90bf4546ad699c9a54672d3608672a4b1197917e9f0c267876dc1756a4c3e90518a20e7ab0fa182a3124d1ff2b279707c
-  data.tar.gz: a4a4d17f52774a5d9706871724bced764822e22890d1e8c42678eef41ab0db47ecc6b488f41234f9752313b23d4f85689bcc052b224172a4d988bdfde3aecf63
+  metadata.gz: ff0fb931c40fc501d0c84c28d520e538cb4f7ecb06e9d55a7d1f065ff8f25a23847da67f1390b8f14bbbdef7c3f7b1524cd94b0dd58b90d450d4802719526f6b
+  data.tar.gz: 6b1c3860b0ef8da51c38438a2ff9c6976ce32cb15da264e953083648deadd24e917beb3716d6788a55032c4bfea7a90b8ba78303733bbef3d38d39431e97b66a

data/app/assets/javascripts/application.js

@@ -22,9 +22,9 @@
 //= require bootstrap.js
 //= require jquery-fileupload/basic
 //= require blockly/blockly_compressed
-//= require fix_blockly.js
 //= require blockly/blocks_compressed
 //= require blockly/msg/js/ja
+//= require fix_blockly.js
 //= require underscore
 //= require backbone
 //= require smalruby

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

@@ -62,7 +62,10 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  '<%= suffix %>\n'
+  if Blockly.Ruby.receiver() == 'main'
+    ''
+  else
+    '<%= suffix %>\n'
 <% end %>
 
 # もし<　>なら
@@ -141,8 +144,12 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  cond = Blockly.Ruby.valueToCode(@, 'COND', Blockly.Ruby.ORDER_CONDITIONAL) || 'true'
-  "await until #{cond}\n"
+  if Blockly.Ruby.receiver() == 'main'
+    ''
+  else
+    await = Blockly.Ruby.characterMethodCallInput_('await')[0]
+    cond = Blockly.Ruby.valueToCode(@, 'COND', Blockly.Ruby.ORDER_CONDITIONAL) || 'true'
+    "#{await} until #{cond}\n"
 
 # <　>まで繰り返す
 <% n = "#{category}_until" %>
@@ -180,4 +187,7 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  'await\n'
+  if Blockly.Ruby.receiver() == 'main'
+    ''
+  else
+    Blockly.Ruby.characterMethodCall_('await')

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

@@ -12,7 +12,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @appendDummyInput()
-      .appendField('まずは')
+      .appendField('実行ボタンがクリックされたとき')
     @appendStatementInput('DO')
     @setPreviousStatement(true)
     @setNextStatement(true)

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

@@ -2,7 +2,13 @@
 
 <%
   category = 'hardware'
-  color = 208
+  colors = {
+    motion: 208,
+    looks: 270,
+    events: 33,
+    sensing: 190,
+    etc: 340,
+  }
 %>
 
 # ハードウェアの環境設定
@@ -36,7 +42,7 @@ twoWDPinDropdown = (["D#{n}", "D#{n}"] for n in [2..10])
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:etc] %>)
     @appendDummyInput().appendField('ハードウェアを準備する')
     @setTooltip('')
 
@@ -59,7 +65,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:looks] %>)
     @appendDummyInput()
       .appendField('LED')
       .appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN')
@@ -82,7 +88,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:looks] %>)
     @appendDummyInput()
       .appendField('RGB LED')
       .appendField(new Blockly.FieldDropdown(acDropdown), 'AC')
@@ -110,7 +116,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:looks] %>)
     @appendDummyInput()
       .appendField('RGB LED')
       .appendField(new Blockly.FieldDropdown(acDropdown), 'AC')
@@ -135,7 +141,7 @@ Blockly.Blocks['<%= n %>'] =
     dropdown = ([String(n), String(n)] for n in [0..9])
 
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:looks] %>)
     @appendDummyInput()
       .appendField('7セグディスプレイに')
       .appendField(new Blockly.FieldDropdown(dropdown), 'NUM')
@@ -153,7 +159,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:looks] %>)
     @appendDummyInput()
       .appendField('7セグディスプレイをオフにする')
     @setPreviousStatement(true)
@@ -170,7 +176,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:looks] %>)
     @appendValueInput('TEXT')
       .appendField('LCDに')
       .setCheck('String')
@@ -190,7 +196,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:looks] %>)
     @appendDummyInput()
       .appendField('LCDをクリアする')
     @setPreviousStatement(true)
@@ -205,7 +211,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:looks] %>)
     @appendDummyInput()
       .appendField('7セグディスプレイをオフにする')
     @setPreviousStatement(true)
@@ -222,7 +228,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:motion] %>)
     @appendDummyInput()
       .appendField('サーボ')
       .appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN')
@@ -266,7 +272,7 @@ Blockly.Blocks['<%= n %>'] =
     dropdown = (["D#{n}", "D#{n}"] for n in [2..10])
 
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:motion] %>)
     @appendDummyInput()
       .appendField('2WD車')
       .appendField(new Blockly.FieldDropdown(twoWDPinDropdown), 'PIN')
@@ -287,7 +293,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:motion] %>)
     @appendDummyInput()
       .appendField('2WD車')
       .appendField(new Blockly.FieldDropdown(twoWDPinDropdown), 'PIN')
@@ -321,7 +327,7 @@ Blockly.Blocks['<%= n %>'] =
       ['止める', 'stop'],
     ]
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:motion] %>)
     @appendDummyInput()
       .appendField(new Blockly.FieldDropdown(commands), 'COMMAND')
     @setOutput(true, 'String')
@@ -346,7 +352,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:sensing] %>)
     @appendDummyInput()
       .appendField('ボタン')
       .appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN')
@@ -372,7 +378,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:events] %>)
     @appendDummyInput()
       .appendField('ボタン')
       .appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN')
@@ -404,7 +410,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:sensing] %>)
     @appendDummyInput()
       .appendField('センサー')
       .appendField(new Blockly.FieldDropdown(aiPinDropdown), 'PIN')
@@ -420,7 +426,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
-    @setColour(<%= color %>)
+    @setColour(<%= colors[:events] %>)
     @appendDummyInput()
       .appendField('センサー')
       .appendField(new Blockly.FieldDropdown(aiPinDropdown), 'PIN')

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

@@ -2,7 +2,7 @@
 
 <%
   category = 'looks'
-  color = 264
+  color = 270
 %>
 
 # [　]と(　)秒言う

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

@@ -2,7 +2,7 @@
 
 <%
   category = 'motion'
-  color = 225
+  color = 208
 %>
 
 # (　)歩動かす

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

@@ -2,7 +2,7 @@
 
 <%
   category = 'operators'
-  color = 93
+  color = 100
 %>
 
 # 変数:(　) + (　)

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

@@ -2,7 +2,7 @@
 
 <%
   category = 'sensing'
-  color = 200
+  color = 190
 %>
 
 # 調べるの環境設定

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

@@ -2,7 +2,7 @@
 
 <%
   category = 'sound'
-  color = 296
+  color = 300
 %>
 
 # [▼プリセット音声]

data/app/assets/javascripts/fix_blockly.js

@@ -14,3 +14,15 @@ Blockly.Names.prototype.safeName_ = function(name) {
   }
   return name;
 };
+
+var originalBlocksMathNumberInit = Blockly.Blocks['math_number'].init;
+Blockly.Blocks['math_number'].init = function() {
+  originalBlocksMathNumberInit.call(this);
+  this.setColour(100);
+};
+
+var originalBlocksTextInit = Blockly.Blocks['text'].init;
+Blockly.Blocks['text'].init = function() {
+  originalBlocksTextInit.call(this);
+  this.setColour(100);
+};

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

@@ -108,7 +108,7 @@ Blockly.Ruby.characterMethodCallInput_ = (method, args, options = {}) ->
 
 Blockly.Ruby.characterSetVariable_ = (name, val, operator = '=') ->
   if @c_()
-    "#{@rn_({ dropSelf: false})}#{name} #{operator} #{val}\n"
+    "#{@rn_({ dropSelf: false })}#{name} #{operator} #{val}\n"
   else
     ''
 

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

@@ -66,6 +66,8 @@ window.Smalruby =
       el: $('#character-modal')
     @Views.LoadModalView = new Smalruby.LoadModalView
       el: $('#load-modal')
+    @Views.ResetModalView = new Smalruby.ResetModalView
+      el: $('#reset-modal')
 
     Smalruby.downloading = false
     window.onbeforeunload = (event) ->
@@ -162,5 +164,15 @@ window.Smalruby =
       else
         true
 
+  # リセットする
+  reset: ->
+    @blocklyLoading = true
+    Blockly.mainWorkspace.clear()
+    @Collections.CharacterSet.reset()
+    $('#filename').val('')
+    window.textEditor.getSession().getDocument().setValue('')
+    window.textEditor.moveCursorTo(0, 0)
+    window.changed = false
+
 $(document).ready ->
   Smalruby.initialize()

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

@@ -272,7 +272,11 @@ Smalruby.MainMenuView = Backbone.View.extend
   onReset: (e) ->
     e.preventDefault()
 
-    location.reload()
+    if window.changed
+      Smalruby.Views.ResetModalView.render()
+    else
+      Smalruby.reset()
+    true
 
   onSignin: (e) ->
     e.preventDefault()

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

@@ -0,0 +1,11 @@
+# リセット確認ダイアログを表現するビュー
+Smalruby.ResetModalView = Backbone.View.extend
+  events:
+    'click #reset-modal-ok-button': 'onOk'
+
+  render: ->
+    @$el.modal('show')
+
+  onOk: (e) ->
+    Smalruby.reset()
+    @$el.modal('hide')

data/app/assets/stylesheets/toolbox.css.scss.erb

@@ -24,27 +24,28 @@
   end
 
   hues = %w(
-    225
-    225
-    264
-    296
+    208
+    208
+    208
+    208
+    270
+    300
     160
+    330
+    330
     33
     43
     43
     43
-    200
-    93
-    93
-    93
-    330
+    43
+    190
+    100
+    100
+    100
+    100
+    340
+    340
     340
-    208
-    208
-    208
-    208
-    208
-    208
   ).map(&:to_i)
 
   colors = hues.map { |h|
@@ -57,16 +58,25 @@
 
 #\:<%= ids[index] %> {
     .blocklyTreeRow {
-        padding-top: 0.25em;
-        padding-bottom: 0.25em;
-        border-left: 0.75em solid #<%= color %>;
+        margin-bottom: 1px;
+        padding-top: 1px;
+        padding-bottom: 1px;
+        color: white;
+        background-color: #<%= color %> !important;
+
+        span.blocklyTreeIcon, span.blocklyTreeLabel {
+          font-size: 14px;
+        }
     }
 
     .blocklyTreeRow.blocklyTreeSelected {
-        color: white;
         font-weight: bold;
         background-color: #<%= active_color %> !important;
     }
 }
 
 <% end %>
+
+div.blocklyTreeRoot {
+    padding: 0;
+}

data/app/controllers/source_codes_controller.rb

@@ -4,6 +4,31 @@ require 'nkf'
 class SourceCodesController < ApplicationController
   before_filter :check_whether_standalone, only: [:write, :run, :load_local]
 
+  # デモプログラム
+  DEMO_PROGRAMS =
+    [
+     {
+       title: '車のおいかけっこ',
+       filename: 'car_chase.rb',
+       imageUrl: '/smalruby/assets/car2.png',
+     },
+     {
+       title: 'クリックスターだにゃ～',
+       filename: 'star.rb',
+       imageUrl: '/smalruby/assets/cat1.png',
+     },
+     {
+       title: 'ピンポンゲーム',
+       filename: 'pong.rb',
+       imageUrl: '/smalruby/assets/cat2.png',
+     },
+     {
+       title: 'ライトをぴかっとさせるでよ',
+       filename: 'hardware_led.rb',
+       imageUrl: '/smalruby/assets/frog1.png',
+     },
+    ]
+
   def index
     res = {
       localPrograms: [],
@@ -22,26 +47,7 @@ class SourceCodesController < ApplicationController
     end
 
     # TODO: XMLから情報を抽出する
-    res[:demoPrograms] << {
-      title: '車のおいかけっこ',
-      filename: 'car_chase.rb',
-      imageUrl: '/smalruby/assets/car2.png',
-    }
-    res[:demoPrograms] << {
-      title: 'クリックスターだにゃ～',
-      filename: 'star.rb',
-      imageUrl: '/smalruby/assets/cat1.png',
-    }
-    res[:demoPrograms] << {
-      title: 'ピンポンゲーム',
-      filename: 'pong.rb',
-      imageUrl: '/smalruby/assets/cat2.png',
-    }
-    res[:demoPrograms] << {
-      title: 'ライトをぴかっとさせるでよ',
-      filename: 'hardware_led.rb',
-      imageUrl: '/smalruby/assets/frog1.png',
-    }
+    res[:demoPrograms] = DEMO_PROGRAMS
 
     render json: res
   end

data/app/helpers/application_helper.rb

@@ -1,3 +1,6 @@
 # -*- coding: utf-8 -*-
 module ApplicationHelper
+  def modal_css_class
+    "modal hide#{raspberrypi? ? '' : ' fade'}"
+  end
 end

data/app/models/concerns/ruby_to_block/block/motion_turn_xy.rb

@@ -6,7 +6,8 @@ module RubyToBlock
 
       def self.process_match_data(md, context)
         md2 = regexp.match(md[type])
-        add_character_method_call_block(context, md2[1], new(fields: { XY: md2[2] }))
+        add_character_method_call_block(context, md2[1],
+                                        new(fields: { XY: md2[2] }))
         true
       end
     end

data/app/views/editor/_block_tab.html.haml

@@ -31,7 +31,6 @@
             %div
 
 = render 'character_modal'
-= render 'load_modal'
 
 %script#character-selector-template{:type => 'text/template'}
   .item

data/app/views/editor/_character_modal.html.haml

@@ -1,4 +1,4 @@
-#character-modal{:class => 'modal hide fade', :tabindex => '-1',
+#character-modal{:class => "#{modal_css_class}", :tabindex => '-1',
                  :role => 'dialog', :'aria-hidden' => 'true'}
   .modal-body
     #character-modal-right-pane{:class => 'right-pane'}

data/app/views/editor/_load_modal.html.haml

@@ -1,4 +1,4 @@
-#load-modal{:class => "modal hide fade", :tabindex => "-1",
+#load-modal{:class => "#{modal_css_class}", :tabindex => "-1",
             :role => "dialog", :"aria-hidden" => "true"}
   .modal-body
     %ul.thumbnails{:id => "load-modal-local-programs",

data/app/views/editor/_reset_modal.html.haml

@@ -0,0 +1,15 @@
+#reset-modal{class: "#{modal_css_class}", tabindex: "-1",
+             role: "dialog", :"aria-hidden" => "true"}
+  .modal-header
+    %h3
+      本当にリセットしますか？
+  .modal-body
+    %p
+      作成中のプログラムが消えてしまうよ！
+  .modal-footer
+    %button#reset-modal-cancel-button.btn{:"data-dismiss" => "modal", :"aria-hidden" => "true"}<
+      %i.icon-remove
+      やめる
+    %button#reset-modal-ok-button.btn{class: "btn-primary"}<
+      %i.icon-off
+      リセット

data/app/views/editor/_signin_modal.html.haml

@@ -1,4 +1,4 @@
-#signin-modal{class: "modal hide fade", tabindex: "-1",
+#signin-modal{class: "#{modal_css_class}", tabindex: "-1",
               role: "dialog", :"aria-hidden" => "true"}
   .modal-body
     %h4