smalruby-editor 0.3.5 → 0.4.0

data/app/controllers/application_controller.rb

@@ -7,8 +7,9 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
-  helper_method :standalone?, :raspberrypi?, :current_user,
-                :current_preferences
+  helper_method :standalone?, :raspberrypi?,
+                :signed_in?,
+                :current_user, :current_preferences
 
   before_filter :set_locale
   before_filter :reload_preference if Rails.env.development?
@@ -66,6 +67,11 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  # whether signed in or not.
+  def signed_in?
+    session[:username]
+  end
+
   def current_user
     @current_user ||= User.where(name: session[:username]).first
   end

data/app/controllers/costumes_controller.rb

@@ -0,0 +1,58 @@
+class CostumesController < ApplicationController
+  layout false
+
+  before_filter :check_whether_standalone, only: [:show, :create, :destroy]
+
+  def index
+    if signed_in?
+      @costumes = current_user.costumes.with_preset
+    else
+      @costumes = Costume.presets
+    end
+    @costumes = @costumes.merge(Costume.default_order)
+  end
+
+  def show
+    name = params[:basename].sub(/\.png$/, "")
+    costume = current_user.costumes.where(name: name).first
+    send_file costume.path,
+              type: "image/png", disposition: "inline", x_send_file: true
+  end
+
+  def create
+    max_position =
+      current_user.costumes.order(position: :desc).first.try(:position) || -1
+    attrs = {
+      basename: costume_params[:file].original_filename,
+      preset: false,
+      position: max_position + 1,
+    }
+    costume = current_user.costumes.create!(attrs)
+
+    path = costume.path
+    FileUtils.mkdir_p(path.dirname)
+    File.open(path, "wb") do |f|
+      f.write(costume_params[:file].read)
+    end
+
+    index
+
+    render action: "index"
+  end
+
+  def destroy
+    costume = current_user.costumes.where(id: params[:id]).first
+    FileUtils.rm_f(costume.path)
+    costume.destroy
+
+    index
+
+    render action: "index"
+  end
+
+  private
+
+  def costume_params
+    params.require(:costume).permit(:file)
+  end
+end

data/app/controllers/editor_controller.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+require "ostruct"
+
 class EditorController < ApplicationController
   def index
   end

data/app/helpers/costumes_helper.rb

@@ -0,0 +1,2 @@
+module CostumesHelper
+end

data/app/helpers/sessions_helper.rb

@@ -1,6 +1,2 @@
 module SessionsHelper
-  # whether signed in or not.
-  def signed_in?
-    session[:username]
-  end
 end

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

@@ -4,6 +4,8 @@ module RubyToBlock
   module Block
     # すべてのブロックのベースクラス
     class Base
+      STRING_RE = '\s*("[^"]*"|\'[^\']*\')\s*'
+
       attr_accessor :parent
       attr_accessor :prev_sibling
       attr_accessor :sibling

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

@@ -4,12 +4,22 @@ module RubyToBlock
     # ソースコードに含まれるキャラクターを表現するクラス
     class Character < Base
       # rubocop:disable LineLength
-      blocknize '^\s*(\S+)\s*=\s*Character\.new\(costume:\s*"(\s*[^"]+\s*)"\s*,\s*x:\s*(\s*\d+\s*)\s*,\s*y:\s*(\s*\d+\s*)\s*,\s*angle:\s*(\s*\d+\s*)(?:,\s*rotation_style:\s*\s*:(free|left_right|none)\s*)?\)\s*$',
+      blocknize ['^\s*',
+                 '(\S+)', '\s*=\s*', 'Character\.new\(',
+                 'costume:\s*("[^"]+"|\[\s*"[^"]+"\s*(?:,\s*"[^"]+".*)*\])\s*',
+                 '(?:,\s*costume_index:\s*(\d+)\s*)?',
+                 ',\s*x:\s*(\d+)\s*',
+                 ',\s*y:\s*(\d+)\s*',
+                 ',\s*angle:\s*(\d+)\s*',
+                 '(?:,\s*rotation_style:\s+:(free|left_right|none)\s*)?',
+                 '\)',
+                 '\s*$'].join(""),
                 statement: true
       # rubocop:enable LineLength
 
       attr_accessor :name
       attr_accessor :costumes
+      attr_accessor :costume_index
       attr_accessor :x
       attr_accessor :y
       attr_accessor :angle
@@ -18,9 +28,14 @@ module RubyToBlock
       def self.process_match_data(md, context)
         md2 = regexp.match(md[type])
         name = md2[1]
-        context[:characters][name] = new(name: name, costumes: [md2[2]],
-                                         x: md2[3], y: md2[4], angle: md2[5],
-                                         rotation_style: md2[6] || 'free')
+        costumes = md2[2].scan(/"([^"]+)"/).flatten
+        context[:characters][name] = new(name: name,
+                                         costumes: costumes,
+                                         costume_index: md2[3] || "0",
+                                         x: md2[4],
+                                         y: md2[5],
+                                         angle: md2[6],
+                                         rotation_style: md2[7] || "free")
 
         true
       end
@@ -28,6 +43,7 @@ module RubyToBlock
       def initialize(options)
         @name = options[:name]
         @costumes = options[:costumes]
+        @costume_index = options[:costume_index]
         @x = options[:x]
         @y = options[:y]
         @angle = options[:angle]
@@ -36,14 +52,19 @@ module RubyToBlock
 
       def to_xml(parent)
         attrs = {
-          'name' => @name,
-          'x' => @x,
-          'y' => @y,
-          'angle' => @angle,
-          'costumes' => @costumes.join(',')
+          "name" => @name,
+          "x" => @x,
+          "y" => @y,
+          "angle" => @angle,
+          "costumes" => @costumes.join(","),
         }
-        attrs['rotation_style'] = @rotation_style if @rotation_style != 'free'
-        parent.add_element('character', attrs)
+        if @costume_index != "0"
+          attrs["costume_index"] = @costume_index
+        end
+        if @rotation_style != "free"
+          attrs["rotation_style"] = @rotation_style
+        end
+        parent.add_element("character", attrs)
       end
     end
   end

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

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareNeoPixelSetRgb < CharacterMethodCall
+      include HardwareOperation
+
+      # rubocop:disable LineLength
+      blocknize ['^\s*',
+                 CHAR_RE,
+                 'neo_pixel',
+                 '\(', PWM_PIN_RE, '\)',
+                 '\.set\(color:',
+                 '\s*\[(\d+),\s*(\d+),\s*(\d+)\]\s*',
+                 '\)',
+                 '\s*$'].join(''),
+                statement: true
+      # rubocop:enable LineLength
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+
+        block = new(fields: { PIN: md2[2] })
+        add_character_method_call_block(context, md2[1], block,
+                                        RED: md2[3],
+                                        GREEN: md2[4],
+                                        BLUE: md2[5])
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class LooksNextCostume < CharacterMethodCall
+      blocknize ['^\s*',
+                 CHAR_RE,
+                 'next_costume',
+                 '\s*$'].join(""),
+                statement: true
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class LooksSwitchCostume < CharacterMethodCall
+      blocknize ['^\s*',
+                 CHAR_RE,
+                 'switch_costume\(', STRING_RE, '\)',
+                 '\s*$'].join(""),
+                statement: true
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+
+        block = new(fields: { COSTUME: md2[2][1..-2] })
+        _, context.current_block =
+          *add_child_or_create_character_new_block(context, md2[1], block)
+
+        true
+      end
+    end
+  end
+end