smalruby-editor 0.1.20 → 0.1.21

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

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

@@ -49,9 +49,6 @@
       -# もし端に着いたら、跳ね返る
       %block{:type => "#{category}_turn_if_reach_wall"}
 
-      -# 条件:端に着いた
-      %block{:type => "#{category}_reach_wall"}
-
       -# 跳ね返る
       %block{:type => "#{category}_turn"}
 
@@ -85,15 +82,14 @@
     - category = 'hardware'
     %category{:name => 'アクチュエータ'}
       -#- subcategory = 'servo'
-      -# サーボ[▼ピン]を(　)度(5～180)にする
+      -# サーボ[▼PIN]を(　)度(5～180)にする
       -#%block{:type => "#{category}_#{subcategory}_set_position"}
         = toolbox_number_value('POS', 90)
 
       - subcategory = 'two_wheel_drive_car'
-      -# 2WD車[▼ピン]を（　）秒[▼コマンド]
+      -# 2WD車[▼PIN]を（　）秒[▼コマンド]
       %block{:type => "#{category}_#{subcategory}_run"}
-        %field{:name => 'PIN'}<
-          D6
+        = toolbox_pin_field('D5')
         = toolbox_number_value('SEC', 1)
         %value{:name => 'COMMAND'}
           %block{:type => "#{category}_#{subcategory}_commands"}
@@ -103,30 +99,42 @@
         %field{:name => 'COMMAND'}<
           forward
 
-      -# 2WD車[▼ピン]を進める
+      -# 2WD車[▼PIN]を進める
       %block{:type => "#{category}_#{subcategory}_forward"}
-        %field{:name => 'PIN'}<
-          D6
+        = toolbox_pin_field('D5')
 
-      -# 2WD車[▼ピン]をバックさせる
+      -# 2WD車[▼PIN]をバックさせる
       %block{:type => "#{category}_#{subcategory}_backward"}
-        %field{:name => 'PIN'}<
-          D6
+        = toolbox_pin_field('D5')
 
-      -# 2WD車[▼ピン]を左に曲げる
+      -# 2WD車[▼PIN]を左に曲げる
       %block{:type => "#{category}_#{subcategory}_turn_left"}
-        %field{:name => 'PIN'}<
-          D6
+        = toolbox_pin_field('D5')
 
-      -# 2WD車[▼ピン]を右に曲げる
+      -# 2WD車[▼PIN]を右に曲げる
       %block{:type => "#{category}_#{subcategory}_turn_right"}
-        %field{:name => 'PIN'}<
-          D6
+        = toolbox_pin_field('D5')
 
-      -# 2WD車[▼ピン]を止める
+      -# 2WD車[▼PIN]を止める
       %block{:type => "#{category}_#{subcategory}_stop"}
-        %field{:name => 'PIN'}<
-          D6
+        = toolbox_pin_field('D5')
+
+      -# 2WD車[▼PIN]の[▼LOR]の速度を<SPEED>%にする
+      %block{:type => "#{category}_#{subcategory}_set_speed"}
+        = toolbox_pin_field('D5')
+        = toolbox_number_value('SPEED', 100)
+
+      - subcategory = 'motor_driver'
+      -# (モータードライバ[▼PIN]で)モーターを[▼正転させる]
+      %block{:type => "#{category}_#{subcategory}"}
+        = toolbox_pin_field('D6')
+        %field{:name => 'METHOD'}<
+          forward
+
+      -# (モータードライバ[▼PIN]の)モーターの速度を<SPEED>%にする
+      %block{:type => "#{category}_#{subcategory}_set_speed"}
+        = toolbox_pin_field('D6')
+        = toolbox_number_value('SPEED', 100)
 
   - category = 'looks'
   %category{:name => '見た目'}
@@ -173,17 +181,17 @@
 
     - category = 'hardware'
     - subcategory = 'led'
-    -# LED[▼ピン]をオンにする
+    -# LED[▼PIN]をオンにする
     %block{:type => "#{category}_#{subcategory}_on"}
 
-    -# LED[▼ピン]をオフにする
+    -# LED[▼PIN]をオフにする
     %block{:type => "#{category}_#{subcategory}_off"}
 
     -#- subcategory = 'rgb_led'
-    -# RGB LED[▼アノード]コモン[▼ピン]を[カラー]にする
+    -# RGB LED[▼アノード]コモン[▼PIN]を[カラー]にする
     -#%block{:type => "#{category}_#{subcategory}_on"}
 
-    -# RGB LED[▼アノード]コモン[▼ピン]をオフにする
+    -# RGB LED[▼アノード]コモン[▼PIN]をオフにする
     -#%block{:type => "#{category}_#{subcategory}_off"}
 
     -#- subcategory = 'seven_segment_display'
@@ -247,11 +255,8 @@
     -# センサー[▼PIN]が変化したとき
     %block{:type => "#{category}_on_sensor_change"}
 
-    -# ボタン[▼]を押したとき
-    -#%block{:type => "#{category}_on_button_down"}
-
-    -# ボタン[▼]を離したとき
-    -#%block{:type => "#{category}_on_button_up"}
+    -# ボタン[▼PIN]が[▼押された]とき
+    %block{:type => "#{category}_on_button_down_or_up"}
 
   - category = 'control'
   %category{:name => '制御'}
@@ -295,53 +300,65 @@
 
   - category = 'sensing'
   %category{:name => '調べる'}
-    -# 条件:キーボードの[▼キー]が[▼押された]
-    %block{:type => "#{category}_input_key_push_or_down"}
-      = toolbox_key_field
+    %category{:name => '一般'}
+      -# 条件:端に触れた
+      %block{:type => "#{category}_reach_wall"}
+
+      -# 条件:キーボードの[▼キー]が[▼押された]
+      %block{:type => "#{category}_input_key_push_or_down"}
+        = toolbox_key_field
 
-    -# 条件:マウスの[▼左ボタン]が[▼押された]
-    %block{:type => "#{category}_input_mouse_push_or_down"}
+      -# 条件:マウスの[▼左ボタン]が[▼押された]
+      %block{:type => "#{category}_input_mouse_push_or_down"}
 
-    -# 変数:マウスのx座標
-    %block{:type => "#{category}_input_mouse_pos_x"}
+      -# 変数:マウスのx座標
+      %block{:type => "#{category}_input_mouse_pos_x"}
 
-    -# 変数:マウスのy座標
-    %block{:type => "#{category}_input_mouse_pos_y"}
+      -# 変数:マウスのy座標
+      %block{:type => "#{category}_input_mouse_pos_y"}
 
-    -# 条件:[▼キャラクター]に触れた
-    %block{:type => "#{category}_hit"}
+      -# 条件:[▼キャラクター]に触れた
+      %block{:type => "#{category}_hit"}
 
-    -# [　]と聞いて待つ
-    -#%block{:type => "#{category}_ask"}
-    -#  = toolbox_text_value('TEXT', 'あなたのお名前は？')
+      -# [　]と聞いて待つ
+      -#%block{:type => "#{category}_ask"}
+      -#  = toolbox_text_value('TEXT', 'あなたのお名前は？')
 
-    -# 変数:答え
-    -#%block{:type => "#{category}_answer"}
+      -# 変数:答え
+      -#%block{:type => "#{category}_answer"}
 
-    -# 変数:タイマー
-    -#%block{:type => "#{category}_timer_count"}
+      -# 変数:タイマー
+      -#%block{:type => "#{category}_timer_count"}
 
-    -# タイマーをリセット
-    -#%block{:type => "#{category}_timer_reset"}
+      -# タイマーをリセット
+      -#%block{:type => "#{category}_timer_reset"}
 
-    -# 変数:[▼キャラクター]の[▼プロパティ]
-    %block{:type => "#{category}_character_property"}
+      -# 変数:[▼キャラクター]の[▼プロパティ]
+      %block{:type => "#{category}_character_property"}
 
-    -# 変数:現在の[▼時]
-    %block{:type => "#{category}_time_now"}
+      -# 変数:現在の[▼時]
+      %block{:type => "#{category}_time_now"}
 
-    -# 変数:2000年からの日数
-    -#%block{:type => "#{category}_days_since_2000"}
+      -# 変数:2000年からの日数
+      -#%block{:type => "#{category}_days_since_2000"}
 
     - category = 'hardware'
-    -# センサー[▼PIN]
-    %block{:type => "#{category}_sensor_value"}
+    %category{:name => 'ハードウェア'}
+      -# センサー[▼PIN]
+      %block{:type => "#{category}_sensor_value"}
+        = toolbox_pin_field('A0')
+
+      -# 条件:ボタン[▼PIN]が[▼押された]
+      %block{:type => "#{category}_button_down_or_up"}
+        = toolbox_pin_field('D3')
 
-    -# 条件:ボタン[▼]を押している
-    -#%block{:type => "#{category}_button_down"}
+      -# 2WD車[▼PIN]の[▼LOR]の速度%
+      %block{:type => "#{category}_two_wheel_drive_car_speed"}
+        = toolbox_pin_field('D5')
 
-    -# 条件:ボタン[▼]を離している
-    -#%block{:type => "#{category}_button_up"}
+      -# (モータードライバ[▼PIN]の)モーターの速度(%)
+      %block{:type => "#{category}_motor_driver_speed"}
+        = toolbox_pin_field('D6')
 
   - category = 'operators'
   %category{:name => '演算'}
@@ -448,3 +465,7 @@
     %category{:name => 'ハードウェア'}
       -# ハードウェアを準備する
       %block{:type => "#{category}_init_hardware"}
+
+      -# ボタン[▼PIN]のプルアップ抵抗を使わない
+      %block{:type => "#{category}_button_not_use_pullup"}
+        = toolbox_pin_field('D3')

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

@@ -127,4 +127,4 @@
 
 - if raspberrypi?
   %script{type: "text/javascript"}
-    $(function() { $('div[id=":5"]').hide(); });
+    $(function() { $('div[id=":7"]').hide(); });

data/demos/adjust_2wd_car.rb.xml

@@ -0,0 +1,179 @@
+<xml xmlns="http://www.w3.org/1999/xhtml">
+  <character name="car1" x="170" y="266" costumes="car2.png" angle="241" rotation_style="left_right" />
+  <character name="car2" x="420" y="260" costumes="car2.png" angle="0" rotation_style="left_right" />
+  <character name="frog1" x="276" y="88" costumes="frog1.png" angle="0" />
+  <block type="hardware_init_hardware" x="177" y="30" />
+  <block type="ruby_comment" x="178" y="70">
+    <field name="COMMENT">2WD車の左右のモーターを調整する</field>
+    <next>
+      <block type="character_new">
+        <field name="NAME">frog1</field>
+        <statement name="DO">
+          <block type="events_on_start">
+            <statement name="DO">
+              <block type="looks_say" inline="true">
+                <value name="TEXT">
+                  <block type="text">
+                    <field name="TEXT">クリックすると前と後ろに動かすよ。←、→で左右のモーターの速度を調整できるよ</field>
+                  </block>
+                </value>
+              </block>
+            </statement>
+            <next>
+              <block type="events_on_click">
+                <statement name="DO">
+                  <block type="hardware_two_wheel_drive_car_run" inline="true">
+                    <field name="PIN">D5</field>
+                    <value name="SEC">
+                      <block type="math_number">
+                        <field name="NUM">2</field>
+                      </block>
+                    </value>
+                    <value name="COMMAND">
+                      <block type="hardware_two_wheel_drive_car_commands">
+                        <field name="COMMAND">forward</field>
+                      </block>
+                    </value>
+                    <next>
+                      <block type="hardware_two_wheel_drive_car_run" inline="true">
+                        <field name="PIN">D5</field>
+                        <value name="SEC">
+                          <block type="math_number">
+                            <field name="NUM">2</field>
+                          </block>
+                        </value>
+                        <value name="COMMAND">
+                          <block type="hardware_two_wheel_drive_car_commands">
+                            <field name="COMMAND">backward</field>
+                          </block>
+                        </value>
+                      </block>
+                    </next>
+                  </block>
+                </statement>
+                <next>
+                  <block type="events_on_key_push_or_down">
+                    <field name="KEY">K_LEFT</field>
+                    <field name="POD">push</field>
+                    <statement name="DO">
+                      <block type="hardware_two_wheel_drive_car_set_speed" inline="true">
+                        <field name="PIN">D5</field>
+                        <field name="LOR">left</field>
+                        <value name="SPEED">
+                          <block type="operators_minus" inline="true">
+                            <value name="A">
+                              <block type="hardware_two_wheel_drive_car_speed">
+                                <field name="PIN">D5</field>
+                                <field name="LOR">left</field>
+                              </block>
+                            </value>
+                            <value name="B">
+                              <block type="math_number">
+                                <field name="NUM">1</field>
+                              </block>
+                            </value>
+                          </block>
+                        </value>
+                        <next>
+                          <block type="hardware_two_wheel_drive_car_set_speed" inline="true">
+                            <field name="PIN">D5</field>
+                            <field name="LOR">right</field>
+                            <value name="SPEED">
+                              <block type="math_number">
+                                <field name="NUM">100</field>
+                              </block>
+                            </value>
+                          </block>
+                        </next>
+                      </block>
+                    </statement>
+                    <next>
+                      <block type="events_on_key_push_or_down">
+                        <field name="KEY">K_RIGHT</field>
+                        <field name="POD">push</field>
+                        <statement name="DO">
+                          <block type="hardware_two_wheel_drive_car_set_speed" inline="true">
+                            <field name="PIN">D5</field>
+                            <field name="LOR">left</field>
+                            <value name="SPEED">
+                              <block type="math_number">
+                                <field name="NUM">100</field>
+                              </block>
+                            </value>
+                            <next>
+                              <block type="hardware_two_wheel_drive_car_set_speed" inline="true">
+                                <field name="PIN">D5</field>
+                                <field name="LOR">right</field>
+                                <value name="SPEED">
+                                  <block type="operators_minus" inline="true">
+                                    <value name="A">
+                                      <block type="hardware_two_wheel_drive_car_speed">
+                                        <field name="PIN">D5</field>
+                                        <field name="LOR">right</field>
+                                      </block>
+                                    </value>
+                                    <value name="B">
+                                      <block type="math_number">
+                                        <field name="NUM">1</field>
+                                      </block>
+                                    </value>
+                                  </block>
+                                </value>
+                              </block>
+                            </next>
+                          </block>
+                        </statement>
+                      </block>
+                    </next>
+                  </block>
+                </next>
+              </block>
+            </next>
+          </block>
+        </statement>
+      </block>
+    </next>
+  </block>
+  <block type="character_new" x="179" y="617">
+    <field name="NAME">car1</field>
+    <statement name="DO">
+      <block type="events_on_start">
+        <statement name="DO">
+          <block type="control_loop">
+            <statement name="DO">
+              <block type="looks_say" inline="true">
+                <value name="TEXT">
+                  <block type="hardware_two_wheel_drive_car_speed">
+                    <field name="PIN">D5</field>
+                    <field name="LOR">left</field>
+                  </block>
+                </value>
+              </block>
+            </statement>
+          </block>
+        </statement>
+      </block>
+    </statement>
+  </block>
+  <block type="character_new" x="588" y="612">
+    <field name="NAME">car2</field>
+    <statement name="DO">
+      <block type="events_on_start">
+        <statement name="DO">
+          <block type="control_loop">
+            <statement name="DO">
+              <block type="looks_say" inline="true">
+                <value name="TEXT">
+                  <block type="hardware_two_wheel_drive_car_speed">
+                    <field name="PIN">D5</field>
+                    <field name="LOR">right</field>
+                  </block>
+                </value>
+              </block>
+            </statement>
+          </block>
+        </statement>
+      </block>
+    </statement>
+  </block>
+</xml>