RubyGems - smalruby-editor - Versions diffs - 0.1.24 → 0.2.0 - Mend

smalruby-editor 0.1.24 → 0.2.0

Potentially problematic release.

This version of smalruby-editor might be problematic. Click here for more details.

Files changed (51) hide show

data/spec/models/concerns/ruby_to_block_spec.rb CHANGED

@@ -423,13 +423,13 @@ frog1 = Character.new(costume: "frog1.png", x: 261, y: 191, angle: 0)
 frog1.on(:click) do
   say(message: "ライトをぴかっとさせるでよ♪")
-  rgb_led_anode("D3").on(color: [51, 51, 255])
+  rgb_led_anode("D3").color = [51, 51, 255]
   sleep(1)
-  rgb_led_anode("D3").on(color: [255, 255, 153])
+  rgb_led_anode("D3").color = [255, 255, 153]
   sleep(1)
-  rgb_led_anode("D3").on(color: [255, 0, 0])
+  rgb_led_anode("D3").color = [255, 0, 0]
   sleep(1)
-  rgb_led_anode("D3").off
+  rgb_led_anode("D3").turn_off
   say(message: "")
 end
     EOS
@@ -453,7 +453,7 @@ end
               </block>
             </value>
             <next>
-              <block type="hardware_rgb_led_on">
+              <block type="hardware_rgb_led_set_color">
                 <field name="AC">anode</field>
                 <field name="PIN">D3</field>
                 <field name="COLOUR">#3333ff</field>
@@ -465,7 +465,7 @@ end
                       </block>
                     </value>
                     <next>
-                      <block type="hardware_rgb_led_on">
+                      <block type="hardware_rgb_led_set_color">
                         <field name="AC">anode</field>
                         <field name="PIN">D3</field>
                         <field name="COLOUR">#ffff99</field>
@@ -477,7 +477,7 @@ end
                               </block>
                             </value>
                             <next>
-                              <block type="hardware_rgb_led_on">
+                              <block type="hardware_rgb_led_set_color">
                                 <field name="AC">anode</field>
                                 <field name="PIN">D3</field>
                                 <field name="COLOUR">#ff0000</field>
@@ -489,7 +489,7 @@ end
                                       </block>
                                     </value>
                                     <next>
-                                      <block type="hardware_rgb_led_off">
+                                      <block type="hardware_rgb_led_turn_off">
                                         <field name="AC">anode</field>
                                         <field name="PIN">D3</field>
                                         <next>

data/spec/steps/block_mode_steps.rb CHANGED

@@ -50,6 +50,14 @@ step '次のキャラクターを追加する:' do |table|
   end
 end
+step 'キャラクターcar1を追加する' do
+  table = Turnip::Table.new([
+                             %w(name costumes x y angle),
+                             %w(car1 car1.png 0 0 0),
+                            ])
+  step '次のキャラクターを追加する:', table
+end
 step '次のXMLと同等のブロックが配置されていること:' do |xml|
   expect(page.evaluate_script('Smalruby.dumpXml()')).to eq(xml)
 end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby-editor
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.2.0
 platform: ruby
 authors:
 - Kouji Takao
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.32
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.32
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -330,20 +330,22 @@ 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_button_pressed_or_released.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_led_turn_off.rb
+- app/models/concerns/ruby_to_block/block/hardware_led_turn_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_rgb_led_set_color.rb
+- app/models/concerns/ruby_to_block/block/hardware_rgb_led_turn_off.rb
 - app/models/concerns/ruby_to_block/block/hardware_sensor_value.rb
+- app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_action.rb
+- app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_action_with_sec.rb
+- app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_led_turn_on_or_off.rb
+- app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_light_sensor_value.rb
+- app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_touch_sensor_pressed_or_released.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
@@ -454,10 +456,10 @@ files:
 - public/422.html
 - public/500.html
 - public/apple-touch-icon.png
+- public/assets/application-b305a6ea9e7c045a8e170bbf6fb09dd1.js
+- public/assets/application-b305a6ea9e7c045a8e170bbf6fb09dd1.js.gz
 - public/assets/application-d5358d75a2c4e570c749b333c59b55ab.css
 - public/assets/application-d5358d75a2c4e570c749b333c59b55ab.css.gz
-- public/assets/application-fda71a642d958ffbaf90185c471d6e51.js
-- public/assets/application-fda71a642d958ffbaf90185c471d6e51.js.gz
 - public/assets/blockly/msg/js/en_us-6f7333af29688596ef863fa36a22cb41.js
 - public/assets/blockly/msg/js/en_us-6f7333af29688596ef863fa36a22cb41.js.gz
 - public/assets/blockly/msg/js/ja-d2cbf808bda8180571bc5f39141a98fe.js
@@ -478,11 +480,11 @@ files:
 - public/assets/jquery-ui/ui-icons_888888_256x240-ce584ffa171c3ea9a018cf0d7bec65c8.png
 - public/assets/jquery-ui/ui-icons_cd0a0a_256x240-747e96029e8dedcabc224e5f7d1f2ede.png
 - public/assets/loading-e77296be32d066d3e29d3bf9803fa417.gif
-- public/assets/manifest-1a9856df207640ec658271db34b30dbb.json
-- public/assets/msg/en_us-893d970ff8061fbe7459f009582c4df5.js
-- public/assets/msg/en_us-893d970ff8061fbe7459f009582c4df5.js.gz
-- public/assets/msg/ja-4d22bd0341f464f9d1b9f373121bce6d.js
-- public/assets/msg/ja-4d22bd0341f464f9d1b9f373121bce6d.js.gz
+- public/assets/manifest-ebd584fa603a378faf780f013e6a447d.json
+- public/assets/msg/en_us-c6f8f0084f38560bf933b742ede64a52.js
+- public/assets/msg/en_us-c6f8f0084f38560bf933b742ede64a52.js.gz
+- public/assets/msg/ja-3703e6ceebd04ae1f08b0e871800539d.js
+- public/assets/msg/ja-3703e6ceebd04ae1f08b0e871800539d.js.gz
 - public/assets/progressbar-ee8fb1222f286f625bbf7332844a6a0c.gif
 - public/blockly/media/1x1.gif
 - public/blockly/media/click.mp3
@@ -552,19 +554,22 @@ 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/button_pressed_or_released.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/led_turn_off.feature
+- spec/acceptance/block_mode/blocks/hardware/led_turn_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/rgb_led_set_color.feature
+- spec/acceptance/block_mode/blocks/hardware/rgb_led_turn_off.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/smalrubot_v3_action.feature
+- spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_action_with_sec.feature
+- spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_led_turn_on_or_off.feature
+- spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_light_sensor_value.feature
+- spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_motor_speed.feature
+- spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_touch_sensor_pressed_or_released.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
@@ -721,19 +726,22 @@ 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/button_pressed_or_released.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/led_turn_off.feature
+- spec/acceptance/block_mode/blocks/hardware/led_turn_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/rgb_led_set_color.feature
+- spec/acceptance/block_mode/blocks/hardware/rgb_led_turn_off.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/smalrubot_v3_action.feature
+- spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_action_with_sec.feature
+- spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_led_turn_on_or_off.feature
+- spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_light_sensor_value.feature
+- spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_motor_speed.feature
+- spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_touch_sensor_pressed_or_released.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

data/app/models/concerns/ruby_to_block/block/hardware_button_not_use_pullup.rb DELETED

@@ -1,18 +0,0 @@
-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_on_button_down_or_up.rb DELETED

@@ -1,19 +0,0 @@
-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_on_sensor_change.rb DELETED

@@ -1,17 +0,0 @@
-module RubyToBlock
-  module Block
-    class HardwareOnSensorChange < CharacterEvent
-      # rubocop:disable LineLength
-      blocknize '^\s*' + CHAR_RE + 'on\(:sensor_change,\s*"(A[0-5])"\s*\)\s+do\s*$',
-                statement: true, indent: true
-      # rubocop:enable LineLength
-      def self.process_match_data(md, context)
-        md2 = regexp.match(md[type])
-        add_character_event_blocks(context, md2[1],
-                                   new(fields: { PIN: md2[2] }))
-        true
-      end
-    end
-  end
-end

data/spec/acceptance/block_mode/blocks/hardware/led_off.feature DELETED

@@ -1,75 +0,0 @@
-# encoding: utf-8
-# language: ja
-@javascript
-機能: hardware_led_off - 「LED[▼ピン]をオフにする」ブロック
-  シナリオ: ブロックのみ配置する
-    前提 "ブロック" タブを表示する
-    もし 次のブロックを配置する:
-    """
-    %block{:type => "hardware_led_off", :x => "0", :y => "0"}
-      %field{:name => "PIN"}<
-        D13
-    """
-    かつ ブロックからソースコードを生成する
-    ならば テキストエディタのプログラムは "" であること
-  シナリオ: キャラクターとブロックを配置する
-    前提 "ブロック" タブを表示する
-    かつ 次のキャラクターを追加する:
-      | name | costumes | x | y | angle |
-      | car1 | car1.png | 0 | 0 |     0 |
-    もし 次のブロックを配置する:
-    """
-    %block{:type => "character_new", :x => "21", :y => "15"}
-      %field{:name => "NAME"}<
-        car1
-      %statement{:name => "DO"}
-        %block{:type => "hardware_led_off", :x => "0", :y => "0"}
-          %field{:name => "PIN"}<
-            D13
-    """
-    かつ ブロックからソースコードを生成する
-    ならば テキストエディタのプログラムは以下であること:
-    """
-    require "smalruby"
-    car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
-    car1.led("D13").off
-    """
-  シナリオ: キャラクターとイベントとブロックを配置する
-    前提 "ブロック" タブを表示する
-    かつ 次のキャラクターを追加する:
-      | name | costumes | x | y | angle |
-      | car1 | car1.png | 0 | 0 |     0 |
-    もし 次のブロックを配置する:
-    """
-    %block{:type => "character_new", :x => "21", :y => "15"}
-      %field{:name => "NAME"}<
-        car1
-      %statement{:name => "DO"}
-        %block{:type => "events_on_start"}
-          %statement{:name => "DO"}
-            %block{:type => "hardware_led_off", :x => "0", :y => "0"}
-              %field{:name => "PIN"}<
-                D13
-    """
-    かつ ブロックからソースコードを生成する
-    ならば テキストエディタのプログラムは以下であること:
-    """
-    require "smalruby"
-    car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
-    car1.on(:start) do
-      led("D13").off
-    end
-    """

data/spec/acceptance/block_mode/blocks/hardware/led_on.feature DELETED

@@ -1,75 +0,0 @@
-# encoding: utf-8
-# language: ja
-@javascript
-機能: hardware_led_on - 「LED[▼ピン]をオンにする」ブロック
-  シナリオ: ブロックのみ配置する
-    前提 "ブロック" タブを表示する
-    もし 次のブロックを配置する:
-    """
-    %block{:type => "hardware_led_on", :x => "0", :y => "0"}
-      %field{:name => "PIN"}<
-        D13
-    """
-    かつ ブロックからソースコードを生成する
-    ならば テキストエディタのプログラムは "" であること
-  シナリオ: キャラクターとブロックを配置する
-    前提 "ブロック" タブを表示する
-    かつ 次のキャラクターを追加する:
-      | name | costumes | x | y | angle |
-      | car1 | car1.png | 0 | 0 |     0 |
-    もし 次のブロックを配置する:
-    """
-    %block{:type => "character_new", :x => "21", :y => "15"}
-      %field{:name => "NAME"}<
-        car1
-      %statement{:name => "DO"}
-        %block{:type => "hardware_led_on", :x => "0", :y => "0"}
-          %field{:name => "PIN"}<
-            D13
-    """
-    かつ ブロックからソースコードを生成する
-    ならば テキストエディタのプログラムは以下であること:
-    """
-    require "smalruby"
-    car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
-    car1.led("D13").on
-    """
-  シナリオ: キャラクターとイベントとブロックを配置する
-    前提 "ブロック" タブを表示する
-    かつ 次のキャラクターを追加する:
-      | name | costumes | x | y | angle |
-      | car1 | car1.png | 0 | 0 |     0 |
-    もし 次のブロックを配置する:
-    """
-    %block{:type => "character_new", :x => "21", :y => "15"}
-      %field{:name => "NAME"}<
-        car1
-      %statement{:name => "DO"}
-        %block{:type => "events_on_start"}
-          %statement{:name => "DO"}
-            %block{:type => "hardware_led_on", :x => "0", :y => "0"}
-              %field{:name => "PIN"}<
-                D13
-    """
-    かつ ブロックからソースコードを生成する
-    ならば テキストエディタのプログラムは以下であること:
-    """
-    require "smalruby"
-    car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
-    car1.on(:start) do
-      led("D13").on
-    end
-    """

data/spec/acceptance/block_mode/blocks/hardware/on_button_down_or_up.feature DELETED

@@ -1,87 +0,0 @@
-# encoding: utf-8
-# language: ja
-@javascript
-機能: hardware_on_button_down_or_up - 「ボタン[▼PIN]が[▼押された]とき」ブロック
-  シナリオ: ブロックのみ配置する
-    前提 "ブロック" タブを表示する
-    もし 次のブロックを配置する:
-    """
-    %block{:type => "hardware_on_button_down_or_up", :x => "0", :y => "0"}
-      %field{:name => "PIN"}<
-        D2
-      %field{:name => "DOU"}<
-        down
-    """
-    かつ ブロックからソースコードを生成する
-    ならば テキストエディタのプログラムは "" であること
-  シナリオ: キャラクターとブロックを配置する
-    前提 "ブロック" タブを表示する
-    かつ 次のキャラクターを追加する:
-      | name | costumes | x | y | angle |
-      | car1 | car1.png | 0 | 0 |     0 |
-    もし 次のブロックを配置する:
-    """
-    %block{:type => "character_new", :x => "21", :y => "15"}
-      %field{:name => "NAME"}<
-        car1
-      %statement{:name => "DO"}
-        %block{:type => "hardware_on_button_down_or_up", :x => "0", :y => "0"}
-          %field{:name => "PIN"}<
-            D2
-          %field{:name => "DOU"}<
-            down
-    """
-    かつ ブロックからソースコードを生成する
-    ならば テキストエディタのプログラムは以下であること:
-    """
-    require "smalruby"
-    car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
-    car1.on(:button_down, "D2") do
-    end
-    """
-  シナリオ: キャラクターとイベントとブロックを配置する
-    前提 "ブロック" タブを表示する
-    かつ 次のキャラクターを追加する:
-      | name | costumes | x | y | angle |
-      | car1 | car1.png | 0 | 0 |     0 |
-    もし 次のブロックを配置する:
-    """
-    %block{:type => "character_new", :x => "21", :y => "15"}
-      %field{:name => "NAME"}<
-        car1
-      %statement{:name => "DO"}
-        %block{:type => "events_on_start"}
-          %statement{:name => "DO"}
-            %block{:type => "hardware_on_button_down_or_up", :x => "0", :y => "0"}
-              %field{:name => "PIN"}<
-                D2
-              %field{:name => "DOU"}<
-                up
-    """
-    かつ ブロックからソースコードを生成する
-    ならば テキストエディタのプログラムは以下であること:
-    """
-    require "smalruby"
-    car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
-    car1.on(:start) do
-      on(:button_up, "D2") do
-      end
-    end
-    """