smalruby-editor 0.1.20 → 0.1.21

data/lib/smalruby_editor.rb

@@ -2,6 +2,22 @@
 require 'smalruby_editor/version'
 
 module SmalrubyEditor
+  # ジャンルのカラー
+  COLORS = {
+    character: 198,
+    control: 43,
+    data: 330,
+    etc: 340,
+    events: 33,
+    looks: 270,
+    motion: 208,
+    operators: 100,
+    pen: 160,
+    ruby: 340,
+    sensing: 190,
+    sound: 300,
+  }
+
   def create_home_directory(home_dir = nil)
     if home_dir.blank?
       path = ENV['SMALRUBY_EDITOR_HOME'] || '~/.smalruby-editor'

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
-module SmalrubyEditor
-  VERSION =  '0.1.20'
-end
+module SmalrubyEditor
+  VERSION =  '0.1.21'
+end

data/public/assets/{application-c8991557a0789ac1bc9220f409e7f1c1.js → application-734570836cdba680c1568220a51af40f.js}

@@ -12886,16 +12886,33 @@ Blockly.Blocks['text'].init = function() {
         }
         this.set('filename', filename);
       }
-      if (this.get('filename').match(/\.xml$/)) {
-        data = Smalruby.dumpXml();
+      if (!this.get('data')) {
+        if (this.get('filename').match(/\.xml$/)) {
+          data = Smalruby.dumpXml();
+        } else {
+          if (window.blockMode) {
+            data = Blockly.Ruby.workspaceToCode();
+          } else {
+            data = window.textEditor.getSession().getDocument().getValue();
+          }
+        }
+        return this.set('data', data);
+      }
+    },
+    getRbxmlFilename: function() {
+      var filename;
+      filename = this.get('filename');
+      if (filename.match(/\.rb\.xml$/)) {
+        return filename;
       } else {
-        if (window.blockMode) {
-          data = Blockly.Ruby.workspaceToCode();
+        if (filename.match(/\.rb$/)) {
+          return filename + '.xml';
+        } else if (filename.match(/\.xml$/)) {
+          return filename.replace(/\.xml$/, '.rb.xml');
         } else {
-          data = window.textEditor.getSession().getDocument().getValue();
+          return filename + '.rb.xml';
         }
       }
-      return this.set('data', data);
     },
     run: function() {
       return this.post_('run');
@@ -13585,16 +13602,12 @@ Blockly.Blocks['text'].init = function() {
       return window.textEditor.focus();
     },
     onRun: function(e) {
-      var errorMsg, filename, sourceCode, xmlSourceCode,
+      var errorMsg, sourceCode, xmlSourceCode,
         _this = this;
       e.preventDefault();
       sourceCode = this.getSourceCode();
-      filename = sourceCode.get('filename');
-      if (!filename.match(/\.xml$/)) {
-        filename += '.xml';
-      }
       xmlSourceCode = new Smalruby.SourceCode({
-        filename: filename
+        filename: sourceCode.getRbxmlFilename()
       });
       clearMessages();
       this.blockUI({
@@ -13704,15 +13717,11 @@ Blockly.Blocks['text'].init = function() {
         $('#filename').focus();
         return;
       }
+      sourceCode = this.getSourceCode();
       if (window.blockMode) {
-        if (!filename.match(/\.xml$/)) {
-          filename += '.xml';
-        }
         sourceCode = new Smalruby.SourceCode({
-          filename: filename
+          filename: sourceCode.getRbxmlFilename()
         });
-      } else {
-        sourceCode = this.getSourceCode();
       }
       clearMessages();
       this.blockUI({
@@ -14018,6 +14027,25 @@ case     end      next     return   until\
     }
   };
 
+  Blockly.Ruby.defineCharacter = function(c) {
+    var blockName, name, rotationStyle;
+    name = c.get('name');
+    blockName = "character_" + name;
+    if (!Blockly.Ruby.definitions_[blockName]) {
+      switch (c.get('rotationStyle')) {
+        case 'left_right':
+          rotationStyle = ', rotation_style: :left_right';
+          break;
+        case 'none':
+          rotationStyle = ', rotation_style: :none';
+          break;
+        default:
+          rotationStyle = '';
+      }
+      return Blockly.Ruby.definitions_[blockName] = "" + name + " = Character.new(costume: " + (Blockly.Ruby.quote_(c.costume())) + ", x: " + (c.get('x')) + ", y: " + (c.get('y')) + ", angle: " + (c.get('angle')) + rotationStyle + ")";
+    }
+  };
+
   Blockly.Ruby.characterStack = function() {
     return this.definitions_['character_stack'];
   };
@@ -14166,8 +14194,24 @@ case     end      next     return   until\
     return line + '\n';
   };
 
+  Blockly.Ruby.escapeChars_ = {
+    '"': '\\"'
+  };
+
   Blockly.Ruby.quote_ = function(string) {
-    return '\"' + string + '\"';
+    var i, s, sb, _fn, _i, _ref;
+    s = String(string);
+    sb = ['"'];
+    _fn = function(i) {
+      var ch;
+      ch = s.charAt(i);
+      return sb[i + 1] = Blockly.Ruby.escapeChars_[ch] || ch;
+    };
+    for (i = _i = 0, _ref = s.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+      _fn(i);
+    }
+    sb.push('"');
+    return sb.join('');
   };
 
   Blockly.Ruby.scrub_ = function(block, code) {
@@ -14353,6 +14397,21 @@ case     end      next     return   until\
     }
   };
 
+  Blockly.Block.prototype.getCharacterFieldValue = function(name) {
+    var c, char;
+    if (name == null) {
+      name = 'CHAR';
+    }
+    char = this.getFieldValue(name);
+    if (Blockly.Ruby.c()) {
+      c = Smalruby.Collections.CharacterSet.findWhere({
+        name: char
+      });
+      Blockly.Ruby.defineCharacter(c);
+    }
+    return char;
+  };
+
 }).call(this);
 (function() {
   Blockly.Ruby['math_number'] = function(block) {
@@ -14442,19 +14501,9 @@ case     end      next     return   until\
   };
 
   Blockly.Ruby['character_new'] = function(block) {
-    var c, code, rotationStyle, targetBlock;
+    var c, code, targetBlock;
     c = block.character;
-    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.defineCharacter(c);
     Blockly.Ruby.cs_().push(c);
     try {
       targetBlock = block.getInputTargetBlock('DO');
@@ -14771,13 +14820,13 @@ case     end      next     return   until\
 
   Blockly.Ruby['events_on_hit'] = function(block) {
     var char;
-    char = this.getFieldValue('CHAR');
+    char = this.getCharacterFieldValue();
     return Blockly.Ruby.characterEvent_(block, 'DO', 'hit', char);
   };
 
 }).call(this);
 (function() {
-  var acDropdown, aiPinDropdown, dioPinDropdown, n, pwmPinDropdown, rgbLedPinDropdown, twoWDPinDropdown;
+  var acDropdown, aiPinDropdown, dioPinDropdown, lorPinDropdown, n, pwmPinDropdown, rgbLedPinDropdown, twoWDPinDropdown;
 
   window.SmalrubyEditor.Hardware = {
     Type: 'Arduino',
@@ -14832,6 +14881,8 @@ case     end      next     return   until\
 
   acDropdown = [['アノード', 'anode'], ['カソード', 'cathode']];
 
+  lorPinDropdown = [['左', 'left'], ['右', 'right']];
+
   twoWDPinDropdown = (function() {
     var _i, _results;
     _results = [];
@@ -15218,43 +15269,127 @@ case     end      next     return   until\
     return [code, Blockly.Ruby.ORDER_ATOMIC];
   };
 
-  Blockly.Blocks['hardware_button_down'] = {
+  Blockly.Blocks['hardware_two_wheel_drive_car_set_speed'] = {
+    init: function() {
+      this.setHelpUrl('');
+      this.setColour(208);
+      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN').appendField('の').appendField(new Blockly.FieldDropdown(lorPinDropdown), 'LOR').appendField('の速度を');
+      this.interpolateMsg('%1%にする', ['SPEED', ['Number'], Blockly.ALIGN_RIGHT], Blockly.ALIGN_RIGHT);
+      this.setInputsInline(true);
+      this.setPreviousStatement(true);
+      this.setNextStatement(true);
+      return this.setTooltip('');
+    }
+  };
+
+  Blockly.Ruby['hardware_two_wheel_drive_car_set_speed'] = function(block) {
+    var lor, pin, speed;
+    pin = this.getFieldValue('PIN');
+    lor = this.getFieldValue('LOR');
+    speed = Blockly.Ruby.valueToCode(this, 'SPEED', Blockly.Ruby.ORDER_NONE) || '100';
+    return Blockly.Ruby.characterMethodCall_("two_wheel_drive_car(" + (Blockly.Ruby.quote_(pin)) + ")." + lor + "_speed = " + speed);
+  };
+
+  Blockly.Blocks['hardware_two_wheel_drive_car_speed'] = {
     init: function() {
       this.setHelpUrl('');
       this.setColour(190);
-      this.appendDummyInput().appendField('ボタン').appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN').appendField('を押している');
-      this.setOutput(true, 'Boolean');
+      this.appendDummyInput().appendField('2WD車').appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN').appendField('の').appendField(new Blockly.FieldDropdown(lorPinDropdown), 'LOR').appendField('の速度(%)');
+      this.setOutput(true, 'Number');
       return this.setTooltip('');
     }
   };
 
-  Blockly.Ruby['hardware_button_down'] = function(block) {
+  Blockly.Ruby['hardware_two_wheel_drive_car_speed'] = function(block) {
+    var lor, pin;
+    pin = this.getFieldValue('PIN');
+    lor = this.getFieldValue('LOR');
+    return Blockly.Ruby.characterMethodCallInput_("two_wheel_drive_car(" + (Blockly.Ruby.quote_(pin)) + ")." + lor + "_speed");
+  };
+
+  Blockly.Blocks['hardware_motor_driver'] = {
+    init: function() {
+      var methodDropdown;
+      methodDropdown = [['正転させる', 'forward'], ['逆転させる', 'backward'], ['止める', 'stop']];
+      this.setHelpUrl('');
+      this.setColour(208);
+      this.appendDummyInput().appendField('(モータードライバ').appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN').appendField('で)モーターを').appendField(new Blockly.FieldDropdown(methodDropdown), 'METHOD');
+      this.setInputsInline(true);
+      this.setPreviousStatement(true);
+      this.setNextStatement(true);
+      return this.setTooltip('');
+    }
+  };
+
+  Blockly.Ruby['hardware_motor_driver'] = function(block) {
+    var method, pin;
+    pin = this.getFieldValue('PIN');
+    method = this.getFieldValue('METHOD');
+    return Blockly.Ruby.characterMethodCall_("motor_driver(" + (Blockly.Ruby.quote_(pin)) + ")." + method);
+  };
+
+  Blockly.Blocks['hardware_motor_driver_set_speed'] = {
+    init: function() {
+      this.setHelpUrl('');
+      this.setColour(208);
+      this.appendDummyInput().appendField('(モータードライバ').appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN').appendField('の)モーターの速度を');
+      this.interpolateMsg('%1%にする', ['SPEED', ['Number'], Blockly.ALIGN_RIGHT], Blockly.ALIGN_RIGHT);
+      this.setInputsInline(true);
+      this.setPreviousStatement(true);
+      this.setNextStatement(true);
+      return this.setTooltip('');
+    }
+  };
+
+  Blockly.Ruby['hardware_motor_driver_set_speed'] = function(block) {
+    var pin, speed;
+    pin = this.getFieldValue('PIN');
+    speed = Blockly.Ruby.valueToCode(this, 'SPEED', Blockly.Ruby.ORDER_NONE) || '100';
+    return Blockly.Ruby.characterMethodCall_("motor_driver(" + (Blockly.Ruby.quote_(pin)) + ").speed = " + speed);
+  };
+
+  Blockly.Blocks['hardware_motor_driver_speed'] = {
+    init: function() {
+      this.setHelpUrl('');
+      this.setColour(190);
+      this.appendDummyInput().appendField('(モータードライバ').appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN').appendField('の)モーターの速度(%)');
+      this.setOutput(true, 'Number');
+      return this.setTooltip('');
+    }
+  };
+
+  Blockly.Ruby['hardware_motor_driver_speed'] = function(block) {
     var pin;
     pin = this.getFieldValue('PIN');
-    return ["button(" + pin + ").down?", Blockly.Ruby.ORDER_ATOMIC];
+    return Blockly.Ruby.characterMethodCallInput_("motor_driver(" + (Blockly.Ruby.quote_(pin)) + ").speed");
   };
 
-  Blockly.Blocks['hardware_button_up'] = {
+  Blockly.Blocks['hardware_button_down_or_up'] = {
     init: function() {
+      var douDropdown;
+      douDropdown = window.SmalrubyEditor.Sensing.DownOrUpDropdown;
       this.setHelpUrl('');
       this.setColour(190);
-      this.appendDummyInput().appendField('ボタン').appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN').appendField('を離している');
+      this.appendDummyInput().appendField('ボタン').appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN').appendField('が').appendField(new Blockly.FieldDropdown(douDropdown), 'DOU');
       this.setOutput(true, 'Boolean');
       return this.setTooltip('');
     }
   };
 
-  Blockly.Ruby['hardware_button_up'] = function(block) {
-    var pin;
+  Blockly.Ruby['hardware_button_down_or_up'] = function(block) {
+    var dou, pin;
     pin = this.getFieldValue('PIN');
-    return ["button(" + pin + ").up?", Blockly.Ruby.ORDER_ATOMIC];
+    dou = this.getFieldValue('DOU');
+    return Blockly.Ruby.characterMethodCallInput_("button(" + (Blockly.Ruby.quote_(pin)) + ")." + dou + "?");
   };
 
-  Blockly.Blocks['hardware_on_button_down'] = {
+  Blockly.Blocks['hardware_on_button_down_or_up'] = {
     init: function() {
+      var douDropdown;
+      douDropdown = window.SmalrubyEditor.Sensing.DownOrUpDropdown;
       this.setHelpUrl('');
       this.setColour(33);
-      this.appendDummyInput().appendField('ボタン').appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN').appendField('を押したとき');
+      this.appendDummyInput().appendField('ボタン').appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN').appendField('が').appendField(new Blockly.FieldDropdown(douDropdown), 'DOU').appendField('とき');
       this.appendStatementInput('DO');
       this.setPreviousStatement(true);
       this.setNextStatement(true);
@@ -15262,38 +15397,28 @@ case     end      next     return   until\
     }
   };
 
-  Blockly.Ruby['hardware_on_button_down'] = function(block) {
-    var branch, pin, var0;
-    if ((var0 = Blockly.Ruby.receiverName())) {
-      pin = this.getFieldValue('PIN');
-      branch = Blockly.Ruby.statementToCode(block, 'DO') || '\n';
-      return "\n" + var0 + ".on(:button_down, " + pin + ") do\n" + branch + "end\n";
-    } else {
-      return '';
-    }
+  Blockly.Ruby['hardware_on_button_down_or_up'] = function(block) {
+    var dou, pin;
+    pin = this.getFieldValue('PIN');
+    dou = this.getFieldValue('DOU');
+    return Blockly.Ruby.characterEvent_(block, 'DO', "button_" + dou, Blockly.Ruby.quote_(pin));
   };
 
-  Blockly.Blocks['hardware_on_button_up'] = {
+  Blockly.Blocks['hardware_button_not_use_pullup'] = {
     init: function() {
       this.setHelpUrl('');
-      this.setColour(33);
-      this.appendDummyInput().appendField('ボタン').appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN').appendField('を離したとき');
-      this.appendStatementInput('DO');
+      this.setColour(340);
+      this.appendDummyInput().appendField('ボタン').appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN').appendField('のプルアップ抵抗を使わない');
       this.setPreviousStatement(true);
       this.setNextStatement(true);
       return this.setTooltip('');
     }
   };
 
-  Blockly.Ruby['hardware_on_button_up'] = function(block) {
-    var branch, pin, var0;
-    if ((var0 = Blockly.Ruby.receiverName())) {
-      pin = this.getFieldValue('PIN');
-      branch = Blockly.Ruby.statementToCode(block, 'DO') || '\n';
-      return "\n" + var0 + ".on(:button_up, " + pin + ") do\n" + branch + "end\n";
-    } else {
-      return '';
-    }
+  Blockly.Ruby['hardware_button_not_use_pullup'] = function(block) {
+    var pin;
+    pin = this.getFieldValue('PIN');
+    return Blockly.Ruby.characterMethodCall_("button(" + (Blockly.Ruby.quote_(pin)) + ").not_use_pullup");
   };
 
   Blockly.Blocks['hardware_sensor_value'] = {
@@ -15623,7 +15748,7 @@ case     end      next     return   until\
 
   Blockly.Ruby['motion_point_towards_character'] = function(block) {
     var char;
-    char = this.getFieldValue('CHAR');
+    char = this.getCharacterFieldValue();
     return Blockly.Ruby.characterMethodCall_('point_towards', char);
   };
 
@@ -15678,7 +15803,7 @@ case     end      next     return   until\
 
   Blockly.Ruby['motion_go_to_character'] = function(block) {
     var char;
-    char = this.getFieldValue('CHAR');
+    char = this.getCharacterFieldValue();
     return Blockly.Ruby.characterMethodCall_("go_to(" + char + ")");
   };
 
@@ -15789,20 +15914,6 @@ case     end      next     return   until\
     return Blockly.Ruby.characterMethodCall_('turn_if_reach_wall');
   };
 
-  Blockly.Blocks['motion_reach_wall'] = {
-    init: function() {
-      this.setHelpUrl('');
-      this.setColour(208);
-      this.appendDummyInput().appendField('端に着いた');
-      this.setOutput(true, 'Boolean');
-      return this.setTooltip('');
-    }
-  };
-
-  Blockly.Ruby['motion_reach_wall'] = function(block) {
-    return Blockly.Ruby.characterMethodCallInput_('reach_wall?');
-  };
-
   Blockly.Blocks['motion_turn'] = {
     init: function() {
       this.setHelpUrl('');
@@ -16397,9 +16508,28 @@ case     end      next     return   until\
   window.SmalrubyEditor.Sensing = {
     KeyDropdown: [['↑', 'K_UP'], ['↓', 'K_DOWN'], ['←', 'K_LEFT'], ['→', 'K_RIGHT'], ['スペース', 'K_SPACE'], ['a', 'K_A'], ['b', 'K_B'], ['c', 'K_C'], ['d', 'K_D'], ['e', 'K_E'], ['f', 'K_F'], ['g', 'K_G'], ['h', 'K_H'], ['i', 'K_I'], ['j', 'K_J'], ['k', 'K_K'], ['l', 'K_L'], ['m', 'K_M'], ['n', 'K_N'], ['o', 'K_O'], ['p', 'K_P'], ['q', 'K_Q'], ['r', 'K_R'], ['s', 'K_S'], ['t', 'K_T'], ['u', 'K_U'], ['v', 'K_V'], ['w', 'K_W'], ['x', 'K_X'], ['y', 'K_Y'], ['z', 'K_Z'], ['0', 'K_0'], ['1', 'K_1'], ['2', 'K_2'], ['3', 'K_3'], ['4', 'K_4'], ['5', 'K_5'], ['6', 'K_6'], ['7', 'K_7'], ['8', 'K_8'], ['9', 'K_9']],
     PushOrDownDropdown: [['押された', 'push'], ['押され続けている', 'down']],
-    MouseButtonDropdown: [['左ボタン', 'M_LBUTTON'], ['中ボタン', 'M_MBUTTON'], ['右ボタン', 'M_RBUTTON']]
+    MouseButtonDropdown: [['左ボタン', 'M_LBUTTON'], ['中ボタン', 'M_MBUTTON'], ['右ボタン', 'M_RBUTTON']],
+    DownOrUpDropdown: [['押された', 'down'], ['離された', 'up']]
   };
 
+  Blockly.Blocks['sensing_reach_wall'] = {
+    init: function() {
+      this.setHelpUrl('');
+      this.setColour(190);
+      this.appendDummyInput().appendField('端に触れた');
+      this.setOutput(true, 'Boolean');
+      return this.setTooltip('');
+    }
+  };
+
+  Blockly.Ruby['sensing_reach_wall'] = function(block) {
+    return Blockly.Ruby.characterMethodCallInput_('reach_wall?');
+  };
+
+  Blockly.Blocks['motion_reach_wall'] = Blockly.Blocks['sensing_reach_wall'];
+
+  Blockly.Ruby['motion_reach_wall'] = Blockly.Ruby['sensing_reach_wall'];
+
   Blockly.Blocks['sensing_input_key_push_or_down'] = {
     init: function() {
       var keyDropdown, podDropdown;
@@ -16480,7 +16610,7 @@ case     end      next     return   until\
 
   Blockly.Ruby['sensing_hit'] = function(block) {
     var char;
-    char = this.getFieldValue('CHAR');
+    char = this.getCharacterFieldValue();
     return Blockly.Ruby.characterMethodCallInput_('hit?', char);
   };
 
@@ -16559,7 +16689,7 @@ case     end      next     return   until\
 
   Blockly.Ruby['sensing_character_property'] = function(block) {
     var c, char, property;
-    char = this.getFieldValue('CHAR');
+    char = this.getCharacterFieldValue();
     property = this.getFieldValue('PROPERTY');
     c = Smalruby.Collections.CharacterSet.findWhere({
       name: char