smalruby-editor 0.2.1 → 0.2.2

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

@@ -0,0 +1,171 @@
+%xml{:id => 'toolbox', :style => 'display: none'}
+  %category{:name => tt('.motion')}
+    - category = 'hardware'
+    - subcategory = 'smalrubot_s1'
+    %block{type: "#{category}_#{subcategory}_action"}
+      %field{name: 'ACTION'}<
+        forward
+
+    %block{type: "#{category}_#{subcategory}_action_with_sec"}
+      %field{name: 'ACTION'}<
+        forward
+      = toolbox_number_value('SEC', 0.5)
+
+  - category = 'looks'
+  %category{:name => tt('.looks')}
+    %block{:type => "#{category}_say"}
+      %value{name: 'TEXT'}
+        - category = 'hardware'
+        - subcategory = 'smalrubot_s1'
+        %block{type: "#{category}_#{subcategory}_ir_photoreflector_value"}
+    - category = 'hardware'
+    - subcategory = 'smalrubot_s1'
+    %block{type: "#{category}_#{subcategory}_led_turn_on_or_off"}
+      %field{name: 'OOO'}<
+        turn_on
+
+  %category{:name => tt('.data'), :custom => 'VARIABLE'}
+
+  - category = 'events'
+  %category{:name => tt('.events')}
+    -# まずは
+    %block{:type => "#{category}_on_start"}
+
+    -# キーボードの[▼キー]が[▼押された/押され続けている]とき
+    %block{:type => "#{category}_on_key_push_or_down"}
+      = toolbox_key_field
+      = toolbox_pod_field
+
+  - category = 'control'
+  %category{:name => tt('.control')}
+    -# ずっと
+    %block{:type => "#{category}_loop"}
+
+    -# (　)回繰り返す
+    %block{:type => "#{category}_times"}
+      = toolbox_number_value('COUNT', 10)
+
+    -# <　>まで繰り返す
+    %block{:type => "#{category}_until"}
+
+    -# 繰り返しから脱出する
+    %block{:type => "#{category}_break"}
+
+    -# 次の繰り返しにジャンプする
+    %block{:type => "#{category}_next"}
+
+    -# 現在の繰り返しをやり直す
+    %block{:type => "#{category}_redo"}
+
+    -# (　)秒待つ
+    %block{:type => "#{category}_sleep"}
+      = toolbox_number_value('SEC', 1)
+
+    -# <　>まで待つ
+    %block{:type => "#{category}_await_until"}
+
+    -# ほんの少し待つ
+    %block{:type => "#{category}_await"}
+
+    -# もし<　>なら
+    %block{:type => "#{category}_if"}
+
+    -# もし<　>なら～でなければ
+    %block{:type => "#{category}_if_else"}
+
+  - category = 'sensing'
+  %category{:name => tt('.sensing')}
+    -# 条件:キーボードの[▼キー]が[▼押された]
+    %block{:type => "#{category}_input_key_push_or_down"}
+      = toolbox_key_field
+      = toolbox_pod_field
+
+    -# 条件:マウスの[▼左ボタン]が[▼押された]
+    %block{:type => "#{category}_input_mouse_push_or_down"}
+      = toolbox_pod_field
+
+    -# [　]と聞いて待つ
+    -#%block{:type => "#{category}_ask"}
+    -#  = toolbox_text_value('TEXT', 'あなたのお名前は？')
+
+    -# 変数:答え
+    -#%block{:type => "#{category}_answer"}
+
+    -# 変数:タイマー
+    -#%block{:type => "#{category}_timer_count"}
+
+    -# タイマーをリセット
+    -#%block{:type => "#{category}_timer_reset"}
+
+    - category = 'hardware'
+    - subcategory = 'smalrubot_s1'
+    %block{type: "#{category}_#{subcategory}_ir_photoreflector_value"}
+
+  - category = 'operators'
+  %category{:name => tt('.operators')}
+    -# 条件:(　) < (　)
+    %block{:type => "#{category}_compare_gt"}
+
+    -# 条件:(　) <= (　)
+    %block{:type => "#{category}_compare_gte"}
+
+    -# 条件:(　) = (　)
+    %block{:type => "#{category}_compare_eq"}
+
+    -# 条件:(　) >= (　)
+    %block{:type => "#{category}_compare_lte"}
+
+    -# 条件:(　) > (　)
+    %block{:type => "#{category}_compare_lt"}
+
+    -# 条件:<　> かつ <　>
+    %block{:type => "#{category}_and"}
+
+    -# 条件:<　> または <　>
+    %block{:type => "#{category}_or"}
+
+    -# 条件:<　> ではない
+    %block{:type => "#{category}_negate"}
+
+    -# 条件:真
+    %block{:type => "#{category}_true"}
+
+    -# 条件:偽
+    %block{:type => "#{category}_false"}
+
+    -# 変数:(　) + (　)
+    %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}_modulo"}
+      = toolbox_number_value('A', 5)
+      = toolbox_number_value('B', 2)
+
+    -# 変数:(　)を丸める
+    %block{:type => "#{category}_round"}
+      = toolbox_number_value('A', 0.5)
+
+    -# 変数:(　)の[▼数学関数]
+    %block{:type => "#{category}_math_method"}
+      = toolbox_number_value('NUM', 9)
+      %field{:name => 'METHOD'}<
+        Math.sqrt(%num%)
+
+    -# 数値
+    %block{:type => 'math_number'}
+      %field{:name => 'NUM'}<
+        0

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

@@ -0,0 +1,177 @@
+%xml{:id => 'toolbox', :style => 'display: none'}
+  %category{:name => tt('.motion')}
+    - category = 'hardware'
+    - subcategory = 'smalrubot_v3'
+    %block{type: "#{category}_#{subcategory}_action"}
+      %field{name: 'ACTION'}<
+        forward
+
+    %block{type: "#{category}_#{subcategory}_action_with_sec"}
+      %field{name: 'ACTION'}<
+        forward
+      = toolbox_number_value('SEC', 0.5)
+
+    %block{type: "#{category}_#{subcategory}_motor_set_speed"}
+      = toolbox_number_value('SPEED', 100)
+
+  %category{:name => tt('.looks')}
+    - category = 'hardware'
+    - subcategory = 'smalrubot_v3'
+    %block{type: "#{category}_#{subcategory}_led_turn_on_or_off"}
+      %field{name: 'COLOUR'}<
+        red
+      %field{name: 'OOO'}<
+        turn_on
+
+  %category{:name => tt('.data'), :custom => 'VARIABLE'}
+
+  - category = 'events'
+  %category{:name => tt('.events')}
+    -# まずは
+    %block{:type => "#{category}_on_start"}
+
+    -# キーボードの[▼キー]が[▼押された/押され続けている]とき
+    %block{:type => "#{category}_on_key_push_or_down"}
+      = toolbox_key_field
+      = toolbox_pod_field
+
+  - category = 'control'
+  %category{:name => tt('.control')}
+    -# ずっと
+    %block{:type => "#{category}_loop"}
+
+    -# (　)回繰り返す
+    %block{:type => "#{category}_times"}
+      = toolbox_number_value('COUNT', 10)
+
+    -# <　>まで繰り返す
+    %block{:type => "#{category}_until"}
+
+    -# 繰り返しから脱出する
+    %block{:type => "#{category}_break"}
+
+    -# 次の繰り返しにジャンプする
+    %block{:type => "#{category}_next"}
+
+    -# 現在の繰り返しをやり直す
+    %block{:type => "#{category}_redo"}
+
+    -# (　)秒待つ
+    %block{:type => "#{category}_sleep"}
+      = toolbox_number_value('SEC', 1)
+
+    -# <　>まで待つ
+    %block{:type => "#{category}_await_until"}
+
+    -# ほんの少し待つ
+    %block{:type => "#{category}_await"}
+
+    -# もし<　>なら
+    %block{:type => "#{category}_if"}
+
+    -# もし<　>なら～でなければ
+    %block{:type => "#{category}_if_else"}
+
+  - category = 'sensing'
+  %category{:name => tt('.sensing')}
+    -# 条件:キーボードの[▼キー]が[▼押された]
+    %block{:type => "#{category}_input_key_push_or_down"}
+      = toolbox_key_field
+      = toolbox_pod_field
+
+    -# 条件:マウスの[▼左ボタン]が[▼押された]
+    %block{:type => "#{category}_input_mouse_push_or_down"}
+      = toolbox_pod_field
+
+    -# [　]と聞いて待つ
+    -#%block{:type => "#{category}_ask"}
+    -#  = toolbox_text_value('TEXT', 'あなたのお名前は？')
+
+    -# 変数:答え
+    -#%block{:type => "#{category}_answer"}
+
+    -# 変数:タイマー
+    -#%block{:type => "#{category}_timer_count"}
+
+    -# タイマーをリセット
+    -#%block{:type => "#{category}_timer_reset"}
+
+    - category = 'hardware'
+    - subcategory = 'smalrubot_v3'
+    %block{type: "#{category}_#{subcategory}_touch_sensor_pressed_or_released"}
+    %block{type: "#{category}_#{subcategory}_light_sensor_value"}
+    %block{type: "#{category}_#{subcategory}_motor_speed"}
+
+  - category = 'operators'
+  %category{:name => tt('.operators')}
+    -# 条件:(　) < (　)
+    %block{:type => "#{category}_compare_gt"}
+
+    -# 条件:(　) <= (　)
+    %block{:type => "#{category}_compare_gte"}
+
+    -# 条件:(　) = (　)
+    %block{:type => "#{category}_compare_eq"}
+
+    -# 条件:(　) >= (　)
+    %block{:type => "#{category}_compare_lte"}
+
+    -# 条件:(　) > (　)
+    %block{:type => "#{category}_compare_lt"}
+
+    -# 条件:<　> かつ <　>
+    %block{:type => "#{category}_and"}
+
+    -# 条件:<　> または <　>
+    %block{:type => "#{category}_or"}
+
+    -# 条件:<　> ではない
+    %block{:type => "#{category}_negate"}
+
+    -# 条件:真
+    %block{:type => "#{category}_true"}
+
+    -# 条件:偽
+    %block{:type => "#{category}_false"}
+
+    -# 変数:(　) + (　)
+    %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}_modulo"}
+      = toolbox_number_value('A', 5)
+      = toolbox_number_value('B', 2)
+
+    -# 変数:(　)を丸める
+    %block{:type => "#{category}_round"}
+      = toolbox_number_value('A', 0.5)
+
+    -# 変数:(　)の[▼数学関数]
+    %block{:type => "#{category}_math_method"}
+      = toolbox_number_value('NUM', 9)
+      %field{:name => 'METHOD'}<
+        Math.sqrt(%num%)
+
+    -# 数値
+    %block{:type => 'math_number'}
+      %field{:name => 'NUM'}<
+        0
+
+  %category{:name => tt('.etc')}
+    - category = 'hardware'
+    -# ハードウェアを準備する
+    %block{:type => "#{category}_init_hardware"}

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

@@ -126,5 +126,15 @@
 = render 'reset_modal'
 
 - if raspberrypi?
-  %script{type: "text/javascript"}
-    $(function() { $('div[aria-level="1"][aria-posinset="4"],div[aria-level="1"][aria-posinset="10"]').hide(); });
+  :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]}';
+
+- if SmalrubyEditor::Config.features.is_a?(Array)
+  :javascript
+    window.Smalruby.Features = #{SmalrubyEditor::Config.features.to_json};

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

@@ -13,6 +13,7 @@
   <meta name="msapplication-wide310x150logo" content="wide.png" />
   <meta name="msapplication-square310x310logo" content="large.png" />
   <%= stylesheet_link_tag    "application", media: "all" %>
+  <%= 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_locale_name}" %>

data/config/environments/production.rb

@@ -67,6 +67,7 @@ SmalrubyEditor::Application.configure do
   config.assets.precompile += %w(
     blockly/msg/js/*.js
     msg/*.js
+    toolbox_*.css
   )
 
   # Ignore bad email addresses and do not raise email delivery errors.

data/config/locales/en.yml

@@ -3,6 +3,15 @@ en:
     smalruby_editor: "Smalruby v%{version}"
     "ok": "OK"
     cancel: "Cancel"
+    reset: &reset "Reset"
+    login: &login "Login"
+    name: "Name"
+
+  controllers:
+    source_codes:
+      not_ruby_program: " isn't ruby program."
+      not_exist: " does not exist."
+      exist: " already exist."
 
   editor:
     index:
@@ -13,9 +22,9 @@ en:
       load: "Load"
       save: "Save"
       check: "Check"
-      reset: "Reset"
+      reset: *reset
       logout: "Logout"
-      login: "Login"
+      login: *login
 
     block_tab:
       character: "Character"
@@ -25,29 +34,15 @@ en:
 
     toolbox:
       motion: "Motion"
-      motion_move: "Move"
-      motion_rotate: "Rotate"
-      motion_actuator: "Actuator"
       looks: "Looks"
       sound: "Sound"
       pen: "Pen"
       data: "Data"
-      data_variables: "Variables"
       events: "Events"
       control: "Control"
-      control_loop: "Loop"
-      control_wait: "Wait"
-      control_if: "If-Then"
       sensing: "Sensing"
-      sensing_general: "General"
-      sensing_hardware: "Hardware"
       operators: "Operators"
-      operators_calculate: "Calculate"
-      operators_string: "String"
-      operators_condition: "Condition"
       etc: "More Blocks"
-      etc_ruby: "Ruby"
-      etc_hardware: "Hardware"
       hello: "Hello!"
       world: "world"
       text: "text"
@@ -64,3 +59,11 @@ en:
       find_program: "Find program"
       computer: "From this computer..."
       remix: "Remix"
+
+    reset_modal:
+      title: "Are you sure you want to reset ?"
+      message: "Your program will disappear!"
+
+    signin_modal:
+      message: "Input your name<br>not to mix with other people's program."
+      username_placeholder: "username, ID, nickname, etc..."