smalruby-editor 0.2.1-x86-mingw32 → 0.2.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 322300c91cb3be15ca123aed5778949776efab96
-  data.tar.gz: 3ec172bc24afd0ba188530f2cdeefb5fb4088443
+  metadata.gz: 16e2f41ebe0bcb080122de6d84382e4a82c550b0
+  data.tar.gz: c1a2828d36962c91c92e3e3eaec07fd808ea3306
 SHA512:
-  metadata.gz: 7d6e97d54e7642f6855686fb4a3cd0db1855b923263b37c7ea240a03db02f7d5b02419dc44db8bd383667e99101cfc04419f056193794e1fea0f4c1ae46cf562
-  data.tar.gz: c26010d761c5089ea5155e092a73f6a9e3903d91c3e06f7f0abdc0d934432f36f3ce06b94572a33c4015d65163c8431a5c492a9b988af70a77a3dd121dac3a80
+  metadata.gz: 5153febde2d8cb996df669b9c58753edb474b79ec59929c49e0483729ca52d9909ab27abe58478e3eed0f8661a7f6d75715baaf50382ed6ec29674c78fdeb57e
+  data.tar.gz: 44d20b9087ca9195c4f16d57d142403b8fc14b3e464e8d8622dcc7fa20cd9bf7f895ec272a6cb0a4306f746a027042829ab5bb0d9b348392bff3fe59fcf16ae0

data/LEGAL

@@ -40,6 +40,7 @@ vendor/assets/javascripts/jquery.blockUI.js:
 public/favicon.ico, public/apple-touch-icon.png, public/large.png,
 public/square.png, public/tiny.png, public/wide.png:
 
-  Copyright (C) Hikari Arakawa (Smalruby Project) 2013,
-  licensed under CC BY-SA 2.1 JP:
-  http://creativecommons.org/licenses/by-sa/2.1/jp/ .
+  Copyright (C) Hikari Arakawa (Ruby Programming Shounendan and
+  Smalruby) 2013. このイメージキャラクター、もしくはその派生版は、Ｒｕ
+  ｂｙプログラミング少年団とスモウルビー：Smalrubyに関連する文脈で誰で
+  も自由に利用できるが、それらは荒川ひかりによる保証を示すものではない。

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

@@ -19,10 +19,14 @@ Blockly.Blocks['<%= n %>'] =
     nameField = new Blockly.FieldLabel('')
     # HACK: ラベルをXMLとして出力させるためにEDITABLEをtrueにしている
     nameField.EDITABLE = true
-    # HACK: 画像とラベルの縦位置を合わせる
-    nameField.textElement_.setAttribute('y', 10)
     nameField.setText = _.bind(@nameFieldSetText_, @)
 
+    # HACK: 画像とラベルの縦位置を合わせる
+    originalInit = nameField.init
+    nameField.init = ->
+      originalInit.apply(@, arguments)
+      @getSvgRoot().setAttribute('y', size / 4)
+
     @appendDummyInput()
       .appendField(imageField, 'COSTUME')
       .appendField(nameField, 'NAME')
@@ -34,7 +38,7 @@ Blockly.Blocks['<%= n %>'] =
   dispose: (healStack, animate) ->
     @character.off 'change', @changeHandler
     @character.unlink?(@)
-    Blockly.Block.prototype.dispose.apply(@, arguments)
+    @constructor.prototype.dispose.apply(@, arguments)
 
   nameFieldSetText_: (name) ->
     charSet = Smalruby.Collections.CharacterSet

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

@@ -32,12 +32,10 @@ Blockly.Blocks['<%= n %>'] =
 
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput()
-      .appendField(<%= bm('.on_key_push_or_down_prefix') %>)
-      .appendField(new Blockly.FieldDropdown(keyDropdown), 'KEY')
-      .appendField(<%= bm('.on_key_push_or_down_middle') %>)
-      .appendField(new Blockly.FieldDropdown(podDropdown), 'POD')
-      .appendField(<%= bm('.on_key_push_or_down_suffix') %>)
+    @interpolateMsg(<%= bm('.on_key_push_or_down') %>,
+                    ['KEY', new Blockly.FieldDropdown(keyDropdown)],
+                    ['POD', new Blockly.FieldDropdown(podDropdown)],
+                    Blockly.ALIGN_RIGHT)
     @appendStatementInput('DO')
     @setPreviousStatement(true)
     @setNextStatement(true)
@@ -70,10 +68,9 @@ Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput()
-      .appendField(<%= bm('.on_hit_prefix') %>)
-      .appendField(new Smalruby.FieldCharacter(), 'CHAR')
-      .appendField(<%= bm('.on_hit_suffix') %>)
+    @interpolateMsg(<%= bm('.on_hit') %>,
+                    ['CHAR', new Smalruby.FieldCharacter()],
+                    Blockly.ALIGN_RIGHT)
     @appendStatementInput('DO')
     @setPreviousStatement(true)
     @setNextStatement(true)

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

@@ -83,7 +83,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:looks] %>)
     @interpolateMsg(<%= bm(".led_#{method}") %>,
-                    ['PIN', ['Dropdown', dioPinDropdown], Blockly.ALIGN_RIGHT],
+                    ['PIN', new Blockly.FieldDropdown(dioPinDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setPreviousStatement(true)
     @setNextStatement(true)
@@ -105,9 +105,9 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:looks] %>)
     @interpolateMsg(<%= bm('.rgb_led_set_color') %>,
-                    ['AC', ['Dropdown', acDropdown], Blockly.ALIGN_RIGHT],
-                    ['PIN', ['Dropdown', rgbLedPinDropdown], Blockly.ALIGN_RIGHT],
-                    ['COLOUR', ['Colour', '#ff0000'], Blockly.ALIGN_RIGHT],
+                    ['AC', new Blockly.FieldDropdown(acDropdown)],
+                    ['PIN', new Blockly.FieldDropdown(rgbLedPinDropdown)],
+                    ['COLOUR', new Blockly.FieldColour('#ff0000')],
                     Blockly.ALIGN_RIGHT)
     @setPreviousStatement(true)
     @setNextStatement(true)
@@ -130,8 +130,8 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:looks] %>)
     @interpolateMsg(<%= bm('.rgb_led_turn_off') %>,
-                    ['AC', ['Dropdown', acDropdown], Blockly.ALIGN_RIGHT],
-                    ['PIN', ['Dropdown', rgbLedPinDropdown], Blockly.ALIGN_RIGHT],
+                    ['AC', new Blockly.FieldDropdown(acDropdown)],
+                    ['PIN', new Blockly.FieldDropdown(rgbLedPinDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setPreviousStatement(true)
     @setNextStatement(true)
@@ -153,7 +153,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:looks] %>)
     @interpolateMsg(<%= bm('.seven_segment_display_show') %>,
-                    ['NUM', ['Dropdown', dropdown], Blockly.ALIGN_RIGHT],
+                    ['NUM', new Blockly.FieldDropdown(dropdown)],
                     Blockly.ALIGN_RIGHT)
     @setPreviousStatement(true)
     @setNextStatement(true)
@@ -222,7 +222,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:motion] %>)
     @interpolateMsg(<%= bm('.servo_set_position') %>,
-                    ['PIN', ['Dropdown', pwmPinDropdown], Blockly.ALIGN_RIGHT],
+                    ['PIN', new Blockly.FieldDropdown(pwmPinDropdown)],
                     ['POS', ['Number'], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
@@ -254,7 +254,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:motion] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_#{method}") %>,
-                    ['PIN', ['Dropdown', twoWDPinDropdown], Blockly.ALIGN_RIGHT],
+                    ['PIN', new Blockly.FieldDropdown(twoWDPinDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
     @setPreviousStatement(true)
@@ -275,7 +275,7 @@ Blockly.Blocks['<%= n %>'] =
     @setColour(<%= colors[:motion] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_run") %>,
                     ['COMMAND', ['String'], Blockly.ALIGN_RIGHT],
-                    ['PIN', ['Dropdown', twoWDPinDropdown], Blockly.ALIGN_RIGHT],
+                    ['PIN', new Blockly.FieldDropdown(twoWDPinDropdown)],
                     ['SEC', ['Number'], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
@@ -296,8 +296,9 @@ Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
     @setColour(<%= colors[:motion] %>)
-    @appendDummyInput()
-      .appendField(new Blockly.FieldDropdown(actionDropdown), 'COMMAND')
+    @interpolateMsg(<%= bm(".#{subcategory}_commands") %>,
+                    ['COMMAND', new Blockly.FieldDropdown(actionDropdown)],
+                    Blockly.ALIGN_RIGHT)
     @setOutput(true, 'String')
     @setTooltip('')
 
@@ -312,8 +313,8 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:motion] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_set_speed") %>,
-                    ['PIN', ['Dropdown', pwmPinDropdown], Blockly.ALIGN_RIGHT],
-                    ['LOR', ['Dropdown', lorDropdown], Blockly.ALIGN_RIGHT],
+                    ['PIN', new Blockly.FieldDropdown(pwmPinDropdown)],
+                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
                     ['SPEED', ['Number'], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
@@ -334,8 +335,8 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:sensing] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_speed") %>,
-                    ['PIN', ['Dropdown', pwmPinDropdown], Blockly.ALIGN_RIGHT],
-                    ['LOR', ['Dropdown', lorDropdown], Blockly.ALIGN_RIGHT],
+                    ['PIN', new Blockly.FieldDropdown(pwmPinDropdown)],
+                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Number')
     @setTooltip('')
@@ -361,8 +362,8 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:motion] %>)
     @interpolateMsg(<%= bm(".#{subcategory}") %>,
-                    ['PIN', ['Dropdown', pwmPinDropdown], Blockly.ALIGN_RIGHT],
-                    ['METHOD', ['Dropdown', methodDropdown], Blockly.ALIGN_RIGHT],
+                    ['PIN', new Blockly.FieldDropdown(pwmPinDropdown)],
+                    ['METHOD', new Blockly.FieldDropdown(methodDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
     @setPreviousStatement(true)
@@ -382,7 +383,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:motion] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_set_speed") %>,
-                    ['PIN', ['Dropdown', pwmPinDropdown], Blockly.ALIGN_RIGHT],
+                    ['PIN', new Blockly.FieldDropdown(pwmPinDropdown)],
                     ['SPEED', ['Number'], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
@@ -402,7 +403,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:sensing] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_speed") %>,
-                    ['PIN', ['Dropdown', pwmPinDropdown], Blockly.ALIGN_RIGHT],
+                    ['PIN', new Blockly.FieldDropdown(pwmPinDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Number')
     @setTooltip('')
@@ -423,8 +424,8 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:sensing] %>)
     @interpolateMsg(<%= bm(".button_pressed_or_released") %>,
-                    ['PIN', ['Dropdown', dioPinDropdown], Blockly.ALIGN_RIGHT],
-                    ['POR', ['Dropdown', porDropdown], Blockly.ALIGN_RIGHT],
+                    ['PIN', new Blockly.FieldDropdown(dioPinDropdown)],
+                    ['POR', new Blockly.FieldDropdown(porDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Boolean')
     @setTooltip('')
@@ -443,7 +444,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:sensing] %>)
     @interpolateMsg(<%= bm('.sensor_value') %>,
-                    ['PIN', ['Dropdown', aiPinDropdown], Blockly.ALIGN_RIGHT],
+                    ['PIN', new Blockly.FieldDropdown(aiPinDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Number')
     @setTooltip('')
@@ -471,8 +472,8 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:looks] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_led_turn_on_or_off") %>,
-                    ['COLOUR', ['Dropdown', colourDropdown], Blockly.ALIGN_RIGHT],
-                    ['OOO', ['Dropdown', oooDropdown], Blockly.ALIGN_RIGHT],
+                    ['COLOUR', new Blockly.FieldDropdown(colourDropdown)],
+                    ['OOO', new Blockly.FieldDropdown(oooDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
     @setPreviousStatement(true)
@@ -491,7 +492,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:sensing] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_motor_speed") %>,
-                    ['LOR', ['Dropdown', lorDropdown], Blockly.ALIGN_RIGHT],
+                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Number')
     @setTooltip('')
@@ -507,7 +508,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:motion] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_motor_set_speed") %>,
-                    ['LOR', ['Dropdown', lorDropdown], Blockly.ALIGN_RIGHT],
+                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
                     ['SPEED', ['Number'], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
@@ -528,7 +529,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:motion] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_action") %>,
-                    ['ACTION', ['Dropdown', actionDropdown], Blockly.ALIGN_RIGHT],
+                    ['ACTION', new Blockly.FieldDropdown(actionDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
     @setPreviousStatement(true)
@@ -546,7 +547,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:motion] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_action_with_sec") %>,
-                    ['ACTION', ['Dropdown', actionDropdown], Blockly.ALIGN_RIGHT],
+                    ['ACTION', new Blockly.FieldDropdown(actionDropdown)],
                     ['SEC', ['Number'], Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
@@ -568,8 +569,8 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:sensing] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_touch_sensor_pressed_or_released") %>,
-                    ['LOR', ['Dropdown', lorDropdown], Blockly.ALIGN_RIGHT],
-                    ['POR', ['Dropdown', porDropdown], Blockly.ALIGN_RIGHT],
+                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
+                    ['POR', new Blockly.FieldDropdown(porDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Boolean')
     @setTooltip('')
@@ -591,3 +592,90 @@ Blockly.Blocks['<%= n %>'] =
 
 Blockly.Ruby['<%= n %>'] = (block) ->
   Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.light_sensor.value")
+
+
+# SmalrubotS1 sub category
+<% subcategory = 'smalrubot_s1' %>
+
+# turn on/off Smalrubot s1 blue/white LED
+<% n = "#{category}_#{subcategory}_led_turn_on_or_off" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    colourDropdown = [
+      [<%= bm('colour.blue') %>, 'blue'],
+      [<%= bm('colour.white') %>, 'white'],
+    ]
+    oooDropdown = [
+      [<%= bm('common.turn_on') %>, 'turn_on'],
+      [<%= bm('common.turn_off') %>, 'turn_off'],
+    ]
+
+    @setHelpUrl('')
+    @setColour(<%= colors[:looks] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_led_turn_on_or_off") %>,
+                    ['COLOUR', new Blockly.FieldDropdown(colourDropdown)],
+                    ['OOO', new Blockly.FieldDropdown(oooDropdown)],
+                    Blockly.ALIGN_RIGHT)
+    @setInputsInline(true)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  colour = @getFieldValue('COLOUR')
+  ooo = @getFieldValue('OOO')
+  Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{ooo}_#{colour}_led")
+
+# forward/backward/turn left/turn right/stop Smalrubot s1
+<% n = "#{category}_#{subcategory}_action" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:motion] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_action") %>,
+                    ['ACTION', new Blockly.FieldDropdown(actionDropdown)],
+                    Blockly.ALIGN_RIGHT)
+    @setInputsInline(true)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  action = @getFieldValue('ACTION')
+  Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{action}")
+
+# forward/backward/turn left/turn right/stop Smalrubot s1 for ( ) secs
+<% n = "#{category}_#{subcategory}_action_with_sec" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:motion] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_action_with_sec") %>,
+                    ['ACTION', new Blockly.FieldDropdown(actionDropdown)],
+                    ['SEC', ['Number'], Blockly.ALIGN_RIGHT],
+                    Blockly.ALIGN_RIGHT)
+    @setInputsInline(true)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  action = @getFieldValue('ACTION')
+  sec = Blockly.Ruby.valueToCode(@, 'SEC', Blockly.Ruby.ORDER_FUNCTION_CALL) || 'nil'
+  Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{action}(sec: #{sec})")
+
+# Smalrubot s1 left/right ir photoreflector value
+<% n = "#{category}_#{subcategory}_ir_photoreflector_value" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:sensing] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_ir_photoreflector_value") %>,
+                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
+                    Blockly.ALIGN_RIGHT)
+    @setOutput(true, 'Boolean')
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  lor = @getFieldValue('LOR')
+  Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.#{lor}_ir_photoreflector_value")

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

@@ -91,9 +91,9 @@ Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput()
-      .appendField(new Smalruby.FieldCharacter(), 'CHAR')
-      .appendField(<%= bm('.point_towards_character') %>)
+    @interpolateMsg(<%= bm('.point_towards_character') %>,
+                    ['CHAR', new Smalruby.FieldCharacter()],
+                    Blockly.ALIGN_RIGHT)
     @setPreviousStatement(true)
     @setNextStatement(true)
     @setTooltip('')
@@ -108,11 +108,10 @@ Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput().appendField(<%= bm('.set_x_y_x') %>)
-    @appendValueInput('X').setCheck('Number')
-    @appendDummyInput().appendField(<%= bm('.set_x_y_y') %>)
-    @appendValueInput('Y').setCheck('Number')
-    @appendDummyInput().appendField(<%= bm('.set_x_y_suffix') %>)
+    @interpolateMsg(<%= bm('.set_x_y') %>,
+                    ['X', ['Number'], Blockly.ALIGN_RIGHT],
+                    ['Y', ['Number'], Blockly.ALIGN_RIGHT],
+                    Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
     @setPreviousStatement(true)
     @setNextStatement(true)
@@ -144,10 +143,9 @@ Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput()
-      .appendField(<%= bm('.go_to_character_prefix') %>)
-      .appendField(new Smalruby.FieldCharacter(), 'CHAR')
-      .appendField(<%= bm('.go_to_character_suffix') %>)
+    @interpolateMsg(<%= bm('.go_to_character') %>,
+                    ['CHAR', new Smalruby.FieldCharacter()],
+                    Blockly.ALIGN_RIGHT)
     @setPreviousStatement(true)
     @setNextStatement(true)
     @setTooltip('')
@@ -248,10 +246,9 @@ Blockly.Blocks['<%= n %>'] =
 
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput()
-      .appendField(<%= bm('.turn_xy_prefix') %>)
-      .appendField(new Blockly.FieldDropdown(dropdown), 'XY')
-      .appendField(<%= bm('.turn_xy_suffix') %>)
+    @interpolateMsg(<%= bm('.turn_xy') %>,
+                    ['XY', new Blockly.FieldDropdown(dropdown)],
+                    Blockly.ALIGN_RIGHT)
     @setPreviousStatement(true)
     @setNextStatement(true)
     @setTooltip('')
@@ -272,10 +269,9 @@ Blockly.Blocks['<%= n %>'] =
 
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput()
-      .appendField(<%= bm('.set_rotation_style_prefix') %>)
-      .appendField(new Blockly.FieldDropdown(dropdown), 'STYLE')
-      .appendField(<%= bm('.set_rotation_style_suffix') %>)
+    @interpolateMsg(<%= bm('.set_rotation_style') %>,
+                    ['STYLE', new Blockly.FieldDropdown(dropdown)],
+                    Blockly.ALIGN_RIGHT)
     @setPreviousStatement(true)
     @setNextStatement(true)
     @setTooltip('')

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

@@ -241,7 +241,7 @@ Blockly.Blocks['<%= n %>'] =
     @setColour(<%= color %>)
     @interpolateMsg(<%= bm('.math_method') %>,
                     ['NUM', ['Number'], Blockly.ALIGN_RIGHT],
-                    ['METHOD', ['Dropdown', dropdown], Blockly.ALIGN_RIGHT],
+                    ['METHOD', new Blockly.FieldDropdown(dropdown)],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
     @setOutput(true, 'Number')

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

@@ -3,6 +3,7 @@
 <%
   category = 'pen'
   require 'smalruby_editor'
+  require 'smalruby_editor/blockly_message_helper'
   color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
@@ -34,7 +35,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @interpolateMsg(<%= bm('.set_pen_color') %>,
-                    ['COLOUR', ['Colour', '#ff0000'], Blockly.ALIGN_RIGHT],
+                    ['COLOUR', new Blockly.FieldColour('#ff0000')],
                     Blockly.ALIGN_RIGHT)
     @setPreviousStatement(true)
     @setNextStatement(true)

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

@@ -63,9 +63,9 @@ Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @interpolateMsg('p %1',
-                     ['ARG', null, Blockly.ALIGN_RIGHT],
-                     Blockly.ALIGN_RIGHT)
+    @interpolateMsg(<%= bm('.p') %>,
+                    ['ARG', null, Blockly.ALIGN_RIGHT],
+                    Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
     @setPreviousStatement(true)
     @setNextStatement(true)

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

@@ -215,10 +215,10 @@ Blockly.Blocks['<%= n %>'] =
 
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput()
-      .appendField(new Smalruby.FieldCharacter(), 'CHAR')
-      .appendField(<%= bm('.character_property_middle') %>)
-      .appendField(new Blockly.FieldDropdown(dropdown), 'PROPERTY')
+    @interpolateMsg(<%= bm('.character_property') %>,
+                    ['CHAR', new Smalruby.FieldCharacter()],
+                    ['PROPERTY', new Blockly.FieldDropdown(dropdown)],
+                    Blockly.ALIGN_RIGHT)
     @setOutput(true, ['Number', 'String'])
     @setTooltip('')
 
@@ -244,9 +244,9 @@ Blockly.Blocks['<%= n %>'] =
 
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput()
-      .appendField(<%= bm('.time_now') %>)
-      .appendField(new Blockly.FieldDropdown(dropdown), 'METHOD')
+    @interpolateMsg(<%= bm('.time_now') %>,
+                    ['METHOD', new Blockly.FieldDropdown(dropdown)],
+                    Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Number')
     @setTooltip('')
 
@@ -261,7 +261,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @appendDummyInput()
-      .appendField('2000年からの日数')
+      .appendField(<%= bm('.days_since_2000') %>)
     @setOutput(true, 'Number')
     @setTooltip('')
 

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

@@ -23,7 +23,9 @@ Blockly.Blocks['<%= n %>'] =
     ]
     @setHelpUrl('')
     @setColour(<%= color %>)
-    @appendDummyInput().appendField(new Blockly.FieldDropdown(sounds), 'NAME')
+    @interpolateMsg(<%= bm('.preset_sounds') %>,
+                    ['NAME', new Blockly.FieldDropdown(sounds)],
+                    Blockly.ALIGN_RIGHT)
     @setOutput(true, 'String')
     @setTooltip('')
 

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

@@ -0,0 +1,105 @@
+/**
+ * this program copied from Blockly and modified
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+<%
+  require 'smalruby_editor'
+%>
+
+// blockly/core/toolbox.js
+// HACK: don't close category when clicked twice
+Blockly.Toolbox.TreeNode.prototype.onMouseDown = function(e) {
+  // Expand icon.
+  if (this.hasChildren() && this.isUserCollapsible_) {
+    this.toggle();
+    this.select();
+  } else if (this.isSelected()) {
+    //this.getTree().setSelectedItem(null);
+  } else {
+    this.select();
+  }
+  this.updateRow();
+};
+
+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) {
+    name = 'unnamed';
+  } else {
+    // Unfortunately names in non-latin characters will look like
+    // _E9_9F_B3_E4_B9_90 which is pretty meaningless.
+    // HACK: Rubyでは日本語の変数名を許可しているためencodeURIを行わない。
+    // また、使えない記号を置換する。
+    name = name.replace(/[ !"#$%&'()=\-~^\\|`@{\[+;*:}\]<>,.?\/]/g, '_')
+    // Most languages don't allow names with leading numbers.
+    if ('0123456789'.indexOf(name[0]) != -1) {
+      name = '_' + name;
+    }
+  }
+  return name;
+};

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

@@ -51,6 +51,9 @@ Blockly.Ruby.init = ->
     @definitions_['receiver_stack'] = ['main']
     @definitions_['character_stack'] = []
 
+    if Smalruby.isEnabled('auto_init_hardware')
+      @definitions_['init_hardware'] = 'init_hardware'
+
 Blockly.Ruby.defineCharacter = (c) ->
   name = c.get('name')
   blockName = "character_#{name}"