smalruby-editor 0.2.4-x86-mingw32 → 0.2.5-x86-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

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

Files changed (54) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +8 -0
  3. data/Guardfile +8 -1
  4. data/app/assets/javascripts/blocks/hardware.js.coffee.erb +11 -152
  5. data/app/assets/javascripts/msg/en_us.js +5 -5
  6. data/app/assets/javascripts/msg/ja.js +5 -5
  7. data/app/assets/javascripts/views/signin_modal_view.js.coffee.erb +0 -0
  8. data/app/controllers/sessions_controller.rb +0 -0
  9. data/app/helpers/sessions_helper.rb +4 -0
  10. data/app/models/concerns/ruby_to_block/block/hardware_operation.rb +11 -0
  11. data/app/models/concerns/ruby_to_block/block/{hardware_smalrubot_s1_led_turn_on_or_off.rb → hardware_smalrubot_action.rb} +8 -5
  12. data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_action_with_sec.rb +25 -0
  13. data/app/models/concerns/ruby_to_block/block/{hardware_smalrubot_v3_motor_speed.rb → hardware_smalrubot_dc_motor_power_ratio.rb} +8 -5
  14. data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_dc_motor_set_power_ratio.rb +23 -0
  15. data/app/models/concerns/ruby_to_block/block/{hardware_smalrubot_v3_led_turn_on_or_off.rb → hardware_smalrubot_led_turn_on_or_off.rb} +8 -5
  16. data/app/models/concerns/ruby_to_block/block/{hardware_smalrubot_s1_ir_photoreflector_value.rb → hardware_smalrubot_sensor_value.rb} +8 -6
  17. data/app/views/editor/_toolbox_default.html.haml +4 -7
  18. data/app/views/editor/index.html.haml +7 -18
  19. data/bin/spring +0 -0
  20. data/config/application.rb +1 -0
  21. data/lib/smalruby_editor/version.rb +1 -1
  22. data/public/assets/{application-eece3e01e35f8f689e2e282a168f6059.js → application-e64da116c4adad30e499acda9d657fb5.js} +9 -9
  23. data/public/assets/application-e64da116c4adad30e499acda9d657fb5.js.gz +0 -0
  24. data/public/assets/{manifest-93f591b19a2a69655db7b53fa00d6b17.json → manifest-beef6aec1f5553cda5a2fe11ef0774ea.json} +1 -1
  25. data/public/assets/msg/{en_us-3eb2f104a6bad9c60226ff7475013874.js → en_us-a3f6b99f4b54cfaeed42452de11ab02e.js} +1 -1
  26. data/public/assets/msg/en_us-a3f6b99f4b54cfaeed42452de11ab02e.js.gz +0 -0
  27. data/public/assets/msg/ja-9323664964a9b8ede99ae16c43db5827.js +1 -0
  28. data/public/assets/msg/ja-9323664964a9b8ede99ae16c43db5827.js.gz +0 -0
  29. data/smalruby-editor.gemspec +1 -1
  30. data/spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_led_turn_on_or_off.feature +8 -8
  31. data/spec/acceptance/block_mode/blocks/hardware/{smalrubot_v3_motor_speed.feature → smalrubot_v3_dc_motor_power_ratio.feature} +12 -12
  32. data/spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_led_turn_on_or_off.feature +8 -8
  33. data/spec/acceptance/block_mode/blocks/hardware/{smalrubot_s1_ir_photoreflector_value.feature → smalrubot_v3_sensor_value.feature} +7 -7
  34. data/spec/models/concerns/ruby_to_block/block/{hardware__smalrubot_s1_spec.rb → hardware__smalrubot_spec.rb} +88 -84
  35. data/spec/spec_helper.rb +0 -0
  36. data/spec/steps/base_steps.rb +0 -0
  37. data/spec/steps/text_editor_steps.rb +0 -0
  38. metadata +23 -36
  39. data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_action.rb +0 -13
  40. data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_action_with_sec.rb +0 -14
  41. data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_dc_motor_power_ratio.rb +0 -26
  42. data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_dc_motor_set_power_ratio.rb +0 -21
  43. data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_action.rb +0 -22
  44. data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_action_with_sec.rb +0 -24
  45. data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_light_sensor_value.rb +0 -28
  46. data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_motor_set_speed.rb +0 -21
  47. data/app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_touch_sensor_pressed_or_released.rb +0 -29
  48. data/public/assets/application-eece3e01e35f8f689e2e282a168f6059.js.gz +0 -0
  49. data/public/assets/msg/en_us-3eb2f104a6bad9c60226ff7475013874.js.gz +0 -0
  50. data/public/assets/msg/ja-8450d011b1f093dc4b6b7c467e5bcae4.js +0 -1
  51. data/public/assets/msg/ja-8450d011b1f093dc4b6b7c467e5bcae4.js.gz +0 -0
  52. data/spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_light_sensor_value.feature +0 -92
  53. data/spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_touch_sensor_pressed_or_released.feature +0 -108
  54. data/spec/models/concerns/ruby_to_block/block/hardware__smalrubot_v3_spec.rb +0 -433
data/spec/models/concerns/ruby_to_block/block/{hardware__smalrubot_s1_spec.rb → hardware__smalrubot_spec.rb} RENAMED
@@ -4,68 +4,70 @@ require_relative 'shared/block_examples'
4
4
 
5
5
  # rubocop:disable EmptyLines, LineLength
6
6
 
7
- describe RubyToBlock::Block, 'Smalrubot s1 blocks', to_blocks: true do
8
- parts = <<-EOS
7
+ describe RubyToBlock::Block, 'Smalrubot blocks', to_blocks: true do
8
+ %w(s1 v3).each do |smalrubot_version|
9
+ describe smalrubot_version do
10
+ parts = <<-EOS
9
11
  require "smalruby"
10
12
 
11
13
  init_hardware
12
14
  car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
13
15
 
14
16
  car1.on(:start) do
15
- smalrubot_s1.forward
16
- smalrubot_s1.backward
17
- smalrubot_s1.turn_left
18
- smalrubot_s1.turn_right
19
- smalrubot_s1.stop
17
+ smalrubot_#{smalrubot_version}.forward
18
+ smalrubot_#{smalrubot_version}.backward
19
+ smalrubot_#{smalrubot_version}.turn_left
20
+ smalrubot_#{smalrubot_version}.turn_right
21
+ smalrubot_#{smalrubot_version}.stop
20
22
 
21
- smalrubot_s1.forward(sec: 0.5)
22
- smalrubot_s1.backward(sec: 0.4)
23
- smalrubot_s1.turn_left(sec: 0.3)
24
- smalrubot_s1.turn_right(sec: 0.2)
25
- smalrubot_s1.stop(sec: 0.1)
23
+ smalrubot_#{smalrubot_version}.forward(sec: 0.5)
24
+ smalrubot_#{smalrubot_version}.backward(sec: 0.4)
25
+ smalrubot_#{smalrubot_version}.turn_left(sec: 0.3)
26
+ smalrubot_#{smalrubot_version}.turn_right(sec: 0.2)
27
+ smalrubot_#{smalrubot_version}.stop(sec: 0.1)
26
28
 
27
- p(smalrubot_s1.left_ir_photoreflector_value)
28
- p(smalrubot_s1.right_ir_photoreflector_value)
29
+ p(smalrubot_#{smalrubot_version}.left_sensor_value)
30
+ p(smalrubot_#{smalrubot_version}.right_sensor_value)
29
31
 
30
- smalrubot_s1.turn_on_white_led
31
- smalrubot_s1.turn_off_blue_led
32
+ smalrubot_#{smalrubot_version}.turn_on_left_led
33
+ smalrubot_#{smalrubot_version}.turn_off_right_led
32
34
 
33
- p(smalrubot_s1.left_dc_motor_power_ratio)
34
- p(smalrubot_s1.right_dc_motor_power_ratio)
35
+ p(smalrubot_#{smalrubot_version}.left_dc_motor_power_ratio)
36
+ p(smalrubot_#{smalrubot_version}.right_dc_motor_power_ratio)
35
37
 
36
- smalrubot_s1.left_dc_motor_power_ratio = 10
37
- smalrubot_s1.right_dc_motor_power_ratio = 90
38
+ smalrubot_#{smalrubot_version}.left_dc_motor_power_ratio = 10
39
+ smalrubot_#{smalrubot_version}.right_dc_motor_power_ratio = 90
38
40
  end
39
- car1.smalrubot_s1.forward
40
- car1.smalrubot_s1.backward
41
- car1.smalrubot_s1.turn_left
42
- car1.smalrubot_s1.turn_right
43
- car1.smalrubot_s1.stop
41
+ car1.smalrubot_#{smalrubot_version}.forward
42
+ car1.smalrubot_#{smalrubot_version}.backward
43
+ car1.smalrubot_#{smalrubot_version}.turn_left
44
+ car1.smalrubot_#{smalrubot_version}.turn_right
45
+ car1.smalrubot_#{smalrubot_version}.stop
44
46
 
45
- car1.smalrubot_s1.forward(sec: 0.5)
46
- car1.smalrubot_s1.backward(sec: 0.4)
47
- car1.smalrubot_s1.turn_left(sec: 0.3)
48
- car1.smalrubot_s1.turn_right(sec: 0.2)
49
- car1.smalrubot_s1.stop(sec: 0.1)
47
+ car1.smalrubot_#{smalrubot_version}.forward(sec: 0.5)
48
+ car1.smalrubot_#{smalrubot_version}.backward(sec: 0.4)
49
+ car1.smalrubot_#{smalrubot_version}.turn_left(sec: 0.3)
50
+ car1.smalrubot_#{smalrubot_version}.turn_right(sec: 0.2)
51
+ car1.smalrubot_#{smalrubot_version}.stop(sec: 0.1)
50
52
 
51
- p(car1.smalrubot_s1.left_ir_photoreflector_value)
52
- p(car1.smalrubot_s1.right_ir_photoreflector_value)
53
+ p(car1.smalrubot_#{smalrubot_version}.left_sensor_value)
54
+ p(car1.smalrubot_#{smalrubot_version}.right_sensor_value)
53
55
 
54
- car1.smalrubot_s1.turn_on_white_led
55
- car1.smalrubot_s1.turn_off_blue_led
56
+ car1.smalrubot_#{smalrubot_version}.turn_on_left_led
57
+ car1.smalrubot_#{smalrubot_version}.turn_off_right_led
56
58
 
57
- p(car1.smalrubot_s1.left_dc_motor_power_ratio)
58
- p(car1.smalrubot_s1.right_dc_motor_power_ratio)
59
+ p(car1.smalrubot_#{smalrubot_version}.left_dc_motor_power_ratio)
60
+ p(car1.smalrubot_#{smalrubot_version}.right_dc_motor_power_ratio)
59
61
 
60
- car1.smalrubot_s1.left_dc_motor_power_ratio = 10
61
- car1.smalrubot_s1.right_dc_motor_power_ratio = 90
62
- EOS
63
- describe compact_source_code(parts) do
64
- _parts = parts
65
- let(:data) { _parts }
62
+ car1.smalrubot_#{smalrubot_version}.left_dc_motor_power_ratio = 10
63
+ car1.smalrubot_#{smalrubot_version}.right_dc_motor_power_ratio = 90
64
+ EOS
65
+ describe compact_source_code(parts) do
66
+ _parts = parts
67
+ let(:data) { _parts }
66
68
 
67
- it '結果が正しいこと' do
68
- should eq_block_xml(<<-XML)
69
+ it '結果が正しいこと' do
70
+ should eq_block_xml(<<-XML)
69
71
  <character name="car1" x="0" y="0" angle="0" costumes="car1.png" />
70
72
  <block type="hardware_init_hardware" />
71
73
  <block type="character_new">
@@ -73,22 +75,22 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
73
75
  <statement name="DO">
74
76
  <block type="events_on_start">
75
77
  <statement name="DO">
76
- <block type="hardware_smalrubot_s1_action" inline="true">
78
+ <block type="hardware_smalrubot_#{smalrubot_version}_action" inline="true">
77
79
  <field name="ACTION">forward</field>
78
80
  <next>
79
- <block type="hardware_smalrubot_s1_action" inline="true">
81
+ <block type="hardware_smalrubot_#{smalrubot_version}_action" inline="true">
80
82
  <field name="ACTION">backward</field>
81
83
  <next>
82
- <block type="hardware_smalrubot_s1_action" inline="true">
84
+ <block type="hardware_smalrubot_#{smalrubot_version}_action" inline="true">
83
85
  <field name="ACTION">turn_left</field>
84
86
  <next>
85
- <block type="hardware_smalrubot_s1_action" inline="true">
87
+ <block type="hardware_smalrubot_#{smalrubot_version}_action" inline="true">
86
88
  <field name="ACTION">turn_right</field>
87
89
  <next>
88
- <block type="hardware_smalrubot_s1_action" inline="true">
90
+ <block type="hardware_smalrubot_#{smalrubot_version}_action" inline="true">
89
91
  <field name="ACTION">stop</field>
90
92
  <next>
91
- <block type="hardware_smalrubot_s1_action_with_sec" inline="true">
93
+ <block type="hardware_smalrubot_#{smalrubot_version}_action_with_sec" inline="true">
92
94
  <field name="ACTION">forward</field>
93
95
  <value name="SEC">
94
96
  <block type="math_number">
@@ -96,7 +98,7 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
96
98
  </block>
97
99
  </value>
98
100
  <next>
99
- <block type="hardware_smalrubot_s1_action_with_sec" inline="true">
101
+ <block type="hardware_smalrubot_#{smalrubot_version}_action_with_sec" inline="true">
100
102
  <field name="ACTION">backward</field>
101
103
  <value name="SEC">
102
104
  <block type="math_number">
@@ -104,7 +106,7 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
104
106
  </block>
105
107
  </value>
106
108
  <next>
107
- <block type="hardware_smalrubot_s1_action_with_sec" inline="true">
109
+ <block type="hardware_smalrubot_#{smalrubot_version}_action_with_sec" inline="true">
108
110
  <field name="ACTION">turn_left</field>
109
111
  <value name="SEC">
110
112
  <block type="math_number">
@@ -112,7 +114,7 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
112
114
  </block>
113
115
  </value>
114
116
  <next>
115
- <block type="hardware_smalrubot_s1_action_with_sec" inline="true">
117
+ <block type="hardware_smalrubot_#{smalrubot_version}_action_with_sec" inline="true">
116
118
  <field name="ACTION">turn_right</field>
117
119
  <value name="SEC">
118
120
  <block type="math_number">
@@ -120,7 +122,7 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
120
122
  </block>
121
123
  </value>
122
124
  <next>
123
- <block type="hardware_smalrubot_s1_action_with_sec" inline="true">
125
+ <block type="hardware_smalrubot_#{smalrubot_version}_action_with_sec" inline="true">
124
126
  <field name="ACTION">stop</field>
125
127
  <value name="SEC">
126
128
  <block type="math_number">
@@ -130,41 +132,41 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
130
132
  <next>
131
133
  <block type="ruby_p" inline="true">
132
134
  <value name="ARG">
133
- <block type="hardware_smalrubot_s1_ir_photoreflector_value">
135
+ <block type="hardware_smalrubot_#{smalrubot_version}_sensor_value">
134
136
  <field name="LOR">left</field>
135
137
  </block>
136
138
  </value>
137
139
  <next>
138
140
  <block type="ruby_p" inline="true">
139
141
  <value name="ARG">
140
- <block type="hardware_smalrubot_s1_ir_photoreflector_value">
142
+ <block type="hardware_smalrubot_#{smalrubot_version}_sensor_value">
141
143
  <field name="LOR">right</field>
142
144
  </block>
143
145
  </value>
144
146
  <next>
145
- <block type="hardware_smalrubot_s1_led_turn_on_or_off" inline="true">
146
- <field name="COLOUR">white</field>
147
+ <block type="hardware_smalrubot_#{smalrubot_version}_led_turn_on_or_off" inline="true">
148
+ <field name="LOR">left</field>
147
149
  <field name="OOO">turn_on</field>
148
150
  <next>
149
- <block type="hardware_smalrubot_s1_led_turn_on_or_off" inline="true">
150
- <field name="COLOUR">blue</field>
151
+ <block type="hardware_smalrubot_#{smalrubot_version}_led_turn_on_or_off" inline="true">
152
+ <field name="LOR">right</field>
151
153
  <field name="OOO">turn_off</field>
152
154
  <next>
153
155
  <block type="ruby_p" inline="true">
154
156
  <value name="ARG">
155
- <block type="hardware_smalrubot_s1_dc_motor_power_ratio">
157
+ <block type="hardware_smalrubot_#{smalrubot_version}_dc_motor_power_ratio">
156
158
  <field name="LOR">left</field>
157
159
  </block>
158
160
  </value>
159
161
  <next>
160
162
  <block type="ruby_p" inline="true">
161
163
  <value name="ARG">
162
- <block type="hardware_smalrubot_s1_dc_motor_power_ratio">
164
+ <block type="hardware_smalrubot_#{smalrubot_version}_dc_motor_power_ratio">
163
165
  <field name="LOR">right</field>
164
166
  </block>
165
167
  </value>
166
168
  <next>
167
- <block type="hardware_smalrubot_s1_dc_motor_set_power_ratio" inline="true">
169
+ <block type="hardware_smalrubot_#{smalrubot_version}_dc_motor_set_power_ratio" inline="true">
168
170
  <field name="LOR">left</field>
169
171
  <value name="SPEED">
170
172
  <block type="math_number">
@@ -172,7 +174,7 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
172
174
  </block>
173
175
  </value>
174
176
  <next>
175
- <block type="hardware_smalrubot_s1_dc_motor_set_power_ratio" inline="true">
177
+ <block type="hardware_smalrubot_#{smalrubot_version}_dc_motor_set_power_ratio" inline="true">
176
178
  <field name="LOR">right</field>
177
179
  <value name="SPEED">
178
180
  <block type="math_number">
@@ -216,22 +218,22 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
216
218
  </block>
217
219
  </statement>
218
220
  <next>
219
- <block type="hardware_smalrubot_s1_action" inline="true">
221
+ <block type="hardware_smalrubot_#{smalrubot_version}_action" inline="true">
220
222
  <field name="ACTION">forward</field>
221
223
  <next>
222
- <block type="hardware_smalrubot_s1_action" inline="true">
224
+ <block type="hardware_smalrubot_#{smalrubot_version}_action" inline="true">
223
225
  <field name="ACTION">backward</field>
224
226
  <next>
225
- <block type="hardware_smalrubot_s1_action" inline="true">
227
+ <block type="hardware_smalrubot_#{smalrubot_version}_action" inline="true">
226
228
  <field name="ACTION">turn_left</field>
227
229
  <next>
228
- <block type="hardware_smalrubot_s1_action" inline="true">
230
+ <block type="hardware_smalrubot_#{smalrubot_version}_action" inline="true">
229
231
  <field name="ACTION">turn_right</field>
230
232
  <next>
231
- <block type="hardware_smalrubot_s1_action" inline="true">
233
+ <block type="hardware_smalrubot_#{smalrubot_version}_action" inline="true">
232
234
  <field name="ACTION">stop</field>
233
235
  <next>
234
- <block type="hardware_smalrubot_s1_action_with_sec" inline="true">
236
+ <block type="hardware_smalrubot_#{smalrubot_version}_action_with_sec" inline="true">
235
237
  <field name="ACTION">forward</field>
236
238
  <value name="SEC">
237
239
  <block type="math_number">
@@ -239,7 +241,7 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
239
241
  </block>
240
242
  </value>
241
243
  <next>
242
- <block type="hardware_smalrubot_s1_action_with_sec" inline="true">
244
+ <block type="hardware_smalrubot_#{smalrubot_version}_action_with_sec" inline="true">
243
245
  <field name="ACTION">backward</field>
244
246
  <value name="SEC">
245
247
  <block type="math_number">
@@ -247,7 +249,7 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
247
249
  </block>
248
250
  </value>
249
251
  <next>
250
- <block type="hardware_smalrubot_s1_action_with_sec" inline="true">
252
+ <block type="hardware_smalrubot_#{smalrubot_version}_action_with_sec" inline="true">
251
253
  <field name="ACTION">turn_left</field>
252
254
  <value name="SEC">
253
255
  <block type="math_number">
@@ -255,7 +257,7 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
255
257
  </block>
256
258
  </value>
257
259
  <next>
258
- <block type="hardware_smalrubot_s1_action_with_sec" inline="true">
260
+ <block type="hardware_smalrubot_#{smalrubot_version}_action_with_sec" inline="true">
259
261
  <field name="ACTION">turn_right</field>
260
262
  <value name="SEC">
261
263
  <block type="math_number">
@@ -263,7 +265,7 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
263
265
  </block>
264
266
  </value>
265
267
  <next>
266
- <block type="hardware_smalrubot_s1_action_with_sec" inline="true">
268
+ <block type="hardware_smalrubot_#{smalrubot_version}_action_with_sec" inline="true">
267
269
  <field name="ACTION">stop</field>
268
270
  <value name="SEC">
269
271
  <block type="math_number">
@@ -273,41 +275,41 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
273
275
  <next>
274
276
  <block type="ruby_p" inline="true">
275
277
  <value name="ARG">
276
- <block type="hardware_smalrubot_s1_ir_photoreflector_value">
278
+ <block type="hardware_smalrubot_#{smalrubot_version}_sensor_value">
277
279
  <field name="LOR">left</field>
278
280
  </block>
279
281
  </value>
280
282
  <next>
281
283
  <block type="ruby_p" inline="true">
282
284
  <value name="ARG">
283
- <block type="hardware_smalrubot_s1_ir_photoreflector_value">
285
+ <block type="hardware_smalrubot_#{smalrubot_version}_sensor_value">
284
286
  <field name="LOR">right</field>
285
287
  </block>
286
288
  </value>
287
289
  <next>
288
- <block type="hardware_smalrubot_s1_led_turn_on_or_off" inline="true">
289
- <field name="COLOUR">white</field>
290
+ <block type="hardware_smalrubot_#{smalrubot_version}_led_turn_on_or_off" inline="true">
291
+ <field name="LOR">left</field>
290
292
  <field name="OOO">turn_on</field>
291
293
  <next>
292
- <block type="hardware_smalrubot_s1_led_turn_on_or_off" inline="true">
293
- <field name="COLOUR">blue</field>
294
+ <block type="hardware_smalrubot_#{smalrubot_version}_led_turn_on_or_off" inline="true">
295
+ <field name="LOR">right</field>
294
296
  <field name="OOO">turn_off</field>
295
297
  <next>
296
298
  <block type="ruby_p" inline="true">
297
299
  <value name="ARG">
298
- <block type="hardware_smalrubot_s1_dc_motor_power_ratio">
300
+ <block type="hardware_smalrubot_#{smalrubot_version}_dc_motor_power_ratio">
299
301
  <field name="LOR">left</field>
300
302
  </block>
301
303
  </value>
302
304
  <next>
303
305
  <block type="ruby_p" inline="true">
304
306
  <value name="ARG">
305
- <block type="hardware_smalrubot_s1_dc_motor_power_ratio">
307
+ <block type="hardware_smalrubot_#{smalrubot_version}_dc_motor_power_ratio">
306
308
  <field name="LOR">right</field>
307
309
  </block>
308
310
  </value>
309
311
  <next>
310
- <block type="hardware_smalrubot_s1_dc_motor_set_power_ratio" inline="true">
312
+ <block type="hardware_smalrubot_#{smalrubot_version}_dc_motor_set_power_ratio" inline="true">
311
313
  <field name="LOR">left</field>
312
314
  <value name="SPEED">
313
315
  <block type="math_number">
@@ -315,7 +317,7 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
315
317
  </block>
316
318
  </value>
317
319
  <next>
318
- <block type="hardware_smalrubot_s1_dc_motor_set_power_ratio" inline="true">
320
+ <block type="hardware_smalrubot_#{smalrubot_version}_dc_motor_set_power_ratio" inline="true">
319
321
  <field name="LOR">right</field>
320
322
  <value name="SPEED">
321
323
  <block type="math_number">
@@ -362,6 +364,8 @@ car1.smalrubot_s1.right_dc_motor_power_ratio = 90
362
364
  </statement>
363
365
  </block>
364
366
  XML
367
+ end
368
+ end
365
369
  end
366
370
  end
367
371
  end
data/spec/spec_helper.rb CHANGED
File without changes
data/spec/steps/base_steps.rb CHANGED
File without changes
data/spec/steps/text_editor_steps.rb CHANGED
File without changes
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smalruby-editor
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4
4
+ version: 0.2.5
5
5
  platform: x86-mingw32
6
6
  authors:
7
7
  - Kouji Takao
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-14 00:00:00.000000000 Z
11
+ date: 2015-05-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -198,14 +198,14 @@ dependencies:
198
198
  requirements:
199
199
  - - "~>"
200
200
  - !ruby/object:Gem::Version
201
- version: 0.1.4
201
+ version: 0.1.6
202
202
  type: :runtime
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
206
  - - "~>"
207
207
  - !ruby/object:Gem::Version
208
- version: 0.1.4
208
+ version: 0.1.6
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: bundler
211
211
  requirement: !ruby/object:Gem::Requirement
@@ -345,19 +345,12 @@ files:
345
345
  - app/models/concerns/ruby_to_block/block/hardware_rgb_led_set_color.rb
346
346
  - app/models/concerns/ruby_to_block/block/hardware_rgb_led_turn_off.rb
347
347
  - app/models/concerns/ruby_to_block/block/hardware_sensor_value.rb
348
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_action.rb
349
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_action_with_sec.rb
350
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_dc_motor_power_ratio.rb
351
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_dc_motor_set_power_ratio.rb
352
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_ir_photoreflector_value.rb
353
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_s1_led_turn_on_or_off.rb
354
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_action.rb
355
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_action_with_sec.rb
356
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_led_turn_on_or_off.rb
357
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_light_sensor_value.rb
358
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_motor_set_speed.rb
359
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_motor_speed.rb
360
- - app/models/concerns/ruby_to_block/block/hardware_smalrubot_v3_touch_sensor_pressed_or_released.rb
348
+ - app/models/concerns/ruby_to_block/block/hardware_smalrubot_action.rb
349
+ - app/models/concerns/ruby_to_block/block/hardware_smalrubot_action_with_sec.rb
350
+ - app/models/concerns/ruby_to_block/block/hardware_smalrubot_dc_motor_power_ratio.rb
351
+ - app/models/concerns/ruby_to_block/block/hardware_smalrubot_dc_motor_set_power_ratio.rb
352
+ - app/models/concerns/ruby_to_block/block/hardware_smalrubot_led_turn_on_or_off.rb
353
+ - app/models/concerns/ruby_to_block/block/hardware_smalrubot_sensor_value.rb
361
354
  - app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car.rb
362
355
  - app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car_commands.rb
363
356
  - app/models/concerns/ruby_to_block/block/hardware_two_wheel_drive_car_run.rb
@@ -474,8 +467,8 @@ files:
474
467
  - public/apple-touch-icon.png
475
468
  - public/assets/application-c196e243630d74071981a16041bf391d.css
476
469
  - public/assets/application-c196e243630d74071981a16041bf391d.css.gz
477
- - public/assets/application-eece3e01e35f8f689e2e282a168f6059.js
478
- - public/assets/application-eece3e01e35f8f689e2e282a168f6059.js.gz
470
+ - public/assets/application-e64da116c4adad30e499acda9d657fb5.js
471
+ - public/assets/application-e64da116c4adad30e499acda9d657fb5.js.gz
479
472
  - public/assets/blockly/msg/js/en_us-d5e1938b2d57c1df954f4411b9165d10.js
480
473
  - public/assets/blockly/msg/js/en_us-d5e1938b2d57c1df954f4411b9165d10.js.gz
481
474
  - public/assets/blockly/msg/js/ja-9f676d46458a2802b8f5a797c90ae8a4.js
@@ -496,11 +489,11 @@ files:
496
489
  - public/assets/jquery-ui/ui-icons_888888_256x240-ce584ffa171c3ea9a018cf0d7bec65c8.png
497
490
  - public/assets/jquery-ui/ui-icons_cd0a0a_256x240-747e96029e8dedcabc224e5f7d1f2ede.png
498
491
  - public/assets/loading-e77296be32d066d3e29d3bf9803fa417.gif
499
- - public/assets/manifest-93f591b19a2a69655db7b53fa00d6b17.json
500
- - public/assets/msg/en_us-3eb2f104a6bad9c60226ff7475013874.js
501
- - public/assets/msg/en_us-3eb2f104a6bad9c60226ff7475013874.js.gz
502
- - public/assets/msg/ja-8450d011b1f093dc4b6b7c467e5bcae4.js
503
- - public/assets/msg/ja-8450d011b1f093dc4b6b7c467e5bcae4.js.gz
492
+ - public/assets/manifest-beef6aec1f5553cda5a2fe11ef0774ea.json
493
+ - public/assets/msg/en_us-a3f6b99f4b54cfaeed42452de11ab02e.js
494
+ - public/assets/msg/en_us-a3f6b99f4b54cfaeed42452de11ab02e.js.gz
495
+ - public/assets/msg/ja-9323664964a9b8ede99ae16c43db5827.js
496
+ - public/assets/msg/ja-9323664964a9b8ede99ae16c43db5827.js.gz
504
497
  - public/assets/progressbar-ee8fb1222f286f625bbf7332844a6a0c.gif
505
498
  - public/assets/toolbox_default-e023d3f7a2cc7cc1f54a1224577b3c26.css
506
499
  - public/assets/toolbox_default-e023d3f7a2cc7cc1f54a1224577b3c26.css.gz
@@ -592,14 +585,12 @@ files:
592
585
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_action.feature
593
586
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_action_with_sec.feature
594
587
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_dc_motor_power_ratio.feature
595
- - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_ir_photoreflector_value.feature
596
588
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_led_turn_on_or_off.feature
597
589
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_action.feature
598
590
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_action_with_sec.feature
591
+ - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_dc_motor_power_ratio.feature
599
592
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_led_turn_on_or_off.feature
600
- - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_light_sensor_value.feature
601
- - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_motor_speed.feature
602
- - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_touch_sensor_pressed_or_released.feature
593
+ - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_sensor_value.feature
603
594
  - spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car.feature
604
595
  - spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car_speed.feature
605
596
  - spec/acceptance/block_mode/blocks/looks/hide.feature
@@ -674,8 +665,7 @@ files:
674
665
  - spec/models/concerns/ruby_to_block/block/control_if_spec.rb
675
666
  - spec/models/concerns/ruby_to_block/block/control_loop_spec.rb
676
667
  - spec/models/concerns/ruby_to_block/block/events_on_start_spec.rb
677
- - spec/models/concerns/ruby_to_block/block/hardware__smalrubot_s1_spec.rb
678
- - spec/models/concerns/ruby_to_block/block/hardware__smalrubot_v3_spec.rb
668
+ - spec/models/concerns/ruby_to_block/block/hardware__smalrubot_spec.rb
679
669
  - spec/models/concerns/ruby_to_block/block/hardware_spec.rb
680
670
  - spec/models/concerns/ruby_to_block/block/looks_say_spec.rb
681
671
  - spec/models/concerns/ruby_to_block/block/looks_spec.rb
@@ -772,14 +762,12 @@ test_files:
772
762
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_action.feature
773
763
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_action_with_sec.feature
774
764
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_dc_motor_power_ratio.feature
775
- - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_ir_photoreflector_value.feature
776
765
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_s1_led_turn_on_or_off.feature
777
766
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_action.feature
778
767
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_action_with_sec.feature
768
+ - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_dc_motor_power_ratio.feature
779
769
  - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_led_turn_on_or_off.feature
780
- - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_light_sensor_value.feature
781
- - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_motor_speed.feature
782
- - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_touch_sensor_pressed_or_released.feature
770
+ - spec/acceptance/block_mode/blocks/hardware/smalrubot_v3_sensor_value.feature
783
771
  - spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car.feature
784
772
  - spec/acceptance/block_mode/blocks/hardware/two_wheel_drive_car_speed.feature
785
773
  - spec/acceptance/block_mode/blocks/looks/hide.feature
@@ -854,8 +842,7 @@ test_files:
854
842
  - spec/models/concerns/ruby_to_block/block/control_if_spec.rb
855
843
  - spec/models/concerns/ruby_to_block/block/control_loop_spec.rb
856
844
  - spec/models/concerns/ruby_to_block/block/events_on_start_spec.rb
857
- - spec/models/concerns/ruby_to_block/block/hardware__smalrubot_s1_spec.rb
858
- - spec/models/concerns/ruby_to_block/block/hardware__smalrubot_v3_spec.rb
845
+ - spec/models/concerns/ruby_to_block/block/hardware__smalrubot_spec.rb
859
846
  - spec/models/concerns/ruby_to_block/block/hardware_spec.rb
860
847
  - spec/models/concerns/ruby_to_block/block/looks_say_spec.rb
861
848
  - spec/models/concerns/ruby_to_block/block/looks_spec.rb