smalruby-editor 0.1.20 → 0.1.21

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

@@ -2,7 +2,8 @@
 
 <%
   category = 'operators'
-  color = 100
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
 # 変数:(　) + (　)

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

@@ -2,7 +2,8 @@
 
 <%
   category = 'pen'
-  color = 160
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
 # ペンを下ろす

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

@@ -2,7 +2,8 @@
 
 <%
   category = 'ruby'
-  color = 340
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
 # 文

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

@@ -2,7 +2,8 @@
 
 <%
   category = 'sensing'
-  color = 190
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
 # 調べるの環境設定
@@ -26,6 +27,27 @@ window.SmalrubyEditor.Sensing =
     ['中ボタン', 'M_MBUTTON'],
     ['右ボタン', 'M_RBUTTON'],
   ]
+  DownOrUpDropdown: [
+    ['押された', 'down'],
+    ['離された', 'up'],
+  ]
+
+# 条件:端に触れた
+<% 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?')
+
+# HACK: 後方互換性のため、motion_reach_wallとして複製する
+Blockly.Blocks['motion_reach_wall'] = Blockly.Blocks['<%= n %>']
+Blockly.Ruby['motion_reach_wall'] = Blockly.Ruby['<%= n %>']
 
 # 条件:キーボードの[▼キー]が[▼押された]
 <% n = "#{category}_input_key_push_or_down" %>
@@ -104,7 +126,7 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  char = @getFieldValue('CHAR')
+  char = @getCharacterFieldValue()
   Blockly.Ruby.characterMethodCallInput_('hit?', char)
 
 # [　]と聞いて待つ
@@ -192,7 +214,7 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  char = @getFieldValue('CHAR')
+  char = @getCharacterFieldValue()
   property = @getFieldValue('PROPERTY')
   c = Smalruby.Collections.CharacterSet.findWhere({ name: char })
   Blockly.Ruby.characterMethodCallInput_(property, null, { object: c })

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

@@ -2,7 +2,8 @@
 
 <%
   category = 'sound'
-  color = 300
+  require 'smalruby_editor'
+  color = SmalrubyEditor::COLORS[category.to_sym]
 %>
 
 # [▼プリセット音声]

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

@@ -51,6 +51,20 @@ Blockly.Ruby.init = ->
     @definitions_['receiver_stack'] = ['main']
     @definitions_['character_stack'] = []
 
+Blockly.Ruby.defineCharacter = (c) ->
+  name = c.get('name')
+  blockName = "character_#{name}"
+  if !Blockly.Ruby.definitions_[blockName]
+    switch c.get('rotationStyle')
+      when 'left_right'
+        rotationStyle = ', rotation_style: :left_right'
+      when 'none'
+        rotationStyle = ', rotation_style: :none'
+      else
+        rotationStyle = ''
+    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 = ->
   @definitions_['character_stack']
 
@@ -159,12 +173,20 @@ Blockly.Ruby.finish = (code) ->
 Blockly.Ruby.scrubNakedValue = (line) ->
   line + '\n'
 
+Blockly.Ruby.escapeChars_ =
+  '"': '\\"'
+
 Blockly.Ruby.quote_ = (string) ->
-  # TODO: 実装すること
-  # stringに"を含んでいたら、aから順番にstringに含まれるか試して、含ま
-  # れていない文字を使って%Qa...aとしようかな。でも生成したソースコード
-  # の可読性が下がりますね。
-  '\"' + string + '\"'
+  # copy and modified goog.string.quote:
+  # http://docs.closure-library.googlecode.com/git/namespace_goog_string.html
+  s = String(string)
+  sb = ['"']
+  for i in [0...s.length]
+    do (i) ->
+      ch = s.charAt(i)
+      sb[i + 1] = Blockly.Ruby.escapeChars_[ch] || ch
+  sb.push('"')
+  sb.join('')
 
 Blockly.Ruby.scrub_ = (block, code) ->
   if code == null

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

@@ -15,15 +15,28 @@ Smalruby.SourceCode = Backbone.Model.extend
           filename = '1.rb'
       @set('filename', filename)
 
-    if @get('filename').match(/\.xml$/)
-      data = Smalruby.dumpXml()
-    else
-      if window.blockMode
-        data = Blockly.Ruby.workspaceToCode()
+    unless @get('data')
+      if @get('filename').match(/\.xml$/)
+        data = Smalruby.dumpXml()
       else
-        data = window.textEditor.getSession().getDocument().getValue()
+        if window.blockMode
+          data = Blockly.Ruby.workspaceToCode()
+        else
+          data = window.textEditor.getSession().getDocument().getValue()
+
+      @set('data', data)
 
-    @set('data', data)
+  getRbxmlFilename: ->
+    filename = @get('filename')
+    if filename.match(/\.rb\.xml$/)
+      filename
+    else
+      if filename.match(/\.rb$/)
+        filename + '.xml'
+      else if filename.match(/\.xml$/)
+        filename.replace(/\.xml$/, '.rb.xml')
+      else
+        filename + '.rb.xml'
 
   run: ->
     @post_('run')

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

@@ -86,9 +86,8 @@ Smalruby.MainMenuView = Backbone.View.extend
 
     sourceCode = @getSourceCode()
 
-    filename = sourceCode.get('filename')
-    filename += '.xml' unless filename.match(/\.xml$/)
-    xmlSourceCode = new Smalruby.SourceCode({ filename: filename })
+    xmlSourceCode =
+      new Smalruby.SourceCode({ filename: sourceCode.getRbxmlFilename() })
 
     clearMessages()
 
@@ -200,11 +199,10 @@ Smalruby.MainMenuView = Backbone.View.extend
       $('#filename').focus()
       return
 
+    sourceCode = @getSourceCode()
     if window.blockMode
-      filename += '.xml' unless filename.match(/\.xml$/)
-      sourceCode = new Smalruby.SourceCode({ filename: filename })
-    else
-      sourceCode = @getSourceCode()
+      sourceCode =
+        new Smalruby.SourceCode({ filename: sourceCode.getRbxmlFilename() })
 
     clearMessages()
 

data/app/assets/stylesheets/editor.css.scss

@@ -13,7 +13,11 @@ $left-pane-width: $character-size + $margin * 2;
 #messages {
     position: absolute;
     right: 20px;
-    z-index: 9999;
+    z-index: 999;
+    max-height: 80%;
+    overflow: auto;
+    bottom: 20px;
+    width: 25%;
 }
 
 .left-pane {

data/app/assets/stylesheets/toolbox.css.scss.erb

@@ -23,30 +23,35 @@
     }.join
   end
 
-  hues = %w(
-    208
-    208
-    208
-    208
-    270
-    300
-    160
-    330
-    330
-    33
-    43
-    43
-    43
-    43
-    190
-    100
-    100
-    100
-    100
-    340
-    340
-    340
-  ).map(&:to_i)
+  require 'smalruby_editor'
+  colors = SmalrubyEditor::COLORS
+
+  hues = [
+    colors[:motion],
+    colors[:motion],
+    colors[:motion],
+    colors[:motion],
+    colors[:looks],
+    colors[:sound],
+    colors[:pen],
+    colors[:data],
+    colors[:data],
+    colors[:events],
+    colors[:control],
+    colors[:control],
+    colors[:control],
+    colors[:control],
+    colors[:sensing],
+    colors[:sensing],
+    colors[:sensing],
+    colors[:operators],
+    colors[:operators],
+    colors[:operators],
+    colors[:operators],
+    colors[:etc],
+    colors[:etc],
+    colors[:etc],
+  ]
 
   colors = hues.map { |h|
     [hsv_to_rgb(h, 100, 80), hsv_to_rgb(h, 100, 100)]

data/app/controllers/source_codes_controller.rb

@@ -4,50 +4,21 @@ require 'nkf'
 class SourceCodesController < ApplicationController
   before_filter :check_whether_standalone, only: [:write, :run, :load_local]
 
-  # デモプログラム
-  DEMO_PROGRAMS =
-    [
-     {
-       title: '車のおいかけっこ',
-       filename: 'car_chase.rb',
-       imageUrl: '/smalruby/assets/car2.png',
-     },
-     {
-       title: 'クリックスターだにゃ～',
-       filename: 'star.rb',
-       imageUrl: '/smalruby/assets/cat1.png',
-     },
-     {
-       title: 'ピンポンゲーム',
-       filename: 'pong.rb',
-       imageUrl: '/smalruby/assets/cat2.png',
-     },
-     {
-       title: 'ライトをぴかっとさせるでよ',
-       filename: 'hardware_led.rb',
-       imageUrl: '/smalruby/assets/frog1.png',
-     },
-    ]
-
   def index
     res = {
       localPrograms: [],
       demoPrograms: [],
     }
     if standalone?
-      local_program_paths.each do |path|
-        # TODO: XMLからタイトルを抽出する
-        # TODO: XMLからキャラクターの画像を抽出する
-        filename = rb_basename(path)
-        res[:localPrograms] << {
-          title: filename,
-          filename: filename,
-        }
-      end
+      res[:localPrograms] = local_program_paths.map { |path|
+        SourceCode.new(filename: path.basename.to_s, data: path.read).summary
+      }
     end
 
-    # TODO: XMLから情報を抽出する
-    res[:demoPrograms] = DEMO_PROGRAMS
+    res[:demoPrograms] = Pathname.glob(Rails.root.join('demos/*.rb.xml')).map {
+      |path|
+      SourceCode.new(filename: path.basename.to_s, data: path.read).summary
+    }
 
     render json: res
   end

data/app/helpers/editor_helper.rb

@@ -17,6 +17,15 @@ module EditorHelper
     %(<field name="#{h name}">#{h value}</field>).html_safe
   end
 
+  # ツールボックスのブロックに対して、PINの入力フィールドの値を設定する
+  #
+  # @param [String] value ピン
+  # @param [String] name 名前
+  # @return [String] XML
+  def toolbox_pin_field(value, name = 'PIN')
+    %(<field name="#{h name}">#{h value}</field>).html_safe
+  end
+
   # ツールボックスのブロックに対して、数値型の入力のブロックを設定する
   #
   # @param [String] name 入力値の名前

data/app/models/concerns/ruby_to_block/block/hardware_button_down_or_up.rb

@@ -0,0 +1,25 @@
+module RubyToBlock
+  module Block
+    class HardwareButtonDownOrUp < Value
+      include CharacterOperation
+      include HardwareOperation
+
+      blocknize '^\s*' + CHAR_RE +
+                'button\(' + DIO_PIN_RE + '\)\.(down|up)\?\s*$',
+                value: true
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+
+        character = get_character(context, md2[1])
+        return false if context.receiver && context.receiver != character
+
+        block = new(fields: { PIN: md2[2], DOU: md2[3] })
+        context.add_value(block)
+        block.character = character
+
+        true
+      end
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/hardware_button_not_use_pullup.rb

@@ -0,0 +1,18 @@
+module RubyToBlock
+  module Block
+    class HardwareButtonNotUsePullup < CharacterMethodCall
+      include HardwareOperation
+
+      blocknize '^\s*' + CHAR_RE +
+                'button\(' + DIO_PIN_RE + '\)\.not_use_pullup\s*$',
+                statement: true
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        add_character_method_call_block(context, md2[1],
+                                        new(fields: { PIN: md2[2] }))
+        true
+      end
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/hardware_motor_driver.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareMotorDriver < CharacterMethodCall
+      # rubocop:disable LineLength
+      blocknize '^\s*' + CHAR_RE +
+                'motor_driver\("(D(?:3|5|6|9|10|11))"\)\.(forward|backward|stop)\s*$',
+                statement: true
+      # rubocop:enable LineLength
+
+      attr_accessor :method_name
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        add_character_method_call_block(context, md2[1],
+                                        new(fields: { PIN: md2[2],
+                                                      METHOD: md2[3] }))
+        true
+      end
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/hardware_motor_driver_set_speed.rb

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareMotorDriverSetSpeed < CharacterMethodCall
+      include HardwareOperation
+
+      blocknize '^\s*' + CHAR_RE +
+                'motor_driver\(' + PWM_PIN_RE + '\)\.speed\s*=\s*(\S+)\s*$',
+                statement: true, inline: true
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        add_character_method_call_block(context, md2[1],
+                                        new(fields: { PIN: md2[2] }),
+                                        SPEED: md2[3])
+        true
+      end
+    end
+  end
+end