smalruby-editor 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59bea4fd2cb13d2beba62439389718dfd4df9634
-  data.tar.gz: 517ffe74246bc3d0798cee22cee17fdcf7cf3c35
+  metadata.gz: d519d07db19419635f0be2aa269950b37b83f1d3
+  data.tar.gz: a06bc9dcc87dbb3f5b25075281a18305f706ca15
 SHA512:
-  metadata.gz: e01be5a60a0fdadb05f51330e68eb55d05229f8171e60652047795e6c2eb173fc0e4b46e7a73c0f22b0cea202297dbf781f861011f92573dad751e3189dc83bf
-  data.tar.gz: 3bd68304ff57c0319d7efa944179f646ea3887b52fb8500527c715c03b3ed358d323d522511b4e869ed7f8a596d07f27c54a793405eb74149de289a694915b5f
+  metadata.gz: 7620ae47249b1052a4076bc18287f19f738f5baa6e9e3820356f1f2b956486c01d43e27f3c26ed74002b972108da171786e00b598b6952eb7f15738e2213cc58
+  data.tar.gz: e19c3affd303d060f88741f875a970c2f88b97004e281cc93876b93b1d72decd8ad6c9cfae6c66b53547d20e81d51d411901cdcbece5fa657c2ebb366b47519a

data/.rubocop.yml

@@ -37,3 +37,11 @@ ClassLength:
 # LoadErrorなど、rescueブロックを空にすることはよくあるため。
 HandleExceptions:
   Enabled: false
+
+# when use if/unless modifier, can't check coverage
+IfUnlessModifier:
+  Enabled: false
+
+# this is not important for me.
+StringLiterals:
+  Enabled: false

data/Guardfile

@@ -17,12 +17,19 @@ group :red_green_refactor, halt_on_fail: true do
     watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
   end
 
-  guard :rspec, cmd: 'bundle exec bin/rspec' do
+  guard :rspec, cmd: 'bundle exec bin/spring rspec' do
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
     watch('spec/spec_helper.rb')  { "spec" }
 
     # Rails example
+    watch(%r{^app/models/concerns/ruby_to_block/block/hardware_(.*)\.rb$}) { |m|
+      if /smalrubot/.match(m[1])
+        "spec/models/concerns/ruby_to_block/block/hardware__smalrubot_spec.rb"
+      else
+        "spec/models/concerns/ruby_to_block/block/hardware_spec.rb"
+      end
+    }
     watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
     watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
     watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }

data/app/assets/javascripts/blocks/hardware.js.coffee.erb

@@ -453,158 +453,15 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   pin = @getFieldValue('PIN')
   Blockly.Ruby.characterMethodCallInput_("sensor(#{Blockly.Ruby.quote_(pin)}).value")
 
-# SmalrubotV3 sub category
-<% subcategory = 'smalrubot_v3' %>
-
-# turn on/off Smalrubot v3 red/green LED
-<% n = "#{category}_#{subcategory}_led_turn_on_or_off" %>
-Blockly.Blocks['<%= n %>'] =
-  init: ()->
-    colourDropdown = [
-      [<%= bm('colour.red') %>, 'red'],
-      [<%= bm('colour.green') %>, 'green'],
-    ]
-    oooDropdown = [
-      [<%= bm('common.turn_on') %>, 'turn_on'],
-      [<%= bm('common.turn_off') %>, 'turn_off'],
-    ]
-
-    @setHelpUrl('')
-    @setColour(<%= colors[:looks] %>)
-    @interpolateMsg(<%= bm(".#{subcategory}_led_turn_on_or_off") %>,
-                    ['COLOUR', new Blockly.FieldDropdown(colourDropdown)],
-                    ['OOO', new Blockly.FieldDropdown(oooDropdown)],
-                    Blockly.ALIGN_RIGHT)
-    @setInputsInline(true)
-    @setPreviousStatement(true)
-    @setNextStatement(true)
-    @setTooltip('')
-
-Blockly.Ruby['<%= n %>'] = (block) ->
-  colour = @getFieldValue('COLOUR')
-  ooo = @getFieldValue('OOO')
-  Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{colour}_led.#{ooo}")
-
-# Smalrubot v3 left/right motor speed
-<% n = "#{category}_#{subcategory}_motor_speed" %>
-Blockly.Blocks['<%= n %>'] =
-  init: ()->
-    @setHelpUrl('')
-    @setColour(<%= colors[:sensing] %>)
-    @interpolateMsg(<%= bm(".#{subcategory}_motor_speed") %>,
-                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
-                    Blockly.ALIGN_RIGHT)
-    @setOutput(true, 'Number')
-    @setTooltip('')
-
-Blockly.Ruby['<%= n %>'] = (block) ->
-  lor = @getFieldValue('LOR')
-  Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.#{lor}_motor.speed")
-
-# set Smalrubot v3 left/right motor speed
-<% n = "#{category}_#{subcategory}_motor_set_speed" %>
-Blockly.Blocks['<%= n %>'] =
-  init: ()->
-    @setHelpUrl('')
-    @setColour(<%= colors[:motion] %>)
-    @interpolateMsg(<%= bm(".#{subcategory}_motor_set_speed") %>,
-                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
-                    ['SPEED', ['Number'], Blockly.ALIGN_RIGHT],
-                    Blockly.ALIGN_RIGHT)
-    @setInputsInline(true)
-    @setPreviousStatement(true)
-    @setNextStatement(true)
-    @setTooltip('')
-
-Blockly.Ruby['<%= n %>'] = (block) ->
-  lor = @getFieldValue('LOR')
-  speed = Blockly.Ruby.valueToCode(@, 'SPEED', Blockly.Ruby.ORDER_NONE) || '100'
-  Blockly.Ruby.characterSetVariable_("<%= subcategory %>.#{lor}_motor.speed",
-                                     speed)
-
-# forward/backward/turn left/turn right/stop Smalrubot v3
-<% n = "#{category}_#{subcategory}_action" %>
-Blockly.Blocks['<%= n %>'] =
-  init: ()->
-    @setHelpUrl('')
-    @setColour(<%= colors[:motion] %>)
-    @interpolateMsg(<%= bm(".#{subcategory}_action") %>,
-                    ['ACTION', new Blockly.FieldDropdown(actionDropdown)],
-                    Blockly.ALIGN_RIGHT)
-    @setInputsInline(true)
-    @setPreviousStatement(true)
-    @setNextStatement(true)
-    @setTooltip('')
-
-Blockly.Ruby['<%= n %>'] = (block) ->
-  action = @getFieldValue('ACTION')
-  Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{action}")
-
-# forward/backward/turn left/turn right/stop Smalrubot v3 for ( ) secs
-<% n = "#{category}_#{subcategory}_action_with_sec" %>
-Blockly.Blocks['<%= n %>'] =
-  init: ()->
-    @setHelpUrl('')
-    @setColour(<%= colors[:motion] %>)
-    @interpolateMsg(<%= bm(".#{subcategory}_action_with_sec") %>,
-                    ['ACTION', new Blockly.FieldDropdown(actionDropdown)],
-                    ['SEC', ['Number'], Blockly.ALIGN_RIGHT],
-                    Blockly.ALIGN_RIGHT)
-    @setInputsInline(true)
-    @setPreviousStatement(true)
-    @setNextStatement(true)
-    @setTooltip('')
-
-Blockly.Ruby['<%= n %>'] = (block) ->
-  action = @getFieldValue('ACTION')
-  sec = Blockly.Ruby.valueToCode(@, 'SEC', Blockly.Ruby.ORDER_FUNCTION_CALL) || 'nil'
-  Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{action}(sec: #{sec})")
-
-# Smalrubot v3 touch sensor pressed/released
-<% n = "#{category}_#{subcategory}_touch_sensor_pressed_or_released" %>
-Blockly.Blocks['<%= n %>'] =
-  init: ()->
-    porDropdown = window.SmalrubyEditor.Sensing.PressedOrReleasedDropdown
-
-    @setHelpUrl('')
-    @setColour(<%= colors[:sensing] %>)
-    @interpolateMsg(<%= bm(".#{subcategory}_touch_sensor_pressed_or_released") %>,
-                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
-                    ['POR', new Blockly.FieldDropdown(porDropdown)],
-                    Blockly.ALIGN_RIGHT)
-    @setOutput(true, 'Boolean')
-    @setTooltip('')
-
-Blockly.Ruby['<%= n %>'] = (block) ->
-  lor = @getFieldValue('LOR')
-  por = @getFieldValue('POR')
-  Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.#{lor}_touch_sensor.#{por}?")
-
-# Smalrubot v3 light sensor value
-<% n = "#{category}_#{subcategory}_light_sensor_value" %>
-Blockly.Blocks['<%= n %>'] =
-  init: ()->
-    @setHelpUrl('')
-    @setColour(<%= colors[:sensing] %>)
-    @appendDummyInput().appendField(<%= bm(".#{subcategory}_light_sensor_value") %>)
-    @setOutput(true, 'Number')
-    @setTooltip('')
-
-Blockly.Ruby['<%= n %>'] = (block) ->
-  Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.light_sensor.value")
-
 
+# SmalrubotV3 sub category
 # SmalrubotS1 sub category
-<% subcategory = 'smalrubot_s1' %>
+<% %w(smalrubot_v3 smalrubot_s1).each do |subcategory| %>
 
 # turn on/off Smalrubot s1 blue/white LED
 <% n = "#{category}_#{subcategory}_led_turn_on_or_off" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
-    colourDropdown = [
-      [<%= bm('colour.blue') %>, 'blue'],
-      [<%= bm('colour.white') %>, 'white'],
-    ]
     oooDropdown = [
       [<%= bm('common.turn_on') %>, 'turn_on'],
       [<%= bm('common.turn_off') %>, 'turn_off'],
@@ -613,7 +470,7 @@ Blockly.Blocks['<%= n %>'] =
     @setHelpUrl('')
     @setColour(<%= colors[:looks] %>)
     @interpolateMsg(<%= bm(".#{subcategory}_led_turn_on_or_off") %>,
-                    ['COLOUR', new Blockly.FieldDropdown(colourDropdown)],
+                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
                     ['OOO', new Blockly.FieldDropdown(oooDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setInputsInline(true)
@@ -622,9 +479,9 @@ Blockly.Blocks['<%= n %>'] =
     @setTooltip('')
 
 Blockly.Ruby['<%= n %>'] = (block) ->
-  colour = @getFieldValue('COLOUR')
+  lor = @getFieldValue('LOR')
   ooo = @getFieldValue('OOO')
-  Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{ooo}_#{colour}_led")
+  Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{ooo}_#{lor}_led")
 
 # forward/backward/turn left/turn right/stop Smalrubot s1
 <% n = "#{category}_#{subcategory}_action" %>
@@ -664,13 +521,13 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   sec = Blockly.Ruby.valueToCode(@, 'SEC', Blockly.Ruby.ORDER_FUNCTION_CALL) || 'nil'
   Blockly.Ruby.characterMethodCall_("<%= subcategory %>.#{action}(sec: #{sec})")
 
-# Smalrubot s1 left/right ir photoreflector value
-<% n = "#{category}_#{subcategory}_ir_photoreflector_value" %>
+# Smalrubot s1 left/right sensor value
+<% n = "#{category}_#{subcategory}_sensor_value" %>
 Blockly.Blocks['<%= n %>'] =
   init: ()->
     @setHelpUrl('')
     @setColour(<%= colors[:sensing] %>)
-    @interpolateMsg(<%= bm(".#{subcategory}_ir_photoreflector_value") %>,
+    @interpolateMsg(<%= bm(".#{subcategory}_sensor_value") %>,
                     ['LOR', new Blockly.FieldDropdown(lorDropdown)],
                     Blockly.ALIGN_RIGHT)
     @setOutput(true, 'Boolean')
@@ -678,7 +535,7 @@ Blockly.Blocks['<%= n %>'] =
 
 Blockly.Ruby['<%= n %>'] = (block) ->
   lor = @getFieldValue('LOR')
-  Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.#{lor}_ir_photoreflector_value")
+  Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.#{lor}_sensor_value")
 
 # Smalrubot s1 left/right dc motor power ratio
 <% n = "#{category}_#{subcategory}_dc_motor_power_ratio" %>
@@ -716,3 +573,5 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   speed = Blockly.Ruby.valueToCode(@, 'SPEED', Blockly.Ruby.ORDER_NONE) || '100'
   Blockly.Ruby.characterSetVariable_("<%= subcategory %>.#{lor}_dc_motor_power_ratio",
                                      speed)
+
+<% end %>

data/app/assets/javascripts/msg/en_us.js

@@ -252,17 +252,17 @@ Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_SET_SPEED = "set (motor driver %1's) mo
 Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_SPEED = "(motor driver %1's) motor speed (%)";
 Blockly.Msg.BLOCKS_HARDWARE_BUTTON_PRESSED_OR_RELEASED = 'button %1 %2 ?';
 Blockly.Msg.BLOCKS_HARDWARE_SENSOR_VALUE = 'sensor %1 value';
+
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LED_TURN_ON_OR_OFF = '%2 Smalrubot v3 %1 LED';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SPEED = 'Smalrubot v3 %1 motor speed';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SET_SPEED = 'set Smalrubot v3 %1 motor speed to %2 %';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION = '%1 Smalrubot v3';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION_WITH_SEC = '%1 Smalrubot v3 for %2 secs';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_TOUCH_SENSOR_PRESSED_OR_RELEASED = 'Smalrubot v3 %1 touch sensor %2 ?';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LIGHT_SENSOR_VALUE = 'Smalrubot v3 light sensor value';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_SENSOR_VALUE = 'Smalrubot v3 %1 sensor';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_DC_MOTOR_POWER_RATIO = 'Smalrubot v3 %1 dc motor power ratio';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_DC_MOTOR_SET_POWER_RATIO = 'set Smalrubot v3 %1 dc motor power ratio to %2 %';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_LED_TURN_ON_OR_OFF = '%2 Smalrubot s1 %1 LED';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION = '%1 Smalrubot s1';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION_WITH_SEC = '%1 Smalrubot s1 for %2 secs';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_IR_PHOTOREFLECTOR_VALUE = 'Smalrubot s1 %1 IR Photoreflector';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_SENSOR_VALUE = 'Smalrubot s1 %1 sensor';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_DC_MOTOR_POWER_RATIO = 'Smalrubot s1 %1 dc motor power ratio';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_DC_MOTOR_SET_POWER_RATIO = 'set Smalrubot s1 %1 dc motor power ratio to %2 %';
 

data/app/assets/javascripts/msg/ja.js

@@ -86,6 +86,7 @@ Blockly.Msg.VIEWS_SIGNIN_MODAL_VIEW_ERROR = 'ログインに失敗しました';
 
 // blocks/motion.js.coffee.erb
 Blockly.Msg.BLOCKS_MOTION_MOVE = '■%1歩動かす';
+Blockly.Msg.BLOCKS_MOTION_MOVE2 = '■%1歩動かす2';
 Blockly.Msg.BLOCKS_MOTION_TURN_RIGHT_DEGREES = '■時計回りに%1度回す';
 Blockly.Msg.BLOCKS_MOTION_TURN_LEFT_DEGREES = '■反時計回りに%1度回す';
 Blockly.Msg.BLOCKS_MOTION_POINT_IN_DIRECTION = '■%1 度に向ける';
@@ -253,16 +254,15 @@ Blockly.Msg.BLOCKS_HARDWARE_MOTOR_DRIVER_SPEED = '◎(モータードライバ %
 Blockly.Msg.BLOCKS_HARDWARE_BUTTON_PRESSED_OR_RELEASED = '◎ボタン %1 が %2 ？';
 Blockly.Msg.BLOCKS_HARDWARE_SENSOR_VALUE = '◎センサー %1';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LED_TURN_ON_OR_OFF = '★スモウルボットV3の %1 LEDを %2';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SPEED = '◎スモウルボットV3の %1 モーターの速度(%)';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_MOTOR_SET_SPEED = '■スモウルボットV3の %1 モーターの速度を %2 (%) にする';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION = '■スモウルボットV3を %1';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_ACTION_WITH_SEC = '■スモウルボットV3を %2 秒 %1';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_TOUCH_SENSOR_PRESSED_OR_RELEASED = '◎スモウルボットV3の %1 のタッチセンサーが %2 ？';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_LIGHT_SENSOR_VALUE = '◎スモウルボットV3の光センサー';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_SENSOR_VALUE = '◎スモウルボットV3の %1 のセンサー';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_DC_MOTOR_POWER_RATIO = '◎スモウルボットV3の %1 DCモーターの速度(%)';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_V3_DC_MOTOR_SET_POWER_RATIO = '■スモウルボットV3の %1 DCモーターの速度を %2 (%) にする';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_LED_TURN_ON_OR_OFF = '★スモウルボットS1の %1 LEDを %2';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION = '■スモウルボットS1を %1';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION_WITH_SEC = '■スモウルボットS1を %2 秒 %1';
-Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_IR_PHOTOREFLECTOR_VALUE = '◎スモウルボットS1の %1 のセンサー';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_SENSOR_VALUE = '◎スモウルボットS1の %1 のセンサー';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_DC_MOTOR_POWER_RATIO = '◎スモウルボットS1の %1 DCモーターの速度(%)';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_DC_MOTOR_SET_POWER_RATIO = '■スモウルボットS1の %1 DCモーターの速度を %2 (%) にする';
 

data/app/helpers/sessions_helper.rb

@@ -1,2 +1,6 @@
 module SessionsHelper
+  # whether signed in or not.
+  def signed_in?
+    session[:username]
+  end
 end

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

@@ -5,13 +5,24 @@ module RubyToBlock
     module HardwareOperation
       extend ActiveSupport::Concern
 
+      SMALRUBOT_RE = '(smalrubot_[^.]+)'
       DIO_PIN_RE = '\s*"(D(?:[2-9]|10|11|12|13))"\s*'
       PWM_PIN_RE = '\s*"(D(?:3|5|6|9|10|11))"\s*'
       AIO_PIN_RE = '\s*"(A[0-5])"\s*'
       TWO_WHEEL_DRIVE_CAR_PIN_RE = '\s*"(D[56])"\s*'
       LOR_RE = '(left|right)'
+      ON_OFF_RE = '(turn_on|turn_off)'
       POR_RE = '(pressed|released)'
       ACTION_RE = '(forward|backward|turn_left|turn_right|stop)'
+
+      included do
+        attr_accessor :smalrubot_name
+      end
+
+      def type
+        @type ||=
+          (smalrubot_name ? super.gsub('smalrubot', smalrubot_name) : super)
+      end
     end
   end
 end

data/app/models/concerns/ruby_to_block/block/{hardware_smalrubot_s1_led_turn_on_or_off.rb → hardware_smalrubot_action.rb}

@@ -1,19 +1,22 @@
 # -*- coding: utf-8 -*-
 module RubyToBlock
   module Block
-    class HardwareSmalrubotS1LedTurnOnOrOff < CharacterMethodCall
+    class HardwareSmalrubotAction < CharacterMethodCall
       include HardwareOperation
 
       # rubocop:disable LineLength
-      blocknize '^\s*' + CHAR_RE +
-                'smalrubot_s1\.(turn_on|turn_off)_(blue|white)_led' +
-                '\s*$',
+      blocknize ['^\s*',
+                 CHAR_RE,
+                 SMALRUBOT_RE, '\.',
+                 ACTION_RE,
+                 '\s*$'].join(''),
                 statement: true, inline: true
       # rubocop:enable LineLength
 
       def self.process_match_data(md, context)
         md2 = regexp.match(md[type])
-        block = new(fields: { COLOUR: md2[3], OOO: md2[2] })
+        block = new(fields: { ACTION: md2[3] })
+        block.smalrubot_name = md2[2]
         add_character_method_call_block(context, md2[1], block)
         true
       end

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

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

data/app/models/concerns/ruby_to_block/block/{hardware_smalrubot_v3_motor_speed.rb → hardware_smalrubot_dc_motor_power_ratio.rb}

@@ -1,12 +1,14 @@
 module RubyToBlock
   module Block
-    class HardwareSmalrubotV3MotorSpeed < Value
+    class HardwareSmalrubotDcMotorPowerRatio < Value
       include CharacterOperation
       include HardwareOperation
 
-      blocknize '^\s*' + CHAR_RE +
-                'smalrubot_v3\.' +
-                LOR_RE + '_motor_speed\s*$',
+      blocknize ['^\s*',
+                 CHAR_RE,
+                 SMALRUBOT_RE, '\.',
+                 LOR_RE, '_dc_motor_power_ratio',
+                 '\s*$'].join(''),
                 value: true
 
       def self.process_match_data(md, context)
@@ -15,7 +17,8 @@ module RubyToBlock
         character = get_character(context, md2[1])
         return false if context.receiver && context.receiver != character
 
-        block = new(fields: { LOR: md2[2] })
+        block = new(fields: { LOR: md2[3] })
+        block.smalrubot_name = md2[2]
         context.add_value(block)
         block.character = character
 

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

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareSmalrubotDcMotorSetPowerRatio < CharacterMethodCall
+      include HardwareOperation
+
+      blocknize ['^\s*',
+                 CHAR_RE,
+                 SMALRUBOT_RE, '\.',
+                 LOR_RE, '_dc_motor_power_ratio\s*=\s*(\S+)',
+                 '\s*$'].join(''),
+                statement: true, inline: true
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        block = new(fields: { LOR: md2[3] })
+        block.smalrubot_name = md2[2]
+        add_character_method_call_block(context, md2[1], block, SPEED: md2[4])
+        true
+      end
+    end
+  end
+end