smalruby-editor 0.3.5-x86-mingw32 → 0.4.0-x86-mingw32

data/config/locales/en.yml

@@ -37,6 +37,7 @@ en:
     index:
       block: "Block"
       msg_input_program_name: "Input your program name(ex:01.rb)"
+      menu: "Menu"
       run: "Run"
       download: "Download"
       load: "Load"
@@ -49,7 +50,7 @@ en:
 
     block_tab:
       character: "Character"
-      new_character: "New Character"
+      new_character: "New character"
       direction_parameter: "Dir:"
       stage: "Stage"
 
@@ -74,6 +75,10 @@ en:
       y_position: "Y"
       msg_input_name: "car1 and ball1 etc..."
       direction: "Dir"
+      costumes: "Costumes:"
+      new_costume: "New costume"
+      costume_name: "Costume name"
+      msg_input_costume_name: "costume1 etc..."
 
     load_modal:
       preset_programs: "Preset programs"
@@ -92,6 +97,10 @@ en:
       message: "Input your name<br>not to mix with other people's program."
       username_placeholder: "username, ID, nickname, etc..."
 
+  costumes:
+    index:
+      upload_costume: "Upload costume..."
+
   users:
     preferences:
       toolbox: "Toolbox"

data/config/locales/ja.yml

@@ -38,6 +38,7 @@ ja:
     index:
       block: "ブロック"
       msg_input_program_name: "プログラムの名前を入れてね（例：01.rb）"
+      menu: "メニュー"
       run: "実行"
       download: "ダウンロード"
       load: "ロード"
@@ -75,6 +76,10 @@ ja:
       y_position: "Y座標"
       msg_input_name: "car1やball1など"
       direction: "向き"
+      costumes: "コスチューム:"
+      new_costume: "新しいコスチューム"
+      costume_name: "コスチュームの名前"
+      msg_input_costume_name: "costume1など"
 
     load_modal:
       preset_programs: "いろいろなプログラム"
@@ -93,6 +98,11 @@ ja:
       message: "あなたの名前をいれて、<br />ほかの人のプログラムとまざらないようにしよう♪"
       username_placeholder: "名前、生徒番号、ニックネームなど"
 
+  costumes:
+    index:
+      upload_costume: "新しい画像"
+      confirm_to_delete_costume: "登録した画像を削除します。本当にいいですか？"
+
   users:
     preferences:
       toolbox: "ツールボックス"

data/config/routes.rb

@@ -11,6 +11,8 @@ SmalrubyEditor::Application.routes.draw do
   match '/signout', to: 'sessions#destroy', via: 'delete'
 
   resources :users, only: [:update]
+  resources :costumes, only: [:index, :create, :destroy]
+  get "/smalruby/assets/:basename", to: "costumes#show"
 
   resources :source_codes, only: [:create, :index]
   post 'source_codes/check'

data/config/unicorn.rb

@@ -1,23 +1,23 @@
-worker_processes Integer(ENV['WEB_CONCURRENCY'] || 3)
-timeout 15
-preload_app true
-
-# rubocop:disable Output
-before_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
-    Process.kill 'QUIT', Process.pid
-  end
-
-  defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect!
-end
-
-after_fork do |server, worker|
-  Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing.' \
-         ' Wait for master to send QUIT'
-  end
-
-  defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection
-end
-# rubocop:enable Output
+worker_processes Integer(ENV['WEB_CONCURRENCY'] || 3)
+timeout 15
+preload_app true
+
+# rubocop:disable Output
+before_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
+    Process.kill 'QUIT', Process.pid
+  end
+
+  defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect!
+end
+
+after_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn worker intercepting TERM and doing nothing.' \
+         ' Wait for master to send QUIT'
+  end
+
+  defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection
+end
+# rubocop:enable Output

data/db/migrate/20150513061250_add_index_name_on_users.rb

@@ -1,6 +1,6 @@
 class AddIndexNameOnUsers < ActiveRecord::Migration
   def up
-    add_index :users, :name, :unique
+    add_index :users, :name, unique: true
   end
 
   def down

data/db/migrate/20150607012053_create_costumes.rb

@@ -0,0 +1,12 @@
+class CreateCostumes < ActiveRecord::Migration
+  def change
+    create_table :costumes do |t|
+      t.string :name, null: false, unique: true
+      t.boolean :preset, null: false, default: false
+      t.integer :position, null: false
+      t.references :user
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20150607012707_add_indexes_on_costumes.rb

@@ -0,0 +1,13 @@
+class AddIndexesOnCostumes < ActiveRecord::Migration
+  def up
+    add_index :costumes, :name
+    add_index :costumes, :position
+    add_index :costumes, :user_id
+  end
+
+  def down
+    remove_index :costumes, :name
+    remove_index :costumes, :position
+    remove_index :costumes, :user_id
+  end
+end

data/db/migrate/20150607034013_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb

@@ -0,0 +1,31 @@
+# This migration comes from acts_as_taggable_on_engine (originally 1)
+class ActsAsTaggableOnMigration < ActiveRecord::Migration
+  def self.up
+    create_table :tags do |t|
+      t.string :name
+    end
+
+    create_table :taggings do |t|
+      t.references :tag
+
+      # You should make sure that the column created is
+      # long enough to store the required class names.
+      t.references :taggable, polymorphic: true
+      t.references :tagger, polymorphic: true
+
+      # Limit is created to prevent MySQL error on index
+      # length for MyISAM table type: http://bit.ly/vgW2Ql
+      t.string :context, limit: 128
+
+      t.datetime :created_at
+    end
+
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    drop_table :taggings
+    drop_table :tags
+  end
+end

data/db/migrate/20150607034014_add_missing_unique_indices.acts_as_taggable_on_engine.rb

@@ -0,0 +1,21 @@
+# This migration comes from acts_as_taggable_on_engine (originally 2)
+class AddMissingUniqueIndices < ActiveRecord::Migration
+  def self.up
+    add_index :tags, :name, unique: true
+
+    remove_index :taggings, :tag_id
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+    add_index :taggings,
+              [:tag_id, :taggable_id, :taggable_type, :context,
+               :tagger_id, :tagger_type],
+              unique: true, name: 'taggings_idx'
+  end
+
+  def self.down
+    remove_index :tags, :name
+
+    remove_index :taggings, name: 'taggings_idx'
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+end

data/db/migrate/20150607034015_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb

@@ -0,0 +1,15 @@
+# This migration comes from acts_as_taggable_on_engine (originally 3)
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+  def self.up
+    add_column :tags, :taggings_count, :integer, default: 0
+
+    ActsAsTaggableOn::Tag.reset_column_information
+    ActsAsTaggableOn::Tag.find_each do |tag|
+      ActsAsTaggableOn::Tag.reset_counters(tag.id, :taggings)
+    end
+  end
+
+  def self.down
+    remove_column :tags, :taggings_count
+  end
+end

data/db/migrate/20150607034016_add_missing_taggable_index.acts_as_taggable_on_engine.rb

@@ -0,0 +1,10 @@
+# This migration comes from acts_as_taggable_on_engine (originally 4)
+class AddMissingTaggableIndex < ActiveRecord::Migration
+  def self.up
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+end

data/db/migrate/20150607034017_change_collation_for_tag_names.acts_as_taggable_on_engine.rb

@@ -0,0 +1,12 @@
+# This migration comes from acts_as_taggable_on_engine (originally 5)
+# This migration is added to circumvent issue #623 and have special characters
+# work properly
+class ChangeCollationForTagNames < ActiveRecord::Migration
+  # rubocop:disable LineLength
+  def up
+    if ActsAsTaggableOn::Utils.using_mysql?
+      execute("ALTER TABLE tags MODIFY name varchar(255) CHARACTER SET utf8 COLLATE utf8_bin;")
+    end
+  end
+  # rubocop:enable LineLength
+end

data/db/migrate/20150607034018_insert_preset_costumes.rb

@@ -0,0 +1,9 @@
+class InsertPresetCostumes < ActiveRecord::Migration
+  def up
+    Costume.create_presets
+  end
+
+  def down
+    Costume.destroy_presets
+  end
+end

data/db/schema.rb

@@ -11,7 +11,20 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150513061250) do
+ActiveRecord::Schema.define(version: 20150607034018) do
+
+  create_table "costumes", force: true do |t|
+    t.string   "name",                       null: false
+    t.boolean  "preset",     default: false, null: false
+    t.integer  "position",                   null: false
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "costumes", ["name"], name: "index_costumes_on_name"
+  add_index "costumes", ["position"], name: "index_costumes_on_position"
+  add_index "costumes", ["user_id"], name: "index_costumes_on_user_id"
 
   create_table "source_codes", force: true do |t|
     t.text     "data"
@@ -20,6 +33,26 @@ ActiveRecord::Schema.define(version: 20150513061250) do
     t.string   "filename"
   end
 
+  create_table "taggings", force: true do |t|
+    t.integer  "tag_id"
+    t.integer  "taggable_id"
+    t.string   "taggable_type"
+    t.integer  "tagger_id"
+    t.string   "tagger_type"
+    t.string   "context",       limit: 128
+    t.datetime "created_at"
+  end
+
+  add_index "taggings", ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
+  add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
+
+  create_table "tags", force: true do |t|
+    t.string  "name"
+    t.integer "taggings_count", default: 0
+  end
+
+  add_index "tags", ["name"], name: "index_tags_on_name", unique: true
+
   create_table "users", force: true do |t|
     t.string   "name"
     t.text     "preferences"
@@ -27,6 +60,6 @@ ActiveRecord::Schema.define(version: 20150513061250) do
     t.datetime "updated_at"
   end
 
-  add_index "users", ["name"], name: "index_users_on_name", unique: true, using: :btree
+  add_index "users", ["name"], name: "index_users_on_name", unique: true
 
 end

data/db/seeds.rb

@@ -5,3 +5,5 @@
 #
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
+
+Costume.create_presets

data/demos/car_chase.rb.xml

@@ -1,129 +1,129 @@
-<xml xmlns="http://www.w3.org/1999/xhtml">
-  <character name="car1" x="0" y="0" costumes="car2.png" angle="0" />
-  <character name="car2" x="0" y="415" costumes="car4.png" angle="0" />
-  <block type="ruby_comment" x="53" y="45">
-    <field name="COMMENT">車のおいかけっこ</field>
-  </block>
-  <block type="ruby_comment" x="55" y="100">
-    <field name="COMMENT">逃げる車</field>
-    <next>
-      <block type="character_new">
-        <field name="NAME">car1</field>
-        <statement name="DO">
-          <block type="events_on_start">
-            <statement name="DO">
-              <block type="control_loop">
-                <statement name="DO">
-                  <block type="motion_move" inline="true">
-                    <value name="STEP">
-                      <block type="math_number">
-                        <field name="NUM">6</field>
-                      </block>
-                    </value>
-                    <next>
-                      <block type="control_if" inline="true">
-                        <value name="COND">
-                          <block type="motion_reach_wall" />
-                        </value>
-                        <statement name="THEN">
-                          <block type="motion_turn" />
-                        </statement>
-                      </block>
-                    </next>
-                  </block>
-                </statement>
-              </block>
-            </statement>
-            <next>
-              <block type="events_on_key_push_or_down">
-                <field name="KEY">K_LEFT</field>
-                <field name="POD">down</field>
-                <statement name="DO">
-                  <block type="motion_rotate_left" inline="true">
-                    <value name="ANGLE">
-                      <block type="math_number">
-                        <field name="NUM">15</field>
-                      </block>
-                    </value>
-                  </block>
-                </statement>
-                <next>
-                  <block type="events_on_key_push_or_down">
-                    <field name="KEY">K_RIGHT</field>
-                    <field name="POD">down</field>
-                    <statement name="DO">
-                      <block type="motion_rotate_right" inline="true">
-                        <value name="ANGLE">
-                          <block type="math_number">
-                            <field name="NUM">15</field>
-                          </block>
-                        </value>
-                      </block>
-                    </statement>
-                  </block>
-                </next>
-              </block>
-            </next>
-          </block>
-        </statement>
-      </block>
-    </next>
-  </block>
-  <block type="ruby_comment" x="454" y="99">
-    <field name="COMMENT">追いかける車</field>
-    <next>
-      <block type="character_new">
-        <field name="NAME">car2</field>
-        <statement name="DO">
-          <block type="events_on_start">
-            <statement name="DO">
-              <block type="control_loop">
-                <statement name="DO">
-                  <block type="motion_point_towards_character">
-                    <field name="CHAR">car1</field>
-                    <next>
-                      <block type="motion_move" inline="true">
-                        <value name="STEP">
-                          <block type="math_number">
-                            <field name="NUM">3</field>
-                          </block>
-                        </value>
-                        <next>
-                          <block type="control_if_else" inline="true">
-                            <value name="COND">
-                              <block type="sensing_hit">
-                                <field name="CHAR">car1</field>
-                              </block>
-                            </value>
-                            <statement name="THEN">
-                              <block type="looks_say" inline="true">
-                                <value name="TEXT">
-                                  <block type="text">
-                                    <field name="TEXT">追いつきました！</field>
-                                  </block>
-                                </value>
-                              </block>
-                            </statement>
-                            <statement name="ELSE">
-                              <block type="looks_say" inline="true">
-                                <value name="TEXT">
-                                  <block type="text">
-                                    <field name="TEXT" />
-                                  </block>
-                                </value>
-                              </block>
-                            </statement>
-                          </block>
-                        </next>
-                      </block>
-                    </next>
-                  </block>
-                </statement>
-              </block>
-            </statement>
-          </block>
-        </statement>
-      </block>
-    </next>
-  </block>
+<xml xmlns="http://www.w3.org/1999/xhtml">
+  <character name="car1" x="0" y="0" costumes="car2.png" angle="0" />
+  <character name="car2" x="0" y="415" costumes="car4.png" angle="0" />
+  <block type="ruby_comment" x="53" y="45">
+    <field name="COMMENT">車のおいかけっこ</field>
+  </block>
+  <block type="ruby_comment" x="55" y="100">
+    <field name="COMMENT">逃げる車</field>
+    <next>
+      <block type="character_new">
+        <field name="NAME">car1</field>
+        <statement name="DO">
+          <block type="events_on_start">
+            <statement name="DO">
+              <block type="control_loop">
+                <statement name="DO">
+                  <block type="motion_move" inline="true">
+                    <value name="STEP">
+                      <block type="math_number">
+                        <field name="NUM">6</field>
+                      </block>
+                    </value>
+                    <next>
+                      <block type="control_if" inline="true">
+                        <value name="COND">
+                          <block type="motion_reach_wall" />
+                        </value>
+                        <statement name="THEN">
+                          <block type="motion_turn" />
+                        </statement>
+                      </block>
+                    </next>
+                  </block>
+                </statement>
+              </block>
+            </statement>
+            <next>
+              <block type="events_on_key_push_or_down">
+                <field name="KEY">K_LEFT</field>
+                <field name="POD">down</field>
+                <statement name="DO">
+                  <block type="motion_rotate_left" inline="true">
+                    <value name="ANGLE">
+                      <block type="math_number">
+                        <field name="NUM">15</field>
+                      </block>
+                    </value>
+                  </block>
+                </statement>
+                <next>
+                  <block type="events_on_key_push_or_down">
+                    <field name="KEY">K_RIGHT</field>
+                    <field name="POD">down</field>
+                    <statement name="DO">
+                      <block type="motion_rotate_right" inline="true">
+                        <value name="ANGLE">
+                          <block type="math_number">
+                            <field name="NUM">15</field>
+                          </block>
+                        </value>
+                      </block>
+                    </statement>
+                  </block>
+                </next>
+              </block>
+            </next>
+          </block>
+        </statement>
+      </block>
+    </next>
+  </block>
+  <block type="ruby_comment" x="454" y="99">
+    <field name="COMMENT">追いかける車</field>
+    <next>
+      <block type="character_new">
+        <field name="NAME">car2</field>
+        <statement name="DO">
+          <block type="events_on_start">
+            <statement name="DO">
+              <block type="control_loop">
+                <statement name="DO">
+                  <block type="motion_point_towards_character">
+                    <field name="CHAR">car1</field>
+                    <next>
+                      <block type="motion_move" inline="true">
+                        <value name="STEP">
+                          <block type="math_number">
+                            <field name="NUM">3</field>
+                          </block>
+                        </value>
+                        <next>
+                          <block type="control_if_else" inline="true">
+                            <value name="COND">
+                              <block type="sensing_hit">
+                                <field name="CHAR">car1</field>
+                              </block>
+                            </value>
+                            <statement name="THEN">
+                              <block type="looks_say" inline="true">
+                                <value name="TEXT">
+                                  <block type="text">
+                                    <field name="TEXT">追いつきました！</field>
+                                  </block>
+                                </value>
+                              </block>
+                            </statement>
+                            <statement name="ELSE">
+                              <block type="looks_say" inline="true">
+                                <value name="TEXT">
+                                  <block type="text">
+                                    <field name="TEXT" />
+                                  </block>
+                                </value>
+                              </block>
+                            </statement>
+                          </block>
+                        </next>
+                      </block>
+                    </next>
+                  </block>
+                </statement>
+              </block>
+            </statement>
+          </block>
+        </statement>
+      </block>
+    </next>
+  </block>
 </xml>