smalruby-editor 0.1.1-x86-mingw32 → 0.1.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0260bba256e25005f4bb317cde9e826d10e12109
-  data.tar.gz: 5e1eb533ec3c00d45ecec7d4144703c851912b63
+  metadata.gz: 96882af4698c86e6f93655993010b2e4c3fb7bdd
+  data.tar.gz: 744c0843a58a6ee7a8c2831d69ee6ad81278c86f
 SHA512:
-  metadata.gz: 9430d59c96d38189e8f7475dbe597bccdae279767a3608ebd18c519fed937f6c26a1d70856b4798e2fa1ba42642f4f8d9c2bbb3e22cf5ea271ff60681d2ed680
-  data.tar.gz: 15638f5552baadbeffbfeffebd3cfca8f0642b6a78303f0d8b06882020e4ab922963bb82a850d61879dcc4fb6078fc19d7dc114c4f5cc6f64ebddaf96f28db05
+  metadata.gz: 831ca11f66993f73f36ee423244eb39ad0e2ff7e983ea021c317e0899e8bff26d71c59ffffe98a7cb72a02dfd462d525a142d81864aa7d51fe05fbc853e3f103
+  data.tar.gz: b26681dd47e00bef42f77433fc2cdbf615421187435e7f3530176888815b936b74740fd2b72219c3c7ce905b936cd4a5a2a4ab3c88d9d4b57e2cb7dcd525b835

data/app/assets/demos/default.xml

@@ -77,7 +77,7 @@
               <block type="control_loop">
                 <statement name="DO">
                   <block type="motion_point_towards_character">
-                    <field name="VAR">car1</field>
+                    <field name="CHAR">car1</field>
                     <next>
                       <block type="motion_move" inline="true">
                         <value name="STEP">

data/app/assets/javascripts/application.js

@@ -34,5 +34,6 @@
 //= require_tree ./routers
 //= require ./block_mode
 //= require_tree ./generators
+//= require ./blocks/field_character
 //= require_tree ./blocks
 //= require ./ruby_mode

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

@@ -5,7 +5,7 @@
 <% n = "#{category}_number" %>
 Blockly.Ruby['<%= n %>'] = (block) ->
   code = parseFloat(@getFieldValue('NUM'))
-  order = if code < 0 then Blockly.Ruby.ORDER_UNARY_SIGN else Blockly.Ruby.ORDER_ATOMIC
+  order = if code < 0 then Blockly.Ruby.ORDER_UNARY_MINUS_SIGN else Blockly.Ruby.ORDER_ATOMIC
   [code, order]
 
 

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

@@ -69,7 +69,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @appendDummyInput()
-      .appendField(new Blockly.FieldVariable('car1'), 'CHAR') # TODO
+      .appendField(new Smalruby.FieldCharacter(), 'CHAR') # TODO
       .appendField('にぶつかったとき')
     @appendStatementInput('DO')
     @setPreviousStatement(true)
@@ -77,6 +77,5 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  char = Blockly.Ruby.variableDB_
-    .getName(block.getFieldValue('CHAR'), Blockly.Variables.NAME_TYPE)
+  char = @getFieldValue('CHAR')
   Blockly.Ruby.characterEvent_(block, 'DO', 'hit', char)

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

@@ -0,0 +1,108 @@
+'use strict'
+
+goog.provide('Smalruby.FieldCharacter')
+
+goog.require('Blockly.FieldDropdown')
+
+
+Smalruby.FieldCharacter = (character, opt_changeHandler) ->
+  if opt_changeHandler
+    changeHandler = (value) =>
+      retVal = Smalruby.FieldCharacter.dropdownChange.call(@, value)
+      if retVal
+        newVal = retVal
+      else
+        retVal = @getValue()
+      opt_changeHandler.call(@, newVal)
+      retVal
+  else
+    changeHandler = Smalruby.FieldCharacter.dropdownChange
+
+  Smalruby.FieldCharacter.superClass_.constructor
+    .call(@, Smalruby.FieldCharacter.dropdownCreate, changeHandler)
+
+  charSet = Smalruby.Collections.CharacterSet
+  charSet.on('add', @onCharacterSetAdd_, @)
+  charSet.on('remove', @onCharacterSetRemove_, @)
+  charSet.on('reset', @onCharacterSetReset_, @)
+
+  @character = Smalruby.FieldCharacter.NullCharacter
+
+  unless character
+    character = Smalruby.Collections.CharacterSet.first()
+  @setCharacter(character)
+
+goog.inherits(Smalruby.FieldCharacter, Blockly.FieldDropdown)
+
+Smalruby.FieldCharacter.prototype.setCharacter = (character) ->
+  return if character == @character
+
+  @character.unlink(@)
+  @character.off('change:name', @onCharacterChangeName_, @)
+  @character = if character then character else Smalruby.FieldCharacter.NullCharacter
+  @character.link(@)
+  @character.on('change:name', @onCharacterChangeName_, @)
+
+  @setValue(@character.get('name'))
+
+Smalruby.FieldCharacter.prototype.onCharacterSetAdd_ = (model, collection, options) ->
+  if @character == Smalruby.FieldCharacter.NullCharacter
+    @setCharacter(model)
+
+Smalruby.FieldCharacter.prototype.onCharacterSetRemove_ = (model, collection, options) ->
+  if model == @character
+    @setCharacter()
+
+Smalruby.FieldCharacter.prototype.onCharacterSetReset_ = (collection, options) ->
+  if @character == Smalruby.FieldCharacter.NullCharacter
+    @setCharacter(collection.first())
+  else
+    @setCharacter(collection.findWhere({ name: @getValue() }))
+
+Smalruby.FieldCharacter.prototype.onCharacterChangeName_ = (model, value, options) ->
+  @setValue(value)
+
+Smalruby.FieldCharacter.prototype.clone = ->
+  new Smalruby.FieldCharacter(@character, @changeHandler_)
+
+Smalruby.FieldCharacter.prototype.dispose = ->
+  charSet = Smalruby.Collections.CharacterSet
+  charSet.off('add', @onCharacterSetAdd_, @)
+  charSet.off('remove', @onCharacterSetRemove_, @)
+  charSet.off('reset', @onCharacterSetReset_, @)
+  @setCharacter()
+
+  Blockly.FieldDropdown.prototype.dispose.call(@)
+
+Smalruby.FieldCharacter.prototype.setText = (value) ->
+  # HACK: XMLをロードしたときにキャラクターとリンクさせる
+  unless @character
+    @character = Smalruby.FieldCharacter.NullCharacter
+    charSet = Smalruby.Collections.CharacterSet
+    @setCharacter(charSet.findWhere({ name: value }))
+  Blockly.FieldDropdown.prototype.setText.call(@, value)
+
+Smalruby.FieldCharacter.dropdownCreate = ->
+  charSet = Smalruby.Collections.CharacterSet
+  if charSet.length > 0
+    Smalruby.Collections.CharacterSet.map (c) ->
+      n = c.get('name')
+      [n, n]
+  else
+    [[Smalruby.FieldCharacter.NullCharacter.get('name'), '']]
+
+Smalruby.FieldCharacter.dropdownChange = (value) ->
+  c = Smalruby.Collections.CharacterSet.findWhere({ name: value })
+  if c
+    @setCharacter(c)
+    value
+  else
+    null
+
+Smalruby.FieldCharacter.NullCharacter =
+  get: (name) ->
+    'キャラクターなし'
+  on: -> $.noop
+  off: -> $.noop
+  link: -> $.noop
+  unlink: -> $.noop

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

@@ -9,12 +9,16 @@
 window.SmalrubyEditor.Hardware =
   Type: 'Arduino' # 種別
   DioPins: [2..13] # デジタルIOピン
+  PwmPins: [3, 5, 6, 9, 10, 11] # デジタルIOピンのうちPWMに対応しているピン
   AiPins: [0..5] # アナログ入力ピン
 
 dioPinDropdown =
   (["D#{n}", "D#{n}"] for n in window.SmalrubyEditor.Hardware.DioPins)
 
 pwmPinDropdown =
+  (["D#{n}", "D#{n}"] for n in window.SmalrubyEditor.Hardware.PwmPins)
+
+rgbLedPinDropdown =
   (["D#{n}", "D#{n}"] for n in [3, 9])
 
 aiPinDropdown =
@@ -81,7 +85,7 @@ Blockly.Blocks['<%= n %>'] =
       .appendField('RGB LED')
       .appendField(new Blockly.FieldDropdown(acDropdown), 'AC')
       .appendField('コモン')
-      .appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN')
+      .appendField(new Blockly.FieldDropdown(rgbLedPinDropdown), 'PIN')
       .appendField('を')
       .appendField(new Blockly.FieldColour('#ff0000'), 'COLOUR')
       .appendField('にする')
@@ -109,7 +113,7 @@ Blockly.Blocks['<%= n %>'] =
       .appendField('RGB LED')
       .appendField(new Blockly.FieldDropdown(acDropdown), 'AC')
       .appendField('コモン')
-      .appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN')
+      .appendField(new Blockly.FieldDropdown(rgbLedPinDropdown), 'PIN')
       .appendField('をオフにする')
     @setPreviousStatement(true)
     @setNextStatement(true)
@@ -209,6 +213,35 @@ Blockly.Blocks['<%= n %>'] =
 Blockly.Ruby['<%= n %>'] = (block) ->
   "seven_segment_display.off\n"
 
+# 「サーボ」サブジャンル
+
+# 「サーボ[▼ピン]を(　)度(5～180)にする」ブロック
+<% n = "#{category}_servo_set_position" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= color %>)
+    @appendDummyInput()
+      .appendField('サーボ')
+      .appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN')
+      .appendField('を')
+    @appendValueInput('POS')
+      .setCheck('Number')
+    @appendDummyInput()
+      .appendField('度(5～180)にする')
+    @setInputsInline(true)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  pin = @getFieldValue('PIN')  #p sensor("A0").value
+  #p sensor("A0").value.class
+  #p(sensor("A0").value / 6)
+
+  pos = Blockly.Ruby.valueToCode(@, 'POS', Blockly.Ruby.ORDER_FUNCTION_CALL) || '5'
+  Blockly.Ruby.characterMethodCall_("servo(#{Blockly.Ruby.quote_(pin)}).position = #{pos}")
+
 # 「ボタン」サブジャンル
 
 # 条件:ボタン[▼]を押している

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

@@ -90,14 +90,14 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @appendDummyInput()
-      .appendField(new Blockly.FieldVariable('char1'), 'VAR')
+      .appendField(new Smalruby.FieldCharacter(), 'CHAR')
       .appendField('へ向ける')
     @setPreviousStatement(true)
     @setNextStatement(true)
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  char = Blockly.Ruby.variableDB_.getName(block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE)
+  char = @getFieldValue('CHAR')
   Blockly.Ruby.characterMethodCall_('point_towards', char)
 
 # x座標を(　)、y座標を(　)にする
@@ -144,14 +144,14 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @appendDummyInput()
-      .appendField(new Blockly.FieldVariable('char1'), 'VAR')
+      .appendField(new Smalruby.FieldCharacter(), 'CHAR')
       .appendField('へ行く')
     @setPreviousStatement(true)
     @setNextStatement(true)
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  var0 = Blockly.Ruby.variableDB_.getName(block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE)
+  char = @getFieldValue('CHAR')
   "#{Blockly.Ruby.rn()}go_to(#{var0})\n"
 
 # (　)秒でx座標を(　)、y座標を(　)に変える

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

@@ -11,11 +11,11 @@
 # 変数:(　) / (　)
 <%
   [
-    ['add', '＋', 'ADDITIVE', '+'],
-    ['minus', 'ー', 'ADDITIVE', '-'],
-    ['multiply', '×', 'MULTIPLICATIVE', '*'],
-    ['divide', '÷', 'MULTIPLICATIVE', '/'],
-  ].each do |suffix, operator_label, order_suffix, operator|
+    ['add', '＋', 'ADDITIVE', '+', '0', '0'],
+    ['minus', 'ー', 'ADDITIVE', '-', '0', '0'],
+    ['multiply', '×', 'MULTIPLICATIVE', '*', '0', '0'],
+    ['divide', '÷', 'MULTIPLICATIVE', '/', '0', '1'],
+  ].each do |suffix, operator_label, order_suffix, operator, default_a, default_b|
     n = "#{category}_#{suffix}"
 %>
 
@@ -24,8 +24,8 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @interpolateMsg('%1<%= operator_label %>%2',
-                     ['A', null, Blockly.ALIGN_RIGHT],
-                     ['B', null, Blockly.ALIGN_RIGHT],
+                    ['A', null, Blockly.ALIGN_RIGHT],
+                    ['B', null, Blockly.ALIGN_RIGHT],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
     @setOutput(true, null)
@@ -33,8 +33,8 @@ Blockly.Blocks['<%= n %>'] =
 
 Blockly.Ruby['<%= n %>'] = (block) ->
   order = Blockly.Ruby.ORDER_<%= order_suffix %>
-  a = Blockly.Ruby.valueToCode(block, 'A', order) || '0'
-  b = Blockly.Ruby.valueToCode(block, 'B', order) || '0'
+  a = Blockly.Ruby.valueToCode(block, 'A', order) || '<%= default_a %>'
+  b = Blockly.Ruby.valueToCode(block, 'B', order) || '<%= default_b %>'
   [a + ' <%= operator %> ' + b, order]
 <% end %>
 
@@ -45,12 +45,12 @@ Blockly.Ruby['<%= n %>'] = (block) ->
 # 条件:(　) > (　)
 <%
   [
-    ['compare_gt', '＜', '<'],
-    ['compare_gte', '≦', '<='],
-    ['compare_eq', '＝', '=='],
-    ['compare_lte', '≧', '>='],
-    ['compare_lt', '＞', '>'],
-  ].each do |suffix, operator_label, operator|
+    ['compare_lt', '＜', '<', 'RELATIONAL'],
+    ['compare_lte', '≦', '<=', 'RELATIONAL'],
+    ['compare_eq', '＝', '==', 'EQUALS'],
+    ['compare_gte', '≧', '>=', 'RELATIONAL'],
+    ['compare_gt', '＞', '>', 'RELATIONAL'],
+  ].each do |suffix, operator_label, operator, order_suffix|
     n = "#{category}_#{suffix}"
 %>
 
@@ -67,7 +67,7 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  order = Blockly.Ruby.ORDER_RELATIONAL;
+  order = Blockly.Ruby.ORDER_<%= order_suffix %>;
   a = Blockly.Ruby.valueToCode(block, 'A', order) || '0'
   b = Blockly.Ruby.valueToCode(block, 'B', order) || '0'
   [a + ' <%= operator %> ' + b, order]
@@ -88,10 +88,9 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  order = Blockly.Ruby.ORDER_FUNCTION_CALL
-  a = Blockly.Ruby.valueToCode(block, 'A', order) || '0'
-  b = Blockly.Ruby.valueToCode(block, 'B', order) || '0'
-  ["rand(#{a}..#{b})", order]
+  a = Blockly.Ruby.valueToCode(block, 'A', Blockly.Ruby.ORDER_RANGE) || '0'
+  b = Blockly.Ruby.valueToCode(block, 'B', Blockly.Ruby.ORDER_RANGE) || '0'
+  ["rand(#{a}..#{b})", Blockly.Ruby.ORDER_FUNCTION_CALL]
 
 # 条件:<　> かつ <　>
 # 条件:<　> または <　>
@@ -136,11 +135,11 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  order = Blockly.Ruby.ORDER_LOGICAL_NOT
+  order = Blockly.Ruby.ORDER_UNARY_SIGN
   a = Blockly.Ruby.valueToCode(block, 'A', order) || 'true'
   ["!#{a}", order]
 
-# 変数:(　)の[　]番目
+# 変数:(　)の(　)番目
 <% n = "#{category}_index_of" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
@@ -155,12 +154,11 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  order = Blockly.Ruby.ORDER_FUNCTION_CALL
-  a = Blockly.Ruby.valueToCode(block, 'A', order) || '""'
-  index = Blockly.Ruby.valueToCode(block, 'INDEX', order) || '0'
-  ["#{a}[#{index}]", order]
+  a = Blockly.Ruby.valueToCode(block, 'A', Blockly.Ruby.ORDER_FUNCTION_CALL) || '""'
+  index = Blockly.Ruby.valueToCode(block, 'INDEX', Blockly.Ruby.ORDER_INDEX) || '0'
+  ["#{a}[#{index}]", Blockly.Ruby.ORDER_FUNCTION_CALL]
 
-# 変数:[　]の長さ
+# 変数:(　)の長さ
 <% n = "#{category}_length" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
@@ -194,8 +192,8 @@ Blockly.Blocks['<%= n %>'] =
 
 Blockly.Ruby['<%= n %>'] = (block) ->
   order = Blockly.Ruby.ORDER_MULTIPLICATIVE
-  a = Blockly.Ruby.valueToCode(block, 'A', order) || '5'
-  b = Blockly.Ruby.valueToCode(block, 'B', order) || '2'
+  a = Blockly.Ruby.valueToCode(block, 'A', order) || '1'
+  b = Blockly.Ruby.valueToCode(block, 'B', order) || '1'
   ["#{a} % #{b}", order]
 
 # 変数:(　)を丸める

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

@@ -98,14 +98,13 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @appendDummyInput()
-      .appendField(new Blockly.FieldVariable('car1'), 'CHAR')
+      .appendField(new Smalruby.FieldCharacter(), 'CHAR')
       .appendField('に触れた')
     @setOutput(true, 'Boolean')
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  char = Blockly.Ruby.variableDB_
-    .getName(block.getFieldValue('CHAR'), Blockly.Variables.NAME_TYPE)
+  char = @getFieldValue('CHAR')
   Blockly.Ruby.characterMethodCallInput_('hit?', char)
 
 # [　]と聞いて待つ
@@ -186,15 +185,14 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= color %>)
     @appendDummyInput()
-      .appendField(new Blockly.FieldVariable('car1'), 'CHAR')
+      .appendField(new Smalruby.FieldCharacter(), 'CHAR')
       .appendField('の')
       .appendField(new Blockly.FieldDropdown(dropdown), 'PROPERTY')
     @setOutput(true, ['Number', 'String'])
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  char = Blockly.Ruby.variableDB_
-    .getName(block.getFieldValue('CHAR'), Blockly.Variables.NAME_TYPE)
+  char = @getFieldValue('CHAR')
   property = @getFieldValue('PROPERTY')
   c = Smalruby.Collections.CharacterSet.findWhere({ name: char })
   Blockly.Ruby.characterMethodCallInput_(property, null, { object: c })

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

@@ -10,28 +10,30 @@ break    elsif    module   retry    unless   __ENCODING__
 case     end      next     return   until
 '.split(/\s+/)
 
-# TODO: 確認すること
 Blockly.Ruby.ORDER_ATOMIC = 0            # 0 "" ...
 Blockly.Ruby.ORDER_COLLECTION = 1        # tuples, lists, dictionaries
 Blockly.Ruby.ORDER_STRING_CONVERSION = 1 # `expression...`
-Blockly.Ruby.ORDER_MEMBER = 2            # . []
-Blockly.Ruby.ORDER_FUNCTION_CALL = 2     # ()
-Blockly.Ruby.ORDER_EXPONENTIATION = 3    # **
-Blockly.Ruby.ORDER_UNARY_SIGN = 4        # + -
-Blockly.Ruby.ORDER_BITWISE_NOT = 4       # ~
-Blockly.Ruby.ORDER_MULTIPLICATIVE = 5    # * / // %
-Blockly.Ruby.ORDER_ADDITIVE = 6          # + -
-Blockly.Ruby.ORDER_BITWISE_SHIFT = 7     # << >>
-Blockly.Ruby.ORDER_BITWISE_AND = 8       # &
-Blockly.Ruby.ORDER_BITWISE_XOR = 9       # ^
-Blockly.Ruby.ORDER_BITWISE_OR = 10       # |
-Blockly.Ruby.ORDER_RELATIONAL = 11       # in, not in, is, is not,
-                                         # <, <=, >, >=, <>, !=, ==
-Blockly.Ruby.ORDER_LOGICAL_NOT = 12      # not
-Blockly.Ruby.ORDER_LOGICAL_AND = 13      # and
-Blockly.Ruby.ORDER_LOGICAL_OR = 14       # or
-Blockly.Ruby.ORDER_CONDITIONAL = 15      # if else
-Blockly.Ruby.ORDER_LAMBDA = 16           # lambda
+Blockly.Ruby.ORDER_MEMBER = 2           # ::
+Blockly.Ruby.ORDER_INDEX = 3            # []
+Blockly.Ruby.ORDER_FUNCTION_CALL = 4    # ()
+Blockly.Ruby.ORDER_UNARY_SIGN = 5       # +(単項)  !  ~
+Blockly.Ruby.ORDER_EXPONENTIATION = 6   # **
+Blockly.Ruby.ORDER_UNARY_MINUS_SIGN = 7 # -(単項)
+Blockly.Ruby.ORDER_MULTIPLICATIVE = 8   # *  /  %
+Blockly.Ruby.ORDER_ADDITIVE = 9         # +  -
+Blockly.Ruby.ORDER_BITWISE_SHIFT = 10   # << >>
+Blockly.Ruby.ORDER_BITWISE_AND = 11     # &
+Blockly.Ruby.ORDER_BITWISE_XOR = 12     # ^
+Blockly.Ruby.ORDER_BITWISE_OR = 12      # |
+Blockly.Ruby.ORDER_RELATIONAL = 13      # > >=  < <=
+Blockly.Ruby.ORDER_EQUALS = 14          # <=> ==  === !=  =~  !~
+Blockly.Ruby.ORDER_LOGICAL_AND = 15     # &&
+Blockly.Ruby.ORDER_LOGICAL_OR = 16      # ||
+Blockly.Ruby.ORDER_RANGE = 17           # ..  ...
+Blockly.Ruby.ORDER_CONDITIONAL = 18     # ?:(条件演算子)
+Blockly.Ruby.ORDER_ASSIGNMENT = 19      # =(+=, -= ... )
+Blockly.Ruby.ORDER_NOT = 20             # not
+Blockly.Ruby.ORDER_AND_OR = 21          # and or
 Blockly.Ruby.ORDER_NONE = 99             # (...)
 
 Blockly.Ruby.INFINITE_LOOP_TRAP = null

data/app/assets/javascripts/models/character.js.coffee

@@ -14,6 +14,27 @@ Smalruby.Character = Backbone.Model.extend({
     if @get('costumes').length == 0
       @set({ costumes: [Smalruby.Character.PRESET_COSTUMES[0]] })
 
+  validate: (attrs, options) ->
+    errors = []
+
+    name = attrs.name
+    if _.isUndefined(name) || _.isNull(name) ||
+       (_.isString(name) && name.length == 0)
+      errors.push
+        attr: 'name'
+        message: 'Name is required'
+
+    if _.isString(name) &&
+       name.match(/^[0-9A-Z]|[!\"\#$%&\'()\-=^~\\|@`\[{;+:*\]},<.>/?]/)
+      errors.push
+        attr: 'name'
+        message: 'Name is invalid'
+
+    if errors.length > 0
+      return errors
+
+    return
+
   link: (object) ->
     @objects.push(object)
     @objects = _.uniq(@objects)

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

@@ -37,9 +37,11 @@ Smalruby.CharacterModalView = Backbone.View.extend
         true
 
     self = @
-    @$el.find('input[name="character[name]"]').change (e) ->
+    changeNameFunc = (e) ->
       self.model.set({ name: $(@).val() })
       self.nameChanged = true
+    @$el.find('input[name="character[name]"]').change(changeNameFunc)
+    @$el.find('input[name="character[name]"]').keyup(changeNameFunc)
 
     @$el.find('input[name="character[x]"]').change (e) ->
       self.model.set({ x: $(@).val() })
@@ -55,11 +57,14 @@ Smalruby.CharacterModalView = Backbone.View.extend
     @listenTo(@model, 'change:y', @onChangeY)
     @listenTo(@model, 'change:angle', @onChangeAngle)
     @listenTo(@model, 'change:costumes', @onChangeCostumes)
+    @listenTo(@model, 'change', @onChange)
 
-    @onChange(@model)
+    @callAllOnChangeAttributes_()
 
   render: ->
+    @onChange(@model)
     @$el.modal('show')
+
     # HACK: ダイアログを表示して500ms程度待たないと画像のサイズが取得できなかった
     f = ->
       if @readImageSizeflag
@@ -74,7 +79,7 @@ Smalruby.CharacterModalView = Backbone.View.extend
     if @readImageSizeflag
       setTimeout(_.bind(f, @), 1)
 
-  onChange: (model, options)->
+  callAllOnChangeAttributes_: ->
     @onChangeName(@model, @model.get('name'))
     @onChangeX(@model, @model.get('x'))
     @onChangeY(@model, @model.get('y'))
@@ -118,6 +123,22 @@ Smalruby.CharacterModalView = Backbone.View.extend
     else
       @readImageSizeflag = true
 
+  onChange: (model, options) ->
+    return unless @target
+
+    @$el.find('.control-group[for="character[name]"]').removeClass('error')
+    @$el.find('#character-modal-ok-button').removeClass('disabled').removeAttr('disabled')
+
+    unless @model.isValid()
+      @$el.find('.control-group[for="character[name]"]').addClass('error')
+      @$el.find('#character-modal-ok-button').addClass('disabled').attr({ disabled: 'disabled' })
+
+    name = @model.get('name')
+    if @target.get('name') != name &&
+       Smalruby.Collections.CharacterSet.findWhere({ name: name })
+      @$el.find('.control-group[for="character[name]"]').addClass('error')
+      @$el.find('#character-modal-ok-button').addClass('disabled').attr({ disabled: 'disabled' })
+
   onSelectCostume: (e) ->
     e.preventDefault()
 

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

@@ -17,7 +17,7 @@
 
       #character-modal-attributes
         %form#character-modal-form{:class => 'form-horizontal'}
-          .control-group
+          .control-group{:for => "character[name]"}
             %label.control-label{:for => 'character_name'}<
               名前
             .controls

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

@@ -22,7 +22,6 @@
 
     -# [▼]へ向ける
     %block{:type => "#{category}_point_towards_character"}
-      = toolbox_character_field
 
     -# x座標を(　)、y座標を(　)にする
     %block{:type => "#{category}_set_x_y"}
@@ -247,12 +246,12 @@
       = toolbox_number_value('A', 1)
       = toolbox_number_value('B', 10)
 
-    -# 変数:(　)の[　]番目
+    -# 変数:(　)の(　)番目
     %block{:type => "#{category}_index_of"}
       = toolbox_text_value('A', 'あいうえお')
       = toolbox_number_value('INDEX', 1)
 
-    -# 変数:[　]の長さ
+    -# 変数:(　)の長さ
     %block{:type => "#{category}_length"}
       = toolbox_text_value('A', 'あいうえお')
 
@@ -363,6 +362,11 @@
     -#  -# LCDをクリアする
     -#  %block{:type => "#{category}_lcd_clear"}
 
+    %category{:name => 'サーボ'}
+      -# サーボ[▼ピン]を(　)度(5～180)にする
+      %block{:type => "#{category}_servo_set_position"}
+        = toolbox_number_value('POS', 90)
+
     -#%category{:name => 'ボタン'}
     -#  -# 条件:ボタン[▼]を押している
     -#  %block{:type => "#{category}_button_down"}

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
 module SmalrubyEditor
-  VERSION =  '0.1.1'
+  VERSION =  '0.1.2'
 end