smalruby-editor 0.1.23-x86-mingw32 → 0.1.24-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7f9e3657a17fff32fcd9ac5b73969f9e406f593
-  data.tar.gz: 9a3e3b072a873403ae7fee32c1bdffaef07161f8
+  metadata.gz: 42f6d2af5f4f6c84ae004c8ce00075e298c78d2f
+  data.tar.gz: 850e6b965ebdd14beccf80b57e49295dda964d2c
 SHA512:
-  metadata.gz: 5da5933e6419273e373c0fb36851607c35726a60a5e858b90ae0dad1f727d0b6f876a1a77c9a6592b2c3436d2e3e9cbbbec43987a9903cd6c77e407986e4b400
-  data.tar.gz: b822bbc6a28e7b310b6385f1d926417d1478f4277fe0e26b487090f8c879dca050d0ca59efbb8a596a1c9ac93fcb421ca65fa3397a529e923f74cb6bd244df91
+  metadata.gz: fadf35fb278a419515c9d8b4ac222d0bbfbf2f82cbb515d1a0619a38b2c4001684aef925ecd702232b4e041f030577a9dc544e191149cffe6879b05c66850fed
+  data.tar.gz: 21cb579247d0979cf0be7ce503207f3ba35f2ce42a80b61a9330c320672ed1429722db5d866b44694d2a81a47c7b46d2d933b5c3c91d21de31458d612c879268

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 %>

data/bin/bundle

@@ -1,3 +1,3 @@
-#!/usr/bin/env ruby.exe
+#!/usr/bin/env ruby
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 load Gem.bin_path('bundler', 'bundle')

data/bin/rails

@@ -1,4 +1,8 @@
-#!/usr/bin/env ruby.exe
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError
+end
 APP_PATH = File.expand_path('../../config/application',  __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/bin/rake

@@ -1,4 +1,8 @@
-#!/usr/bin/env ruby.exe
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError
+end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/bin/rspec

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError
+end
+require 'bundler/setup'
+load Gem.bin_path('rspec-core', 'rspec')

data/bin/spring

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast
+# It gets overwritten when you run the `spring binstub` command
+
+unless defined?(Spring)
+  require 'rubygems'
+  require 'bundler'
+
+  re = /^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m
+  if (match = Bundler.default_lockfile.read.match(re))
+    ENV['GEM_PATH'] =
+      ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
+    ENV['GEM_HOME'] = ''
+    Gem.paths = ENV
+
+    gem 'spring', match[1]
+    require 'spring/binstub'
+  end
+end

data/bin/teaspoon

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError
+end
+require 'bundler/setup'
+load Gem.bin_path('teaspoon', 'teaspoon')

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
-module SmalrubyEditor
-  VERSION =  '0.1.23'
-end
+module SmalrubyEditor
+  VERSION = '0.1.24'
+end

data/smalruby-editor.gemspec

@@ -61,7 +61,6 @@ Gem::Specification.new do |spec|
      ['sass-rails', '~> 4.0.0'],
      ['uglifier', '>= 1.3.0'],
      ['coffee-rails', '~> 4.0.0'],
-     ['turbolinks'],
      ['jbuilder', '~> 2.0'],
      ['flatstrap-sass'],
      ['shared-mime-info'],

data/spec/models/source_code_spec.rb

@@ -77,7 +77,7 @@ describe SourceCode, 'Rubyのソースコードを表現するモデル' do
   end
 
   describe '#summary', 'プログラムの概要を取得する' do
-    describe 'XML形式'do
+    describe 'XML形式' do
       let(:xml_path) { rb_path + '.xml' }
       let(:data) { Rails.root.join(xml_path).read }
       let(:source_code) {
@@ -128,4 +128,91 @@ describe SourceCode, 'Rubyのソースコードを表現するモデル' do
       end
     end
   end
+
+  describe '#include_block?' do
+    describe 'XML形式' do
+      let(:data) { Rails.root.join(xml_path).read }
+      let(:source_code) {
+        SourceCode.new(filename: File.basename(xml_path), data: data)
+      }
+
+      subject { source_code.include_block?(type) }
+
+      context 'ソースコードにハードウェア関連ブロックを含む場合' do
+        let(:xml_path) { 'demos/adjust_2wd_car.rb.xml' }
+
+        context '引数にhardware_init_hardwareを指定する' do
+          let(:type) { 'hardware_init_hardware' }
+
+          it { should be_true }
+        end
+
+        context '引数にハードウェア関連ブロックを指定する' do
+          let(:type) { /^hardware_/ }
+
+          it { should be_true }
+        end
+
+        context '引数にpen_down_penを指定する' do
+          let(:type) { 'pen_down_pen' }
+
+          it { should be_false }
+        end
+
+        context '引数にペン関連ブロックを指定する' do
+          let(:type) { /^pen_/ }
+
+          it { should be_false }
+        end
+      end
+
+      context 'ソースコードにハードウェア関連ブロックを含まない場合' do
+        let(:xml_path) { 'demos/star.rb.xml' }
+
+        context '引数にhardware_init_hardwareを指定する' do
+          let(:type) { 'hardware_init_hardware' }
+
+          it { should be_false }
+        end
+
+        context '引数にハードウェア関連ブロックを指定する' do
+          let(:type) { /^hardware_/ }
+
+          it { should be_false }
+        end
+
+        context '引数にpen_down_penを指定する' do
+          let(:type) { 'pen_down_pen' }
+
+          it { should be_true }
+        end
+
+        context '引数にペン関連ブロックを指定する' do
+          let(:type) { /^pen_/ }
+
+          it { should be_true }
+        end
+      end
+    end
+  end
+
+  describe '#xml?' do
+    let(:source_code) {
+      SourceCode.new(filename: File.basename(path))
+    }
+
+    subject { source_code.xml? }
+
+    context 'a' do
+      let(:path) { 'car1.rb' }
+
+      it { should be_false }
+    end
+
+    context 'b' do
+      let(:path) { 'car1.rb.xml' }
+
+      it { should be_true }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,154 +1,131 @@
 # -*- coding: utf-8 -*-
 require 'rubygems'
-require 'spork'
-# uncomment the following line to use spork with the debugger
-# require 'spork/ext/ruby-debug'
-
-Spork.prefork do
-  # Loading more in this block will cause your tests to run faster. However,
-  # if you change any configuration or code from libraries loaded here, you'll
-  # need to restart spork for it take effect.
-
-  ENV['RAILS_ENV'] ||= 'test'
-  require File.expand_path('../../config/environment', __FILE__)
-  require 'rspec/rails'
-  require 'rspec/autorun'
-  require 'capybara/dsl'
-  require 'capybara/rspec'
-  require 'capybara/poltergeist'
-  require 'turnip'
-  require 'turnip/capybara'
-  require 'simplecov' if ENV['COVERAGE'] || ENV['COVERALLS']
-
-  # Requires supporting ruby files with custom matchers and macros, etc,
-  # in spec/support/ and its subdirectories.
-  Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
-
-  # Checks for pending migrations before tests are run.
-  # If you are not using ActiveRecord, you can remove this line.
-  ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
-
-  RSpec.configure do |config|
-    # ## Mock Framework
-    #
-    # If you prefer to use mocha, flexmock or RR, uncomment the
-    # appropriate line:
-    #
-    # config.mock_with :mocha
-    # config.mock_with :flexmock
-    # config.mock_with :rr
-
-    # Remove this line if you're not using ActiveRecord or
-    # ActiveRecord fixtures
-    config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-    # If you're not using ActiveRecord, or you'd prefer not to run each of your
-    # examples within a transaction, remove the following line or assign false
-    # instead of true.
-    config.use_transactional_fixtures = false
-
-    # If true, the base class of anonymous controllers will be inferred
-    # automatically. This will be the default behavior in future versions of
-    # rspec-rails.
-    config.infer_base_class_for_anonymous_controllers = false
-
-    # Run specs in random order to surface order dependencies. If you find an
-    # order dependency and want to debug it, you can fix the order by providing
-    # the seed, which is printed after each run.
-    #     --seed 1234
-    config.order = 'random'
-
-    twb = (ENV['TARGET_WEB_BROWZER'] || ENV['TWB']).try(:downcase)
-    case twb
-    when 'firefox', 'ie', 'chrome'
-      Capybara.register_driver :selenium do |app|
-        opts = { browser: twb.to_sym }
-
-        dir = downloads_dir.to_s
-        dir.gsub!(File::SEPARATOR, File::ALT_SEPARATOR) if windows?
-        case twb
-        when 'firefox'
-          opts[:profile] = profile = Selenium::WebDriver::Firefox::Profile.new
-          profile['browser.download.folderList'] = 2 # custom location
-          profile['browser.download.dir'] = dir
-          profile['browser.helperApps.neverAsk.saveToDisk'] = 'text/plain'
-        when 'ie'
-          opts[:introduce_flakiness_by_ignoring_security_domains] = true
-        when 'chrome'
-          FileUtils.mkdir_p(dir)
-          opts[:prefs] = {
-            download: {
-              prompt_for_download: false,
-              default_directory: dir,
-              directory_upgrade: true,
-            }
-          }
-
-          opts[:switches] =
-            %w(
-              --ignore-certificate-errors
-              --disable-popup-blocking
-              --disable-translate
-            )
-        end
 
-        Capybara::Selenium::Driver.new(app, opts)
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rspec/rails'
+require 'rspec/autorun'
+require 'capybara/dsl'
+require 'capybara/rspec'
+require 'capybara/poltergeist'
+require 'turnip'
+require 'turnip/capybara'
+require 'simplecov' if ENV['COVERAGE'] || ENV['COVERALLS']
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
+
+RSpec.configure do |config|
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the
+  # appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+
+  # Remove this line if you're not using ActiveRecord or
+  # ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = false
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
+  twb = (ENV['TARGET_WEB_BROWZER'] || ENV['TWB']).try(:downcase)
+  case twb
+  when 'firefox', 'ie', 'chrome'
+    Capybara.register_driver :selenium do |app|
+      opts = { browser: twb.to_sym }
+
+      dir = downloads_dir.to_s
+      dir.gsub!(File::SEPARATOR, File::ALT_SEPARATOR) if windows?
+      case twb
+      when 'firefox'
+        opts[:profile] = profile = Selenium::WebDriver::Firefox::Profile.new
+        profile['browser.download.folderList'] = 2 # custom location
+        profile['browser.download.dir'] = dir
+        profile['browser.helperApps.neverAsk.saveToDisk'] = 'text/plain'
+      when 'ie'
+        opts[:introduce_flakiness_by_ignoring_security_domains] = true
+      when 'chrome'
+        FileUtils.mkdir_p(dir)
+        opts[:prefs] = {
+          download: {
+            prompt_for_download: false,
+            default_directory: dir,
+            directory_upgrade: true,
+          }
+        }
+
+        opts[:switches] =
+          %w(
+            --ignore-certificate-errors
+            --disable-popup-blocking
+            --disable-translate
+          )
       end
-      Capybara.javascript_driver = :selenium
-    else
-      Capybara.javascript_driver = :poltergeist
-      Capybara.register_driver(:poltergeist) { |app|
-        Capybara::Poltergeist::Driver.new(app, timeout: 120)
-      }
-    end
 
-    config.include JsonSpec::Helpers
-    config.include ERB::Util, type: :helper
-    config.include ERB::Util, type: :feature
-    config.include ActionView::Helpers::JavaScriptHelper, type: :feature
-
-    config.after(javascript: true) do
-      page.execute_script('window.onbeforeunload = null')
-      FileUtils.rm_rf(downloads_dir) if selenium?
+      Capybara::Selenium::Driver.new(app, opts)
     end
+    Capybara.javascript_driver = :selenium
+  else
+    Capybara.javascript_driver = :poltergeist
+    Capybara.register_driver(:poltergeist) { |app|
+      Capybara::Poltergeist::Driver.new(app, timeout: 120)
+    }
+  end
 
-    config.before(javascript: true, standalone: true) do
-      page.driver.restart
+  config.include JsonSpec::Helpers
+  config.include ERB::Util, type: :helper
+  config.include ERB::Util, type: :feature
+  config.include ActionView::Helpers::JavaScriptHelper, type: :feature
 
-      @_rails_env = Rails.env
-      Rails.env = ENV['RAILS_ENV'] = 'standalone'
-      @_home = ENV['HOME']
-      @_tmpdir = ENV['HOME'] = Dir.mktmpdir('smalruby-')
-    end
+  config.after(javascript: true) do
+    page.execute_script('window.onbeforeunload = null')
+    FileUtils.rm_rf(downloads_dir) if selenium?
+  end
 
-    config.after(javascript: true, standalone: true) do
-      FileUtils.remove_entry_secure(@_tmpdir)
-      ENV['HOME'] = @_home
-      Rails.env = ENV['RAILS_ENV'] = @_rails_env
+  config.before(javascript: true, standalone: true) do
+    page.driver.restart
 
-      page.driver.restart
-    end
+    @_rails_env = Rails.env
+    Rails.env = ENV['RAILS_ENV'] = 'standalone'
+    @_home = ENV['HOME']
+    @_tmpdir = ENV['HOME'] = Dir.mktmpdir('smalruby-')
+  end
 
-    config.before :suite do
-      DatabaseRewinder.clean_all
-    end
+  config.after(javascript: true, standalone: true) do
+    FileUtils.remove_entry_secure(@_tmpdir)
+    ENV['HOME'] = @_home
+    Rails.env = ENV['RAILS_ENV'] = @_rails_env
 
-    config.after :each do
-      DatabaseRewinder.clean
-    end
+    page.driver.restart
   end
-end
-
-Spork.each_run do
-  # This code will be run each time you run your specs.
 
-  # http://penguinlab.jp/blog/post/2256# より
-  if Spork.using_spork?
-    # app 下のファイル / locale / routes をリロード
-    # railties-3.2.3/lib/rails/application/finisher.rb あたりを参考に
-    Rails.application.reloaders.each { |reloader| reloader.execute_if_updated }
+  config.before :suite do
+    DatabaseRewinder.clean_all
+  end
 
-    # machinist gem を利用してる場合、blueprints を再度読み直す
-    # load "#{File.dirname(__FILE__)}/support/blueprints.rb"
+  config.after :each do
+    DatabaseRewinder.clean
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby-editor
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: turbolinks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -252,6 +238,7 @@ files:
 - ".ruby-version"
 - ".simplecov"
 - ".travis.yml"
+- Guardfile
 - LEGAL
 - LICENSE
 - Procfile
@@ -403,7 +390,10 @@ files:
 - bin/bundle
 - bin/rails
 - bin/rake
+- bin/rspec
 - bin/smalruby-editor
+- bin/spring
+- bin/teaspoon
 - config.ru
 - config/application.rb
 - config/boot.rb
@@ -450,10 +440,10 @@ files:
 - public/422.html
 - public/500.html
 - public/apple-touch-icon.png
-- public/assets/application-92fb2e7b8dd198fbfae7f8451c891ba2.css
-- public/assets/application-92fb2e7b8dd198fbfae7f8451c891ba2.css.gz
-- public/assets/application-e3cd434424f565fcebf7d7d13353536f.js
-- public/assets/application-e3cd434424f565fcebf7d7d13353536f.js.gz
+- public/assets/application-d5358d75a2c4e570c749b333c59b55ab.css
+- public/assets/application-d5358d75a2c4e570c749b333c59b55ab.css.gz
+- public/assets/application-fda71a642d958ffbaf90185c471d6e51.js
+- public/assets/application-fda71a642d958ffbaf90185c471d6e51.js.gz
 - public/assets/blockly/msg/js/en_us-6f7333af29688596ef863fa36a22cb41.js
 - public/assets/blockly/msg/js/en_us-6f7333af29688596ef863fa36a22cb41.js.gz
 - public/assets/blockly/msg/js/ja-d2cbf808bda8180571bc5f39141a98fe.js
@@ -474,11 +464,11 @@ files:
 - public/assets/jquery-ui/ui-icons_888888_256x240-ce584ffa171c3ea9a018cf0d7bec65c8.png
 - public/assets/jquery-ui/ui-icons_cd0a0a_256x240-747e96029e8dedcabc224e5f7d1f2ede.png
 - public/assets/loading-e77296be32d066d3e29d3bf9803fa417.gif
-- public/assets/manifest-6094ee90554fe1d9bb1a229d8daa16d7.json
+- public/assets/manifest-1a9856df207640ec658271db34b30dbb.json
 - public/assets/msg/en_us-893d970ff8061fbe7459f009582c4df5.js
 - public/assets/msg/en_us-893d970ff8061fbe7459f009582c4df5.js.gz
-- public/assets/msg/ja-8f29832e96564fb7a0c2280c4d4390b8.js
-- public/assets/msg/ja-8f29832e96564fb7a0c2280c4d4390b8.js.gz
+- public/assets/msg/ja-4d22bd0341f464f9d1b9f373121bce6d.js
+- public/assets/msg/ja-4d22bd0341f464f9d1b9f373121bce6d.js.gz
 - public/assets/progressbar-ee8fb1222f286f625bbf7332844a6a0c.gif
 - public/blockly/media/1x1.gif
 - public/blockly/media/click.mp3