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

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

data/spec/models/concerns/ruby_to_block_spec.rb

@@ -102,7 +102,7 @@ end
                     <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" />
@@ -305,7 +305,7 @@ end
                     <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/source_code_spec.rb

@@ -75,4 +75,57 @@ describe SourceCode, 'Rubyのソースコードを表現するモデル' do
 
     it { should eq(Digest::SHA256.hexdigest(data)) }
   end
+
+  describe '#summary', 'プログラムの概要を取得する' do
+    describe 'XML形式'do
+      let(:xml_path) { rb_path + '.xml' }
+      let(:data) { Rails.root.join(xml_path).read }
+      let(:source_code) {
+        SourceCode.new(filename: File.basename(xml_path), data: data)
+      }
+
+      subject { source_code.summary }
+
+      {
+        car_chase: {
+          title: '車のおいかけっこ',
+          filename: 'car_chase.rb',
+          imageUrl: '/smalruby/assets/car2.png',
+        },
+        star: {
+          title: 'クリックスターだにゃ～',
+          filename: 'star.rb',
+          imageUrl: '/smalruby/assets/cat1.png',
+        },
+        pong: {
+          title: 'ピンポンゲーム',
+          filename: 'pong.rb',
+          imageUrl: '/smalruby/assets/cat2.png',
+        },
+        hardware_led: {
+          title: 'ライトをぴかっとさせるでよ',
+          filename: 'hardware_led.rb',
+          imageUrl: '/smalruby/assets/frog1.png',
+        },
+        adjust_2wd_car: {
+          title: '2WD車の左右のモーターを調整する',
+          filename: 'adjust_2wd_car.rb',
+          imageUrl: '/smalruby/assets/car2.png',
+        },
+      }.each do |name, summary|
+        _rb_path = "demos/#{name}.rb"
+        context "'#{_rb_path + '.xml'}'" do
+          let(:rb_path) { _rb_path }
+
+          summary.each do |key, value|
+            describe key do
+              subject { super()[key] }
+
+              it { should eq(value) }
+            end
+          end
+        end
+      end
+    end
+  end
 end

data/spec/steps/base_steps.rb

@@ -254,6 +254,11 @@ step 'ホームディレクトリの :filename の内容が :program である
   expect(path.read).to eq(program)
 end
 
+step 'ホームディレクトリの :filename が次の内容であること:' do |filename, program|
+  path = Pathname("~/#{filename}").expand_path
+  expect(path.read).to eq(program)
+end
+
 step ':directory ディレクトリに :program という内容の :filename が存在する' do
   |directory, program, filename|
   File.open(Pathname("#{directory}/#{filename}").expand_path, 'w') do |f|