smalruby-editor 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b24256d1fe46a0a8c3ce28bd7ed20f60f77395a
-  data.tar.gz: d6c8e1c8edce2ae53175e78abb804ad90077c563
+  metadata.gz: 4f7cc4d9a3e93cfb74cbb139e4e46429f3aa6011
+  data.tar.gz: f8837100d385ab0114a1596481b6500dd7852a30
 SHA512:
-  metadata.gz: fd51308b9b000c171ae9efbf11f1e40ab28eda5875524650ccbf36ff0e615127c27987b87cd80cdff7fa5bb2d2cd01bec87a74cc39ef3b8eeed714ee431d414e
-  data.tar.gz: d837a3ede7efa6ff6f87087326746bb18510e359da15786b0a4d70d50aac34009ba7a561365e99582112fc224898351296913fa4ddf9a559e015d7ff3a5bc568
+  metadata.gz: b352897a1eea4be81af8b3d72ff7e3d2697c02b2e619656a4ead5ab7943964672f5d0d753f401b88dd5fd5adfbafd0a3d82bc22ea4740bbc6dbd50a177d2451c
+  data.tar.gz: 806c1574f73523fecb2a83fba6288918084ac85ffa7688810a7c4f9d084f73620698f9380af6924e26507a7267bc60f01b0615e464fcf74931601b21e4f8b3e4

data/.rspec

@@ -1,4 +1,3 @@
 --color
 --format documentation
---drb
 -r turnip/rspec

data/.rubocop.yml

@@ -30,3 +30,7 @@ MethodLength:
 # デフォルトの100は短すぎる。なんとなく250行とした。
 ClassLength:
   Max: 250
+
+# LoadErrorなど、rescueブロックを空にすることはよくあるため。
+HandleExceptions:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.1.4
+2.1.5

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.1.4
+  - 2.1.5
 
 env:
   AUDIODEV=null

data/Guardfile

@@ -0,0 +1,45 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %(app lib config test spec feature)
+
+## Uncomment to clear the screen before every task
+# clearing :on
+
+group :red_green_refactor, halt_on_fail: true do
+  guard :rubocop, all_on_start: false do
+    watch(%r{.+\.rb$})
+    watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  end
+
+  guard :rspec, cmd: 'bundle exec bin/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/(.+)\.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"] }
+    watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+    watch('config/routes.rb')                           { "spec/routing" }
+    watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+    # Capybara features specs
+    watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+    # Turnip features and steps
+    watch(%r{^spec/acceptance/(.+)\.feature$})
+    watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+  end
+end
+
+guard 'livereload' do
+  watch(%r{app/views/.+\.(erb|haml|slim)$})
+  watch(%r{app/helpers/.+\.rb})
+  watch(%r{public/.+\.(css|js|html)})
+  watch(%r{config/locales/.+\.yml})
+  # Rails Assets Pipeline
+  watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
+end

data/app/assets/javascripts/application.js

@@ -15,7 +15,6 @@
 //= require jquery.ui.draggable
 //= require jquery.ui.droppable
 //= require jquery.blockUI
-//= require turbolinks
 //= require ace/ace
 //= require ace/theme-clouds.js
 //= require ace/mode-ruby.js

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

@@ -80,7 +80,7 @@ Blockly.Msg.BLOCKS_SENSING_DOWN = Blockly.Msg.BLOCKS_SENSING_PUSH;
 Blockly.Msg.BLOCKS_SENSING_M_LBUTTON = '左ボタン';
 Blockly.Msg.BLOCKS_SENSING_M_MBUTTON = '中ボタン';
 Blockly.Msg.BLOCKS_SENSING_M_RBUTTON = '右ボタン';
-Blockly.Msg.BLOCKS_SENSING_UP = '押された';
+Blockly.Msg.BLOCKS_SENSING_UP = '離された';
 Blockly.Msg.BLOCKS_SENSING_REACH_WALL = '端に触れた';
 Blockly.Msg.BLOCKS_SENSING_INPUT_KEY_PUSH_OR_DOWN_PREFIX = 'キーボードの';
 Blockly.Msg.BLOCKS_SENSING_INPUT_KEY_PUSH_OR_DOWN_MIDDLE = 'が';

data/app/assets/stylesheets/toolbox.css.scss.erb

@@ -27,29 +27,15 @@
   colors = SmalrubyEditor::COLORS
 
   hues = [
-    colors[:motion],
-    colors[:motion],
-    colors[:motion],
     colors[:motion],
     colors[:looks],
     colors[:sound],
     colors[:pen],
     colors[:data],
-    colors[:data],
     colors[:events],
     colors[:control],
-    colors[:control],
-    colors[:control],
-    colors[:control],
     colors[:sensing],
-    colors[:sensing],
-    colors[:sensing],
-    colors[:operators],
-    colors[:operators],
     colors[:operators],
-    colors[:operators],
-    colors[:etc],
-    colors[:etc],
     colors[:etc],
   ]
 
@@ -57,11 +43,10 @@
     [hsv_to_rgb(h, 100, 80), hsv_to_rgb(h, 100, 100)]
   }
 
-  ids = (0..9).to_a + ('a'..'z').to_a
   colors.each.with_index(1) do |(color, active_color), index|
 %>
 
-#\:<%= ids[index] %> {
+div[aria-level="1"][aria-posinset="<%= index %>"] {
     .blocklyTreeRow {
         margin-bottom: 1px;
         padding-top: 1px;

data/app/controllers/source_codes_controller.rb

@@ -9,16 +9,21 @@ class SourceCodesController < ApplicationController
       localPrograms: [],
       demoPrograms: [],
     }
+
+    select_and_get_summary = proc { |path|
+      s = SourceCode.new(filename: path.basename.to_s, data: path.read)
+      next if raspberrypi? && s.include_block?(/^(hardware_|pen_)/)
+      s.summary
+    }
+
     if standalone?
-      res[:localPrograms] = local_program_paths.map { |path|
-        SourceCode.new(filename: path.basename.to_s, data: path.read).summary
-      }
+      res[:localPrograms] =
+        local_program_paths.map(&select_and_get_summary).compact
     end
 
-    res[:demoPrograms] = Pathname.glob(Rails.root.join('demos/*.rb.xml')).map {
-      |path|
-      SourceCode.new(filename: path.basename.to_s, data: path.read).summary
-    }
+    demo_program_paths = Pathname.glob(Rails.root.join('demos/*.rb.xml'))
+    res[:demoPrograms] =
+      demo_program_paths.map(&select_and_get_summary).compact
 
     render json: res
   end

data/app/models/source_code.rb

@@ -67,7 +67,7 @@ class SourceCode < ActiveRecord::Base
   # ソースコードの概要を取得する
   def summary
     res = {}
-    if /\.xml\z/ =~ filename
+    if xml?
       res[:filename] = filename.sub(/\.xml\z/, '')
 
       doc = Nokogiri::HTML.parse(data)
@@ -84,8 +84,41 @@ class SourceCode < ActiveRecord::Base
     res
   end
 
+  # 指定した命令ブロックを含んでいるかどうかを返す
+  #
+  # @param [String|Regexp] type 命令ブロックの種類
+  # @return [Boolean] 命令ブロックを含む場合はtrue、そうでない場合はfalse
+  def include_block?(type)
+    if xml?
+      doc = Nokogiri::HTML.parse(data)
+      if type.is_a?(Regexp)
+        doc.xpath(%(//block[matches(@type, '#{type.source}')]),
+                  MatchesXPathFunction.new).length > 0
+      else
+        doc.xpath(%(//block[@type="#{type}"])).length > 0
+      end
+    else
+      false
+    end
+  end
+
+  # ソースコードの種別がXML形式かどうかを返す
+  def xml?
+    !!(/\.xml\z/ =~ filename)
+  end
+
   private
 
+  class MatchesXPathFunction
+    def matches(node_set, regex)
+      node_set.select { |node|
+        node.value =~ /#{regex}/
+      }
+    end
+  end
+
+  private_constant :MatchesXPathFunction
+
   def validate_filename
     if File.basename(filename) != filename
       errors.add(:filename, 'includes directory separator(s)')

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

@@ -40,10 +40,12 @@
         = toolbox_number_value('Y', 0)
 
       -# 変数:x座標
-      %block{:type => "#{category}_self_x"}
+      - if !raspberrypi?
+        %block{:type => "#{category}_self_x"}
 
       -# 変数:y座標
-      %block{:type => "#{category}_self_y"}
+      - if !raspberrypi?
+        %block{:type => "#{category}_self_y"}
 
     %category{:name => t('.motion_rotate')}
       -# もし端に着いたら、跳ね返る
@@ -77,64 +79,66 @@
       %block{:type => "#{category}_set_rotation_style"}
 
       -# 変数:向き
-      %block{:type => "#{category}_self_angle"}
-
-    - category = 'hardware'
-    %category{:name => t('.motion_actuator')}
-      - subcategory = 'servo'
-      -# サーボ[▼PIN]を(　)度(5～180)にする
-      %block{:type => "#{category}_#{subcategory}_set_position"}
-        = toolbox_number_value('POS', 90)
-
-      - subcategory = 'two_wheel_drive_car'
-      -# 2WD車[▼PIN]を（　）秒[▼コマンド]
-      %block{:type => "#{category}_#{subcategory}_run"}
-        = toolbox_pin_field('D5')
-        = toolbox_number_value('SEC', 1)
-        %value{:name => 'COMMAND'}
-          %block{:type => "#{category}_#{subcategory}_commands"}
-
-      -# [▼コマンド]
-      %block{:type => "#{category}_#{subcategory}_commands"}
-        %field{:name => 'COMMAND'}<
-          forward
-
-      -# 2WD車[▼PIN]を進める
-      %block{:type => "#{category}_#{subcategory}_forward"}
-        = toolbox_pin_field('D5')
-
-      -# 2WD車[▼PIN]をバックさせる
-      %block{:type => "#{category}_#{subcategory}_backward"}
-        = toolbox_pin_field('D5')
-
-      -# 2WD車[▼PIN]を左に曲げる
-      %block{:type => "#{category}_#{subcategory}_turn_left"}
-        = toolbox_pin_field('D5')
-
-      -# 2WD車[▼PIN]を右に曲げる
-      %block{:type => "#{category}_#{subcategory}_turn_right"}
-        = toolbox_pin_field('D5')
-
-      -# 2WD車[▼PIN]を止める
-      %block{:type => "#{category}_#{subcategory}_stop"}
-        = toolbox_pin_field('D5')
-
-      -# 2WD車[▼PIN]の[▼LOR]の速度を<SPEED>%にする
-      %block{:type => "#{category}_#{subcategory}_set_speed"}
-        = toolbox_pin_field('D5')
-        = toolbox_number_value('SPEED', 100)
-
-      - subcategory = 'motor_driver'
-      -# (モータードライバ[▼PIN]で)モーターを[▼正転させる]
-      %block{:type => "#{category}_#{subcategory}"}
-        = toolbox_pin_field('D6')
-        %field{:name => 'METHOD'}<
-          forward
-
-      -# (モータードライバ[▼PIN]の)モーターの速度を<SPEED>%にする
-      %block{:type => "#{category}_#{subcategory}_set_speed"}
-        = toolbox_pin_field('D6')
-        = toolbox_number_value('SPEED', 100)
+      - if !raspberrypi?
+        %block{:type => "#{category}_self_angle"}
+
+    - if !raspberrypi?
+      - category = 'hardware'
+      %category{:name => t('.motion_actuator')}
+        - subcategory = 'servo'
+        -# サーボ[▼PIN]を(　)度(5～180)にする
+        %block{:type => "#{category}_#{subcategory}_set_position"}
+          = toolbox_number_value('POS', 90)
+
+        - subcategory = 'two_wheel_drive_car'
+        -# 2WD車[▼PIN]を（　）秒[▼コマンド]
+        %block{:type => "#{category}_#{subcategory}_run"}
+          = toolbox_pin_field('D5')
+          = toolbox_number_value('SEC', 1)
+          %value{:name => 'COMMAND'}
+            %block{:type => "#{category}_#{subcategory}_commands"}
+
+        -# [▼コマンド]
+        %block{:type => "#{category}_#{subcategory}_commands"}
+          %field{:name => 'COMMAND'}<
+            forward
+
+        -# 2WD車[▼PIN]を進める
+        %block{:type => "#{category}_#{subcategory}_forward"}
+          = toolbox_pin_field('D5')
+
+        -# 2WD車[▼PIN]をバックさせる
+        %block{:type => "#{category}_#{subcategory}_backward"}
+          = toolbox_pin_field('D5')
+
+        -# 2WD車[▼PIN]を左に曲げる
+        %block{:type => "#{category}_#{subcategory}_turn_left"}
+          = toolbox_pin_field('D5')
+
+        -# 2WD車[▼PIN]を右に曲げる
+        %block{:type => "#{category}_#{subcategory}_turn_right"}
+          = toolbox_pin_field('D5')
+
+        -# 2WD車[▼PIN]を止める
+        %block{:type => "#{category}_#{subcategory}_stop"}
+          = toolbox_pin_field('D5')
+
+        -# 2WD車[▼PIN]の[▼LOR]の速度を<SPEED>%にする
+        %block{:type => "#{category}_#{subcategory}_set_speed"}
+          = toolbox_pin_field('D5')
+          = toolbox_number_value('SPEED', 100)
+
+        - subcategory = 'motor_driver'
+        -# (モータードライバ[▼PIN]で)モーターを[▼正転させる]
+        %block{:type => "#{category}_#{subcategory}"}
+          = toolbox_pin_field('D6')
+          %field{:name => 'METHOD'}<
+            forward
+
+        -# (モータードライバ[▼PIN]の)モーターの速度を<SPEED>%にする
+        %block{:type => "#{category}_#{subcategory}_set_speed"}
+          = toolbox_pin_field('D6')
+          = toolbox_number_value('SPEED', 100)
 
   - category = 'looks'
   %category{:name => t('.looks')}
@@ -179,35 +183,36 @@
     -# [▼プリセット画像]
     -#%block{:type => "#{category}_preset_images"}
 
-    - category = 'hardware'
-    - subcategory = 'led'
-    -# LED[▼PIN]をオンにする
-    %block{:type => "#{category}_#{subcategory}_on"}
+    - if !raspberrypi?
+      - category = 'hardware'
+      - subcategory = 'led'
+      -# LED[▼PIN]をオンにする
+      %block{:type => "#{category}_#{subcategory}_on"}
 
-    -# LED[▼PIN]をオフにする
-    %block{:type => "#{category}_#{subcategory}_off"}
+      -# LED[▼PIN]をオフにする
+      %block{:type => "#{category}_#{subcategory}_off"}
 
-    - subcategory = 'rgb_led'
-    -# RGB LED[▼アノード]コモン[▼PIN]を[カラー]にする
-    %block{:type => "#{category}_#{subcategory}_on"}
+      - subcategory = 'rgb_led'
+      -# RGB LED[▼アノード]コモン[▼PIN]を[カラー]にする
+      %block{:type => "#{category}_#{subcategory}_on"}
 
-    -# RGB LED[▼アノード]コモン[▼PIN]をオフにする
-    %block{:type => "#{category}_#{subcategory}_off"}
+      -# RGB LED[▼アノード]コモン[▼PIN]をオフにする
+      %block{:type => "#{category}_#{subcategory}_off"}
 
-    - subcategory = 'seven_segment_display'
-    -# 7セグディスプレイに[▼0-9]を表示する
-    %block{:type => "#{category}_#{subcategory}_show"}
+      - subcategory = 'seven_segment_display'
+      -# 7セグディスプレイに[▼0-9]を表示する
+      %block{:type => "#{category}_#{subcategory}_show"}
 
-    -# 7セグディスプレイをオフにする
-    %block{:type => "#{category}_#{subcategory}_off"}
+      -# 7セグディスプレイをオフにする
+      %block{:type => "#{category}_#{subcategory}_off"}
 
-    - subcategory = 'lcd'
-    -# LCDに(　)を表示する
-    %block{:type => "#{category}_#{subcategory}_puts"}
-      = toolbox_text_value('TEXT', 'Hello')
+      - subcategory = 'lcd'
+      -# LCDに(　)を表示する
+      %block{:type => "#{category}_#{subcategory}_puts"}
+        = toolbox_text_value('TEXT', 'Hello')
 
-    -# LCDをクリアする
-    %block{:type => "#{category}_#{subcategory}_clear"}
+      -# LCDをクリアする
+      %block{:type => "#{category}_#{subcategory}_clear"}
 
   - category = 'sound'
   %category{:name => t('.sound')}
@@ -224,14 +229,15 @@
 
   - category = 'pen'
   %category{:name => t('.pen')}
-    -# ペンを下ろす
-    %block{:type => "#{category}_down_pen"}
+    - if !raspberrypi?
+      -# ペンを下ろす
+      %block{:type => "#{category}_down_pen"}
 
-    -# ペンを上げる
-    %block{:type => "#{category}_up_pen"}
+      -# ペンを上げる
+      %block{:type => "#{category}_up_pen"}
 
-    -# ペンの色を[カラー]にする
-    %block{:type => "#{category}_set_pen_color"}
+      -# ペンの色を[カラー]にする
+      %block{:type => "#{category}_set_pen_color"}
 
   %category{:name => t('.data')}
     %category{:name => t('.data_variables'), :custom => 'VARIABLE'}
@@ -251,12 +257,13 @@
     -# [▼キャラクター]にぶつかったとき
     %block{:type => "#{category}_on_hit"}
 
-    - category = 'hardware'
-    -# センサー[▼PIN]が変化したとき
-    %block{:type => "#{category}_on_sensor_change"}
+    - if !raspberrypi?
+      - category = 'hardware'
+      -# センサー[▼PIN]が変化したとき
+      %block{:type => "#{category}_on_sensor_change"}
 
-    -# ボタン[▼PIN]が[▼押された]とき
-    %block{:type => "#{category}_on_button_down_or_up"}
+      -# ボタン[▼PIN]が[▼押された]とき
+      %block{:type => "#{category}_on_button_down_or_up"}
 
   - category = 'control'
   %category{:name => t('.control')}
@@ -274,11 +281,12 @@
       -# 繰り返しから脱出する
       %block{:type => "#{category}_break"}
 
-      -# 次の繰り返しにジャンプする
-      %block{:type => "#{category}_next"}
+      - if !raspberrypi?
+        -# 次の繰り返しにジャンプする
+        %block{:type => "#{category}_next"}
 
-      -# 現在の繰り返しをやり直す
-      %block{:type => "#{category}_redo"}
+        -# 現在の繰り返しをやり直す
+        %block{:type => "#{category}_redo"}
 
     %category{:name => t('.control_wait')}
       -# (　)秒待つ
@@ -336,29 +344,31 @@
       -# 変数:[▼キャラクター]の[▼プロパティ]
       %block{:type => "#{category}_character_property"}
 
-      -# 変数:現在の[▼時]
-      %block{:type => "#{category}_time_now"}
+      - if !raspberrypi?
+        -# 変数:現在の[▼時]
+        %block{:type => "#{category}_time_now"}
 
-      -# 変数:2000年からの日数
-      -#%block{:type => "#{category}_days_since_2000"}
+        -# 変数:2000年からの日数
+        %block{:type => "#{category}_days_since_2000"}
 
-    - category = 'hardware'
-    %category{:name => t('.sensing_hardware')}
-      -# センサー[▼PIN]
-      %block{:type => "#{category}_sensor_value"}
-        = toolbox_pin_field('A0')
+    - if !raspberrypi?
+      - category = 'hardware'
+      %category{:name => t('.sensing_hardware')}
+        -# センサー[▼PIN]
+        %block{:type => "#{category}_sensor_value"}
+          = toolbox_pin_field('A0')
 
-      -# 条件:ボタン[▼PIN]が[▼押された]
-      %block{:type => "#{category}_button_down_or_up"}
-        = toolbox_pin_field('D3')
+        -# 条件:ボタン[▼PIN]が[▼押された]
+        %block{:type => "#{category}_button_down_or_up"}
+          = toolbox_pin_field('D3')
 
-      -# 2WD車[▼PIN]の[▼LOR]の速度%
-      %block{:type => "#{category}_two_wheel_drive_car_speed"}
-        = toolbox_pin_field('D5')
+        -# 2WD車[▼PIN]の[▼LOR]の速度%
+        %block{:type => "#{category}_two_wheel_drive_car_speed"}
+          = toolbox_pin_field('D5')
 
-      -# (モータードライバ[▼PIN]の)モーターの速度(%)
-      %block{:type => "#{category}_motor_driver_speed"}
-        = toolbox_pin_field('D6')
+        -# (モータードライバ[▼PIN]の)モーターの速度(%)
+        %block{:type => "#{category}_motor_driver_speed"}
+          = toolbox_pin_field('D6')
 
   - category = 'operators'
   %category{:name => t('.operators')}
@@ -381,19 +391,20 @@
         = toolbox_number_value('B', 10)
 
       -# 変数:(　)を(　)で割った余り
-      %block{:type => "#{category}_modulo"}
-        = toolbox_number_value('A', 5)
-        = toolbox_number_value('B', 2)
+      - if !raspberrypi?
+        %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}_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 => "#{category}_math_method"}
+          = toolbox_number_value('NUM', 9)
+          %field{:name => 'METHOD'}<
+            Math.sqrt(%num%)
 
       -# 数値
       %block{:type => 'math_number'}
@@ -447,25 +458,26 @@
       %block{:type => "#{category}_false"}
 
   %category{:name => t('.etc')}
-    - category = 'ruby'
-    %category{:name => t('.etc_ruby')}
-      -# 文
-      %block{:type => "#{category}_statement"}
+    - if !raspberrypi?
+      - category = 'ruby'
+      %category{:name => t('.etc_ruby')}
+        -# 文
+        %block{:type => "#{category}_statement"}
 
-      -# 式
-      %block{:type => "#{category}_expression"}
+        -# 式
+        %block{:type => "#{category}_expression"}
 
-      -# コメント
-      %block{:type => "#{category}_comment"}
+        -# コメント
+        %block{:type => "#{category}_comment"}
 
-      -# p
-      %block{:type => "#{category}_p"}
+        -# p
+        %block{:type => "#{category}_p"}
 
-    - category = 'hardware'
-    %category{:name => t('.etc_hardware')}
-      -# ハードウェアを準備する
-      %block{:type => "#{category}_init_hardware"}
+      - category = 'hardware'
+      %category{:name => t('.etc_hardware')}
+        -# ハードウェアを準備する
+        %block{:type => "#{category}_init_hardware"}
 
-      -# ボタン[▼PIN]のプルアップ抵抗を使わない
-      %block{:type => "#{category}_button_not_use_pullup"}
-        = toolbox_pin_field('D3')
+        -# ボタン[▼PIN]のプルアップ抵抗を使わない
+        %block{:type => "#{category}_button_not_use_pullup"}
+          = toolbox_pin_field('D3')

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

@@ -41,16 +41,16 @@
           = t('.check')
         %button#reset-button.btn{class: "btn-primary"}<
           %i.icon-off
-          = t('Reset')
+          = t('.reset')
         - if standalone?
           - if session[:username]
             %button#signout-button.btn{class: "btn-primary"}<
               %i.icon-eject
-              = t('logout')
+              = t('.logout')
           - else
             %button#signout-button.btn{class: "btn-primary", style: "display: none"}<
               %i.icon-eject
-              = t('logout')
+              = t('.logout')
 
       - else
         .btn-group
@@ -127,4 +127,4 @@
 
 - if raspberrypi?
   %script{type: "text/javascript"}
-    $(function() { $('div[id=":7"]').hide(); });
+    $(function() { $('div[aria-level="1"][aria-posinset="4"],div[aria-level="1"][aria-posinset="10"]').hide(); });

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

@@ -10,8 +10,8 @@
   <meta name="msapplication-square150x150logo" content="square.png" />
   <meta name="msapplication-wide310x150logo" content="wide.png" />
   <meta name="msapplication-square310x310logo" content="large.png" />
-  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%= stylesheet_link_tag    "application", media: "all" %>
+  <%= javascript_include_tag "application" %>
   <%= javascript_include_tag "blockly/msg/js/#{blockly_message_locale_name}" %>
   <%= javascript_include_tag "msg/#{blockly_message_locale_name}" %>
   <%= csrf_meta_tags %>