smalruby-editor 0.1.20 → 0.1.21

data/spec/acceptance/block_mode/demo.feature

@@ -12,7 +12,9 @@
     require "smalruby"
 
     car1 = Character.new(costume: "car2.png", x: 0, y: 0, angle: 0)
-    car2 = Character.new(costume: "car3.png", x: 0, y: 415, angle: 0)
+    car2 = Character.new(costume: "car4.png", x: 0, y: 415, angle: 0)
+    # 車のおいかけっこ
+
     # 逃げる車
 
     car1.on(:start) do

data/spec/acceptance/standalone/save.feature

@@ -43,3 +43,54 @@
     ならば 確認メッセージ "前に01.rbという名前でセーブしているけど本当にセーブしますか？\nセーブすると前に作成したプログラムは消えてしまうよ！" を表示すること
     かつ "メッセージ" に "セーブをキャンセルしました" を含むこと
     かつ ホームディレクトリの "01.rb" の内容が "puts 'Hello, World!'" であること
+
+  シナリオテンプレート: ブロックモードでセーブボタンを押してローカルマシンにプログラムを保存できる
+    前提 "ブロック" タブを表示する
+    かつ 次のキャラクターを追加する:
+      | name | costumes |   x |   y | angle |
+      | car1 | car4.png  | 300 | 200 |    90 |
+    かつ 次のブロックを配置する:
+      """
+      %block{:type => "character_new", :x => "0", :y => "0"}
+        %field{:name => "NAME"}<
+          car1
+        %statement{:name => "DO"}
+          %block{:type => "motion_move", :x => "0", :y => "0"}
+            %value{:name => "STEP"}
+              %block{:type => "math_number"}
+                %field{:name => "NUM"}<
+                  10
+      """
+    かつ プログラムの名前に "<プログラムの名前>" を指定する
+
+    もし サブメニューの "セーブボタン" をクリックする
+    かつ JavaScriptによるリクエストが終わるまで待つ
+
+    ならば "メッセージ" に "セーブしました" を含むこと
+    かつ ホームディレクトリに "<保存したファイルの名前>" が存在すること
+    かつ ホームディレクトリの "<保存したファイルの名前>" が次の内容であること:
+      """
+      <xml>
+        <character x="300" y="200" name="car1" costumes="car4.png" angle="90"></character>
+        <block type="character_new" x="0" y="0">
+          <field name="NAME">car1</field>
+          <statement name="DO">
+            <block type="motion_move" inline="true">
+              <value name="STEP">
+                <block type="math_number">
+                  <field name="NUM">10</field>
+                </block>
+              </value>
+            </block>
+          </statement>
+        </block>
+      </xml>
+      """
+
+    例:
+      | プログラムの名前 | 保存したファイルの名前 |
+      | 01.rb            | 01.rb.xml              |
+      | 01.xml           | 01.rb.xml              |
+      | 01.rb.xml        | 01.rb.xml              |
+      | 01               | 01.rb.xml              |
+

data/spec/helpers/editor_helper_spec.rb

@@ -47,6 +47,26 @@ describe EditorHelper do
     end
   end
 
+  describe '#toolbox_pin_field' do
+    subject { toolbox_pin_field(value, name) }
+
+    let(:name) { 'PIN' }
+    let(:value) { 'D5' }
+
+    it { should be_html_safe }
+    it { should include(%(<field name="#{h name}">#{h value}</field>)) }
+
+    context '名前にタグを含む場合', name_include_html: true do
+      it { should include(%(<field name="#{h name}">#{h value}</field>)) }
+    end
+
+    context '名前を省略した場合' do
+      subject { toolbox_pin_field(value) }
+
+      it { should include(%(<field name="PIN">#{h value}</field>)) }
+    end
+  end
+
   describe '#toolbox_number_value' do
     subject { toolbox_number_value(name, value) }
 

data/spec/javascripts/models/source_code_spec.coffee

@@ -0,0 +1,40 @@
+describe 'Smalruby.SourceCode', ->
+  klass = Smalruby.SourceCode
+  self = null
+
+  describe '#getRbxmlFilename', ->
+    describe 'filenameが01.rbのとき', ->
+      beforeEach ->
+        self = new klass
+          filename: '01.rb'
+          data: 'puts "Hello, World!"'
+
+      it '01.rb.xmlを返すこと', ->
+        expect(self.getRbxmlFilename()).to.equal('01.rb.xml')
+
+    describe 'filenameが01のとき', ->
+      beforeEach ->
+        self = new klass
+          filename: '01'
+          data: 'puts "Hello, World!"'
+
+      it '01.rb.xmlを返すこと', ->
+        expect(self.getRbxmlFilename()).to.equal('01.rb.xml')
+
+    describe 'filenameが01.xmlのとき', ->
+      beforeEach ->
+        self = new klass
+          filename: '01.xml'
+          data: 'puts "Hello, World!"'
+
+      it '01.rb.xmlを返すこと', ->
+        expect(self.getRbxmlFilename()).to.equal('01.rb.xml')
+
+    describe 'filenameが01.rb.xmlのとき', ->
+      beforeEach ->
+        self = new klass
+          filename: '01.rb.xml'
+          data: 'puts "Hello, World!"'
+
+      it '01.rb.xmlを返すこと', ->
+        expect(self.getRbxmlFilename()).to.equal('01.rb.xml')

data/spec/models/concerns/ruby_to_block/block/hardware_spec.rb

@@ -197,4 +197,273 @@ end
       XML
     end
   end
+
+  parts = <<-EOS
+require "smalruby"
+
+init_hardware
+car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
+
+car1.on(:start) do
+  motor_driver("D3").speed = 50
+  p(motor_driver("D3").speed)
+  motor_driver("D3").forward
+  motor_driver("D3").backward
+end
+car1.motor_driver("D3").speed = 50
+p(car1.motor_driver("D3").speed)
+car1.motor_driver("D3").stop
+  EOS
+  describe compact_source_code(parts) do
+    _parts = parts
+    let(:data) { _parts }
+
+    it '結果が正しいこと' do
+      should eq_block_xml(<<-XML)
+  <character name="car1" x="0" y="0" angle="0" costumes="car1.png" />
+  <block type="hardware_init_hardware" />
+  <block type="character_new">
+    <field name="NAME">car1</field>
+    <statement name="DO">
+      <block type="events_on_start">
+        <statement name="DO">
+          <block type="hardware_motor_driver_set_speed" inline="true">
+            <field name="PIN">D3</field>
+            <value name="SPEED">
+              <block type="math_number">
+                <field name="NUM">50</field>
+              </block>
+            </value>
+            <next>
+              <block type="ruby_p" inline="true">
+                <value name="ARG">
+                  <block type="hardware_motor_driver_speed">
+                    <field name="PIN">D3</field>
+                  </block>
+                </value>
+                <next>
+                  <block type="hardware_motor_driver">
+                    <field name="PIN">D3</field>
+                    <field name="METHOD">forward</field>
+                    <next>
+                      <block type="hardware_motor_driver">
+                        <field name="PIN">D3</field>
+                        <field name="METHOD">backward</field>
+                      </block>
+                    </next>
+                  </block>
+                </next>
+              </block>
+            </next>
+          </block>
+        </statement>
+        <next>
+          <block type="hardware_motor_driver_set_speed" inline="true">
+            <field name="PIN">D3</field>
+            <value name="SPEED">
+              <block type="math_number">
+                <field name="NUM">50</field>
+              </block>
+            </value>
+            <next>
+              <block type="ruby_p" inline="true">
+                <value name="ARG">
+                  <block type="hardware_motor_driver_speed">
+                    <field name="PIN">D3</field>
+                  </block>
+                </value>
+                <next>
+                  <block type="hardware_motor_driver">
+                    <field name="PIN">D3</field>
+                    <field name="METHOD">stop</field>
+                  </block>
+                </next>
+              </block>
+            </next>
+          </block>
+        </next>
+      </block>
+    </statement>
+  </block>
+      XML
+    end
+  end
+
+  parts = <<-EOS
+require "smalruby"
+
+init_hardware
+car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
+
+car1.on(:start) do
+  two_wheel_drive_car("D5").left_speed = 50
+  p(two_wheel_drive_car("D5").left_speed)
+  two_wheel_drive_car("D5").forward
+  two_wheel_drive_car("D5").backward
+end
+car1.two_wheel_drive_car("D5").right_speed = 50
+p(car1.two_wheel_drive_car("D5").right_speed)
+car1.two_wheel_drive_car("D5").stop
+  EOS
+  describe compact_source_code(parts) do
+    _parts = parts
+    let(:data) { _parts }
+
+    it '結果が正しいこと' do
+      should eq_block_xml(<<-XML)
+  <character name="car1" x="0" y="0" angle="0" costumes="car1.png" />
+  <block type="hardware_init_hardware" />
+  <block type="character_new">
+    <field name="NAME">car1</field>
+    <statement name="DO">
+      <block type="events_on_start">
+        <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">50</field>
+              </block>
+            </value>
+            <next>
+              <block type="ruby_p" inline="true">
+                <value name="ARG">
+                  <block type="hardware_two_wheel_drive_car_speed">
+                    <field name="PIN">D5</field>
+                    <field name="LOR">left</field>
+                  </block>
+                </value>
+                <next>
+                  <block type="hardware_two_wheel_drive_car_forward">
+                    <field name="PIN">D5</field>
+                    <next>
+                      <block type="hardware_two_wheel_drive_car_backward">
+                        <field name="PIN">D5</field>
+                      </block>
+                    </next>
+                  </block>
+                </next>
+              </block>
+            </next>
+          </block>
+        </statement>
+        <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">50</field>
+              </block>
+            </value>
+            <next>
+              <block type="ruby_p" inline="true">
+                <value name="ARG">
+                  <block type="hardware_two_wheel_drive_car_speed">
+                    <field name="PIN">D5</field>
+                    <field name="LOR">right</field>
+                  </block>
+                </value>
+                <next>
+                  <block type="hardware_two_wheel_drive_car_stop">
+                    <field name="PIN">D5</field>
+                  </block>
+                </next>
+              </block>
+            </next>
+          </block>
+        </next>
+      </block>
+    </statement>
+  </block>
+      XML
+    end
+  end
+
+  parts = <<-EOS
+require "smalruby"
+
+init_hardware
+car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
+
+car1.on(:button_down, "D3") do
+  p(button("D3").up?)
+  p(button("D3").down?)
+  button("D3").not_use_pullup
+end
+p(car1.button("D3").up?)
+p(car1.button("D3").down?)
+car1.button("D3").not_use_pullup
+  EOS
+  describe compact_source_code(parts) do
+    _parts = parts
+    let(:data) { _parts }
+
+    it '結果が正しいこと' do
+      should eq_block_xml(<<-XML)
+  <character name="car1" x="0" y="0" angle="0" costumes="car1.png" />
+  <block type="hardware_init_hardware" />
+  <block type="character_new">
+    <field name="NAME">car1</field>
+    <statement name="DO">
+      <block type="hardware_on_button_down_or_up">
+        <field name="PIN">D3</field>
+        <field name="DOU">down</field>
+        <statement name="DO">
+          <block type="ruby_p" inline="true">
+            <value name="ARG">
+              <block type="hardware_button_down_or_up">
+                <field name="PIN">D3</field>
+                <field name="DOU">up</field>
+              </block>
+            </value>
+            <next>
+              <block type="ruby_p" inline="true">
+                <value name="ARG">
+                  <block type="hardware_button_down_or_up">
+                    <field name="PIN">D3</field>
+                    <field name="DOU">down</field>
+                  </block>
+                </value>
+                <next>
+                  <block type="hardware_button_not_use_pullup">
+                    <field name="PIN">D3</field>
+                  </block>
+                </next>
+              </block>
+            </next>
+          </block>
+        </statement>
+        <next>
+          <block type="ruby_p" inline="true">
+            <value name="ARG">
+              <block type="hardware_button_down_or_up">
+                <field name="PIN">D3</field>
+                <field name="DOU">up</field>
+              </block>
+            </value>
+            <next>
+              <block type="ruby_p" inline="true">
+                <value name="ARG">
+                  <block type="hardware_button_down_or_up">
+                    <field name="PIN">D3</field>
+                    <field name="DOU">down</field>
+                  </block>
+                </value>
+                <next>
+                  <block type="hardware_button_not_use_pullup">
+                    <field name="PIN">D3</field>
+                  </block>
+                </next>
+              </block>
+            </next>
+          </block>
+        </next>
+      </block>
+    </statement>
+  </block>
+      XML
+    end
+  end
 end

data/spec/models/concerns/ruby_to_block/block/motion_spec.rb

@@ -276,7 +276,7 @@ car1.point_towards(car1)
             <next>
               <block type="control_if" inline="true">
                 <value name="COND">
-                  <block type="motion_reach_wall" />
+                  <block type="sensing_reach_wall" />
                 </value>
                 <statement name="THEN">
                   <block type="motion_turn" />

data/spec/models/concerns/ruby_to_block/block/{motion_reach_wall_spec.rb → sensing_reach_wall_spec.rb}

@@ -4,7 +4,7 @@ require_relative 'shared/block_examples'
 
 # rubocop:disable EmptyLines, LineLength
 
-describe RubyToBlock::Block::MotionReachWall, to_blocks: true do
+describe RubyToBlock::Block::SensingReachWall, to_blocks: true do
   parts = <<-EOS
 if reach_wall?
 
@@ -18,7 +18,7 @@ end
       should eq_block_xml(<<-XML)
           <block type="control_if" inline="true">
             <value name="COND">
-              <block type="motion_reach_wall" />
+              <block type="sensing_reach_wall" />
             </value>
           </block>
       XML

data/spec/models/concerns/ruby_to_block/block/text_spec.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+require_relative 'shared/block_examples'
+
+# rubocop:disable EmptyLines, LineLength
+
+describe RubyToBlock::Block::Text, to_blocks: true do
+  parts = <<-EOS
+require "smalruby"
+
+p("こんにちは")
+p("\\"\\"")
+  EOS
+  describe compact_source_code(parts) do
+    _parts = parts
+    let(:data) { _parts }
+
+    it '結果が正しいこと' do
+      should eq_block_xml(<<-XML)
+  <block type="ruby_p" inline="true">
+    <value name="ARG">
+      <block type="text">
+        <field name="TEXT">こんにちは</field>
+      </block>
+    </value>
+    <next>
+      <block type="ruby_p" inline="true">
+        <value name="ARG">
+          <block type="text">
+            <field name="TEXT">&quot;&quot;</field>
+          </block>
+        </value>
+      </block>
+    </next>
+  </block>
+      XML
+    end
+  end
+end