smalruby-editor 0.1.20 → 0.1.21

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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby-editor
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,20 +178,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: smalruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.28
+        version: 0.0.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.28
+        version: 0.0.30
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -327,16 +341,25 @@ files:
 - app/models/concerns/ruby_to_block/block/events_on_click.rb
 - app/models/concerns/ruby_to_block/block/events_on_key_push_or_down.rb
 - app/models/concerns/ruby_to_block/block/events_on_start.rb
+- app/models/concerns/ruby_to_block/block/hardware_button_down_or_up.rb
+- app/models/concerns/ruby_to_block/block/hardware_button_not_use_pullup.rb
 - app/models/concerns/ruby_to_block/block/hardware_init_hardware.rb
 - app/models/concerns/ruby_to_block/block/hardware_led_off.rb
 - app/models/concerns/ruby_to_block/block/hardware_led_on.rb
+- app/models/concerns/ruby_to_block/block/hardware_motor_driver.rb
+- app/models/concerns/ruby_to_block/block/hardware_motor_driver_set_speed.rb
+- app/models/concerns/ruby_to_block/block/hardware_motor_driver_speed.rb
+- app/models/concerns/ruby_to_block/block/hardware_on_button_down_or_up.rb
 - app/models/concerns/ruby_to_block/block/hardware_on_sensor_change.rb
+- app/models/concerns/ruby_to_block/block/hardware_operation.rb
 - app/models/concerns/ruby_to_block/block/hardware_rgb_led_off.rb
 - app/models/concerns/ruby_to_block/block/hardware_rgb_led_on.rb
 - app/models/concerns/ruby_to_block/block/hardware_sensor_value.rb
 - app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car.rb
 - app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car_commands.rb
 - app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car_run.rb
+- app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car_set_speed.rb
+- app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car_speed.rb
 - app/models/concerns/ruby_to_block/block/looks_hide.rb
 - app/models/concerns/ruby_to_block/block/looks_say.rb
 - app/models/concerns/ruby_to_block/block/looks_show.rb
@@ -349,7 +372,6 @@ files:
 - app/models/concerns/ruby_to_block/block/motion_move.rb
 - app/models/concerns/ruby_to_block/block/motion_point_towards_character.rb
 - app/models/concerns/ruby_to_block/block/motion_point_towards_mouse.rb
-- app/models/concerns/ruby_to_block/block/motion_reach_wall.rb
 - app/models/concerns/ruby_to_block/block/motion_rotate_left.rb
 - app/models/concerns/ruby_to_block/block/motion_rotate_right.rb
 - app/models/concerns/ruby_to_block/block/motion_self_angle.rb
@@ -369,8 +391,10 @@ files:
 - app/models/concerns/ruby_to_block/block/require_smalruby.rb
 - app/models/concerns/ruby_to_block/block/ruby_comment.rb
 - app/models/concerns/ruby_to_block/block/ruby_expression.rb
+- app/models/concerns/ruby_to_block/block/ruby_p.rb
 - app/models/concerns/ruby_to_block/block/ruby_statement.rb
 - app/models/concerns/ruby_to_block/block/sensing_hit.rb
+- app/models/concerns/ruby_to_block/block/sensing_reach_wall.rb
 - app/models/concerns/ruby_to_block/block/sound_play.rb
 - app/models/concerns/ruby_to_block/block/sound_preset_sounds.rb
 - app/models/concerns/ruby_to_block/block/text.rb
@@ -417,10 +441,10 @@ files:
 - db/migrate/20131219045113_add_filename_to_source_code.rb
 - db/schema.rb
 - db/seeds.rb
+- demos/adjust_2wd_car.rb.xml
 - demos/car_chase.rb.xml
 - demos/hardware_led.rb.xml
 - demos/pong.rb.xml
-- demos/rgb_led_anode.rb.xml
 - demos/star.rb.xml
 - lib/assets/.keep
 - lib/smalruby_editor.rb
@@ -503,15 +527,21 @@ files:
 - spec/acceptance/block_mode/blocks/events/on_hit.feature
 - spec/acceptance/block_mode/blocks/events/on_key_push_or_down.feature
 - spec/acceptance/block_mode/blocks/events/on_start.feature
+- spec/acceptance/block_mode/blocks/hardware/button_down_or_up.feature
+- spec/acceptance/block_mode/blocks/hardware/button_not_use_pullup.feature
 - spec/acceptance/block_mode/blocks/hardware/init_hardware.feature
 - spec/acceptance/block_mode/blocks/hardware/led_off.feature
 - spec/acceptance/block_mode/blocks/hardware/led_on.feature
+- spec/acceptance/block_mode/blocks/hardware/motor_driver.feature
+- spec/acceptance/block_mode/blocks/hardware/motor_driver_speed.feature
+- spec/acceptance/block_mode/blocks/hardware/on_button_down_or_up.feature
 - spec/acceptance/block_mode/blocks/hardware/on_sensor_change.feature
 - spec/acceptance/block_mode/blocks/hardware/rgb_led_off.feature
 - spec/acceptance/block_mode/blocks/hardware/rgb_led_on.feature
 - spec/acceptance/block_mode/blocks/hardware/sensor_value.feature
 - spec/acceptance/block_mode/blocks/hardware/servo_set_position.feature
 - spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car.feature
+- spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car_speed.feature
 - spec/acceptance/block_mode/blocks/looks/hide.feature
 - spec/acceptance/block_mode/blocks/looks/say.feature
 - spec/acceptance/block_mode/blocks/looks/show.feature
@@ -539,6 +569,7 @@ files:
 - spec/acceptance/block_mode/blocks/operators/negate.feature
 - spec/acceptance/block_mode/blocks/operators/rand.feature
 - spec/acceptance/block_mode/blocks/operators/round.feature
+- spec/acceptance/block_mode/blocks/operators/text.feature
 - spec/acceptance/block_mode/blocks/operators/true_false.feature
 - spec/acceptance/block_mode/blocks/ruby/expression.feature
 - spec/acceptance/block_mode/blocks/ruby/p.feature
@@ -549,6 +580,7 @@ files:
 - spec/acceptance/block_mode/blocks/sensing/input_mouse_pos_x.feature
 - spec/acceptance/block_mode/blocks/sensing/input_mouse_pos_y.feature
 - spec/acceptance/block_mode/blocks/sensing/input_mouse_push_or_down.feature
+- spec/acceptance/block_mode/blocks/sensing/reach_wall.feature
 - spec/acceptance/block_mode/blocks/sensing/time_now.feature
 - spec/acceptance/block_mode/blocks/sound/play.feature
 - spec/acceptance/block_mode/demo.feature
@@ -575,6 +607,7 @@ files:
 - spec/javascripts/collections/character_set_spec.coffee
 - spec/javascripts/models/character_spec.coffee
 - spec/javascripts/models/scene_spec.coffee
+- spec/javascripts/models/source_code_spec.coffee
 - spec/javascripts/spec_helper.js
 - spec/lib/smalruby_editor_spec.rb
 - spec/models/concerns/ruby_to_block/block/character_method_call_spec.rb
@@ -585,15 +618,16 @@ files:
 - spec/models/concerns/ruby_to_block/block/looks_say_spec.rb
 - spec/models/concerns/ruby_to_block/block/looks_spec.rb
 - spec/models/concerns/ruby_to_block/block/motion_move_spec.rb
-- spec/models/concerns/ruby_to_block/block/motion_reach_wall_spec.rb
 - spec/models/concerns/ruby_to_block/block/motion_spec.rb
 - spec/models/concerns/ruby_to_block/block/motion_turn_spec.rb
 - spec/models/concerns/ruby_to_block/block/motion_turn_xy_spec.rb
 - spec/models/concerns/ruby_to_block/block/require_smalruby_spec.rb
 - spec/models/concerns/ruby_to_block/block/ruby_comment_spec.rb
 - spec/models/concerns/ruby_to_block/block/ruby_statement_spec.rb
+- spec/models/concerns/ruby_to_block/block/sensing_reach_wall_spec.rb
 - spec/models/concerns/ruby_to_block/block/shared/block_examples.rb
 - spec/models/concerns/ruby_to_block/block/sound_spec.rb
+- spec/models/concerns/ruby_to_block/block/text_spec.rb
 - spec/models/concerns/ruby_to_block/block_spec.rb
 - spec/models/concerns/ruby_to_block_spec.rb
 - spec/models/source_code_spec.rb
@@ -614,10 +648,10 @@ files:
 - vendor/assets/javascripts/blockly/msg/js/ja.js
 - vendor/assets/javascripts/jquery.blockUI.js
 - vendor/assets/stylesheets/.keep
-- public/assets/application-c8991557a0789ac1bc9220f409e7f1c1.js
-- public/assets/application-c8991557a0789ac1bc9220f409e7f1c1.js.gz
-- public/assets/application-d4fe6c0f970efe8eab9267fd08718d96.css
-- public/assets/application-d4fe6c0f970efe8eab9267fd08718d96.css.gz
+- public/assets/application-734570836cdba680c1568220a51af40f.js
+- public/assets/application-734570836cdba680c1568220a51af40f.js.gz
+- public/assets/application-898cb749439fba4ce44cffeac1216201.css
+- public/assets/application-898cb749439fba4ce44cffeac1216201.css.gz
 - public/assets/favicon-a37c90b368fd8ed436cb8f9e9396465c.ico
 - public/assets/jquery-ui/animated-overlay-c48c87b7a95316f4698484e3b85ee4aa.gif
 - public/assets/jquery-ui/ui-bg_flat_0_aaaaaa_40x100-58b63faadd031ca3db096dfdffd90224.png
@@ -683,15 +717,21 @@ test_files:
 - spec/acceptance/block_mode/blocks/events/on_hit.feature
 - spec/acceptance/block_mode/blocks/events/on_key_push_or_down.feature
 - spec/acceptance/block_mode/blocks/events/on_start.feature
+- spec/acceptance/block_mode/blocks/hardware/button_down_or_up.feature
+- spec/acceptance/block_mode/blocks/hardware/button_not_use_pullup.feature
 - spec/acceptance/block_mode/blocks/hardware/init_hardware.feature
 - spec/acceptance/block_mode/blocks/hardware/led_off.feature
 - spec/acceptance/block_mode/blocks/hardware/led_on.feature
+- spec/acceptance/block_mode/blocks/hardware/motor_driver.feature
+- spec/acceptance/block_mode/blocks/hardware/motor_driver_speed.feature
+- spec/acceptance/block_mode/blocks/hardware/on_button_down_or_up.feature
 - spec/acceptance/block_mode/blocks/hardware/on_sensor_change.feature
 - spec/acceptance/block_mode/blocks/hardware/rgb_led_off.feature
 - spec/acceptance/block_mode/blocks/hardware/rgb_led_on.feature
 - spec/acceptance/block_mode/blocks/hardware/sensor_value.feature
 - spec/acceptance/block_mode/blocks/hardware/servo_set_position.feature
 - spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car.feature
+- spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car_speed.feature
 - spec/acceptance/block_mode/blocks/looks/hide.feature
 - spec/acceptance/block_mode/blocks/looks/say.feature
 - spec/acceptance/block_mode/blocks/looks/show.feature
@@ -719,6 +759,7 @@ test_files:
 - spec/acceptance/block_mode/blocks/operators/negate.feature
 - spec/acceptance/block_mode/blocks/operators/rand.feature
 - spec/acceptance/block_mode/blocks/operators/round.feature
+- spec/acceptance/block_mode/blocks/operators/text.feature
 - spec/acceptance/block_mode/blocks/operators/true_false.feature
 - spec/acceptance/block_mode/blocks/ruby/expression.feature
 - spec/acceptance/block_mode/blocks/ruby/p.feature
@@ -729,6 +770,7 @@ test_files:
 - spec/acceptance/block_mode/blocks/sensing/input_mouse_pos_x.feature
 - spec/acceptance/block_mode/blocks/sensing/input_mouse_pos_y.feature
 - spec/acceptance/block_mode/blocks/sensing/input_mouse_push_or_down.feature
+- spec/acceptance/block_mode/blocks/sensing/reach_wall.feature
 - spec/acceptance/block_mode/blocks/sensing/time_now.feature
 - spec/acceptance/block_mode/blocks/sound/play.feature
 - spec/acceptance/block_mode/demo.feature
@@ -755,6 +797,7 @@ test_files:
 - spec/javascripts/collections/character_set_spec.coffee
 - spec/javascripts/models/character_spec.coffee
 - spec/javascripts/models/scene_spec.coffee
+- spec/javascripts/models/source_code_spec.coffee
 - spec/javascripts/spec_helper.js
 - spec/lib/smalruby_editor_spec.rb
 - spec/models/concerns/ruby_to_block/block/character_method_call_spec.rb
@@ -765,15 +808,16 @@ test_files:
 - spec/models/concerns/ruby_to_block/block/looks_say_spec.rb
 - spec/models/concerns/ruby_to_block/block/looks_spec.rb
 - spec/models/concerns/ruby_to_block/block/motion_move_spec.rb
-- spec/models/concerns/ruby_to_block/block/motion_reach_wall_spec.rb
 - spec/models/concerns/ruby_to_block/block/motion_spec.rb
 - spec/models/concerns/ruby_to_block/block/motion_turn_spec.rb
 - spec/models/concerns/ruby_to_block/block/motion_turn_xy_spec.rb
 - spec/models/concerns/ruby_to_block/block/require_smalruby_spec.rb
 - spec/models/concerns/ruby_to_block/block/ruby_comment_spec.rb
 - spec/models/concerns/ruby_to_block/block/ruby_statement_spec.rb
+- spec/models/concerns/ruby_to_block/block/sensing_reach_wall_spec.rb
 - spec/models/concerns/ruby_to_block/block/shared/block_examples.rb
 - spec/models/concerns/ruby_to_block/block/sound_spec.rb
+- spec/models/concerns/ruby_to_block/block/text_spec.rb
 - spec/models/concerns/ruby_to_block/block_spec.rb
 - spec/models/concerns/ruby_to_block_spec.rb
 - spec/models/source_code_spec.rb

data/demos/rgb_led_anode.rb.xml

@@ -1,83 +0,0 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-  <character name="frog1" x="261" y="191" angle="0" costumes="frog1.png" />
-  <block type="hardware_init_hardware" x="40" y="6" />
-  <block type="character_new" x="45" y="50">
-    <field name="NAME">frog1</field>
-    <statement name="DO">
-      <block type="events_on_click">
-        <statement name="DO">
-          <block type="looks_say" inline="true">
-            <value name="TEXT">
-              <block type="text">
-                <field name="TEXT">ライトをぴかっとさせるでよ♪</field>
-              </block>
-            </value>
-            <next>
-              <block type="hardware_rgb_led_on">
-                <field name="AC">anode</field>
-                <field name="PIN">D3</field>
-                <field name="COLOUR">#3333ff</field>
-                <next>
-                  <block type="control_sleep" inline="true">
-                    <value name="SEC">
-                      <block type="math_number">
-                        <field name="NUM">1</field>
-                      </block>
-                    </value>
-                    <next>
-                      <block type="hardware_rgb_led_on">
-                        <field name="AC">anode</field>
-                        <field name="PIN">D3</field>
-                        <field name="COLOUR">#ffff99</field>
-                        <next>
-                          <block type="control_sleep" inline="true">
-                            <value name="SEC">
-                              <block type="math_number">
-                                <field name="NUM">1</field>
-                              </block>
-                            </value>
-                            <next>
-                              <block type="hardware_rgb_led_on">
-                                <field name="AC">anode</field>
-                                <field name="PIN">D3</field>
-                                <field name="COLOUR">#ff0000</field>
-                                <next>
-                                  <block type="control_sleep" inline="true">
-                                    <value name="SEC">
-                                      <block type="math_number">
-                                        <field name="NUM">1</field>
-                                      </block>
-                                    </value>
-                                    <next>
-                                      <block type="hardware_rgb_led_off">
-                                        <field name="AC">anode</field>
-                                        <field name="PIN">D3</field>
-                                        <next>
-                                          <block type="looks_say" inline="true">
-                                            <value name="TEXT">
-                                              <block type="text">
-                                                <field name="TEXT" />
-                                              </block>
-                                            </value>
-                                          </block>
-                                        </next>
-                                      </block>
-                                    </next>
-                                  </block>
-                                </next>
-                              </block>
-                            </next>
-                          </block>
-                        </next>
-                      </block>
-                    </next>
-                  </block>
-                </next>
-              </block>
-            </next>
-          </block>
-        </statement>
-      </block>
-    </statement>
-  </block>
-</xml>