smalruby-editor 0.2.4 → 0.2.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby-editor
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -359,19 +359,12 @@ files:
 - 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_s1_action.rb
-- app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_action_with_sec.rb
-- app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_dc_motor_power_ratio.rb
-- app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_dc_motor_set_power_ratio.rb
-- app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_ir_photoreflector_value.rb
-- app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_led_turn_on_or_off.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_motor_set_speed.rb
-- app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_motor_speed.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_smalrubot_action.rb
+- app/models/concerns/ruby_to_block/block/hardware_smalrubot_action_with_sec.rb
+- app/models/concerns/ruby_to_block/block/hardware_smalrubot_dc_motor_power_ratio.rb
+- app/models/concerns/ruby_to_block/block/hardware_smalrubot_dc_motor_set_power_ratio.rb
+- app/models/concerns/ruby_to_block/block/hardware_smalrubot_led_turn_on_or_off.rb
+- app/models/concerns/ruby_to_block/block/hardware_smalrubot_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
@@ -488,8 +481,8 @@ files:
 - public/apple-touch-icon.png
 - public/assets/application-c196e243630d74071981a16041bf391d.css
 - public/assets/application-c196e243630d74071981a16041bf391d.css.gz
-- public/assets/application-eece3e01e35f8f689e2e282a168f6059.js
-- public/assets/application-eece3e01e35f8f689e2e282a168f6059.js.gz
+- public/assets/application-e64da116c4adad30e499acda9d657fb5.js
+- public/assets/application-e64da116c4adad30e499acda9d657fb5.js.gz
 - public/assets/blockly/msg/js/en_us-d5e1938b2d57c1df954f4411b9165d10.js
 - public/assets/blockly/msg/js/en_us-d5e1938b2d57c1df954f4411b9165d10.js.gz
 - public/assets/blockly/msg/js/ja-9f676d46458a2802b8f5a797c90ae8a4.js
@@ -510,11 +503,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-93f591b19a2a69655db7b53fa00d6b17.json
-- public/assets/msg/en_us-3eb2f104a6bad9c60226ff7475013874.js
-- public/assets/msg/en_us-3eb2f104a6bad9c60226ff7475013874.js.gz
-- public/assets/msg/ja-8450d011b1f093dc4b6b7c467e5bcae4.js
-- public/assets/msg/ja-8450d011b1f093dc4b6b7c467e5bcae4.js.gz
+- public/assets/manifest-beef6aec1f5553cda5a2fe11ef0774ea.json
+- public/assets/msg/en_us-a3f6b99f4b54cfaeed42452de11ab02e.js
+- public/assets/msg/en_us-a3f6b99f4b54cfaeed42452de11ab02e.js.gz
+- public/assets/msg/ja-9323664964a9b8ede99ae16c43db5827.js
+- public/assets/msg/ja-9323664964a9b8ede99ae16c43db5827.js.gz
 - public/assets/progressbar-ee8fb1222f286f625bbf7332844a6a0c.gif
 - public/assets/toolbox_default-e023d3f7a2cc7cc1f54a1224577b3c26.css
 - public/assets/toolbox_default-e023d3f7a2cc7cc1f54a1224577b3c26.css.gz
@@ -606,14 +599,12 @@ files:
 - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_action.feature
 - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_action_with_sec.feature
 - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_dc_motor_power_ratio.feature
-- spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_ir_photoreflector_value.feature
 - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_led_turn_on_or_off.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_dc_motor_power_ratio.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/smalrubot_v3_sensor_value.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
@@ -688,8 +679,7 @@ files:
 - spec/models/concerns/ruby_to_block/block/control_if_spec.rb
 - spec/models/concerns/ruby_to_block/block/control_loop_spec.rb
 - spec/models/concerns/ruby_to_block/block/events_on_start_spec.rb
-- spec/models/concerns/ruby_to_block/block/hardware__smalrubot_s1_spec.rb
-- spec/models/concerns/ruby_to_block/block/hardware__smalrubot_v3_spec.rb
+- spec/models/concerns/ruby_to_block/block/hardware__smalrubot_spec.rb
 - spec/models/concerns/ruby_to_block/block/hardware_spec.rb
 - spec/models/concerns/ruby_to_block/block/looks_say_spec.rb
 - spec/models/concerns/ruby_to_block/block/looks_spec.rb
@@ -786,14 +776,12 @@ test_files:
 - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_action.feature
 - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_action_with_sec.feature
 - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_dc_motor_power_ratio.feature
-- spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_ir_photoreflector_value.feature
 - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_led_turn_on_or_off.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_dc_motor_power_ratio.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/smalrubot_v3_sensor_value.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
@@ -868,8 +856,7 @@ test_files:
 - spec/models/concerns/ruby_to_block/block/control_if_spec.rb
 - spec/models/concerns/ruby_to_block/block/control_loop_spec.rb
 - spec/models/concerns/ruby_to_block/block/events_on_start_spec.rb
-- spec/models/concerns/ruby_to_block/block/hardware__smalrubot_s1_spec.rb
-- spec/models/concerns/ruby_to_block/block/hardware__smalrubot_v3_spec.rb
+- spec/models/concerns/ruby_to_block/block/hardware__smalrubot_spec.rb
 - spec/models/concerns/ruby_to_block/block/hardware_spec.rb
 - spec/models/concerns/ruby_to_block/block/looks_say_spec.rb
 - spec/models/concerns/ruby_to_block/block/looks_spec.rb

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_action.rb

@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-module RubyToBlock
-  module Block
-    class HardwareSmalrubotS1Action < HardwareSmalrubotV3Action
-      # rubocop:disable LineLength
-      blocknize '^\s*' + CHAR_RE +
-                'smalrubot_s1\.' + ACTION_RE +
-                '\s*$',
-                statement: true, inline: true
-      # rubocop:enable LineLength
-    end
-  end
-end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_action_with_sec.rb

@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-module RubyToBlock
-  module Block
-    class HardwareSmalrubotS1ActionWithSec < HardwareSmalrubotV3ActionWithSec
-      # rubocop:disable LineLength
-      blocknize '^\s*' + CHAR_RE +
-                'smalrubot_s1\.' + ACTION_RE +
-                '\(\s*sec:\s*(\d+(?:\.\d+)?)\)' +
-                '\s*$',
-                statement: true, inline: true
-      # rubocop:enable LineLength
-    end
-  end
-end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_dc_motor_power_ratio.rb

@@ -1,26 +0,0 @@
-module RubyToBlock
-  module Block
-    class HardwareSmalrubotS1DcMotorPowerRatio < Value
-      include CharacterOperation
-      include HardwareOperation
-
-      blocknize '^\s*' + CHAR_RE +
-                'smalrubot_s1\.' +
-                LOR_RE + '_dc_motor_power_ratio\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: { LOR: md2[2] })
-        context.add_value(block)
-        block.character = character
-
-        true
-      end
-    end
-  end
-end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_dc_motor_set_power_ratio.rb

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-module RubyToBlock
-  module Block
-    class HardwareSmalrubotS1DcMotorSetPowerRatio < CharacterMethodCall
-      include HardwareOperation
-
-      blocknize '^\s*' + CHAR_RE +
-                'smalrubot_s1\.' +
-                LOR_RE + '_dc_motor_power_ratio\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: { LOR: md2[2] }),
-                                        SPEED: md2[3])
-        true
-      end
-    end
-  end
-end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_action.rb

@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-module RubyToBlock
-  module Block
-    class HardwareSmalrubotV3Action < CharacterMethodCall
-      include HardwareOperation
-
-      # rubocop:disable LineLength
-      blocknize '^\s*' + CHAR_RE +
-                'smalrubot_v3\.' + ACTION_RE +
-                '\s*$',
-                statement: true, inline: true
-      # rubocop:enable LineLength
-
-      def self.process_match_data(md, context)
-        md2 = regexp.match(md[type])
-        add_character_method_call_block(context, md2[1],
-                                        new(fields: { ACTION: md2[2] }))
-        true
-      end
-    end
-  end
-end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_action_with_sec.rb

@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-module RubyToBlock
-  module Block
-    class HardwareSmalrubotV3ActionWithSec < CharacterMethodCall
-      include HardwareOperation
-
-      # rubocop:disable LineLength
-      blocknize '^\s*' + CHAR_RE +
-                'smalrubot_v3\.' + ACTION_RE +
-                '\(\s*sec:\s*(\d+(?:\.\d+)?)\)' +
-                '\s*$',
-                statement: true, inline: true
-      # rubocop:enable LineLength
-
-      def self.process_match_data(md, context)
-        md2 = regexp.match(md[type])
-        add_character_method_call_block(context, md2[1],
-                                        new(fields: { ACTION: md2[2] }),
-                                        SEC: md2[3])
-        true
-      end
-    end
-  end
-end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_light_sensor_value.rb

@@ -1,28 +0,0 @@
-module RubyToBlock
-  module Block
-    class HardwareSmalrubotV3LightSensorValue < Value
-      include CharacterOperation
-
-      # rubocop:disable LineLength
-      blocknize '^\s*' + CHAR_RE +
-                'smalrubot_v3\.' +
-                'light_sensor\.value' +
-                '\s*$',
-                value: true
-      # rubocop:enable LineLength
-
-      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
-        context.add_value(block)
-        block.character = character
-
-        true
-      end
-    end
-  end
-end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_motor_set_speed.rb

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-module RubyToBlock
-  module Block
-    class HardwareSmalrubotV3MotorSetSpeed < CharacterMethodCall
-      include HardwareOperation
-
-      blocknize '^\s*' + CHAR_RE +
-                'smalrubot_v3\.' +
-                LOR_RE + '_motor_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: { LOR: md2[2] }),
-                                        SPEED: md2[3])
-        true
-      end
-    end
-  end
-end

data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_touch_sensor_pressed_or_released.rb

@@ -1,29 +0,0 @@
-module RubyToBlock
-  module Block
-    class HardwareSmalrubotV3TouchSensorPressedOrReleased < Value
-      include CharacterOperation
-      include HardwareOperation
-
-      # rubocop:disable LineLength
-      blocknize '^\s*' + CHAR_RE +
-                'smalrubot_v3\.' +
-                LOR_RE + '_touch_sensor\.' + POR_RE + '\?' +
-                '\s*$',
-                value: true
-      # rubocop:enable LineLength
-
-      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: { LOR: md2[2], POR: md2[3] })
-        context.add_value(block)
-        block.character = character
-
-        true
-      end
-    end
-  end
-end

data/spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_light_sensor_value.feature

@@ -1,92 +0,0 @@
-# encoding: utf-8
-# language: en
-@javascript
-Feature: hardware_smalrubot_v3_light_sensor_value block
-  Scenario: ブロックのみ配置する
-    Given "ブロック" タブを表示する
-
-    When 次のブロックを配置する:
-      """
-      %block{:type => "hardware_smalrubot_v3_light_sensor_value", :x => "0", :y => "0"}
-      """
-    And ブロックからソースコードを生成する
-
-    Then テキストエディタのプログラムは "" であること
-
-  Scenario: 文とブロックを配置する
-    Given "ブロック" タブを表示する
-
-    When 次のブロックを配置する:
-      """
-      %block{:type => "ruby_p", :x => "0", :y => "0", :inline => "true" }
-        %value{:name => "ARG"}
-          %block{:type => "hardware_smalrubot_v3_light_sensor_value", :x => "0", :y => "0"}
-      """
-    And ブロックからソースコードを生成する
-
-    Then テキストエディタのプログラムは以下であること:
-      """
-      require "smalruby"
-
-      p("")
-
-      """
-
-  Scenario: キャラクターとブロックを配置する
-    Given "ブロック" タブを表示する
-    And 次のキャラクターを追加する:
-      | name | costumes | x | y | angle |
-      | car1 | car1.png | 0 | 0 |     0 |
-
-    When 次のブロックを配置する:
-      """
-      %block{:type => "character_new", :x => "21", :y => "15"}
-        %field{:name => "NAME"}<
-          car1
-        %statement{:name => "DO"}
-          %block{:type => "ruby_p", :x => "0", :y => "0", :inline => "true" }
-            %value{:name => "ARG"}
-              %block{:type => "hardware_smalrubot_v3_light_sensor_value", :x => "0", :y => "0"}
-      """
-    And ブロックからソースコードを生成する
-
-    Then テキストエディタのプログラムは以下であること:
-      """
-      require "smalruby"
-
-      car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
-      p(car1.smalrubot_v3.light_sensor.value)
-
-      """
-
-  Scenario: キャラクターとイベントとブロックを配置する
-    Given "ブロック" タブを表示する
-    And 次のキャラクターを追加する:
-      | name | costumes | x | y | angle |
-      | car1 | car1.png | 0 | 0 |     0 |
-
-    When 次のブロックを配置する:
-      """
-      %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 => "ruby_p", :x => "0", :y => "0", :inline => "true" }
-                %value{:name => "ARG"}
-                  %block{:type => "hardware_smalrubot_v3_light_sensor_value", :x => "0", :y => "0"}
-      """
-    And ブロックからソースコードを生成する
-
-    Then テキストエディタのプログラムは以下であること:
-      """
-      require "smalruby"
-
-      car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
-
-      car1.on(:start) do
-        p(smalrubot_v3.light_sensor.value)
-      end
-
-      """