smalruby-editor 0.2.1 → 0.2.2

data/config/locales/ja.yml

@@ -3,6 +3,15 @@ ja:
     smalruby_editor: "スモウルビー v%{version}"
     "ok": "決めた！"
     cancel: "やめる"
+    reset: &reset "リセット"
+    login: &login "ログイン"
+    name: "名前"
+
+  controllers:
+    source_codes:
+      not_ruby_program: "はRubyのプログラムではありません"
+      not_exist: "はありません"
+      exist: "すでに同じ名前のプログラムがあります"
 
   editor:
     index:
@@ -13,9 +22,9 @@ ja:
       load: "ロード"
       save: "セーブ"
       check: "チェック"
-      reset: "リセット"
+      reset: *reset
       logout: "ログアウト"
-      login: "ログイン"
+      login: *login
 
     block_tab:
       character: "キャラクター"
@@ -24,30 +33,16 @@ ja:
       stage: "ステージ"
 
     toolbox:
-      motion: "動き"
-      motion_move: "移動"
-      motion_rotate: "回転"
-      motion_actuator: "アクチュエータ"
-      looks: "見た目"
-      sound: "音"
-      pen: "ペン"
-      data: "データ"
-      data_variables: "変数"
-      events: "イベント（〜のとき）"
-      control: "制御"
-      control_loop: "繰り返し"
-      control_wait: "待つ"
-      control_if: "もし～なら"
-      sensing: "調べる"
-      sensing_general: "いろいろ"
-      sensing_hardware: "ハードウェア"
+      motion: "■動き"
+      looks: "★見た目"
+      sound: "♪音"
+      pen: "●ペン"
+      data: "☼データ"
+      events: "♣イベント"
+      control: "◆制御"
+      sensing: "◎調べる"
       operators: "演算"
-      operators_calculate: "計算"
-      operators_string: "文字列"
-      operators_condition: "条件"
-      etc: "その他"
-      etc_ruby: "Ruby"
-      etc_hardware: "ハードウェア"
+      etc: "♠その他"
       hello: "こんにちは！"
       world: "あいうえお"
       text: "文章"
@@ -64,3 +59,11 @@ ja:
       find_program: "プログラムをさがす"
       computer: "このコンピュータ"
       remix: "リミックス"
+
+    reset_modal:
+      title: "本当にリセットしますか？"
+      message: "作成中のプログラムが消えてしまうよ！"
+
+    signin_modal:
+      message: "あなたの名前をいれて、<br />ほかの人のプログラムとまざらないようにしよう♪"
+      username_placeholder: "名前、生徒番号、ニックネームなど"

data/demos/hardware_led.rb.xml

@@ -1,79 +1,79 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-  <character x="261" y="191" name="frog1" costumes="frog1.png" angle="0"></character>
-  <block type="ruby_comment" x="42" y="-39">
-    <field name="COMMENT">ライトをぴかっとさせるでよ</field>
-  </block>
-  <block type="hardware_init_hardware" x="40" y="6"></block>
-  <block type="character_new" x="45" y="50">
-    <field name="NAME">frog1</field>
-    <statement name="DO">
-      <block type="events_on_click">
-        <statement name="DO">
-          <block type="looks_say" inline="true">
-            <value name="TEXT">
-              <block type="text">
-                <field name="TEXT">ライトをぴかっとさせるでよ♪</field>
-              </block>
-            </value>
-            <next>
-              <block type="hardware_led_on">
-                <field name="PIN">D2</field>
-                <next>
-                  <block type="control_sleep" inline="true">
-                    <value name="SEC">
-                      <block type="math_number">
-                        <field name="NUM">1</field>
-                      </block>
-                    </value>
-                    <next>
-                      <block type="hardware_led_off">
-                        <field name="PIN">D2</field>
-                        <next>
-                          <block type="control_sleep" inline="true">
-                            <value name="SEC">
-                              <block type="math_number">
-                                <field name="NUM">1</field>
-                              </block>
-                            </value>
-                            <next>
-                              <block type="hardware_led_on">
-                                <field name="PIN">D13</field>
-                                <next>
-                                  <block type="control_sleep" inline="true">
-                                    <value name="SEC">
-                                      <block type="math_number">
-                                        <field name="NUM">1</field>
-                                      </block>
-                                    </value>
-                                    <next>
-                                      <block type="hardware_led_off">
-                                        <field name="PIN">D13</field>
-                                        <next>
-                                          <block type="looks_say" inline="true">
-                                            <value name="TEXT">
-                                              <block type="text">
-                                                <field name="TEXT"></field>
-                                              </block>
-                                            </value>
-                                          </block>
-                                        </next>
-                                      </block>
-                                    </next>
-                                  </block>
-                                </next>
-                              </block>
-                            </next>
-                          </block>
-                        </next>
-                      </block>
-                    </next>
-                  </block>
-                </next>
-              </block>
-            </next>
-          </block>
-        </statement>
-      </block>
-    </statement>
-  </block>
-</xml>
+<xml xmlns="http://www.w3.org/1999/xhtml">
+  <character x="261" y="191" name="frog1" costumes="frog1.png" angle="0"></character>
+  <block type="ruby_comment" x="42" y="-39">
+    <field name="COMMENT">ライトをぴかっとさせるでよ</field>
+  </block>
+  <block type="hardware_init_hardware" x="40" y="6"></block>
+  <block type="character_new" x="45" y="50">
+    <field name="NAME">frog1</field>
+    <statement name="DO">
+      <block type="events_on_click">
+        <statement name="DO">
+          <block type="looks_say" inline="true">
+            <value name="TEXT">
+              <block type="text">
+                <field name="TEXT">ライトをぴかっとさせるでよ♪</field>
+              </block>
+            </value>
+            <next>
+              <block type="hardware_led_turn_on">
+                <field name="PIN">D2</field>
+                <next>
+                  <block type="control_sleep" inline="true">
+                    <value name="SEC">
+                      <block type="math_number">
+                        <field name="NUM">1</field>
+                      </block>
+                    </value>
+                    <next>
+                      <block type="hardware_led_turn_off">
+                        <field name="PIN">D2</field>
+                        <next>
+                          <block type="control_sleep" inline="true">
+                            <value name="SEC">
+                              <block type="math_number">
+                                <field name="NUM">1</field>
+                              </block>
+                            </value>
+                            <next>
+                              <block type="hardware_led_turn_on">
+                                <field name="PIN">D13</field>
+                                <next>
+                                  <block type="control_sleep" inline="true">
+                                    <value name="SEC">
+                                      <block type="math_number">
+                                        <field name="NUM">1</field>
+                                      </block>
+                                    </value>
+                                    <next>
+                                      <block type="hardware_led_turn_off">
+                                        <field name="PIN">D13</field>
+                                        <next>
+                                          <block type="looks_say" inline="true">
+                                            <value name="TEXT">
+                                              <block type="text">
+                                                <field name="TEXT"></field>
+                                              </block>
+                                            </value>
+                                          </block>
+                                        </next>
+                                      </block>
+                                    </next>
+                                  </block>
+                                </next>
+                              </block>
+                            </next>
+                          </block>
+                        </next>
+                      </block>
+                    </next>
+                  </block>
+                </next>
+              </block>
+            </next>
+          </block>
+        </statement>
+      </block>
+    </statement>
+  </block>
+</xml>

data/lib/smalruby_editor.rb

@@ -18,6 +18,37 @@ module SmalrubyEditor
     sound: 300,
   }
 
+  # http://c4se.hatenablog.com/entry/2013/08/04/190937 をほぼコピーした
+  def hsv_to_rgb(h, s, v)
+    s /= 100.0
+    v /= 100.0
+    c = v * s
+    x = c * (1 - ((h / 60.0) % 2 - 1).abs)
+    m = v - c
+    r, g, b = *(
+      case
+      when h < 60  then [c, x, 0]
+      when h < 120 then [x, c, 0]
+      when h < 180 then [0, c, x]
+      when h < 240 then [0, x, c]
+      when h < 300 then [x, 0, c]
+      else              [c, 0, x]
+      end
+    )
+    [r, g, b].map { |channel|
+      sprintf('%02x', ((channel + m) * 255).ceil)
+    }.join
+  end
+  module_function :hsv_to_rgb
+
+  # return smalruby's home directory
+  # (default is '~/.smalruby-editor').
+  def home_directory
+    path = ENV['SMALRUBY_EDITOR_HOME'] || '~/.smalruby-editor'
+    Pathname(path).expand_path
+  end
+  module_function :home_directory
+
   def create_home_directory(home_dir = nil)
     if home_dir.blank?
       path = ENV['SMALRUBY_EDITOR_HOME'] || '~/.smalruby-editor'
@@ -25,6 +56,7 @@ module SmalrubyEditor
     end
     create_under_home_directories(home_dir)
     create_database_yml(home_dir)
+    create_config_yml(home_dir)
     home_dir
   end
   module_function :create_home_directory
@@ -93,5 +125,31 @@ standalone:
         f.write(DATABASE_YML_TEMPLATE.gsub(/%db_path%/, db_path.to_s))
       end
     end
+
+    CONFIG_YML_TEMPLATE = <<-EOS
+#toolbox_name: default
+#toolbox_css_name: default
+features:
+  - add_character_from_beginning
+  #- disabled_new_character
+  #- auto_init_hardware
+  #- readonly_ruby_mode
+  #- must_signin
+  #- enabled_hardware_blocks_on_default
+  #- enabled_2wd_car_blocks_on_default
+  #- enabled_smalrubot_v3_blocks_on_default
+  #- enabled_smalrubot_s1_blocks_on_default
+    EOS
+
+    def create_config_yml(home_dir)
+      config_yml_path = home_dir.join('config', 'config.yml')
+      unless config_yml_path.exist?
+        File.open(config_yml_path, 'w') do |f|
+          f.write(CONFIG_YML_TEMPLATE)
+        end
+      end
+    end
   end
 end
+
+require 'smalruby_editor/config'

data/lib/smalruby_editor/config.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+module SmalrubyEditor
+  class Config < Settingslogic
+    if Rails.env.test?
+      source({})
+    else
+      path = SmalrubyEditor.home_directory.join('config', 'config.yml')
+      if path.exist?
+        source(path)
+      else
+        source({})
+      end
+    end
+    suppress_errors(true)
+
+    def enabled?(feature)
+      features.try(:include?, feature)
+    end
+    module_function :enabled?
+  end
+end

data/lib/smalruby_editor/version.rb

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

data/smalruby-editor.gemspec

@@ -68,7 +68,8 @@ Gem::Specification.new do |spec|
      ['mime-types', '~> 1.16'],
      ['haml-rails'],
      ['nokogiri'],
-     ['smalruby', '~> 0.1.2'],
+     ['settingslogic'],
+     ['smalruby', '~> 0.1.3'],
     ]
   runtime_dependencies << ['therubyracer'] unless is_windows
   runtime_dependencies.each do |args|

data/spec/acceptance/base.feature

@@ -26,7 +26,7 @@
     ならば 次のXMLと同等のブロックが配置されていること:
       """
       <xml>
-        <block type="ruby_statement" x="0" y="0">
+        <block type="ruby_statement" id="1" x="0" y="0">
           <field name="STATEMENT">stage1 = Stage.new(color: "white")</field>
         </block>
       </xml>
@@ -65,7 +65,7 @@
     ならば 次のXMLと同等のブロックが配置されていること:
       """
       <xml>
-        <block type="ruby_statement" x="0" y="0">
+        <block type="ruby_statement" id="1" x="0" y="0">
           <field name="STATEMENT">stage1 = Stage.new(color: "white")</field>
         </block>
       </xml>
@@ -153,7 +153,7 @@
     ならば 次のXMLと同等のブロックが配置されていること:
       """
       <xml>
-        <block type="ruby_statement" x="0" y="0">
+        <block type="ruby_statement" id="1" x="0" y="0">
           <field name="STATEMENT">stage1 = Stage.new(color: "white")</field>
         </block>
       </xml>

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

@@ -0,0 +1,107 @@
+# encoding: utf-8
+# language: en
+@javascript
+Feature: hardware_smalrubot_s1_action block
+  Background:
+    Given "ブロック" タブを表示する
+    And キャラクターcar1を追加する
+
+  Scenario: ブロックのみ配置する
+    When 次のブロックを配置する:
+      """
+      %block{:type => "hardware_smalrubot_s1_action", :x => "0", :y => "0"}
+        %field{:name => "ACTION"}<
+          backward
+      """
+    And ブロックからソースコードを生成する
+
+    Then テキストエディタのプログラムは "" であること
+
+  Scenario: キャラクターとブロックを配置する
+    When 次のブロックを配置する:
+      """
+      %block{:type => "character_new", :x => "21", :y => "15"}
+        %field{:name => "NAME"}<
+          car1
+        %statement{:name => "DO"}
+          %block{:type => "hardware_smalrubot_s1_action", :x => "0", :y => "0"}
+            %field{:name => "ACTION"}<
+              forward
+            %next
+              %block{:type => "hardware_smalrubot_s1_action", :x => "0", :y => "0"}
+                %field{:name => "ACTION"}<
+                  backward
+                %next
+                  %block{:type => "hardware_smalrubot_s1_action", :x => "0", :y => "0"}
+                    %field{:name => "ACTION"}<
+                      turn_left
+                    %next
+                      %block{:type => "hardware_smalrubot_s1_action", :x => "0", :y => "0"}
+                        %field{:name => "ACTION"}<
+                          turn_right
+                        %next
+                          %block{:type => "hardware_smalrubot_s1_action", :x => "0", :y => "0"}
+                            %field{:name => "ACTION"}<
+                              stop
+      """
+    And ブロックからソースコードを生成する
+
+    Then テキストエディタのプログラムは以下であること:
+      """
+      require "smalruby"
+
+      car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
+      car1.smalrubot_s1.forward
+      car1.smalrubot_s1.backward
+      car1.smalrubot_s1.turn_left
+      car1.smalrubot_s1.turn_right
+      car1.smalrubot_s1.stop
+
+      """
+
+  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 => "hardware_smalrubot_s1_action", :x => "0", :y => "0"}
+                %field{:name => "ACTION"}<
+                  forward
+                %next
+                  %block{:type => "hardware_smalrubot_s1_action", :x => "0", :y => "0"}
+                    %field{:name => "ACTION"}<
+                      backward
+                    %next
+                      %block{:type => "hardware_smalrubot_s1_action", :x => "0", :y => "0"}
+                        %field{:name => "ACTION"}<
+                          turn_left
+                        %next
+                          %block{:type => "hardware_smalrubot_s1_action", :x => "0", :y => "0"}
+                            %field{:name => "ACTION"}<
+                              turn_right
+                            %next
+                              %block{:type => "hardware_smalrubot_s1_action", :x => "0", :y => "0"}
+                                %field{:name => "ACTION"}<
+                                  stop
+      """
+    And ブロックからソースコードを生成する
+
+    Then テキストエディタのプログラムは以下であること:
+      """
+      require "smalruby"
+
+      car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
+
+      car1.on(:start) do
+        smalrubot_s1.forward
+        smalrubot_s1.backward
+        smalrubot_s1.turn_left
+        smalrubot_s1.turn_right
+        smalrubot_s1.stop
+      end
+
+      """