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

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

@@ -78,8 +78,15 @@
                   %i.icon-off
                   = t('.reset')
             - if standalone?
+              %li.divider.signed-in-menu{style: "display: #{signed_in? ? '' : 'none'}"}
               %li
-                %a#signout-button{style: "display: #{signed_in? ? '' : 'none'}"}
+                %a#preference-button.signed-in-menu{style: "display: #{signed_in? ? '' : 'none'}"}
+                  %h4
+                    %i.icon-cog
+                    = t('.preference')
+              %li.divider.signed-in-menu{style: "display: #{signed_in? ? '' : 'none'}"}
+              %li
+                %a#signout-button.signed-in-menu{style: "display: #{signed_in? ? '' : 'none'}"}
                   %h4
                     %i.icon-eject
                     = t('.logout')
@@ -113,11 +120,11 @@
 = render 'signin_modal'
 = render 'load_modal'
 = render 'reset_modal'
+= render 'preference_modal'
 
 - if session[:username]
   :javascript
     window.Smalruby.username = '#{h session[:username]}';
 
-- if SmalrubyEditor::Config.features.is_a?(Array)
-  :javascript
-    window.Smalruby.Features = #{SmalrubyEditor::Config.features.to_json};
+:javascript
+  window.Smalruby.Preferences = #{current_preferences.to_json};

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

@@ -0,0 +1 @@
+= render "toolbox_#{toolbox_name}"

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

@@ -5,6 +5,7 @@
     <%= t('common.smalruby_editor', version: SmalrubyEditor::VERSION) %>
   </title>
   <%= favicon_link_tag %>
+  <meta charset="UTF-8">
   <link rel="apple-touch-icon" href="apple-touch-icon.png" />
   <meta name="application-name" content="Smalruby" />
   <meta name="msapplication-TileColor" content="#0088cc" />
@@ -13,7 +14,6 @@
   <meta name="msapplication-wide310x150logo" content="wide.png" />
   <meta name="msapplication-square310x310logo" content="large.png" />
   <%= stylesheet_link_tag    "application", media: "all" %>
-  <%= stylesheet_link_tag    "toolbox_#{toolbox_css_name}", media: "all" %>
   <%= javascript_include_tag "application" %>
   <%= javascript_include_tag "blockly/msg/js/#{blockly_message_locale_name}" %>
   <%= javascript_include_tag "msg/#{blockly_message_default_locale_name}" %>

data/app/views/users/preferences.html.haml

@@ -0,0 +1,34 @@
+.modal-body#preference-modal-content
+  = form_for(current_user, html: { class: "form-horizontal", method: "PATCH" }) do |f|
+    = f.fields_for(:preferences, OpenStruct.new(f.object.preferences)) do |f2|
+      .page-header
+        %h4
+          %i.icon-th-large
+          = t('.toolbox')
+
+      .control-group
+        = f2.label(:toolbox_name, class: "control-label")
+        .controls
+          - options = Preference.toolbox_names.map { |n| [t(n, scope: "toolbox_names"), n] }
+          = f2.select(:toolbox_name, options)
+
+      - Preference.make_toolbox_name_to_preference_names_hash.each do |toolbox_name, preference_names|
+        - preference_names.each do |n|
+          .control-group{class: "toolbox_preferences #{toolbox_name}"}
+            .controls
+              = f2.label(n, class: "checkbox") do
+                = preferences_field(f2, n)
+                = t(n, scope: "helpers.label.user[preferences]")
+
+      - if Preference.general_preference_names.length > 0
+        .page-header
+          %h4
+            %i.icon-th-large
+            = t('.general')
+
+        - Preference.general_preference_names.each do |n|
+          .control-group
+            .controls
+              = f2.label(n, class: "checkbox") do
+                = preferences_field(f2, n)
+                = t(n, scope: "helpers.label.user[preferences]")

data/config/application.rb

@@ -10,7 +10,7 @@ Bundler.require(:default, Rails.env) unless Rails.env == 'standalone'
 module SmalrubyEditor
   class Application < Rails::Application
     config.time_zone = 'Tokyo'
-    I18n.enforce_available_locales = true
+    I18n.enforce_available_locales = false
     config.i18n.default_locale = :ja
     config.colorize_logging = false
     config.filter_parameters += [:data]

data/config/locales/en.yml

@@ -6,6 +6,7 @@ en:
     reset: &reset "Reset"
     login: &login "Login"
     name: "Name"
+    processing: "Processing..."
 
   controllers:
     source_codes:
@@ -13,6 +14,26 @@ en:
       not_exist: " does not exist."
       exist: " already exist."
 
+  toolbox_names:
+    default: "Normal"
+    smalrubot_s1: "Smalrubot S1"
+    smalrubot_v3: "Smalrubot V3"
+
+  helpers:
+    label:
+      "user[preferences]":
+        toolbox_name: "Toolbox"
+
+        toolbox__default__enabled_hardware_blocks: "Enabled hardware blocks on default"
+        toolbox__default__enabled_smalrubot_v3_blocks: "Enabled smalrubot v3 blocks on default"
+        toolbox__default__enabled_smalrubot_s1_blocks: "Enabled smalrubot s1 blocks on default"
+
+        disabled_add_character_from_beginning: "Disabled add character from beginning"
+        disabled_new_character: "Disabled new character"
+        enabled_auto_init_hardware: "Auto init hardware"
+        enabled_readonly_ruby_mode: "Readonly ruby mode"
+        enabled_must_signin: "Must signin"
+
   editor:
     index:
       block: "Block"
@@ -23,6 +44,7 @@ en:
       save: "Save"
       check: "Check"
       reset: *reset
+      preference: "Preference"
       logout: "Logout"
       login: *login
 
@@ -64,6 +86,14 @@ en:
       title: "Are you sure you want to reset ?"
       message: "Your program will disappear!"
 
+    preference_modal:
+      title: "Preference"
+
     signin_modal:
       message: "Input your name<br>not to mix with other people's program."
       username_placeholder: "username, ID, nickname, etc..."
+
+  users:
+    preferences:
+      toolbox: "Toolbox"
+      general: "General"

data/config/locales/ja.yml

@@ -6,6 +6,7 @@ ja:
     reset: &reset "リセット"
     login: &login "ログイン"
     name: "名前"
+    processing: "処理中"
 
   controllers:
     source_codes:
@@ -13,6 +14,26 @@ ja:
       not_exist: "はありません"
       exist: "すでに同じ名前のプログラムがあります"
 
+  toolbox_names:
+    default: "通常"
+    smalrubot_s1: "スモウルボットS1"
+    smalrubot_v3: "スモウルボットV3"
+
+  helpers:
+    label:
+      "user[preferences]":
+        toolbox_name: "ツールボックスの種類"
+
+        toolbox__default__enabled_hardware_blocks: "ハードウェアブロックを使う"
+        toolbox__default__enabled_smalrubot_s1_blocks: "スモウルボットS1のブロックを使う"
+        toolbox__default__enabled_smalrubot_v3_blocks: "スモウルボットV3のブロックを使う"
+
+        disabled_add_character_from_beginning: "最初にキャラクターを追加しない"
+        disabled_new_character: "キャラクターの追加を禁止する"
+        enabled_auto_init_hardware: "自動でハードウェアを準備する"
+        enabled_readonly_ruby_mode: "プログラムを直接入力できないようにする"
+        enabled_must_signin: "ログインしないと使えないようにする"
+
   editor:
     index:
       block: "ブロック"
@@ -23,6 +44,7 @@ ja:
       save: "セーブ"
       check: "チェック"
       reset: *reset
+      preference: "設定"
       logout: "ログアウト"
       login: *login
 
@@ -64,6 +86,14 @@ ja:
       title: "本当にリセットしますか？"
       message: "作成中のプログラムが消えてしまうよ！"
 
+    preference_modal:
+      title: "設定"
+
     signin_modal:
       message: "あなたの名前をいれて、<br />ほかの人のプログラムとまざらないようにしよう♪"
       username_placeholder: "名前、生徒番号、ニックネームなど"
+
+  users:
+    preferences:
+      toolbox: "ツールボックス"
+      general: "一般"

data/config/routes.rb

@@ -10,6 +10,8 @@ SmalrubyEditor::Application.routes.draw do
   resources :sessions, only: [:create, :destroy]
   match '/signout', to: 'sessions#destroy', via: 'delete'
 
+  resources :users, only: [:update]
+
   resources :source_codes, only: [:create, :index]
   post 'source_codes/check'
   delete 'source_codes/download'
@@ -20,61 +22,6 @@ SmalrubyEditor::Application.routes.draw do
   post 'source_codes/run'
   post 'source_codes/to_blocks'
 
-  # The priority is based upon order of creation: first created ->
-  # highest priority.
-  # See how all your routes lay out with "rake routes".
-
-  # You can have the root of your site routed with "root"
-  # root 'welcome#index'
-
-  # Example of regular route:
-  #   get 'products/:id' => 'catalog#view'
-
-  # Example of named route that can be invoked with purchase_url(id:
-  # product.id)
-  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
-  # Example resource route (maps HTTP verbs to controller actions
-  # automatically):
-  #   resources :products
-
-  # Example resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Example resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Example resource route with more complex sub-resources:
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', on: :collection
-  #     end
-  #   end
-
-  # Example resource route with concerns:
-  #   concern :toggleable do
-  #     post 'toggle'
-  #   end
-  #   resources :posts, concerns: :toggleable
-  #   resources :photos, concerns: :toggleable
-
-  # Example resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
+  get 'preferences', to: 'users#preferences'
+  get 'toolbox', to: 'editor#toolbox'
 end

data/db/migrate/20150513061200_create_users.rb

@@ -0,0 +1,10 @@
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.string :name
+      t.text :preferences
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20150513061250_add_index_name_on_users.rb

@@ -0,0 +1,9 @@
+class AddIndexNameOnUsers < ActiveRecord::Migration
+  def up
+    add_index :users, :name, :unique
+  end
+
+  def down
+    remove_index :users, :name
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131219045113) do
+ActiveRecord::Schema.define(version: 20150513061250) do
 
   create_table "source_codes", force: true do |t|
     t.text     "data"
@@ -20,4 +20,13 @@ ActiveRecord::Schema.define(version: 20131219045113) do
     t.string   "filename"
   end
 
+  create_table "users", force: true do |t|
+    t.string   "name"
+    t.text     "preferences"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "users", ["name"], name: "index_users_on_name", unique: true, using: :btree
+
 end

data/lib/smalruby_editor.rb

@@ -126,34 +126,32 @@ standalone:
       end
     end
 
-    CONFIG_YML_TEMPLATE = <<-EOS
-#toolbox_name: default
-#toolbox_name: raspberrypi
-#toolbox_name: smalrubot_v3
-#toolbox_name: smalrubot_s1
-#toolbox_name: default
-#toolbox_css_name: default
-features:
-  #- disabled_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')
+      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)
+        File.open(config_yml_path, "w") do |f|
+          toolbox_name__preference_names =
+            Preference.make_toolbox_name_to_preference_names_hash
+          Preference.toolbox_names.each do |toolbox_name|
+            f.puts("#toolbox_name: #{toolbox_name}")
+            toolbox_name__preference_names.delete(toolbox_name).try(:each) do
+              |preference_name|
+              f.puts("##{preference_name}: true")
+            end
+            f.puts
+          end
+          preference_names_list =
+            toolbox_name__preference_names.values +
+            [Preference.general_preference_names,
+             Preference.admin_preference_names]
+          preference_names_list.each do |preference_names|
+            preference_names.each do |preference_name|
+              f.puts("##{preference_name}: true")
+            end
+            f.puts
+          end
         end
       end
     end
   end
 end
-
-require 'smalruby_editor/config'

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
 module SmalrubyEditor
-  VERSION =  '0.2.6'
+  VERSION =  '0.2.7'
 end

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

@@ -26,6 +26,8 @@
       """
       require "smalruby"
 
+      init_hardware
+
       p("")
 
       """

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

@@ -39,6 +39,7 @@
     require "smalruby"
 
     init_hardware
+
     car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
 
     """

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

@@ -15,7 +15,13 @@
       """
     かつ ブロックからソースコードを生成する
 
-    ならば テキストエディタのプログラムは "" であること
+    ならば テキストエディタのプログラムは以下であること:
+      """
+      require "smalruby"
+
+      init_hardware
+
+      """
 
   シナリオ: キャラクターとブロックを配置する
     もし 次のブロックを配置する:
@@ -34,6 +40,8 @@
       """
       require "smalruby"
 
+      init_hardware
+
       car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
       car1.led("D13").turn_off
 
@@ -58,6 +66,8 @@
       """
       require "smalruby"
 
+      init_hardware
+
       car1 = Character.new(costume: "car1.png", x: 0, y: 0, angle: 0)
 
       car1.on(:start) do