smalruby-editor 0.1.15 → 0.1.16

data/public/assets/{application-dc485e2270d6c5fce20c149d1e2c4f8d.js → application-842ac8f5aa3fcc87bbb0e8b3a0fef5d7.js}

@@ -12637,7 +12637,8 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
             costumes: xmlChild.getAttribute('costumes').split(','),
             x: parseInt(xmlChild.getAttribute('x'), 10),
             y: parseInt(xmlChild.getAttribute('y'), 10),
-            angle: parseInt(xmlChild.getAttribute('angle'), 10)
+            angle: parseInt(xmlChild.getAttribute('angle'), 10),
+            rotationStyle: xmlChild.getAttribute('rotation_style') || 'free'
           });
           chars.push(c);
         }
@@ -12657,13 +12658,17 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
       xmlDom = Blockly.Xml.workspaceToDom(workspace);
       blocklyDom = xmlDom.firstChild;
       charSet.each(function(c) {
-        var e;
+        var e, rotationStyle;
         e = goog.dom.createDom('character');
         e.setAttribute('x', c.get('x'));
         e.setAttribute('y', c.get('y'));
         e.setAttribute('name', c.get('name'));
         e.setAttribute('costumes', c.get('costumes').join(','));
         e.setAttribute('angle', c.get('angle'));
+        rotationStyle = c.get('rotationStyle');
+        if (rotationStyle !== 'free') {
+          e.setAttribute('rotation_style', rotationStyle);
+        }
         return xmlDom.insertBefore(e, blocklyDom);
       });
       return Blockly.Xml.domToPrettyText(xmlDom);
@@ -12696,6 +12701,7 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
       x: 0,
       y: 0,
       angle: 0,
+      rotationStyle: 'free',
       visible: true,
       using: false
     },
@@ -12768,6 +12774,39 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
         'costumeIndex': i
       });
       return i;
+    },
+    rotationStyleIconName: function() {
+      switch (this.get('rotationStyle')) {
+        case 'free':
+          return 'icon-repeat';
+        case 'left_right':
+          return 'icon-resize-horizontal';
+        case 'none':
+          return 'icon-arrow-right';
+      }
+    },
+    rotateImage: function(selector) {
+      var angle, transformValue;
+      angle = this.get('angle');
+      switch (this.get('rotationStyle')) {
+        case 'free':
+          transformValue = "rotate(" + angle + "deg) scaleX(1)";
+          break;
+        case 'left_right':
+          if (angle < 90 || angle >= 270) {
+            transformValue = "rotate(0deg) scaleX(1)";
+          } else {
+            transformValue = "rotate(0deg) scaleX(-1)";
+          }
+          break;
+        case 'none':
+          transformValue = "rotate(0deg) scaleX(1)";
+      }
+      return $(selector).css({
+        '-moz-transform': transformValue,
+        '-webkit-transform': transformValue,
+        transform: transformValue
+      });
     }
   }, {
     PRESET_COSTUMES: ['car1.png', 'car2.png', 'car3.png', 'car4.png', 'ball1.png', 'ball2.png', 'ball3.png', 'ball4.png', 'ball5.png', 'ball6.png', 'cat1.png', 'cat2.png', 'cat3.png', 'frog1.png', 'ryu1.png', 'ryu2.png', 'taichi1.png', 'taichi2.png'],
@@ -12907,6 +12946,9 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
     model: new Smalruby.Character(),
     events: {
       'click #character-modal-costume-selector a': 'onSelectCostume',
+      'click #character_rotation_style_free': 'onRotationStyleFree',
+      'click #character_rotation_style_left_right': 'onRotationStyleLeftRight',
+      'click #character_rotation_style_none': 'onRotationStyleNone',
       'click #character-modal-ok-button': 'onOk'
     },
     previewZoomLevel: 0.5,
@@ -12974,6 +13016,7 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
       this.listenTo(this.model, 'change:y', this.onChangeY);
       this.listenTo(this.model, 'change:angle', this.onChangeAngle);
       this.listenTo(this.model, 'change:costumes', this.onChangeCostumes);
+      this.listenTo(this.model, 'change:rotationStyle', this.onChangeRotationStyle);
       this.listenTo(this.model, 'change', this.onChange);
       return this.callAllOnChangeAttributes_();
     },
@@ -13005,7 +13048,8 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
       this.onChangeX(this.model, this.model.get('x'));
       this.onChangeY(this.model, this.model.get('y'));
       this.onChangeAngle(this.model, this.model.get('angle'));
-      return this.onChangeCostumes(this.model, this.model.get('costumes'));
+      this.onChangeCostumes(this.model, this.model.get('costumes'));
+      return this.onChangeRotationStyle(this.model, this.model.get('rotationStyle'));
     },
     onChangeName: function(model, value, options) {
       return this.$el.find('input[name="character[name]"]').val(value);
@@ -13025,11 +13069,12 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
       this.$el.find('input[name="character[angle]"]').val(value);
       $('#character_angle_value').text("" + value + "°");
       rotate = "rotate(" + value + "deg)";
-      return $('#character-modal-character').css({
+      $('#character_angle_vector').css({
         '-moz-transform': rotate,
         '-webkit-transform': rotate,
         transform: rotate
       });
+      return this.model.rotateImage('#character-modal-character');
     },
     onChangeCostumes: function(model, value, options) {
       var img, thumb;
@@ -13050,6 +13095,11 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
         return this.readImageSizeflag = true;
       }
     },
+    onChangeRotationStyle: function(model, value, options) {
+      $('#character_rotation_style button.btn').removeClass('btn-primary');
+      $("#character_rotation_style_" + value).addClass('btn-primary');
+      return this.onChangeAngle(this.model, this.model.get('angle'));
+    },
     onChange: function(model, options) {
       var name;
       if (!this.target) {
@@ -13092,6 +13142,21 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
       }
       return this.model.set(attrs);
     },
+    onRotationStyleFree: function() {
+      return this.model.set({
+        rotationStyle: 'free'
+      });
+    },
+    onRotationStyleLeftRight: function() {
+      return this.model.set({
+        rotationStyle: 'left_right'
+      });
+    },
+    onRotationStyleNone: function() {
+      return this.model.set({
+        rotationStyle: 'none'
+      });
+    },
     onOk: function() {
       this.$el.modal('hide');
       if (this.target) {
@@ -13116,7 +13181,7 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
       _ref = ['add', 'remove', 'reset', 'change'];
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         name = _ref[_i];
-        this.listenTo(this.model, name, this.render);
+        this.listenTo(this.model, name, this.onChange);
       }
       this.templateText = $('#character-selector-template').text();
       $('#add-character-button').click(function(e) {
@@ -13141,7 +13206,7 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
       charsEl = $('#character-selector-character-set');
       charsEl.children().remove();
       return this.model.each(function(character) {
-        var html, img, removeButton, rotate;
+        var html, img, removeButton;
         html = $(_.template(_this.templateText, character));
         charsEl.append(html);
         html.find('a.character').click(function(e) {
@@ -13160,18 +13225,20 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
         if (character.get('using')) {
           removeButton.hide();
         }
-        rotate = "rotate(" + (character.get('angle')) + "deg)";
         img = html.find('img');
-        img.css({
-          '-moz-transform': rotate,
-          '-webkit-transform': rotate,
-          transform: rotate
-        });
+        character.rotateImage(img);
         return img.on('dragstart', function(e) {
           return e.preventDefault();
         });
       });
     },
+    onChange: function() {
+      if (!Smalruby.blocklyLoading) {
+        Smalruby.changedAfterTranslating = true;
+        window.changed = true;
+      }
+      return this.render();
+    },
     addBlock_: function(character) {
       var newBlock, onStartBlock;
       newBlock = new Blockly.Block(Blockly.mainWorkspace, 'character_new');
@@ -14315,9 +14382,19 @@ case     end      next     return   until\
   };
 
   Blockly.Ruby['character_new'] = function(block) {
-    var c, code, targetBlock;
+    var c, code, rotationStyle, targetBlock;
     c = block.character;
-    Blockly.Ruby.definitions_["character_" + (c.get('name'))] = "" + (c.get('name')) + " = Character.new(costume: " + (Blockly.Ruby.quote_(c.costume())) + ", x: " + (c.get('x')) + ", y: " + (c.get('y')) + ", angle: " + (c.get('angle')) + ")";
+    switch (c.get('rotationStyle')) {
+      case 'left_right':
+        rotationStyle = ', rotation_style: :left_right';
+        break;
+      case 'none':
+        rotationStyle = ', rotation_style: :none';
+        break;
+      default:
+        rotationStyle = '';
+    }
+    Blockly.Ruby.definitions_["character_" + (c.get('name'))] = "" + (c.get('name')) + " = Character.new(costume: " + (Blockly.Ruby.quote_(c.costume())) + ", x: " + (c.get('x')) + ", y: " + (c.get('y')) + ", angle: " + (c.get('angle')) + rotationStyle + ")";
     Blockly.Ruby.cs_().push(c);
     try {
       targetBlock = block.getInputTargetBlock('DO');
@@ -14619,7 +14696,7 @@ case     end      next     return   until\
 
 }).call(this);
 (function() {
-  var acDropdown, aiPinDropdown, dioPinDropdown, n, pwmPinDropdown, rgbLedPinDropdown;
+  var acDropdown, aiPinDropdown, dioPinDropdown, n, pwmPinDropdown, rgbLedPinDropdown, twoWDPinDropdown;
 
   window.SmalrubyEditor.Hardware = {
     Type: 'Arduino',
@@ -14674,6 +14751,15 @@ case     end      next     return   until\
 
   acDropdown = [['アノード', 'anode'], ['カソード', 'cathode']];
 
+  twoWDPinDropdown = (function() {
+    var _i, _results;
+    _results = [];
+    for (n = _i = 2; _i <= 10; n = ++_i) {
+      _results.push(["D" + n, "D" + n]);
+    }
+    return _results;
+  })();
+
   Blockly.Blocks['hardware_init_hardware'] = {
     init: function() {
       this.setHelpUrl('');
@@ -14888,7 +14974,7 @@ case     end      next     return   until\
       })();
       this.setHelpUrl('');
       this.setColour(208);
-      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(dropdown), 'PIN').appendField('を進める');
+      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(twoWDPinDropdown), 'PIN').appendField('を進める');
       this.setInputsInline(true);
       this.setPreviousStatement(true);
       this.setNextStatement(true);
@@ -14915,7 +15001,7 @@ case     end      next     return   until\
       })();
       this.setHelpUrl('');
       this.setColour(208);
-      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(dropdown), 'PIN').appendField('をバックさせる');
+      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(twoWDPinDropdown), 'PIN').appendField('をバックさせる');
       this.setInputsInline(true);
       this.setPreviousStatement(true);
       this.setNextStatement(true);
@@ -14942,7 +15028,7 @@ case     end      next     return   until\
       })();
       this.setHelpUrl('');
       this.setColour(208);
-      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(dropdown), 'PIN').appendField('を左に曲げる');
+      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(twoWDPinDropdown), 'PIN').appendField('を左に曲げる');
       this.setInputsInline(true);
       this.setPreviousStatement(true);
       this.setNextStatement(true);
@@ -14969,7 +15055,7 @@ case     end      next     return   until\
       })();
       this.setHelpUrl('');
       this.setColour(208);
-      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(dropdown), 'PIN').appendField('を右に曲げる');
+      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(twoWDPinDropdown), 'PIN').appendField('を右に曲げる');
       this.setInputsInline(true);
       this.setPreviousStatement(true);
       this.setNextStatement(true);
@@ -14996,7 +15082,7 @@ case     end      next     return   until\
       })();
       this.setHelpUrl('');
       this.setColour(208);
-      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(dropdown), 'PIN').appendField('を止める');
+      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(twoWDPinDropdown), 'PIN').appendField('を止める');
       this.setInputsInline(true);
       this.setPreviousStatement(true);
       this.setNextStatement(true);
@@ -15010,6 +15096,47 @@ case     end      next     return   until\
     return Blockly.Ruby.characterMethodCall_("two_wheel_drive_car(" + (Blockly.Ruby.quote_(pin)) + ").stop");
   };
 
+  Blockly.Blocks['hardware_two_wheel_drive_car_run'] = {
+    init: function() {
+      this.setHelpUrl('');
+      this.setColour(208);
+      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(twoWDPinDropdown), 'PIN').appendField('を');
+      this.appendValueInput('SEC').setCheck('Number');
+      this.appendDummyInput().appendField('秒');
+      this.appendValueInput('COMMAND').setCheck('String');
+      this.setInputsInline(true);
+      this.setPreviousStatement(true);
+      this.setNextStatement(true);
+      return this.setTooltip('');
+    }
+  };
+
+  Blockly.Ruby['hardware_two_wheel_drive_car_run'] = function(block) {
+    var command, pin, sec;
+    pin = this.getFieldValue('PIN');
+    sec = Blockly.Ruby.valueToCode(this, 'SEC', Blockly.Ruby.ORDER_NONE) || 0;
+    command = Blockly.Ruby.valueToCode(this, 'COMMAND', Blockly.Ruby.ORDER_NONE) || Blockly.Ruby.quote_('stop');
+    return Blockly.Ruby.characterMethodCall_("two_wheel_drive_car(" + (Blockly.Ruby.quote_(pin)) + ").run(command: " + command + ", sec: " + sec + ")");
+  };
+
+  Blockly.Blocks['hardware_two_wheel_drive_car_commands'] = {
+    init: function() {
+      var commands;
+      commands = [['進める', 'forward'], ['バックさせる', 'backward'], ['左に曲げる', 'turn_left'], ['右に曲げる', 'turn_right'], ['止める', 'stop']];
+      this.setHelpUrl('');
+      this.setColour(208);
+      this.appendDummyInput().appendField(new Blockly.FieldDropdown(commands), 'COMMAND');
+      this.setOutput(true, 'String');
+      return this.setTooltip('');
+    }
+  };
+
+  Blockly.Ruby['hardware_two_wheel_drive_car_commands'] = function(block) {
+    var code;
+    code = Blockly.Ruby.quote_(this.getFieldValue('COMMAND'));
+    return [code, Blockly.Ruby.ORDER_ATOMIC];
+  };
+
   Blockly.Blocks['hardware_button_down'] = {
     init: function() {
       this.setHelpUrl('');
@@ -15439,7 +15566,7 @@ case     end      next     return   until\
     var x, y;
     x = Blockly.Ruby.valueToCode(this, 'X', Blockly.Ruby.ORDER_NONE) || '0';
     y = Blockly.Ruby.valueToCode(this, 'Y', Blockly.Ruby.ORDER_NONE) || '0';
-    return Blockly.Ruby.characterSetVariable_('x', x) + Blockly.Ruby.characterSetVariable_('y', y);
+    return Blockly.Ruby.characterSetVariable_('position', "[" + x + ", " + y + "]");
   };
 
   Blockly.Blocks['motion_go_to_mouse'] = {

data/public/assets/manifest-332a5a1668194028b55103e0ea45c054.json

@@ -1 +1 @@
-{"files":{"default-5d1886100d7c8961e9962bbc4bb0c714.xml":{"logical_path":"default.xml","mtime":"2014-02-14T01:28:48+09:00","size":5017,"digest":"5d1886100d7c8961e9962bbc4bb0c714"},"rgb_led_anode-91225bef2a8b97f1cefee862a0619b91.xml":{"logical_path":"rgb_led_anode.xml","mtime":"2014-02-11T14:17:03+09:00","size":3805,"digest":"91225bef2a8b97f1cefee862a0619b91"},"favicon-a37c90b368fd8ed436cb8f9e9396465c.ico":{"logical_path":"favicon.ico","mtime":"2014-01-21T03:18:02+09:00","size":5430,"digest":"a37c90b368fd8ed436cb8f9e9396465c"},"application-735e172a0df828da16d22f5d3c26671f.js":{"logical_path":"application.js","mtime":"2014-02-19T18:22:09+09:00","size":1440213,"digest":"735e172a0df828da16d22f5d3c26671f"},"application-64a390efe879c386a5950515064f062d.css":{"logical_path":"application.css","mtime":"2014-02-19T14:32:55+09:00","size":119186,"digest":"64a390efe879c386a5950515064f062d"},"jquery-ui/animated-overlay-c48c87b7a95316f4698484e3b85ee4aa.gif":{"logical_path":"jquery-ui/animated-overlay.gif","mtime":"2014-02-04T09:35:48+09:00","size":1738,"digest":"c48c87b7a95316f4698484e3b85ee4aa"},"jquery-ui/ui-bg_flat_0_aaaaaa_40x100-58b63faadd031ca3db096dfdffd90224.png":{"logical_path":"jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png","mtime":"2014-02-04T09:35:48+09:00","size":180,"digest":"58b63faadd031ca3db096dfdffd90224"},"jquery-ui/ui-bg_flat_75_ffffff_40x100-937399e8b369d64aa075d13a82c00112.png":{"logical_path":"jquery-ui/ui-bg_flat_75_ffffff_40x100.png","mtime":"2014-02-04T09:35:48+09:00","size":178,"digest":"937399e8b369d64aa075d13a82c00112"},"jquery-ui/ui-bg_glass_55_fbf9ee_1x400-a8c503e0f42a081a92a473b0d30ac6cf.png":{"logical_path":"jquery-ui/ui-bg_glass_55_fbf9ee_1x400.png","mtime":"2014-02-04T09:35:48+09:00","size":120,"digest":"a8c503e0f42a081a92a473b0d30ac6cf"},"jquery-ui/ui-bg_glass_65_ffffff_1x400-ddcbfe385abc3947937caa0b44e2f5d2.png":{"logical_path":"jquery-ui/ui-bg_glass_65_ffffff_1x400.png","mtime":"2014-02-04T09:35:48+09:00","size":105,"digest":"ddcbfe385abc3947937caa0b44e2f5d2"},"jquery-ui/ui-bg_glass_75_dadada_1x400-14dd4a9ad1f21d8c4c7e673ddfb0806f.png":{"logical_path":"jquery-ui/ui-bg_glass_75_dadada_1x400.png","mtime":"2014-02-04T09:35:48+09:00","size":111,"digest":"14dd4a9ad1f21d8c4c7e673ddfb0806f"},"jquery-ui/ui-bg_glass_75_e6e6e6_1x400-a43dfabb23b0a987b567b282bad68346.png":{"logical_path":"jquery-ui/ui-bg_glass_75_e6e6e6_1x400.png","mtime":"2014-02-04T09:35:48+09:00","size":110,"digest":"a43dfabb23b0a987b567b282bad68346"},"jquery-ui/ui-bg_glass_95_fef1ec_1x400-31c0c791a756266043ee8ea61dacb36a.png":{"logical_path":"jquery-ui/ui-bg_glass_95_fef1ec_1x400.png","mtime":"2014-02-04T09:35:48+09:00","size":119,"digest":"31c0c791a756266043ee8ea61dacb36a"},"jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100-33edbdb0d2fcebd2a65c2041a28533da.png":{"logical_path":"jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100.png","mtime":"2014-02-04T09:35:48+09:00","size":101,"digest":"33edbdb0d2fcebd2a65c2041a28533da"},"jquery-ui/ui-icons_222222_256x240-890385424135de1513f00cbecfb7f990.png":{"logical_path":"jquery-ui/ui-icons_222222_256x240.png","mtime":"2014-02-04T09:35:48+09:00","size":4369,"digest":"890385424135de1513f00cbecfb7f990"},"jquery-ui/ui-icons_2e83ff_256x240-824705ca4aa2610434a358fe4018c9c6.png":{"logical_path":"jquery-ui/ui-icons_2e83ff_256x240.png","mtime":"2014-02-04T09:35:48+09:00","size":4369,"digest":"824705ca4aa2610434a358fe4018c9c6"},"jquery-ui/ui-icons_454545_256x240-254e054f6df453dfac49efbc8b78f79d.png":{"logical_path":"jquery-ui/ui-icons_454545_256x240.png","mtime":"2014-02-04T09:35:48+09:00","size":4369,"digest":"254e054f6df453dfac49efbc8b78f79d"},"jquery-ui/ui-icons_888888_256x240-57c441f87c4289a5372823f506c1182d.png":{"logical_path":"jquery-ui/ui-icons_888888_256x240.png","mtime":"2014-02-04T09:35:48+09:00","size":4369,"digest":"57c441f87c4289a5372823f506c1182d"},"jquery-ui/ui-icons_cd0a0a_256x240-261647ac915575f3981ded254ae8d43e.png":{"logical_path":"jquery-ui/ui-icons_cd0a0a_256x240.png","mtime":"2014-02-04T09:35:48+09:00","size":4369,"digest":"261647ac915575f3981ded254ae8d43e"},"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-0047adbc0fb7a529ef7a41b5e0e7d097.js":{"logical_path":"application.js","mtime":"2014-02-20T03:12:12+09:00","size":1441568,"digest":"0047adbc0fb7a529ef7a41b5e0e7d097"},"application-42aa660a3233c7738b7578d30ba040b3.js":{"logical_path":"application.js","mtime":"2014-02-22T15:25:11+09:00","size":1441708,"digest":"42aa660a3233c7738b7578d30ba040b3"},"application-66b65154e7b5dcfe67fa164db6fc5f51.js":{"logical_path":"application.js","mtime":"2014-02-23T21:53:43+09:00","size":1441898,"digest":"66b65154e7b5dcfe67fa164db6fc5f51"},"application-8bfffad1222d4e198f3c7ccc1cbd774f.js":{"logical_path":"application.js","mtime":"2014-02-27T01:28:32+09:00","size":1442504,"digest":"8bfffad1222d4e198f3c7ccc1cbd774f"},"application-4f747690ebc8ec4815ae36021fdb2c44.js":{"logical_path":"application.js","mtime":"2014-03-07T12:36:30+09:00","size":1447094,"digest":"4f747690ebc8ec4815ae36021fdb2c44"},"application-28b7bed56c5389dfa372e972c75b6676.css":{"logical_path":"application.css","mtime":"2014-03-07T10:27:39+09:00","size":119378,"digest":"28b7bed56c5389dfa372e972c75b6676"},"application-3ee566927dc437f1406e5e903da1baf5.js":{"logical_path":"application.js","mtime":"2014-04-30T00:15:32+09:00","size":1452218,"digest":"3ee566927dc437f1406e5e903da1baf5"},"application-5f1777e683ca5d3cf4e0f0374eab6fac.css":{"logical_path":"application.css","mtime":"2014-03-29T10:25:16+09:00","size":120345,"digest":"5f1777e683ca5d3cf4e0f0374eab6fac"},"application-53d651da3309caa498cc0ca6616dbead.css":{"logical_path":"application.css","mtime":"2014-05-06T14:59:20+09:00","size":118430,"digest":"53d651da3309caa498cc0ca6616dbead"},"application-0b3c70107ad81ea9fcda6d7d921bd8cf.js":{"logical_path":"application.js","mtime":"2014-04-30T02:04:36+09:00","size":1452582,"digest":"0b3c70107ad81ea9fcda6d7d921bd8cf"},"application-c2d6a82134037eb9a7f6c7d13d2657db.js":{"logical_path":"application.js","mtime":"2014-05-06T21:22:51+09:00","size":1455113,"digest":"c2d6a82134037eb9a7f6c7d13d2657db"},"application-669cbc2df60729c4b12d739af7595cc6.js":{"logical_path":"application.js","mtime":"2014-05-08T04:10:12+09:00","size":1455352,"digest":"669cbc2df60729c4b12d739af7595cc6"},"application-6579eaebb20aaacfc143d63c77bf4199.js":{"logical_path":"application.js","mtime":"2014-05-11T03:54:51+09:00","size":1455344,"digest":"6579eaebb20aaacfc143d63c77bf4199"},"application-f112e2e4edd69b09d5d1cb92c33144d6.js":{"logical_path":"application.js","mtime":"2014-05-15T23:54:56+09:00","size":1455344,"digest":"f112e2e4edd69b09d5d1cb92c33144d6"},"application-c8214e05b402c742494330b5e957eb38.js":{"logical_path":"application.js","mtime":"2014-05-16T02:08:20+09:00","size":1455681,"digest":"c8214e05b402c742494330b5e957eb38"},"application-c45776825263b5fa7167e55a3b12252c.js":{"logical_path":"application.js","mtime":"2014-05-16T08:50:24+09:00","size":1455659,"digest":"c45776825263b5fa7167e55a3b12252c"},"application-0f9a877d144f84320a10770dfdc5ddd8.js":{"logical_path":"application.js","mtime":"2014-05-16T22:21:05+09:00","size":1455877,"digest":"0f9a877d144f84320a10770dfdc5ddd8"},"application-d60babdd5a50329b329487cf793c2e29.js":{"logical_path":"application.js","mtime":"2014-05-30T19:26:09+09:00","size":1455891,"digest":"d60babdd5a50329b329487cf793c2e29"},"application-dc485e2270d6c5fce20c149d1e2c4f8d.js":{"logical_path":"application.js","mtime":"2014-06-01T22:25:31+09:00","size":1457970,"digest":"dc485e2270d6c5fce20c149d1e2c4f8d"},"application-51ab300acd1779bfba20b099e7000b7e.css":{"logical_path":"application.css","mtime":"2014-06-01T22:26:47+09:00","size":118664,"digest":"51ab300acd1779bfba20b099e7000b7e"}},"assets":{"default.xml":"default-5d1886100d7c8961e9962bbc4bb0c714.xml","rgb_led_anode.xml":"rgb_led_anode-91225bef2a8b97f1cefee862a0619b91.xml","favicon.ico":"favicon-a37c90b368fd8ed436cb8f9e9396465c.ico","application.js":"application-dc485e2270d6c5fce20c149d1e2c4f8d.js","application.css":"application-51ab300acd1779bfba20b099e7000b7e.css","jquery-ui/animated-overlay.gif":"jquery-ui/animated-overlay-c48c87b7a95316f4698484e3b85ee4aa.gif","jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png":"jquery-ui/ui-bg_flat_0_aaaaaa_40x100-58b63faadd031ca3db096dfdffd90224.png","jquery-ui/ui-bg_flat_75_ffffff_40x100.png":"jquery-ui/ui-bg_flat_75_ffffff_40x100-937399e8b369d64aa075d13a82c00112.png","jquery-ui/ui-bg_glass_55_fbf9ee_1x400.png":"jquery-ui/ui-bg_glass_55_fbf9ee_1x400-a8c503e0f42a081a92a473b0d30ac6cf.png","jquery-ui/ui-bg_glass_65_ffffff_1x400.png":"jquery-ui/ui-bg_glass_65_ffffff_1x400-ddcbfe385abc3947937caa0b44e2f5d2.png","jquery-ui/ui-bg_glass_75_dadada_1x400.png":"jquery-ui/ui-bg_glass_75_dadada_1x400-14dd4a9ad1f21d8c4c7e673ddfb0806f.png","jquery-ui/ui-bg_glass_75_e6e6e6_1x400.png":"jquery-ui/ui-bg_glass_75_e6e6e6_1x400-a43dfabb23b0a987b567b282bad68346.png","jquery-ui/ui-bg_glass_95_fef1ec_1x400.png":"jquery-ui/ui-bg_glass_95_fef1ec_1x400-31c0c791a756266043ee8ea61dacb36a.png","jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100.png":"jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100-33edbdb0d2fcebd2a65c2041a28533da.png","jquery-ui/ui-icons_222222_256x240.png":"jquery-ui/ui-icons_222222_256x240-890385424135de1513f00cbecfb7f990.png","jquery-ui/ui-icons_2e83ff_256x240.png":"jquery-ui/ui-icons_2e83ff_256x240-824705ca4aa2610434a358fe4018c9c6.png","jquery-ui/ui-icons_454545_256x240.png":"jquery-ui/ui-icons_454545_256x240-254e054f6df453dfac49efbc8b78f79d.png","jquery-ui/ui-icons_888888_256x240.png":"jquery-ui/ui-icons_888888_256x240-57c441f87c4289a5372823f506c1182d.png","jquery-ui/ui-icons_cd0a0a_256x240.png":"jquery-ui/ui-icons_cd0a0a_256x240-261647ac915575f3981ded254ae8d43e.png","loading.gif":"loading-e8e6dd7833131c92a6c3b9c8ccc6a6ac.gif","progressbar.gif":"progressbar-82023a146fba2a0f6d925629ed2b09c5.gif"}}
+{"files":{"default-5d1886100d7c8961e9962bbc4bb0c714.xml":{"logical_path":"default.xml","mtime":"2014-02-14T01:28:48+09:00","size":5017,"digest":"5d1886100d7c8961e9962bbc4bb0c714"},"rgb_led_anode-91225bef2a8b97f1cefee862a0619b91.xml":{"logical_path":"rgb_led_anode.xml","mtime":"2014-02-11T14:17:03+09:00","size":3805,"digest":"91225bef2a8b97f1cefee862a0619b91"},"favicon-a37c90b368fd8ed436cb8f9e9396465c.ico":{"logical_path":"favicon.ico","mtime":"2014-01-21T03:18:02+09:00","size":5430,"digest":"a37c90b368fd8ed436cb8f9e9396465c"},"application-735e172a0df828da16d22f5d3c26671f.js":{"logical_path":"application.js","mtime":"2014-02-19T18:22:09+09:00","size":1440213,"digest":"735e172a0df828da16d22f5d3c26671f"},"application-64a390efe879c386a5950515064f062d.css":{"logical_path":"application.css","mtime":"2014-02-19T14:32:55+09:00","size":119186,"digest":"64a390efe879c386a5950515064f062d"},"jquery-ui/animated-overlay-c48c87b7a95316f4698484e3b85ee4aa.gif":{"logical_path":"jquery-ui/animated-overlay.gif","mtime":"2014-02-04T09:35:48+09:00","size":1738,"digest":"c48c87b7a95316f4698484e3b85ee4aa"},"jquery-ui/ui-bg_flat_0_aaaaaa_40x100-58b63faadd031ca3db096dfdffd90224.png":{"logical_path":"jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png","mtime":"2014-02-04T09:35:48+09:00","size":180,"digest":"58b63faadd031ca3db096dfdffd90224"},"jquery-ui/ui-bg_flat_75_ffffff_40x100-937399e8b369d64aa075d13a82c00112.png":{"logical_path":"jquery-ui/ui-bg_flat_75_ffffff_40x100.png","mtime":"2014-02-04T09:35:48+09:00","size":178,"digest":"937399e8b369d64aa075d13a82c00112"},"jquery-ui/ui-bg_glass_55_fbf9ee_1x400-a8c503e0f42a081a92a473b0d30ac6cf.png":{"logical_path":"jquery-ui/ui-bg_glass_55_fbf9ee_1x400.png","mtime":"2014-02-04T09:35:48+09:00","size":120,"digest":"a8c503e0f42a081a92a473b0d30ac6cf"},"jquery-ui/ui-bg_glass_65_ffffff_1x400-ddcbfe385abc3947937caa0b44e2f5d2.png":{"logical_path":"jquery-ui/ui-bg_glass_65_ffffff_1x400.png","mtime":"2014-02-04T09:35:48+09:00","size":105,"digest":"ddcbfe385abc3947937caa0b44e2f5d2"},"jquery-ui/ui-bg_glass_75_dadada_1x400-14dd4a9ad1f21d8c4c7e673ddfb0806f.png":{"logical_path":"jquery-ui/ui-bg_glass_75_dadada_1x400.png","mtime":"2014-02-04T09:35:48+09:00","size":111,"digest":"14dd4a9ad1f21d8c4c7e673ddfb0806f"},"jquery-ui/ui-bg_glass_75_e6e6e6_1x400-a43dfabb23b0a987b567b282bad68346.png":{"logical_path":"jquery-ui/ui-bg_glass_75_e6e6e6_1x400.png","mtime":"2014-02-04T09:35:48+09:00","size":110,"digest":"a43dfabb23b0a987b567b282bad68346"},"jquery-ui/ui-bg_glass_95_fef1ec_1x400-31c0c791a756266043ee8ea61dacb36a.png":{"logical_path":"jquery-ui/ui-bg_glass_95_fef1ec_1x400.png","mtime":"2014-02-04T09:35:48+09:00","size":119,"digest":"31c0c791a756266043ee8ea61dacb36a"},"jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100-33edbdb0d2fcebd2a65c2041a28533da.png":{"logical_path":"jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100.png","mtime":"2014-02-04T09:35:48+09:00","size":101,"digest":"33edbdb0d2fcebd2a65c2041a28533da"},"jquery-ui/ui-icons_222222_256x240-890385424135de1513f00cbecfb7f990.png":{"logical_path":"jquery-ui/ui-icons_222222_256x240.png","mtime":"2014-02-04T09:35:48+09:00","size":4369,"digest":"890385424135de1513f00cbecfb7f990"},"jquery-ui/ui-icons_2e83ff_256x240-824705ca4aa2610434a358fe4018c9c6.png":{"logical_path":"jquery-ui/ui-icons_2e83ff_256x240.png","mtime":"2014-02-04T09:35:48+09:00","size":4369,"digest":"824705ca4aa2610434a358fe4018c9c6"},"jquery-ui/ui-icons_454545_256x240-254e054f6df453dfac49efbc8b78f79d.png":{"logical_path":"jquery-ui/ui-icons_454545_256x240.png","mtime":"2014-02-04T09:35:48+09:00","size":4369,"digest":"254e054f6df453dfac49efbc8b78f79d"},"jquery-ui/ui-icons_888888_256x240-57c441f87c4289a5372823f506c1182d.png":{"logical_path":"jquery-ui/ui-icons_888888_256x240.png","mtime":"2014-02-04T09:35:48+09:00","size":4369,"digest":"57c441f87c4289a5372823f506c1182d"},"jquery-ui/ui-icons_cd0a0a_256x240-261647ac915575f3981ded254ae8d43e.png":{"logical_path":"jquery-ui/ui-icons_cd0a0a_256x240.png","mtime":"2014-02-04T09:35:48+09:00","size":4369,"digest":"261647ac915575f3981ded254ae8d43e"},"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-0047adbc0fb7a529ef7a41b5e0e7d097.js":{"logical_path":"application.js","mtime":"2014-02-20T03:12:12+09:00","size":1441568,"digest":"0047adbc0fb7a529ef7a41b5e0e7d097"},"application-42aa660a3233c7738b7578d30ba040b3.js":{"logical_path":"application.js","mtime":"2014-02-22T15:25:11+09:00","size":1441708,"digest":"42aa660a3233c7738b7578d30ba040b3"},"application-66b65154e7b5dcfe67fa164db6fc5f51.js":{"logical_path":"application.js","mtime":"2014-02-23T21:53:43+09:00","size":1441898,"digest":"66b65154e7b5dcfe67fa164db6fc5f51"},"application-8bfffad1222d4e198f3c7ccc1cbd774f.js":{"logical_path":"application.js","mtime":"2014-02-27T01:28:32+09:00","size":1442504,"digest":"8bfffad1222d4e198f3c7ccc1cbd774f"},"application-4f747690ebc8ec4815ae36021fdb2c44.js":{"logical_path":"application.js","mtime":"2014-03-07T12:36:30+09:00","size":1447094,"digest":"4f747690ebc8ec4815ae36021fdb2c44"},"application-28b7bed56c5389dfa372e972c75b6676.css":{"logical_path":"application.css","mtime":"2014-03-07T10:27:39+09:00","size":119378,"digest":"28b7bed56c5389dfa372e972c75b6676"},"application-3ee566927dc437f1406e5e903da1baf5.js":{"logical_path":"application.js","mtime":"2014-04-30T00:15:32+09:00","size":1452218,"digest":"3ee566927dc437f1406e5e903da1baf5"},"application-5f1777e683ca5d3cf4e0f0374eab6fac.css":{"logical_path":"application.css","mtime":"2014-03-29T10:25:16+09:00","size":120345,"digest":"5f1777e683ca5d3cf4e0f0374eab6fac"},"application-53d651da3309caa498cc0ca6616dbead.css":{"logical_path":"application.css","mtime":"2014-05-06T14:59:20+09:00","size":118430,"digest":"53d651da3309caa498cc0ca6616dbead"},"application-0b3c70107ad81ea9fcda6d7d921bd8cf.js":{"logical_path":"application.js","mtime":"2014-04-30T02:04:36+09:00","size":1452582,"digest":"0b3c70107ad81ea9fcda6d7d921bd8cf"},"application-c2d6a82134037eb9a7f6c7d13d2657db.js":{"logical_path":"application.js","mtime":"2014-05-06T21:22:51+09:00","size":1455113,"digest":"c2d6a82134037eb9a7f6c7d13d2657db"},"application-669cbc2df60729c4b12d739af7595cc6.js":{"logical_path":"application.js","mtime":"2014-05-08T04:10:12+09:00","size":1455352,"digest":"669cbc2df60729c4b12d739af7595cc6"},"application-6579eaebb20aaacfc143d63c77bf4199.js":{"logical_path":"application.js","mtime":"2014-05-11T03:54:51+09:00","size":1455344,"digest":"6579eaebb20aaacfc143d63c77bf4199"},"application-f112e2e4edd69b09d5d1cb92c33144d6.js":{"logical_path":"application.js","mtime":"2014-05-15T23:54:56+09:00","size":1455344,"digest":"f112e2e4edd69b09d5d1cb92c33144d6"},"application-c8214e05b402c742494330b5e957eb38.js":{"logical_path":"application.js","mtime":"2014-05-16T02:08:20+09:00","size":1455681,"digest":"c8214e05b402c742494330b5e957eb38"},"application-c45776825263b5fa7167e55a3b12252c.js":{"logical_path":"application.js","mtime":"2014-05-16T08:50:24+09:00","size":1455659,"digest":"c45776825263b5fa7167e55a3b12252c"},"application-0f9a877d144f84320a10770dfdc5ddd8.js":{"logical_path":"application.js","mtime":"2014-05-16T22:21:05+09:00","size":1455877,"digest":"0f9a877d144f84320a10770dfdc5ddd8"},"application-d60babdd5a50329b329487cf793c2e29.js":{"logical_path":"application.js","mtime":"2014-05-30T19:26:09+09:00","size":1455891,"digest":"d60babdd5a50329b329487cf793c2e29"},"application-dc485e2270d6c5fce20c149d1e2c4f8d.js":{"logical_path":"application.js","mtime":"2014-06-01T22:25:31+09:00","size":1457970,"digest":"dc485e2270d6c5fce20c149d1e2c4f8d"},"application-51ab300acd1779bfba20b099e7000b7e.css":{"logical_path":"application.css","mtime":"2014-06-01T22:26:47+09:00","size":118664,"digest":"51ab300acd1779bfba20b099e7000b7e"},"application-413cdca52651d449a8bc24550f6db35c.js":{"logical_path":"application.js","mtime":"2014-06-08T21:19:30+09:00","size":1462683,"digest":"413cdca52651d449a8bc24550f6db35c"},"application-7f560d8d6d224f87269691c57ca9a376.css":{"logical_path":"application.css","mtime":"2014-06-08T13:07:08+09:00","size":119280,"digest":"7f560d8d6d224f87269691c57ca9a376"},"application-842ac8f5aa3fcc87bbb0e8b3a0fef5d7.js":{"logical_path":"application.js","mtime":"2014-06-08T22:17:54+09:00","size":1462685,"digest":"842ac8f5aa3fcc87bbb0e8b3a0fef5d7"}},"assets":{"default.xml":"default-5d1886100d7c8961e9962bbc4bb0c714.xml","rgb_led_anode.xml":"rgb_led_anode-91225bef2a8b97f1cefee862a0619b91.xml","favicon.ico":"favicon-a37c90b368fd8ed436cb8f9e9396465c.ico","application.js":"application-842ac8f5aa3fcc87bbb0e8b3a0fef5d7.js","application.css":"application-7f560d8d6d224f87269691c57ca9a376.css","jquery-ui/animated-overlay.gif":"jquery-ui/animated-overlay-c48c87b7a95316f4698484e3b85ee4aa.gif","jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png":"jquery-ui/ui-bg_flat_0_aaaaaa_40x100-58b63faadd031ca3db096dfdffd90224.png","jquery-ui/ui-bg_flat_75_ffffff_40x100.png":"jquery-ui/ui-bg_flat_75_ffffff_40x100-937399e8b369d64aa075d13a82c00112.png","jquery-ui/ui-bg_glass_55_fbf9ee_1x400.png":"jquery-ui/ui-bg_glass_55_fbf9ee_1x400-a8c503e0f42a081a92a473b0d30ac6cf.png","jquery-ui/ui-bg_glass_65_ffffff_1x400.png":"jquery-ui/ui-bg_glass_65_ffffff_1x400-ddcbfe385abc3947937caa0b44e2f5d2.png","jquery-ui/ui-bg_glass_75_dadada_1x400.png":"jquery-ui/ui-bg_glass_75_dadada_1x400-14dd4a9ad1f21d8c4c7e673ddfb0806f.png","jquery-ui/ui-bg_glass_75_e6e6e6_1x400.png":"jquery-ui/ui-bg_glass_75_e6e6e6_1x400-a43dfabb23b0a987b567b282bad68346.png","jquery-ui/ui-bg_glass_95_fef1ec_1x400.png":"jquery-ui/ui-bg_glass_95_fef1ec_1x400-31c0c791a756266043ee8ea61dacb36a.png","jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100.png":"jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100-33edbdb0d2fcebd2a65c2041a28533da.png","jquery-ui/ui-icons_222222_256x240.png":"jquery-ui/ui-icons_222222_256x240-890385424135de1513f00cbecfb7f990.png","jquery-ui/ui-icons_2e83ff_256x240.png":"jquery-ui/ui-icons_2e83ff_256x240-824705ca4aa2610434a358fe4018c9c6.png","jquery-ui/ui-icons_454545_256x240.png":"jquery-ui/ui-icons_454545_256x240-254e054f6df453dfac49efbc8b78f79d.png","jquery-ui/ui-icons_888888_256x240.png":"jquery-ui/ui-icons_888888_256x240-57c441f87c4289a5372823f506c1182d.png","jquery-ui/ui-icons_cd0a0a_256x240.png":"jquery-ui/ui-icons_cd0a0a_256x240-261647ac915575f3981ded254ae8d43e.png","loading.gif":"loading-e8e6dd7833131c92a6c3b9c8ccc6a6ac.gif","progressbar.gif":"progressbar-82023a146fba2a0f6d925629ed2b09c5.gif"}}

data/smalruby-editor.gemspec

@@ -68,7 +68,7 @@ Gem::Specification.new do |spec|
      ['launchy'],
      ['mime-types', '~> 1.16'],
      ['haml-rails'],
-     ['smalruby', '~> 0.0.23'],
+     ['smalruby', '~> 0.0.25'],
     ]
   runtime_dependencies << ['therubyracer'] unless is_windows
   runtime_dependencies.each do |args|

data/spec/acceptance/block_mode/blocks/motion/set_x_y.feature

@@ -50,8 +50,7 @@
     require "smalruby"
 
     car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
-    car1.x = 200
-    car1.y = 100
+    car1.position = [200, 100]
 
     """
 
@@ -88,8 +87,7 @@
     car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
 
     car1.on(:start) do
-      self.x = 200
-      self.y = 100
+      self.position = [200, 100]
     end
 
     """

data/spec/lib/smalruby_editor_spec.rb

@@ -62,5 +62,17 @@ describe SmalrubyEditor do
         SmalrubyEditor.create_home_directory
       end
     end
+
+    context 'database.ymlが存在する場合', create_home_directory: true do
+      before(:all) do
+        database_yml_path = @home_dir.join('config', 'database.yml')
+        FileUtils.mkdir_p(database_yml_path.dirname)
+        database_yml_path.open('w') do |f|
+          f.write('exist YAML')
+        end
+
+        SmalrubyEditor.create_home_directory(@home_dir)
+      end
+    end
   end
 end

data/spec/models/concerns/ruby_to_block/block/hardware_spec.rb

@@ -14,17 +14,22 @@ car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
 car1.on(:start) do
   led("D4").on
   rgb_led_cathode("D9").on(color: [255, 0, 0])
-  two_wheel_drive_car("D2").forward
+  two_wheel_drive_car("D6").forward
 end
 car1.led("D4").off
 car1.rgb_led_cathode("D9").off
-car1.two_wheel_drive_car("D2").backward
+car1.two_wheel_drive_car("D6").backward
 
 car1.on(:sensor_change, "A0") do
   if sensor("A0").value < 200
-    two_wheel_drive_car("D2").turn_left
-    two_wheel_drive_car("D2").turn_right
-    two_wheel_drive_car("D2").stop
+    two_wheel_drive_car("D6").turn_left
+    two_wheel_drive_car("D6").turn_right
+    two_wheel_drive_car("D6").stop
+    two_wheel_drive_car("D6").run(command: "forward", sec: 1)
+    two_wheel_drive_car("D6").run(command: "backward", sec: 2)
+    two_wheel_drive_car("D6").run(command: "turn_left", sec: 3)
+    two_wheel_drive_car("D6").run(command: "turn_right", sec: 4)
+    two_wheel_drive_car("D6").run(command: "stop", sec: 5)
   end
 end
   EOS
@@ -50,7 +55,7 @@ end
                 <field name="COLOUR">#ff0000</field>
                 <next>
                   <block type="hardware_two_wheel_drive_car_forward">
-                    <field name="PIN">D2</field>
+                    <field name="PIN">D6</field>
                   </block>
                 </next>
               </block>
@@ -66,7 +71,7 @@ end
                 <field name="PIN">D9</field>
                 <next>
                   <block type="hardware_two_wheel_drive_car_backward">
-                    <field name="PIN">D2</field>
+                    <field name="PIN">D6</field>
                     <next>
                       <block type="hardware_on_sensor_change">
                         <field name="PIN">A0</field>
@@ -88,13 +93,88 @@ end
                             </value>
                             <statement name="THEN">
                               <block type="hardware_two_wheel_drive_car_turn_left">
-                                <field name="PIN">D2</field>
+                                <field name="PIN">D6</field>
                                 <next>
                                   <block type="hardware_two_wheel_drive_car_turn_right">
-                                    <field name="PIN">D2</field>
+                                    <field name="PIN">D6</field>
                                     <next>
                                       <block type="hardware_two_wheel_drive_car_stop">
-                                        <field name="PIN">D2</field>
+                                        <field name="PIN">D6</field>
+                                        <next>
+                                          <block type="hardware_two_wheel_drive_car_run" inline="true">
+                                            <field name="PIN">D6</field>
+                                            <value name="SEC">
+                                              <block type="math_number">
+                                                <field name="NUM">1</field>
+                                              </block>
+                                            </value>
+                                            <value name="COMMAND">
+                                              <block type="hardware_two_wheel_drive_car_commands">
+                                                <field name="COMMAND">forward</field>
+                                              </block>
+                                            </value>
+                                            <next>
+                                              <block type="hardware_two_wheel_drive_car_run" inline="true">
+                                                <field name="PIN">D6</field>
+                                                <value name="SEC">
+                                                  <block type="math_number">
+                                                    <field name="NUM">2</field>
+                                                  </block>
+                                                </value>
+                                                <value name="COMMAND">
+                                                  <block type="hardware_two_wheel_drive_car_commands">
+                                                    <field name="COMMAND">backward</field>
+                                                  </block>
+                                                </value>
+                                                <next>
+                                                  <block type="hardware_two_wheel_drive_car_run" inline="true">
+                                                    <field name="PIN">D6</field>
+                                                    <value name="SEC">
+                                                      <block type="math_number">
+                                                        <field name="NUM">3</field>
+                                                      </block>
+                                                    </value>
+                                                    <value name="COMMAND">
+                                                      <block type="hardware_two_wheel_drive_car_commands">
+                                                        <field name="COMMAND">turn_left</field>
+                                                      </block>
+                                                    </value>
+                                                    <next>
+                                                      <block type="hardware_two_wheel_drive_car_run" inline="true">
+                                                        <field name="PIN">D6</field>
+                                                        <value name="SEC">
+                                                          <block type="math_number">
+                                                            <field name="NUM">4</field>
+                                                          </block>
+                                                        </value>
+                                                        <value name="COMMAND">
+                                                          <block type="hardware_two_wheel_drive_car_commands">
+                                                            <field name="COMMAND">turn_right</field>
+                                                          </block>
+                                                        </value>
+                                                        <next>
+                                                          <block type="hardware_two_wheel_drive_car_run" inline="true">
+                                                            <field name="PIN">D6</field>
+                                                            <value name="SEC">
+                                                              <block type="math_number">
+                                                                <field name="NUM">5</field>
+                                                              </block>
+                                                            </value>
+                                                            <value name="COMMAND">
+                                                              <block type="hardware_two_wheel_drive_car_commands">
+                                                                <field name="COMMAND">stop</field>
+                                                              </block>
+                                                            </value>
+                                                          </block>
+                                                        </next>
+                                                      </block>
+                                                    </next>
+                                                  </block>
+                                                </next>
+                                              </block>
+                                            </next>
+                                          </block>
+                                        </next>
                                       </block>
                                     </next>
                                   </block>

data/spec/models/concerns/ruby_to_block/block/motion_spec.rb

@@ -8,8 +8,7 @@ describe RubyToBlock::Block, '移動・回転ジャンル', to_blocks: true do
   parts = <<-EOS
 car1.on(:start) do
   move(10)
-  self.x = 0
-  self.y = 0
+  self.position = [0, 0]
   self.x += 10
   self.x = 0
   self.y += 10
@@ -21,8 +20,7 @@ car1.on(:start) do
   end
 end
 car1.move(10)
-car1.x = 0
-car1.y = 0
+car1.position = [0, 0]
 car1.x += 10
 car1.x = 0
 car1.y += 10
@@ -195,8 +193,7 @@ car1.y = 0
 
   parts = <<-EOS
 car1.move(10)
-car1.x = 0
-car1.y = 0
+car1.position = [0, 0]
 car1.x += 10
   EOS
   describe compact_source_code(parts), character_new_data: true do