smalruby-editor 0.2.2 → 0.2.3

data/app/views/editor/_toolbox_smalrubot_v3.html.haml

@@ -35,42 +35,42 @@
       = toolbox_key_field
       = toolbox_pod_field
 
+    -# キャラクターがクリックされたとき
+    %block{:type => "#{category}_on_click"}
+
   - category = 'control'
   %category{:name => tt('.control')}
-    -# ずっと
-    %block{:type => "#{category}_loop"}
+    -# (　)秒待つ
+    %block{:type => "#{category}_sleep"}
+      = toolbox_number_value('SEC', 1)
+
+    -# ほんの少し待つ
+    %block{:type => "#{category}_await"}
 
     -# (　)回繰り返す
     %block{:type => "#{category}_times"}
       = toolbox_number_value('COUNT', 10)
 
-    -# <　>まで繰り返す
-    %block{:type => "#{category}_until"}
-
-    -# 繰り返しから脱出する
-    %block{:type => "#{category}_break"}
-
-    -# 次の繰り返しにジャンプする
-    %block{:type => "#{category}_next"}
+    -# ずっと
+    %block{:type => "#{category}_loop"}
 
-    -# 現在の繰り返しをやり直す
-    %block{:type => "#{category}_redo"}
+    -# もし<　>なら
+    %block{:type => "#{category}_if"}
 
-    -# (　)秒待つ
-    %block{:type => "#{category}_sleep"}
-      = toolbox_number_value('SEC', 1)
+    -# もし<　>なら～でなければ
+    %block{:type => "#{category}_if_else"}
 
     -# <　>まで待つ
     %block{:type => "#{category}_await_until"}
 
-    -# ほんの少し待つ
-    %block{:type => "#{category}_await"}
+    -# <　>まで繰り返す
+    %block{:type => "#{category}_until"}
 
-    -# もし<　>なら
-    %block{:type => "#{category}_if"}
+    -# 繰り返しから脱出する
+    %block{:type => "#{category}_break"}
 
-    -# もし<　>なら～でなければ
-    %block{:type => "#{category}_if_else"}
+    -# 次の繰り返しにジャンプする
+    %block{:type => "#{category}_next"}
 
   - category = 'sensing'
   %category{:name => tt('.sensing')}
@@ -104,20 +104,47 @@
 
   - category = 'operators'
   %category{:name => tt('.operators')}
+    -# 数値
+    %block{:type => 'math_number'}
+      %field{:name => 'NUM'}<
+        0
+
+    -# テキスト
+    %block{:type => 'text'}
+      %field{:name => 'TEXT'}<
+        = tt('.text')
+
+    -# 変数:(　) + (　)
+    %block{:type => "#{category}_add"}
+
+    -# 変数:(　) - (　)
+    %block{:type => "#{category}_minus"}
+
+    -# 変数:(　) * (　)
+    %block{:type => "#{category}_multiply"}
+
+    -# 変数:(　) / (　)
+    %block{:type => "#{category}_divide"}
+
+    -# 変数:(　)から(　)までの乱数
+    %block{:type => "#{category}_rand"}
+      = toolbox_number_value('A', 1)
+      = toolbox_number_value('B', 10)
+
     -# 条件:(　) < (　)
-    %block{:type => "#{category}_compare_gt"}
+    %block{:type => "#{category}_compare_lt"}
 
     -# 条件:(　) <= (　)
-    %block{:type => "#{category}_compare_gte"}
+    %block{:type => "#{category}_compare_lte"}
 
     -# 条件:(　) = (　)
     %block{:type => "#{category}_compare_eq"}
 
     -# 条件:(　) >= (　)
-    %block{:type => "#{category}_compare_lte"}
+    %block{:type => "#{category}_compare_gte"}
 
     -# 条件:(　) > (　)
-    %block{:type => "#{category}_compare_lt"}
+    %block{:type => "#{category}_compare_gt"}
 
     -# 条件:<　> かつ <　>
     %block{:type => "#{category}_and"}
@@ -128,35 +155,21 @@
     -# 条件:<　> ではない
     %block{:type => "#{category}_negate"}
 
-    -# 条件:真
-    %block{:type => "#{category}_true"}
-
-    -# 条件:偽
-    %block{:type => "#{category}_false"}
-
-    -# 変数:(　) + (　)
-    %block{:type => "#{category}_add"}
+    -# 変数:(　)の(　)番目
+    %block{:type => "#{category}_index_of"}
+      = toolbox_text_value('A', tt('.world'))
+      = toolbox_number_value('INDEX', 1)
 
-    -# 変数:(　) - (　)
-    %block{:type => "#{category}_minus"}
-
-    -# 変数:(　) * (　)
-    %block{:type => "#{category}_multiply"}
-
-    -# 変数:(　) / (　)
-    %block{:type => "#{category}_divide"}
-
-    -# 変数:(　)から(　)までの乱数
-    %block{:type => "#{category}_rand"}
-      = toolbox_number_value('A', 1)
-      = toolbox_number_value('B', 10)
+    -# 変数:(　)の長さ
+    %block{:type => "#{category}_length"}
+      = toolbox_text_value('A', tt('.world'))
 
     -# 変数:(　)を(　)で割った余り
     %block{:type => "#{category}_modulo"}
       = toolbox_number_value('A', 5)
       = toolbox_number_value('B', 2)
 
-    -# 変数:(　)を丸める
+    -# 変数:(　)を四捨五入
     %block{:type => "#{category}_round"}
       = toolbox_number_value('A', 0.5)
 
@@ -166,12 +179,14 @@
       %field{:name => 'METHOD'}<
         Math.sqrt(%num%)
 
-    -# 数値
-    %block{:type => 'math_number'}
-      %field{:name => 'NUM'}<
-        0
+    -# 条件:真
+    %block{:type => "#{category}_true"}
 
-  %category{:name => tt('.etc')}
-    - category = 'hardware'
-    -# ハードウェアを準備する
-    %block{:type => "#{category}_init_hardware"}
+    -# 条件:偽
+    %block{:type => "#{category}_false"}
+
+  - if !SmalrubyEditor::Config.enabled?('auto_init_hardware')
+    %category{:name => tt('.etc')}
+      - category = 'hardware'
+      -# ハードウェアを準備する
+      %block{:type => "#{category}_init_hardware"}

data/app/views/editor/index.html.haml

@@ -125,12 +125,6 @@
 = render 'load_modal'
 = render 'reset_modal'
 
-- if raspberrypi?
-  :javascript
-    $(function() {
-      $('div[aria-level="1"][aria-posinset="4"],div[aria-level="1"][aria-posinset="10"]').hide();
-    });
-
 - if session[:username]
   :javascript
     window.Smalruby.username = '#{h session[:username]}';

data/app/views/layouts/application.html.erb

@@ -16,6 +16,7 @@
   <%= stylesheet_link_tag    "toolbox_#{toolbox_css_name}", media: "all" %>
   <%= javascript_include_tag "application" %>
   <%= javascript_include_tag "blockly/msg/js/#{blockly_message_locale_name}" %>
+  <%= javascript_include_tag "msg/#{blockly_message_default_locale_name}" %>
   <%= javascript_include_tag "msg/#{blockly_message_locale_name}" %>
   <%= csrf_meta_tags %>
 </head>

data/db/schema.rb

@@ -1,23 +1,23 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended that you check this file into your version control system.
-
-ActiveRecord::Schema.define(version: 20131219045113) do
-
-  create_table "source_codes", force: true do |t|
-    t.text     "data"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "filename"
-  end
-
-end
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20131219045113) do
+
+  create_table "source_codes", force: true do |t|
+    t.text     "data"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "filename"
+  end
+
+end

data/lib/smalruby_editor.rb

@@ -128,9 +128,13 @@ standalone:
 
     CONFIG_YML_TEMPLATE = <<-EOS
 #toolbox_name: default
+#toolbox_name: raspberrypi
+#toolbox_name: smalrubot_v3
+#toolbox_name: smalrubot_s1
+#toolbox_name: default
 #toolbox_css_name: default
 features:
-  - add_character_from_beginning
+  #- disabled_add_character_from_beginning
   #- disabled_new_character
   #- auto_init_hardware
   #- readonly_ruby_mode

data/lib/smalruby_editor/config.rb

@@ -4,6 +4,8 @@ module SmalrubyEditor
   class Config < Settingslogic
     if Rails.env.test?
       source({})
+      load!
+      self['features'] = ['disabled_add_character_from_beginning']
     else
       path = SmalrubyEditor.home_directory.join('config', 'config.yml')
       if path.exist?

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
 module SmalrubyEditor
-  VERSION =  '0.2.2'
+  VERSION =  '0.2.3'
 end

data/smalruby-editor.gemspec

@@ -69,7 +69,7 @@ Gem::Specification.new do |spec|
      ['haml-rails'],
      ['nokogiri'],
      ['settingslogic'],
-     ['smalruby', '~> 0.1.3'],
+     ['smalruby', '~> 0.1.4'],
     ]
   runtime_dependencies << ['therubyracer'] unless is_windows
   runtime_dependencies.each do |args|

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

@@ -0,0 +1,116 @@
+# encoding: utf-8
+# language: en
+@javascript
+Feature: hardware_smalrubot_s1_dc_motor_{,set_}power_ratio block
+  Background:
+    Given "ブロック" タブを表示する
+    And キャラクターcar1を追加する
+
+  Scenario: ブロックのみ配置する
+    When 次のブロックを配置する:
+      """
+      %block{:type => "hardware_smalrubot_s1_dc_motor_power_ratio"}
+        %field{:name => "LOR"}<
+          right
+      """
+    And ブロックからソースコードを生成する
+
+    Then テキストエディタのプログラムは "" であること
+
+  Scenario: 文とブロックを配置する
+    When 次のブロックを配置する:
+      """
+      %block{:type => "ruby_p", :x => "0", :y => "0", :inline => "true" }
+        %value{:name => "ARG"}
+          %block{:type => "hardware_smalrubot_s1_dc_motor_power_ratio"}
+            %field{:name => "LOR"}<
+              right
+        %next
+          %block{:type => "hardware_smalrubot_s1_dc_motor_set_power_ratio"}
+            %field{:name => "LOR"}<
+              left
+            %value{:name => "SPEED"}
+              %block{:type => "math_number"}
+                %field{:name => "NUM"}<
+                  50
+      """
+    And ブロックからソースコードを生成する
+
+    Then テキストエディタのプログラムは以下であること:
+      """
+      require "smalruby"
+
+      p("")
+
+      """
+
+  Scenario: キャラクターとブロックを配置する
+    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_s1_dc_motor_power_ratio"}
+                %field{:name => "LOR"}<
+                  right
+            %next
+              %block{:type => "hardware_smalrubot_s1_dc_motor_set_power_ratio"}
+                %field{:name => "LOR"}<
+                  left
+                %value{:name => "SPEED"}
+                  %block{:type => "math_number"}
+                    %field{:name => "NUM"}<
+                      50
+      """
+    And ブロックからソースコードを生成する
+
+    Then テキストエディタのプログラムは以下であること:
+      """
+      require "smalruby"
+
+      car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
+      p(car1.smalrubot_s1.right_dc_motor_power_ratio)
+      car1.smalrubot_s1.left_dc_motor_power_ratio = 50
+
+      """
+
+  Scenario: キャラクターとイベントとブロックを配置する
+    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_s1_dc_motor_power_ratio"}
+                    %field{:name => "LOR"}<
+                      right
+                %next
+                  %block{:type => "hardware_smalrubot_s1_dc_motor_set_power_ratio"}
+                    %field{:name => "LOR"}<
+                      left
+                    %value{:name => "SPEED"}
+                      %block{:type => "math_number"}
+                        %field{:name => "NUM"}<
+                          50
+      """
+    And ブロックからソースコードを生成する
+
+    Then テキストエディタのプログラムは以下であること:
+      """
+      require "smalruby"
+
+      car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
+
+      car1.on(:start) do
+        p(smalrubot_s1.right_dc_motor_power_ratio)
+        self.smalrubot_s1.left_dc_motor_power_ratio = 50
+      end
+
+      """

data/spec/javascripts/models/source_code_spec.coffee

@@ -38,3 +38,8 @@ describe 'Smalruby.SourceCode', ->
 
       it '01.rb.xmlを返すこと', ->
         expect(self.getRbxmlFilename()).to.equal('01.rb.xml')
+
+  describe '.defaultFilename', ->
+    it 'program_<日付>.rbを返すこと', ->
+      now = new Date(2015, 2 - 1, 10, 12, 10, 59)
+      expect(Smalruby.SourceCode.defaultFilename(now)).to.equal('program_150210_121059.rb')

data/spec/models/concerns/ruby_to_block/block/hardware__smalrubot_s1_spec.rb

@@ -4,7 +4,7 @@ require_relative 'shared/block_examples'
 
 # rubocop:disable EmptyLines, LineLength
 
-describe RubyToBlock::Block, 'Smalrubot S1 blocks', to_blocks: true do
+describe RubyToBlock::Block, 'Smalrubot s1 blocks', to_blocks: true do
   parts = <<-EOS
 require "smalruby"
 
@@ -29,6 +29,12 @@ car1.on(:start) do
 
   smalrubot_s1.turn_on_white_led
   smalrubot_s1.turn_off_blue_led
+
+  p(smalrubot_s1.left_dc_motor_power_ratio)
+  p(smalrubot_s1.right_dc_motor_power_ratio)
+
+  smalrubot_s1.left_dc_motor_power_ratio = 10
+  smalrubot_s1.right_dc_motor_power_ratio = 90
 end
 car1.smalrubot_s1.forward
 car1.smalrubot_s1.backward
@@ -47,6 +53,12 @@ p(car1.smalrubot_s1.right_ir_photoreflector_value)
 
 car1.smalrubot_s1.turn_on_white_led
 car1.smalrubot_s1.turn_off_blue_led
+
+p(car1.smalrubot_s1.left_dc_motor_power_ratio)
+p(car1.smalrubot_s1.right_dc_motor_power_ratio)
+
+car1.smalrubot_s1.left_dc_motor_power_ratio = 10
+car1.smalrubot_s1.right_dc_motor_power_ratio = 90
   EOS
   describe compact_source_code(parts) do
     _parts = parts
@@ -137,6 +149,44 @@ car1.smalrubot_s1.turn_off_blue_led
                                                               <block type="hardware_smalrubot_s1_led_turn_on_or_off" inline="true">
                                                                 <field name="COLOUR">blue</field>
                                                                 <field name="OOO">turn_off</field>
+                                                                <next>
+                                                                  <block type="ruby_p" inline="true">
+                                                                    <value name="ARG">
+                                                                      <block type="hardware_smalrubot_s1_dc_motor_power_ratio">
+                                                                        <field name="LOR">left</field>
+                                                                      </block>
+                                                                    </value>
+                                                                    <next>
+                                                                      <block type="ruby_p" inline="true">
+                                                                        <value name="ARG">
+                                                                          <block type="hardware_smalrubot_s1_dc_motor_power_ratio">
+                                                                            <field name="LOR">right</field>
+                                                                          </block>
+                                                                        </value>
+                                                                        <next>
+                                                                          <block type="hardware_smalrubot_s1_dc_motor_set_power_ratio" inline="true">
+                                                                            <field name="LOR">left</field>
+                                                                            <value name="SPEED">
+                                                                              <block type="math_number">
+                                                                                <field name="NUM">10</field>
+                                                                              </block>
+                                                                            </value>
+                                                                            <next>
+                                                                              <block type="hardware_smalrubot_s1_dc_motor_set_power_ratio" inline="true">
+                                                                                <field name="LOR">right</field>
+                                                                                <value name="SPEED">
+                                                                                  <block type="math_number">
+                                                                                    <field name="NUM">90</field>
+                                                                                  </block>
+                                                                                </value>
+                                                                              </block>
+                                                                            </next>
+                                                                          </block>
+                                                                        </next>
+                                                                      </block>
+                                                                    </next>
+                                                                  </block>
+                                                                </next>
                                                               </block>
                                                             </next>
                                                           </block>
@@ -242,6 +292,44 @@ car1.smalrubot_s1.turn_off_blue_led
                                                               <block type="hardware_smalrubot_s1_led_turn_on_or_off" inline="true">
                                                                 <field name="COLOUR">blue</field>
                                                                 <field name="OOO">turn_off</field>
+                                                                <next>
+                                                                  <block type="ruby_p" inline="true">
+                                                                    <value name="ARG">
+                                                                      <block type="hardware_smalrubot_s1_dc_motor_power_ratio">
+                                                                        <field name="LOR">left</field>
+                                                                      </block>
+                                                                    </value>
+                                                                    <next>
+                                                                      <block type="ruby_p" inline="true">
+                                                                        <value name="ARG">
+                                                                          <block type="hardware_smalrubot_s1_dc_motor_power_ratio">
+                                                                            <field name="LOR">right</field>
+                                                                          </block>
+                                                                        </value>
+                                                                        <next>
+                                                                          <block type="hardware_smalrubot_s1_dc_motor_set_power_ratio" inline="true">
+                                                                            <field name="LOR">left</field>
+                                                                            <value name="SPEED">
+                                                                              <block type="math_number">
+                                                                                <field name="NUM">10</field>
+                                                                              </block>
+                                                                            </value>
+                                                                            <next>
+                                                                              <block type="hardware_smalrubot_s1_dc_motor_set_power_ratio" inline="true">
+                                                                                <field name="LOR">right</field>
+                                                                                <value name="SPEED">
+                                                                                  <block type="math_number">
+                                                                                    <field name="NUM">90</field>
+                                                                                  </block>
+                                                                                </value>
+                                                                              </block>
+                                                                            </next>
+                                                                          </block>
+                                                                        </next>
+                                                                      </block>
+                                                                    </next>
+                                                                  </block>
+                                                                </next>
                                                               </block>
                                                             </next>
                                                           </block>