smalruby-editor 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ec9963fe6c59d88b5083a8dc61c2c44ef6ce6b9
-  data.tar.gz: fd979fa5452fedb4a8510610cd2e826f5fe42b3d
+  metadata.gz: c8f9db51b4fbe5048d292165d61594a894d6b8c2
+  data.tar.gz: 83461c45e3816844b626c79217ed0aab4905a13c
 SHA512:
-  metadata.gz: ff0fb931c40fc501d0c84c28d520e538cb4f7ecb06e9d55a7d1f065ff8f25a23847da67f1390b8f14bbbdef7c3f7b1524cd94b0dd58b90d450d4802719526f6b
-  data.tar.gz: 6b1c3860b0ef8da51c38438a2ff9c6976ce32cb15da264e953083648deadd24e917beb3716d6788a55032c4bfea7a90b8ba78303733bbef3d38d39431e97b66a
+  metadata.gz: 08231775c5f8c410072fcf1a6a484f90da2a42f05e2cb6f6b092f2cc734d1a43f5b5fbdb6060606194e3bc1cf0ec2aa8ae6dc602a408cd3870ca3f336733ed90
+  data.tar.gz: de52b28fd77fbbdb05d7b1a044ce68053da28c6231a537a6c7601ac9f6125575d03744ff046654027e18bfaf51c54198ce34c1808f08f48a2f0b17285ead92be

data/.gitignore

@@ -23,4 +23,3 @@
 /coverage
 /pkg
 /features
-/demos/*.xml

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

@@ -2,7 +2,8 @@
 
 <%
   category = 'character'
-  color = 198
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
 # キャラクター
@@ -65,15 +66,7 @@ Blockly.Blocks['<%= n %>'] =
 
 Blockly.Ruby['<%= n %>'] = (block) ->
   c = block.character
-  switch c.get('rotationStyle')
-    when 'left_right'
-      rotationStyle = ', rotation_style: :left_right'
-    when 'none'
-      rotationStyle = ', rotation_style: :none'
-    else
-      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')

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

@@ -2,7 +2,8 @@
 
 <%
   category = 'control'
-  color = 43
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
 # (　)秒待つ

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

@@ -2,5 +2,6 @@
 
 <%
   category = 'data'
-  color = 29
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>

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

@@ -2,5 +2,6 @@
 
 <%
   category = 'etc'
-  color = 270
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>

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

@@ -2,10 +2,11 @@
 
 <%
   category = 'events'
-  color = 33
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
-# まずは
+# 実行ボタンがクリックされたとき
 <% n = "#{category}_on_start" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
@@ -69,7 +70,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @appendDummyInput()
-      .appendField(new Smalruby.FieldCharacter(), 'CHAR') # TODO
+      .appendField(new Smalruby.FieldCharacter(), 'CHAR')
       .appendField('にぶつかったとき')
     @appendStatementInput('DO')
     @setPreviousStatement(true)
@@ -77,5 +78,5 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  char = @getFieldValue('CHAR')
+  char = @getCharacterFieldValue()
   Blockly.Ruby.characterEvent_(block, 'DO', 'hit', char)

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

@@ -106,3 +106,12 @@ Smalruby.FieldCharacter.NullCharacter =
   off: -> $.noop
   link: -> $.noop
   unlink: -> $.noop
+
+Blockly.Block.prototype.getCharacterFieldValue = (name = 'CHAR') ->
+  char = @getFieldValue(name)
+
+  if Blockly.Ruby.c()
+    c = Smalruby.Collections.CharacterSet.findWhere({ name: char })
+    Blockly.Ruby.defineCharacter(c)
+
+  char

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

@@ -2,13 +2,8 @@
 
 <%
   category = 'hardware'
-  colors = {
-    motion: 208,
-    looks: 270,
-    events: 33,
-    sensing: 190,
-    etc: 340,
-  }
+  require 'smalruby_editor'
+  colors = SmalrubyEditor::COLORS
 %>
 
 # ハードウェアの環境設定
@@ -35,6 +30,11 @@ acDropdown = [
   ['カソード', 'cathode']
 ]
 
+lorPinDropdown = [
+  ['左', 'left'],
+  ['右', 'right'],
+]
+
 twoWDPinDropdown = (["D#{n}", "D#{n}"] for n in [2..10])
 
 # ハードウェアを準備する
@@ -52,8 +52,8 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 
 # 「LED」サブジャンル
 
-# LED[▼ピン]をオンにする
-# LED[▼ピン]をオフにする
+# LED[▼PIN]をオンにする
+# LED[▼PIN]をオフにする
 <%
   [
     ['on', 'オン'],
@@ -83,7 +83,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 
 # 「RGB LED」サブジャンル
 
-# RGB LED[▼アノード]コモン[▼ピン]を[カラー]にする
+# RGB LED[▼アノード]コモン[▼PIN]を[カラー]にする
 <% n = "#{category}_rgb_led_on" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
@@ -111,7 +111,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   Blockly.Ruby.characterMethodCall_("rgb_led_#{ac}(#{Blockly.Ruby.quote_(pin)}).on",
                                     "color: [#{red}, #{green}, #{blue}]")
 
-# RGB LED[▼アノード]コモン[▼ピン]をオフにする
+# RGB LED[▼アノード]コモン[▼PIN]をオフにする
 <% n = "#{category}_rgb_led_off" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
@@ -223,7 +223,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 
 # 「サーボ」サブジャンル
 
-# 「サーボ[▼ピン]を(　)度(5～180)にする」ブロック
+# 「サーボ[▼PIN]を(　)度(5～180)にする」ブロック
 <% n = "#{category}_servo_set_position" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
@@ -248,14 +248,14 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   pos = Blockly.Ruby.valueToCode(@, 'POS', Blockly.Ruby.ORDER_FUNCTION_CALL) || '5'
   Blockly.Ruby.characterMethodCall_("servo(#{Blockly.Ruby.quote_(pin)}).position = #{pos}")
 
-# 「車」サブジャンル
+# 「2WD車」サブジャンル
 <% subcategory = 'two_wheel_drive_car' %>
 
-# 2WD車[▼ピン]を進める
-# 2WD車[▼ピン]をバックさせる
-# 2WD車[▼ピン]を左に曲げる
-# 2WD車[▼ピン]を右に曲げる
-# 2WD車[▼ピン]を止める
+# 2WD車[▼PIN]を進める
+# 2WD車[▼PIN]をバックさせる
+# 2WD車[▼PIN]を左に曲げる
+# 2WD車[▼PIN]を右に曲げる
+# 2WD車[▼PIN]を止める
 <%
   [
     ['forward', '進める'],
@@ -288,7 +288,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   Blockly.Ruby.characterMethodCall_("two_wheel_drive_car(#{Blockly.Ruby.quote_(pin)}).<%= method %>")
 <% end %>
 
-# 2WD車[▼ピン]を（　）秒[▼コマンド]
+# 2WD車[▼PIN]を（　）秒[▼コマンド]
 <% n = "#{category}_#{subcategory}_run" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
@@ -337,71 +337,188 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   code = Blockly.Ruby.quote_(@getFieldValue('COMMAND'))
   [code, Blockly.Ruby.ORDER_ATOMIC]
 
-# 「ボタン」サブジャンル
+# 2WD車[▼PIN]の[▼LOR]の速度を<速度の割合>%にする
+<% n = "#{category}_#{subcategory}_set_speed" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:motion] %>)
+    @appendDummyInput()
+      .appendField('2WD車')
+      .appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN')
+      .appendField('の')
+      .appendField(new Blockly.FieldDropdown(lorPinDropdown), 'LOR')
+      .appendField('の速度を')
+    @interpolateMsg('%1%にする',
+                     ['SPEED', ['Number'], Blockly.ALIGN_RIGHT],
+                     Blockly.ALIGN_RIGHT)
+    @setInputsInline(true)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
 
-# 条件:ボタン[▼]を押している
-# 条件:ボタン[▼]を離している
-<%
-  [
-    ['down', '押している'],
-    ['up', '離している'],
-  ].each do |method, label|
-    n = "#{category}_button_#{method}"
-%>
+Blockly.Ruby['<%= n %>'] = (block) ->
+  pin = @getFieldValue('PIN')
+  lor = @getFieldValue('LOR')
+  speed = Blockly.Ruby.valueToCode(@, 'SPEED', Blockly.Ruby.ORDER_NONE) || '100'
+  Blockly.Ruby.characterMethodCall_("two_wheel_drive_car(#{Blockly.Ruby.quote_(pin)}).#{lor}_speed = #{speed}")
+
+# 2WD車[▼PIN]の[▼LOR]の速度(%)
+<% n = "#{category}_#{subcategory}_speed" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:sensing] %>)
+    @appendDummyInput()
+      .appendField('2WD車')
+      .appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN')
+      .appendField('の')
+      .appendField(new Blockly.FieldDropdown(lorPinDropdown), 'LOR')
+      .appendField('の速度(%)')
+    @setOutput(true, 'Number')
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  pin = @getFieldValue('PIN')
+  lor = @getFieldValue('LOR')
+  Blockly.Ruby.characterMethodCallInput_("two_wheel_drive_car(#{Blockly.Ruby.quote_(pin)}).#{lor}_speed")
+
+# 「（モータードライバ{で,の}）モータ」サブジャンル
+<% subcategory = 'motor_driver' %>
+
+# (モータードライバ[▼PIN]で)モーターを[▼正転させる]
+<% n = "#{category}_#{subcategory}" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    methodDropdown = [
+      ['正転させる', 'forward'],
+      ['逆転させる', 'backward'],
+      ['止める', 'stop'],
+    ]
+
+    @setHelpUrl('')
+    @setColour(<%= colors[:motion] %>)
+    @appendDummyInput()
+      .appendField('(モータードライバ')
+      .appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN')
+      .appendField('で)モーターを')
+      .appendField(new Blockly.FieldDropdown(methodDropdown), 'METHOD')
+    @setInputsInline(true)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  pin = @getFieldValue('PIN')
+  method = @getFieldValue('METHOD')
+
+  Blockly.Ruby.characterMethodCall_("motor_driver(#{Blockly.Ruby.quote_(pin)}).#{method}")
 
+# (モータードライバ[▼PIN]の)モーターの速度を<SPEED>%にする
+<% n = "#{category}_#{subcategory}_set_speed" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:motion] %>)
+    @appendDummyInput()
+      .appendField('(モータードライバ')
+      .appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN')
+      .appendField('の)モーターの速度を')
+    @interpolateMsg('%1%にする',
+                     ['SPEED', ['Number'], Blockly.ALIGN_RIGHT],
+                     Blockly.ALIGN_RIGHT)
+    @setInputsInline(true)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  pin = @getFieldValue('PIN')
+  speed = Blockly.Ruby.valueToCode(@, 'SPEED', Blockly.Ruby.ORDER_NONE) || '100'
+  Blockly.Ruby.characterMethodCall_("motor_driver(#{Blockly.Ruby.quote_(pin)}).speed = #{speed}")
+
+# (モータードライバ[▼PIN]の)モーターの速度(%)
+<% n = "#{category}_#{subcategory}_speed" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:sensing] %>)
+    @appendDummyInput()
+      .appendField('(モータードライバ')
+      .appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN')
+      .appendField('の)モーターの速度(%)')
+    @setOutput(true, 'Number')
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  pin = @getFieldValue('PIN')
+  Blockly.Ruby.characterMethodCallInput_("motor_driver(#{Blockly.Ruby.quote_(pin)}).speed")
+
+
+# 「ボタン」サブジャンル
+
+# 条件:ボタン[▼PIN]が[▼押された]
+<% n = "#{category}_button_down_or_up" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    douDropdown = window.SmalrubyEditor.Sensing.DownOrUpDropdown
+
     @setHelpUrl('')
     @setColour(<%= colors[:sensing] %>)
     @appendDummyInput()
       .appendField('ボタン')
       .appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN')
-      .appendField('を<%= label %>')
+      .appendField('が')
+      .appendField(new Blockly.FieldDropdown(douDropdown), 'DOU')
     @setOutput(true, 'Boolean')
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
   pin = @getFieldValue('PIN')
-  ["button(#{pin}).<%= method %>?", Blockly.Ruby.ORDER_ATOMIC]
-<% end %>
-
-# ボタン[▼]を押したとき
-# ボタン[▼]を離したとき
-<%
-  [
-    ['down', '押した'],
-    ['up', '離した'],
-  ].each do |name, label|
-    n = "#{category}_on_button_#{name}"
-%>
+  dou = @getFieldValue('DOU')
+  Blockly.Ruby.characterMethodCallInput_("button(#{Blockly.Ruby.quote_(pin)}).#{dou}?")
 
+# ボタン[▼PIN]が[▼押された]とき
+<% n = "#{category}_on_button_down_or_up" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
+    douDropdown = window.SmalrubyEditor.Sensing.DownOrUpDropdown
+
     @setHelpUrl('')
     @setColour(<%= colors[:events] %>)
     @appendDummyInput()
       .appendField('ボタン')
       .appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN')
-      .appendField('を<%= label %>とき')
+      .appendField('が')
+      .appendField(new Blockly.FieldDropdown(douDropdown), 'DOU')
+      .appendField('とき')
     @appendStatementInput('DO')
     @setPreviousStatement(true)
     @setNextStatement(true)
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  if (var0 = Blockly.Ruby.receiverName())
-    pin = @getFieldValue('PIN')
-    branch = Blockly.Ruby.statementToCode(block, 'DO') || '\n'
-    """
-
+  pin = @getFieldValue('PIN')
+  dou = @getFieldValue('DOU')
+  Blockly.Ruby.characterEvent_(block, 'DO', "button_#{dou}", Blockly.Ruby.quote_(pin))
 
-    #{var0}.on(:button_<%= name %>, #{pin}) do
-    #{branch}end
+# ボタン[▼PIN]のプルアップ抵抗を使わない
+<% n = "#{category}_button_not_use_pullup" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:etc] %>)
+    @appendDummyInput()
+      .appendField('ボタン')
+      .appendField(new Blockly.FieldDropdown(dioPinDropdown), 'PIN')
+      .appendField('のプルアップ抵抗を使わない')
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
 
-    """
-  else
-    ''
-<% end %>
+Blockly.Ruby['<%= n %>'] = (block) ->
+  pin = @getFieldValue('PIN')
+  Blockly.Ruby.characterMethodCall_("button(#{Blockly.Ruby.quote_(pin)}).not_use_pullup")
 
 # 「センサー」サブジャンル
 

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

@@ -2,7 +2,8 @@
 
 <%
   category = 'looks'
-  color = 270
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
 # [　]と(　)秒言う

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

@@ -2,7 +2,8 @@
 
 <%
   category = 'motion'
-  color = 208
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
 # (　)歩動かす
@@ -97,7 +98,7 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  char = @getFieldValue('CHAR')
+  char = @getCharacterFieldValue()
   Blockly.Ruby.characterMethodCall_('point_towards', char)
 
 # x座標を(　)、y座標を(　)にする
@@ -150,7 +151,7 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  char = @getFieldValue('CHAR')
+  char = @getCharacterFieldValue()
   Blockly.Ruby.characterMethodCall_("go_to(#{char})")
 
 # (　)秒でx座標を(　)、y座標を(　)に変える
@@ -220,19 +221,6 @@ Blockly.Blocks['<%= n %>'] =
 Blockly.Ruby['<%= n %>'] = (block) ->
   Blockly.Ruby.characterMethodCall_('turn_if_reach_wall')
 
-# 条件:端に着いた
-<% n = "#{category}_reach_wall" %>
-Blockly.Blocks['<%= n %>'] =
-  init: ()->
-    @setHelpUrl('')
-    @setColour(<%= color %>)
-    @appendDummyInput().appendField('端に着いた')
-    @setOutput(true, 'Boolean')
-    @setTooltip('')
-
-Blockly.Ruby['<%= n %>'] = (block) ->
-  Blockly.Ruby.characterMethodCallInput_('reach_wall?')
-
 # 跳ね返る
 <% n = "#{category}_turn" %>
 Blockly.Blocks['<%= n %>'] =