smalruby-editor 0.1.20-x86-mingw32 → 0.1.21-x86-mingw32

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

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

@@ -0,0 +1,24 @@
+module RubyToBlock
+  module Block
+    class HardwareMotorDriverSpeed < Value
+      include CharacterOperation
+
+      blocknize '^\s*' + CHAR_RE +
+                'motor_driver\("(D(?:3|5|6|9|10|11))"\)\.speed\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] })
+        context.add_value(block)
+        block.character = character
+
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module RubyToBlock
+  module Block
+    class HardwareOnButtonDownOrUp < CharacterEvent
+      include HardwareOperation
+
+      blocknize '^\s*' + CHAR_RE +
+                'on\(:button_(down|up),' + DIO_PIN_RE + '\)\s+' +
+                'do\s*$',
+                statement: true, indent: true
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        add_character_event_blocks(context, md2[1],
+                                   new(fields: { PIN: md2[3], DOU: md2[2] }))
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    # ハードウェアのメソッドや属性に共通するメソッドや定数を定義するモジュール
+    module HardwareOperation
+      extend ActiveSupport::Concern
+
+      DIO_PIN_RE = '\s*"(D(?:[2-9]|10|11|12|13))"\s*'
+      PWM_PIN_RE = '\s*"(D(?:3|5|6|9|10|11))"\s*'
+      AIO_PIN_RE = '\s*"(A[0-5])"\s*'
+      TWO_WHEEL_DRIVE_CAR_PIN_RE = '\s*"(D[56])"\s*'
+      LOR_RE = '(left|right)'
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareTwoWheelDriveCarSetSpeed < CharacterMethodCall
+      include HardwareOperation
+
+      blocknize '^\s*' + CHAR_RE +
+                'two_wheel_drive_car\(' + TWO_WHEEL_DRIVE_CAR_PIN_RE + '\)\.' +
+                LOR_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],
+                                                      LOR: md2[3] }),
+                                        SPEED: md2[4])
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module RubyToBlock
+  module Block
+    class HardwareTwoWheelDriveCarSpeed < Value
+      include CharacterOperation
+      include HardwareOperation
+
+      blocknize '^\s*' + CHAR_RE +
+                'two_wheel_drive_car\(' + TWO_WHEEL_DRIVE_CAR_PIN_RE + '\)\.' +
+                LOR_RE + '_speed\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], LOR: md2[3] })
+        context.add_value(block)
+        block.character = character
+
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class RubyP < CharacterMethodCall
+      blocknize '^\s*p\((.+)\)\s*$',
+                statement: true, inline: true
+
+      def self.process_match_data(md, context)
+        block = new
+        context.add_block(block)
+
+        md2 = regexp.match(md[type])
+        process_value_string(context, block, md2[1], :ARG)
+
+        true
+      end
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/{motion_reach_wall.rb → sensing_reach_wall.rb}

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 module RubyToBlock
   module Block
-    class MotionReachWall < Value
+    class SensingReachWall < Value
       include CharacterOperation
 
       blocknize '^\s*' + CHAR_RE + 'reach_wall\?\s*$',

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

@@ -2,11 +2,12 @@
 module RubyToBlock
   module Block
     class Text < Value
-      blocknize '^\s*"([^"]*)"\s*$', value: true
+      blocknize '^\s*"(.*)"\s*$', value: true
 
       def self.process_match_data(md, context)
         md2 = regexp.match(md[type])
-        context.add_value(new(fields: { TEXT: md2[1] }))
+        text = md2[1].gsub(/\\"/, '"')
+        context.add_value(new(fields: { TEXT: text }))
 
         true
       end

data/app/models/source_code.rb

@@ -64,6 +64,26 @@ class SourceCode < ActiveRecord::Base
     Digest::SHA256.hexdigest(data)
   end
 
+  # ソースコードの概要を取得する
+  def summary
+    res = {}
+    if /\.xml\z/ =~ filename
+      res[:filename] = filename.sub(/\.xml\z/, '')
+
+      doc = Nokogiri::HTML.parse(data)
+      if (attr = doc.xpath('//character[1]/@costumes').first)
+        res[:imageUrl] = "/smalruby/assets/#{attr.value}"
+      end
+      text = doc.xpath('//block[@type="ruby_comment"][1]' +
+                       '/field[@name="COMMENT"]/text()').first
+      res[:title] = text.to_s if text
+    else
+      res[:filename] = filename
+    end
+    res[:title] = filename unless res[:title]
+    res
+  end
+
   private
 
   def validate_filename