smalruby-editor 0.2.6-x86-mingw32 → 0.2.7-x86-mingw32

data/app/assets/stylesheets/application.css

@@ -12,6 +12,7 @@
  *= require_self
  *= require editor
  *= require load-modal
+ *= require preference-modal
  *= require toolbox
  */
 

data/app/assets/stylesheets/preference-modal.css.scss

@@ -0,0 +1,22 @@
+#preference-modal {
+    width: 700px;
+    margin-left: -(700px / 2);
+
+    .modal-body {
+        form {
+            margin-bottom: 0;
+
+            .control-group {
+                margin-bottom: 8px;
+
+                .control-label {
+                    /*width: 100px;*/
+                }
+
+                .controls {
+                    /*margin-left: 100px;*/
+                }
+            }
+        }
+    }
+}

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

@@ -1,3 +1,7 @@
+<%
+  require 'smalruby_editor'
+  colors = SmalrubyEditor::COLORS
+%>
 div.blocklyTreeRoot {
     padding: 0;
 
@@ -16,3 +20,35 @@ div.blocklyTreeRoot {
         font-weight: bold;
     }
 }
+
+<%
+  hues = [
+    colors[:motion],
+    colors[:looks],
+    colors[:sound],
+    colors[:pen],
+    colors[:data],
+    colors[:events],
+    colors[:control],
+    colors[:sensing],
+    colors[:operators],
+    colors[:etc],
+  ]
+
+  colors = hues.map { |h|
+    [SmalrubyEditor.hsv_to_rgb(h, 100, 80),
+     SmalrubyEditor.hsv_to_rgb(h, 100, 100)]
+  }
+
+  colors.each.with_index(1) do |(color, active_color), index|
+%>
+div.blocklyTreeRoot > div:nth-child(2) > div:nth-child(<%= index %>)[aria-level="1"] {
+    .blocklyTreeRow {
+        background-color: #<%= color %> !important;
+    }
+
+    .blocklyTreeRow.blocklyTreeSelected {
+        background-color: #<%= active_color %> !important;
+    }
+}
+<% end %>

data/app/controllers/application_controller.rb

@@ -7,10 +7,11 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
-  helper_method :standalone?, :raspberrypi?
+  helper_method :standalone?, :raspberrypi?, :current_user,
+                :current_preferences
 
   before_filter :set_locale
-  before_filter :reload_config if Rails.env.development?
+  before_filter :reload_preference if Rails.env.development?
 
   private
 
@@ -53,7 +54,22 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def reload_config
-    SmalrubyEditor::Config.reload!
+  def reload_preference
+    Preference.reload!
+  end
+
+  def require_auth
+    if session[:username].blank?
+      head :unauthorized
+      return false
+    end
+  end
+
+  def current_user
+    @current_user ||= User.where(name: session[:username]).first
+  end
+
+  def current_preferences
+    current_user.try(:preferences) || Preference.to_hash
   end
 end

data/app/controllers/editor_controller.rb

@@ -6,4 +6,8 @@ class EditorController < ApplicationController
   def demo
     @filename = (File.basename(params[:filename]) || 'car_chase') + '.rb.xml'
   end
+
+  def toolbox
+    render :toolbox, layout: false
+  end
 end

data/app/controllers/sessions_controller.rb

@@ -6,14 +6,17 @@ class SessionsController < ApplicationController
   def create
     return head :bad_request if params[:username].blank?
 
-    session[:username] = params[:username].to_s
+    user = User.find_or_create_by(name: params[:username].to_s) { |u|
+      u.set_default_preferences
+    }
+    session[:username] = user.name
 
-    render text: session[:username]
+    render json: current_preferences
   end
 
   def destroy
-    session[:username] = nil
+    session[:username] = @current_user = nil
 
-    render nothing: true
+    render json: current_preferences
   end
 end

data/app/controllers/source_codes_controller.rb

@@ -21,7 +21,6 @@ class SourceCodesController < ApplicationController
         local_program_paths.map(&select_and_get_summary).compact
     end
 
-    demo_program_paths = Pathname.glob(Rails.root.join('demos/*.rb.xml'))
     res[:demoPrograms] =
       demo_program_paths.map(&select_and_get_summary).compact
 
@@ -180,7 +179,8 @@ class SourceCodesController < ApplicationController
   end
 
   def demo_program_paths
-    Pathname.glob(Rails.root.join('demos/*.rb.xml'))
+    Pathname.glob(Rails.root.join('demos/*.rb.xml')) +
+      Pathname.glob(SmalrubyEditor.home_directory.join('.demos/*.rb.xml'))
   end
 
   def rb_basename(path)

data/app/controllers/users_controller.rb

@@ -0,0 +1,22 @@
+class UsersController < ApplicationController
+  before_filter :check_whether_standalone
+  before_filter :require_auth
+
+  layout false
+
+  def preferences
+  end
+
+  def update
+    current_user.update_attributes!(user_params)
+
+    render json: current_user.preferences
+  end
+
+  private
+
+  def user_params
+    params.require(:user)
+      .permit(preferences: [Preference.whole_preference_names])
+  end
+end

data/app/helpers/application_helper.rb

@@ -22,13 +22,13 @@ module ApplicationHelper
 
   # name of Toolbox
   def toolbox_name
-    SmalrubyEditor::Config.toolbox_name || 'default'
+    current_preferences["toolbox_name"] || "default"
   end
 
   # css name of Toolbox
   def toolbox_css_name
-    SmalrubyEditor::Config.toolbox_css_name ||
-      SmalrubyEditor::Config.toolbox_name ||
-      'default'
+    current_preferences["toolbox_css_name"] ||
+      current_preferences["toolbox_name"] ||
+      "default"
   end
 end

data/app/helpers/users_helper.rb

@@ -0,0 +1,10 @@
+module UsersHelper
+  def preferences_field(form, name)
+    case name
+    when Preference::BOOLEAN_FIELD_REGEXP
+      form.check_box(name)
+    else
+      form.text_field(name)
+    end
+  end
+end

data/app/models/concerns/ruby_to_block/block/hardware_init_hardware.rb

@@ -3,12 +3,6 @@ module RubyToBlock
   module Block
     class HardwareInitHardware < Base
       blocknize '^\s*init_hardware\s*$', statement: true
-
-      def self.process_match_data(md, context)
-        context.blocks.push(new)
-
-        true
-      end
     end
   end
 end

data/app/models/preference.rb

@@ -0,0 +1,71 @@
+require "smalruby_editor"
+
+class Preference < Settingslogic
+  BOOLEAN_FIELD_REGEXP = /(enabled|disabled)/
+
+  def self.toolbox_names
+    %w(
+      default
+      smalrubot_v3
+      smalrubot_s1
+    )
+  end
+
+  def self.toolbox_preference_names
+    %w(
+      toolbox__default__enabled_hardware_blocks
+      toolbox__default__enabled_smalrubot_v3_blocks
+      toolbox__default__enabled_smalrubot_s1_blocks
+    )
+  end
+
+  def self.general_preference_names
+    %w(
+      disabled_add_character_from_beginning
+      disabled_new_character
+      enabled_auto_init_hardware
+      enabled_readonly_ruby_mode
+    )
+  end
+
+  def self.admin_preference_names
+    %w(
+      enabled_must_signin
+    )
+  end
+
+  def self.whole_preference_names
+    ["toolbox_name"] + toolbox_preference_names +
+      general_preference_names + admin_preference_names
+  end
+
+  def self.defaults
+    (toolbox_preference_names +
+     general_preference_names).map { |n|
+      [n, false]
+    }.to_h.merge("toolbox_name" => "default")
+  end
+
+  def self.make_toolbox_name_to_preference_names_hash
+    toolbox_preference_names.group_by { |n|
+      n.slice(/^toolbox__(.+?)__/, 1)
+    }
+  end
+
+  def initialize(hash_or_file = self.class.source, section = nil)
+    super
+  rescue NoMethodError
+    replace({})
+    @section = section || self.class.source
+    create_accessors!
+  end
+
+  path = SmalrubyEditor.home_directory.join("config", "config.yml")
+  if path.exist?
+    source(path)
+  else
+    source({})
+  end
+  load!
+  suppress_errors(true)
+end

data/app/models/source_code.rb

@@ -2,6 +2,7 @@
 
 require 'tempfile'
 require 'open3'
+require 'nkf'
 require 'digest/sha2'
 require 'bundler'
 require 'smalruby_editor'
@@ -152,6 +153,9 @@ class SourceCode < ActiveRecord::Base
   end
 
   def parse_ruby_error_messages(stderr_str)
+    if SmalrubyEditor.windows?
+      stderr_str = NKF.nkf("-w", stderr_str)
+    end
     stderr_str.lines.each.with_object([]) { |line, res|
       if (md = /^\tfrom .*:(\d+):(in .*)$/.match(line))
         res << { row: md[1].to_i, column: 0, message: md[2] }

data/app/models/user.rb

@@ -0,0 +1,26 @@
+class User < ActiveRecord::Base
+  serialize :preferences
+
+  before_save do
+    preferences.each do |key, value|
+      case key
+      when Preference::BOOLEAN_FIELD_REGEXP
+        if !value.is_a?(TrueClass) && !value.is_a?(FalseClass)
+          if %w(true 1).include?(value)
+            preferences[key] = true
+          else
+            preferences[key] = false
+          end
+        end
+      end
+    end
+  end
+
+  # set default preferences from SMALRUBY_HOME/config/config.yml
+  def set_default_preferences
+    self.preferences = Preference.defaults
+    Preference.to_h.each do |key, value|
+      preferences[key] = value
+    end
+  end
+end

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

@@ -16,12 +16,11 @@
     #selectors-tab-content{:class => 'tab-content'}
       #character-selector-tab{:class => 'tab-pane active selector-tab'}
         #character-selector-character-set
-        - if !SmalrubyEditor::Config.enabled?('disabled_new_character')
-          .item
-            %a#add-character-button{:class => 'character'}
-              %i.icon-plus-sign-alt
-              %br
-              = t('.new_character')
+        #add-character-item.item
+          %a#add-character-button{:class => 'character'}
+            %i.icon-plus-sign-alt
+            %br
+            = t('.new_character')
 
       #scene-selector-tab{:class => 'tab-pane selector-tab'}
         .item

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

@@ -5,14 +5,14 @@
                    :class => "list-programs"}
 
     .page-header
-      %h3<
+      %h3
         %i.icon-th-large
         = t('.preset_programs')
     %ul.thumbnails{:id => "load-modal-demo-programs",
                    :class => "list-programs"}
 
     .page-header
-      %h3<
+      %h3
         %i.icon-search
         = t('.find_program')
     %ul.thumbnails{:class => "list-programs"}

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

@@ -0,0 +1,16 @@
+#preference-modal{class: "#{modal_css_class}", tabindex: "-1",
+                  role: "dialog", "aria-hidden" => "true"}
+  .modal-header
+    %h3
+      %i.icon-cog
+      = t('.title')
+
+  .modal-body#preference-modal-content
+
+  .modal-footer
+    %button.btn{:"data-dismiss" => "modal", :"aria-hidden" => "true"}<
+      %i.icon-remove
+      = t('common.cancel')
+    %button#preference-modal-ok-button{:class => "btn btn-primary"}<
+      %i.icon-circle-blank
+      = t('common.ok')

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

@@ -12,7 +12,7 @@
           %input#signin-modal-username.input-large{name: "username", type: "text", placeholder: t('.username_placeholder')}
 
   .modal-footer
-    - if !SmalrubyEditor::Config.enabled?('must_signin')
+    - if !current_preferences["enabled_must_signin"]
       %button#signin-modal-cancel-button.cancel-button{class: "btn", :"data-dismiss" => "modal", :"aria-hidden" => "true"}<
         %i.icon-remove
         = t('common.cancel')

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

@@ -77,13 +77,26 @@
     -# 変数:向き
     %block{:type => "#{category}_self_angle"}
 
-    - if SmalrubyEditor::Config.enabled?('enabled_hardware_blocks_on_default')
+    - if current_preferences["toolbox__default__enabled_hardware_blocks"]
       - category = 'hardware'
       - subcategory = 'servo'
       -# サーボ[▼PIN]を(　)度(5～180)にする
       %block{:type => "#{category}_#{subcategory}_set_position"}
         = toolbox_number_value('POS', 90)
 
+      - 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 current_preferences["toolbox__default__enabled_2wd_car_blocks"]
       - subcategory = 'two_wheel_drive_car'
       -# 2WD車[▼PIN]を（　）秒[▼コマンド]
       %block{:type => "#{category}_#{subcategory}_run"}
@@ -97,71 +110,60 @@
         %field{:name => 'COMMAND'}<
           forward
 
-      - if SmalrubyEditor::Config.enabled?('enabled_2wd_car_blocks_on_default')
-        -# 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}_forward"}
+        = toolbox_pin_field('D5')
 
-        -# 2WD車[▼PIN]を右に曲げる
-        %block{:type => "#{category}_#{subcategory}_turn_right"}
-          = toolbox_pin_field('D5')
+      -# 2WD車[▼PIN]をバックさせる
+      %block{:type => "#{category}_#{subcategory}_backward"}
+        = toolbox_pin_field('D5')
 
-        -# 2WD車[▼PIN]を止める
-        %block{:type => "#{category}_#{subcategory}_stop"}
-          = toolbox_pin_field('D5')
+      -# 2WD車[▼PIN]を左に曲げる
+      %block{:type => "#{category}_#{subcategory}_turn_left"}
+        = toolbox_pin_field('D5')
 
-        -# 2WD車[▼PIN]の[▼LOR]の速度を<SPEED>%にする
-        %block{:type => "#{category}_#{subcategory}_set_speed"}
-          = toolbox_pin_field('D5')
-          = toolbox_number_value('SPEED', 100)
+      -# 2WD車[▼PIN]を右に曲げる
+      %block{:type => "#{category}_#{subcategory}_turn_right"}
+        = toolbox_pin_field('D5')
 
-      - subcategory = 'motor_driver'
-      -# (モータードライバ[▼PIN]で)モーターを[▼正転させる]
-      %block{:type => "#{category}_#{subcategory}"}
-        = toolbox_pin_field('D6')
-        %field{:name => 'METHOD'}<
-          forward
+      -# 2WD車[▼PIN]を止める
+      %block{:type => "#{category}_#{subcategory}_stop"}
+        = toolbox_pin_field('D5')
 
-      -# (モータードライバ[▼PIN]の)モーターの速度を<SPEED>%にする
+      -# 2WD車[▼PIN]の[▼LOR]の速度を<SPEED>%にする
       %block{:type => "#{category}_#{subcategory}_set_speed"}
-        = toolbox_pin_field('D6')
+        = toolbox_pin_field('D5')
         = toolbox_number_value('SPEED', 100)
 
-      - if SmalrubyEditor::Config.enabled?('enabled_smalrubot_v3_blocks_on_default')
-        - subcategory = 'smalrubot_v3'
-        %block{type: "#{category}_#{subcategory}_action"}
-          %field{name: 'ACTION'}<
-            forward
+    - if current_preferences["toolbox__default__enabled_smalrubot_v3_blocks"]
+      - 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}_action_with_sec"}
+        %field{name: 'ACTION'}<
+          forward
+        = toolbox_number_value('SEC', 0.5)
 
-        %block{type: "#{category}_#{subcategory}_dc_motor_set_power_ratio"}
-          = toolbox_number_value('SPEED', 100)
+      %block{type: "#{category}_#{subcategory}_dc_motor_set_power_ratio"}
+        = toolbox_number_value('SPEED', 100)
 
-      - if SmalrubyEditor::Config.enabled?('enabled_smalrubot_s1_blocks_on_default')
-        - subcategory = 'smalrubot_s1'
-        %block{type: "#{category}_#{subcategory}_action"}
-          %field{name: 'ACTION'}<
-            forward
+    - if current_preferences["toolbox__default__enabled_smalrubot_s1_blocks"]
+      - 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)
+      %block{type: "#{category}_#{subcategory}_action_with_sec"}
+        %field{name: 'ACTION'}<
+          forward
+        = toolbox_number_value('SEC', 0.5)
 
-        %block{type: "#{category}_#{subcategory}_dc_motor_set_power_ratio"}
-          = toolbox_number_value('SPEED', 100)
+      %block{type: "#{category}_#{subcategory}_dc_motor_set_power_ratio"}
+        = toolbox_number_value('SPEED', 100)
 
   - category = 'looks'
   %category{:name => tt('.looks')}
@@ -206,7 +208,7 @@
     -# [▼プリセット画像]
     -#%block{:type => "#{category}_preset_images"}
 
-    - if SmalrubyEditor::Config.enabled?('enabled_hardware_blocks_on_default')
+    - if current_preferences["toolbox__default__enabled_hardware_blocks"]
       - category = 'hardware'
       - subcategory = 'led'
       -# LED[▼PIN]をオンにする
@@ -237,17 +239,19 @@
       -# LCDをクリアする
       %block{:type => "#{category}_#{subcategory}_clear"}
 
-      - if SmalrubyEditor::Config.enabled?('enabled_smalrubot_v3_blocks_on_default')
-        - subcategory = 'smalrubot_v3'
-        %block{type: "#{category}_#{subcategory}_led_turn_on_or_off"}
-          %field{name: 'OOO'}<
-            turn_on
+    - if current_preferences["toolbox__default__enabled_smalrubot_v3_blocks"]
+      - category = 'hardware'
+      - subcategory = 'smalrubot_v3'
+      %block{type: "#{category}_#{subcategory}_led_turn_on_or_off"}
+        %field{name: 'OOO'}<
+          turn_on
 
-      - if SmalrubyEditor::Config.enabled?('enabled_smalrubot_s1_blocks_on_default')
-        - subcategory = 'smalrubot_s1'
-        %block{type: "#{category}_#{subcategory}_led_turn_on_or_off"}
-          %field{name: 'OOO'}<
-            turn_on
+    - if current_preferences["toolbox__default__enabled_smalrubot_s1_blocks"]
+      - category = 'hardware'
+      - subcategory = 'smalrubot_s1'
+      %block{type: "#{category}_#{subcategory}_led_turn_on_or_off"}
+        %field{name: 'OOO'}<
+          turn_on
 
   - category = 'sound'
   %category{:name => tt('.sound')}
@@ -373,7 +377,7 @@
     -# 変数:2000年からの日数
     %block{:type => "#{category}_days_since_2000"}
 
-    - if SmalrubyEditor::Config.enabled?('enabled_hardware_blocks_on_default')
+    - if current_preferences["toolbox__default__enabled_hardware_blocks"]
       - category = 'hardware'
       -# センサー[▼PIN]
       %block{:type => "#{category}_sensor_value"}
@@ -383,24 +387,27 @@
       %block{:type => "#{category}_button_pressed_or_released"}
         = toolbox_pin_field('D3')
 
-      -# 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')
 
-      - if SmalrubyEditor::Config.enabled?('enabled_smalrubot_v3_blocks_on_default')
-        - subcategory = 'smalrubot_v3'
-        %block{type: "#{category}_#{subcategory}_sensor_value"}
-        %block{type: "#{category}_#{subcategory}_dc_motor_power_ratio"}
+    - if current_preferences["toolbox__default__enabled_2wd_car_blocks"]
+      - category = 'hardware'
+      -# 2WD車[▼PIN]の[▼LOR]の速度%
+      %block{:type => "#{category}_two_wheel_drive_car_speed"}
+        = toolbox_pin_field('D5')
+
+    - if current_preferences["toolbox__default__enabled_smalrubot_v3_blocks"]
+      - category = 'hardware'
+      - subcategory = 'smalrubot_v3'
+      %block{type: "#{category}_#{subcategory}_sensor_value"}
+      %block{type: "#{category}_#{subcategory}_dc_motor_power_ratio"}
 
-      - if SmalrubyEditor::Config.enabled?('enabled_smalrubot_s1_blocks_on_default')
-        - category = 'hardware'
-        - subcategory = 'smalrubot_s1'
-        %block{type: "#{category}_#{subcategory}_sensor_value"}
-        %block{type: "#{category}_#{subcategory}_dc_motor_power_ratio"}
+    - if current_preferences["toolbox__default__enabled_smalrubot_s1_blocks"]
+      - category = 'hardware'
+      - subcategory = 'smalrubot_s1'
+      %block{type: "#{category}_#{subcategory}_sensor_value"}
+      %block{type: "#{category}_#{subcategory}_dc_motor_power_ratio"}
 
   - category = 'operators'
   %category{:name => tt('.operators')}
@@ -499,7 +506,7 @@
     -# p
     %block{:type => "#{category}_p"}
 
-    - if SmalrubyEditor::Config.enabled?('enabled_hardware_blocks_on_default')
+    - if !current_preferences["enabled_auto_init_hardware"] && (current_preferences["toolbox__default__enabled_hardware_blocks"] || current_preferences["toolbox__default__enabled_smalrubot_v3_blocks"] || current_preferences["toolbox__default__enabled_smalrubot_s1_blocks"])
       - category = 'hardware'
       -# ハードウェアを準備する
       %block{:type => "#{category}_init_hardware"}