smalruby-editor 0.3.5 → 0.4.0

data/app/models/costume.rb

@@ -0,0 +1,67 @@
+class Costume < ActiveRecord::Base
+  acts_as_taggable
+
+  PRESET_COSTUME_SETTINGS = [
+    { name: "car1", tag_list: %w(Preset Car) },
+    { name: "car2", tag_list: %w(Preset Car) },
+    { name: "car3", tag_list: %w(Preset Car) },
+    { name: "car4", tag_list: %w(Preset Car) },
+    { name: "cat1", tag_list: %w(Preset Animal Cat) },
+    { name: "cat2", tag_list: %w(Preset Animal Cat) },
+    { name: "cat3", tag_list: %w(Preset Animal Cat) },
+    { name: "frog1", tag_list: %w(Preset Aminal Frog) },
+    { name: "ball1", tag_list: %w(Preset Ball) },
+    { name: "ball2", tag_list: %w(Preset Ball) },
+    { name: "ball3", tag_list: %w(Preset Ball) },
+    { name: "ball4", tag_list: %w(Preset Ball) },
+    { name: "ball5", tag_list: %w(Preset Ball) },
+    { name: "ball6", tag_list: %w(Preset Ball) },
+    { name: "ryu1", tag_list: %w(Preset Human Ninja) },
+    { name: "ryu2", tag_list: %w(Preset Human Ninja) },
+    { name: "taichi1", tag_list: %w(Preset Animal Ninja) },
+    { name: "taichi2", tag_list: %w(Preset Animal Ninja) },
+  ]
+
+  belongs_to :user
+
+  scope :presets, -> { where(preset: true) }
+  scope :default_order, -> { order(preset: :asc, position: :asc) }
+
+  class << self
+    def create_presets
+      PRESET_COSTUME_SETTINGS.each.with_index do |setting, index|
+        costume = Costume.find_or_create_by(name: setting[:name],
+                                            position: index,
+                                            preset: true)
+        costume.tag_list = setting[:tag_list]
+        costume.save!
+      end
+    end
+
+    def destroy_presets
+      names = PRESET_COSTUME_SETTINGS.map { |s| s[:name] }
+      where(name: names, preset: true).destroy_all
+    end
+  end
+
+  def url
+    "/smalruby/assets/#{basename}"
+  end
+
+  def path
+    if preset?
+      Rails.root.join("public/smalruby/assets/#{basename}")
+    else
+      s = "~/#{user.name}/__assets__/#{basename}"
+      Pathname(s).expand_path
+    end
+  end
+
+  def basename=(val)
+    self.name = val.sub(/\.png$/, "")
+  end
+
+  def basename
+    "#{name}.png"
+  end
+end

data/app/models/source_code.rb

@@ -73,7 +73,15 @@ class SourceCode < ActiveRecord::Base
 
       doc = Nokogiri::HTML.parse(data)
       if (attr = doc.xpath('//character[1]/@costumes').first)
-        res[:imageUrl] = "/smalruby/assets/#{attr.value}"
+        costumes = attr.value.split(",").map { |s|
+          s.sub(/^[^:]*:/, "")
+        }
+        if (attr = doc.xpath('//character[1]/@costume_index').first)
+          costume_index = attr.value.to_i
+        else
+          costume_index = 0
+        end
+        res[:imageUrl] = "/smalruby/assets/#{costumes[costume_index]}"
       end
       text = doc.xpath('//block[@type="ruby_comment"][1]' +
                        '/field[@name="COMMENT"]/text()').first

data/app/models/user.rb

@@ -1,6 +1,13 @@
 class User < ActiveRecord::Base
   serialize :preferences
 
+  has_many :costumes do
+    def with_preset
+      condition = where(costumes: { preset: true }).where_values.reduce(:or)
+      except(:where).where(condition)
+    end
+  end
+
   before_save do
     preferences.each do |key, value|
       case key

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

@@ -0,0 +1,19 @@
+#character-modal-costume-selector
+  .row-fluid
+    %ul.thumbnails
+      - @costumes.each do |costume|
+        %li
+          %a.thumbnail
+            %img{src: "#{costume.url}", alt: "#{costume.basename}"}
+            - if !costume.preset?
+              %a.remove-button{"data-url" => "#{costume_path(costume)}", "data-message" => "#{t(".confirm_to_delete_costume")}"}
+                %i.icon-remove
+
+      - if signed_in?
+        %li
+          %a#character-modal-upload-costume
+            %i.icon-plus-sign-alt
+            %br
+            = t('.upload_costume')
+          = form_tag(costumes_path, id: "character-modal-upload-costume-form", method: "post", multipart: true) do
+            %input#character-modal-upload-costume-file{type: "file", name: "costume[file]", style: "display: none"}

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

@@ -2,13 +2,27 @@
                  :role => 'dialog', :'aria-hidden' => 'true'}
   .modal-body
     #character-modal-right-pane{:class => 'right-pane'}
-      #character-modal-costume-selector
-        .row-fluid
-          %ul.thumbnails
-            - %w(car1 car2 car3 car4 cat1 cat2 cat3 frog1 ball1 ball2 ball3 ball4 ball5 ball6 ryu1 ryu2 taichi1 taichi2).each do |name|
-              %li
-                %a.thumbnail
-                  %img{:src => "/smalruby/assets/#{name}.png", :alt => "#{name}.png"}
+      #character-modal-right-pane-inner
+        #character-modal-right-pane-inner-right-pane{:class => 'right-pane'}
+          %form#character-modal-costume-form{:class => 'form-horizontal'}
+            .control-group{for: "costume[name]"}
+              %label.control-label{for: "costume_name"}<
+                = t('.costume_name')
+              .controls
+                %input#costume_name.input-large{name: "costume[name]", type: "text", placeholder: t('.msg_input_costume_name')}
+
+          #character-modal-costume-selector
+
+        #character-modal-right-pane-inner-left-pane{:class => 'left-pane'}
+          #character-modal-costume-set-header
+            = t('.costumes')
+          #character-modal-costume-set-container
+            #character-modal-costume-set
+            #character-modal-add-costume.item
+              %a#character-modal-add-costume-button.costume
+                %i.icon-plus-sign-alt
+                %br
+                = t('.new_costume')
 
     #character-modal-left-pane{:class => 'left-pane'}
       #character-modal-preview
@@ -60,3 +74,17 @@
     %button#character-modal-ok-button{:class => 'btn btn-primary'}<
       %i.icon-circle-blank
       = t('common.ok')
+
+%script#character-modal-costume-template{:type => 'text/template'}
+  .item
+    .item-info
+      .name
+        {{- name }}
+      .attributes
+        {{- index }}
+
+      %a.remove-button
+        %i.icon-remove
+
+    %a.costume
+      %img{src: '{{- path }}', alt: '{{- basename }}'}

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

@@ -194,6 +194,9 @@
     -# 消滅する
     %block{:type => "#{category}_vanish"}
 
+    %block{:type => "#{category}_next_costume"}
+    %block{:type => "#{category}_switch_costume"}
+
     -# 大きさを(　)％ずつ変える
     -#%block{:type => "#{category}_change_scale_by"}
     -#  = toolbox_number_value('SCALE', 10)
@@ -217,6 +220,12 @@
       -# LED[▼PIN]をオフにする
       %block{:type => "#{category}_#{subcategory}_turn_off"}
 
+      - subcategory = 'neo_pixel'
+      %block{:type => "#{category}_#{subcategory}_set_rgb"}
+        = toolbox_number_value('RED', 0)
+        = toolbox_number_value('GREEN', 0)
+        = toolbox_number_value('BLUE', 0)
+
       - subcategory = 'rgb_led'
       -# RGB LED[▼アノード]コモン[▼PIN]を[カラー]にする
       %block{:type => "#{category}_#{subcategory}_set_color"}

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

@@ -51,6 +51,7 @@
         .btn-group
           %a#submenu-button{:class => "dropdown-toggle btn btn-primary", :"data-toggle" => "dropdown", :href => "#"}
             %i.icon-reorder
+            = t('.menu')
           %ul#submenu.dropdown-menu{:class => "pull-right"}
             %li
               - if standalone?

data/bin/smalruby-editor

@@ -3,6 +3,7 @@
 
 require 'pathname'
 require 'socket'
+require 'timeout'
 
 ENV['RAILS_ENV'] = 'standalone'
 ENV['SMALRUBY_EDITOR_HOME'] ||= Pathname('~/.smalruby-editor').expand_path.to_s

data/bin/spring

@@ -4,17 +4,15 @@
 # It gets overwritten when you run the `spring binstub` command
 
 unless defined?(Spring)
-  require 'rubygems'
-  require 'bundler'
+  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'] = ''
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
+    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'
+    gem "spring", match[1]
+    require "spring/binstub"
   end
 end

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