smalruby-editor 0.1.15-x86-mingw32 → 0.1.16-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d53fa32a3b8707706add17ac92e087881b7d4f2
-  data.tar.gz: 842742995256fbc29130fbdd9de50b906ed1fd49
+  metadata.gz: 47874074016e9dd005b8b5b4eac725702132b95a
+  data.tar.gz: d44bf9676c75316949454979710c94ea1d7929c2
 SHA512:
-  metadata.gz: 9bab4b91459b18253fca144251ddcbb68a445f2f6cb12702b645a1e5ff894c2411b301bea079d4557875c2b9174e4973044dc8f1a0008b9c4c45da1adf34d4c1
-  data.tar.gz: 32d4a35fb1a7a727b91f8ef59f860589ffa59e2b1810a2338eda4c01a06de5b2a70c4745ab36c58c636dcefdf56643ea285b5196ff87ed356a42e4e121a60ec1
+  metadata.gz: b7c276231be625d03b1b0114d9ab578481eeca372320a9eac85b321ef0f24de124dcbce6d8c32338c2ed9f3777ce30fd5d3da06cc642408203a2888500fabba1
+  data.tar.gz: 69a417672aadef53615da7c5d8f82836290900c2ced56613513a6b624fde363ae5ef21beb571332ff18badd9e86b9f54b36fdfbe63f5d5311333aa4aee1789e8

data/README.rdoc

@@ -11,10 +11,24 @@ The smalruby-editor is a visual programming editor that can create a Ruby script
 * DEMO: http://smalruby.herokuapp.com/demo/
 * DEMO(Arduino): http://smalruby.herokuapp.com/demo/rgb_led_anode/
 
-The smalruby-editor is a part of the Smalruby Project.
+The smalruby-editor is a part of the Smalruby (http://smalruby.jp) Project.
 
 The Smalruby(smɔ́ːrúːbi) Project will provide a Ruby learning environment for middle school students from the upper grades of elementary school. The goal of this project is to achieve software and community sites such as the {Scratch}[http://scratch.mit.edu/] in Ruby. The Scratch has experience as educational programming environment can be used in elementary school. This project consists of the following elements.
 
+== Installation (for User)
+
+requirements:
+
+* Windows or UNIX like OS (Mac OS X, Linux, etc...)
+* Ruby 2.0.0-p353 or higher.
+* dxruby_sdl (only Mac OS X and Linux): https://github.com/takaokouji/dxruby_sdl/
+* rsdl (only Mac OS X): http://www.kumaryu.net/proj/ruby-rsdl/
+
+execute below commands.
+
+  gem install smalruby-editor
+  smalruby-editor
+
 == Installation (for Developer)
 
 requirements:
@@ -32,6 +46,7 @@ execute below commands.
   rake db:create
   rake db:migrate
   rake
+  touch tmp/standalone
   rails server
 
 access <tt>localhost:3000</tt> with your web browser.

data/app/assets/javascripts/blocks/character.js.coffee.erb

@@ -65,8 +65,15 @@ Blockly.Blocks['<%= n %>'] =
 
 Blockly.Ruby['<%= n %>'] = (block) ->
   c = block.character
+  switch c.get('rotationStyle')
+    when 'left_right'
+      rotationStyle = ', rotation_style: :left_right'
+    when 'none'
+      rotationStyle = ', rotation_style: :none'
+    else
+      rotationStyle = ''
   Blockly.Ruby.definitions_["character_#{c.get('name')}"] =
-    "#{c.get('name')} = Character.new(costume: #{Blockly.Ruby.quote_(c.costume())}, x: #{c.get('x')}, y: #{c.get('y')}, angle: #{c.get('angle')})"
+    "#{c.get('name')} = Character.new(costume: #{Blockly.Ruby.quote_(c.costume())}, x: #{c.get('x')}, y: #{c.get('y')}, angle: #{c.get('angle')}#{rotationStyle})"
   Blockly.Ruby.cs_().push(c)
   try
     targetBlock = block.getInputTargetBlock('DO')

data/app/assets/javascripts/blocks/hardware.js.coffee.erb

@@ -29,6 +29,8 @@ acDropdown = [
   ['カソード', 'cathode']
 ]
 
+twoWDPinDropdown = (["D#{n}", "D#{n}"] for n in [2..10])
+
 # ハードウェアを準備する
 <% n = "#{category}_init_hardware" %>
 Blockly.Blocks['<%= n %>'] =
@@ -241,12 +243,13 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   Blockly.Ruby.characterMethodCall_("servo(#{Blockly.Ruby.quote_(pin)}).position = #{pos}")
 
 # 「車」サブジャンル
+<% subcategory = 'two_wheel_drive_car' %>
 
-# 「2WD車[▼ピン]を進める」ブロック
-# 「2WD車[▼ピン]をバックさせる」ブロック
-# 「2WD車[▼ピン]を左に曲げる」ブロック
-# 「2WD車[▼ピン]を右に曲げる」ブロック
-# 「2WD車[▼ピン]を止める」ブロック
+# 2WD車[▼ピン]を進める
+# 2WD車[▼ピン]をバックさせる
+# 2WD車[▼ピン]を左に曲げる
+# 2WD車[▼ピン]を右に曲げる
+# 2WD車[▼ピン]を止める
 <%
   [
     ['forward', '進める'],
@@ -255,7 +258,7 @@ Blockly.Ruby['<%= n %>'] = (block) ->
     ['turn_right', '右に曲げる'],
     ['stop', '止める'],
   ].each do |method, label|
-    n = "#{category}_two_wheel_drive_car_#{method}"
+    n = "#{category}_#{subcategory}_#{method}"
 %>
 
 Blockly.Blocks['<%= n %>'] =
@@ -266,7 +269,7 @@ Blockly.Blocks['<%= n %>'] =
     @setColour(<%= color %>)
     @appendDummyInput()
       .appendField('2WD車')
-      .appendField(new Blockly.FieldDropdown(dropdown), 'PIN')
+      .appendField(new Blockly.FieldDropdown(twoWDPinDropdown), 'PIN')
       .appendField('を<%= label %>')
     @setInputsInline(true)
     @setPreviousStatement(true)
@@ -279,6 +282,55 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   Blockly.Ruby.characterMethodCall_("two_wheel_drive_car(#{Blockly.Ruby.quote_(pin)}).<%= method %>")
 <% end %>
 
+# 2WD車[▼ピン]を（　）秒[▼コマンド]
+<% n = "#{category}_#{subcategory}_run" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= color %>)
+    @appendDummyInput()
+      .appendField('2WD車')
+      .appendField(new Blockly.FieldDropdown(twoWDPinDropdown), 'PIN')
+      .appendField('を')
+    @appendValueInput('SEC')
+      .setCheck('Number')
+    @appendDummyInput()
+      .appendField('秒')
+    @appendValueInput('COMMAND').setCheck('String')
+    @setInputsInline(true)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  pin = @getFieldValue('PIN')
+  sec = Blockly.Ruby.valueToCode(@, 'SEC', Blockly.Ruby.ORDER_NONE) || 0
+  command = Blockly.Ruby.valueToCode(@, 'COMMAND', Blockly.Ruby.ORDER_NONE) || Blockly.Ruby.quote_('stop')
+
+  Blockly.Ruby.characterMethodCall_("two_wheel_drive_car(#{Blockly.Ruby.quote_(pin)}).run(command: #{command}, sec: #{sec})")
+
+# [▼コマンド]
+<% n = "#{category}_#{subcategory}_commands" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    commands = [
+      ['進める', 'forward'],
+      ['バックさせる', 'backward'],
+      ['左に曲げる', 'turn_left'],
+      ['右に曲げる', 'turn_right'],
+      ['止める', 'stop'],
+    ]
+    @setHelpUrl('')
+    @setColour(<%= color %>)
+    @appendDummyInput()
+      .appendField(new Blockly.FieldDropdown(commands), 'COMMAND')
+    @setOutput(true, 'String')
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  code = Blockly.Ruby.quote_(@getFieldValue('COMMAND'))
+  [code, Blockly.Ruby.ORDER_ATOMIC]
+
 # 「ボタン」サブジャンル
 
 # 条件:ボタン[▼]を押している

data/app/assets/javascripts/blocks/motion.js.coffee.erb

@@ -119,8 +119,7 @@ Blockly.Blocks['<%= n %>'] =
 Blockly.Ruby['<%= n %>'] = (block) ->
   x = Blockly.Ruby.valueToCode(@, 'X', Blockly.Ruby.ORDER_NONE) || '0'
   y = Blockly.Ruby.valueToCode(@, 'Y', Blockly.Ruby.ORDER_NONE) || '0'
-  Blockly.Ruby.characterSetVariable_('x', x) +
-    Blockly.Ruby.characterSetVariable_('y', y)
+  Blockly.Ruby.characterSetVariable_('position', "[#{x}, #{y}]")
 
 # マウスポインターへ行く
 <% n = "#{category}_go_to_mouse" %>

data/app/assets/javascripts/models/character.js.coffee

@@ -6,6 +6,7 @@ Smalruby.Character = Backbone.Model.extend({
     x: 0
     y: 0
     angle: 0
+    rotationStyle: 'free'
     visible: true
     using: false
 
@@ -64,6 +65,32 @@ Smalruby.Character = Backbone.Model.extend({
     i = 0 if i >= @get('costumes').length
     @set({ 'costumeIndex': i })
     i
+
+  rotationStyleIconName: ->
+    switch @get('rotationStyle')
+      when 'free'
+        'icon-repeat'
+      when 'left_right'
+        'icon-resize-horizontal'
+      when 'none'
+        'icon-arrow-right'
+
+  rotateImage: (selector) ->
+    angle = @get('angle')
+    switch @get('rotationStyle')
+      when 'free'
+        transformValue = "rotate(#{angle}deg) scaleX(1)"
+      when 'left_right'
+        if angle < 90 || angle >= 270
+          transformValue = "rotate(0deg) scaleX(1)"
+        else
+          transformValue = "rotate(0deg) scaleX(-1)"
+      when 'none'
+        transformValue = "rotate(0deg) scaleX(1)"
+    $(selector).css
+      '-moz-transform': transformValue
+      '-webkit-transform': transformValue
+      transform: transformValue
 }, {
   PRESET_COSTUMES: [
     'car1.png'

data/app/assets/javascripts/smalruby.js.coffee

@@ -131,6 +131,7 @@ window.Smalruby =
           x: parseInt(xmlChild.getAttribute('x'), 10)
           y: parseInt(xmlChild.getAttribute('y'), 10)
           angle: parseInt(xmlChild.getAttribute('angle'), 10)
+          rotationStyle: xmlChild.getAttribute('rotation_style') || 'free'
         chars.push(c)
       i++
     Smalruby.Collections.CharacterSet.reset(chars)
@@ -146,6 +147,9 @@ window.Smalruby =
       e.setAttribute('name', c.get('name'))
       e.setAttribute('costumes', c.get('costumes').join(','))
       e.setAttribute('angle', c.get('angle'))
+      rotationStyle = c.get('rotationStyle')
+      if rotationStyle != 'free'
+        e.setAttribute('rotation_style', rotationStyle)
       xmlDom.insertBefore(e, blocklyDom)
     Blockly.Xml.domToPrettyText(xmlDom)
 

data/app/assets/javascripts/views/character_modal_view.js.coffee

@@ -4,6 +4,9 @@ Smalruby.CharacterModalView = Backbone.View.extend
 
   events:
     'click #character-modal-costume-selector a': 'onSelectCostume'
+    'click #character_rotation_style_free': 'onRotationStyleFree'
+    'click #character_rotation_style_left_right': 'onRotationStyleLeftRight'
+    'click #character_rotation_style_none': 'onRotationStyleNone'
     'click #character-modal-ok-button': 'onOk'
 
   previewZoomLevel: 0.5
@@ -57,6 +60,7 @@ Smalruby.CharacterModalView = Backbone.View.extend
     @listenTo(@model, 'change:y', @onChangeY)
     @listenTo(@model, 'change:angle', @onChangeAngle)
     @listenTo(@model, 'change:costumes', @onChangeCostumes)
+    @listenTo(@model, 'change:rotationStyle', @onChangeRotationStyle)
     @listenTo(@model, 'change', @onChange)
 
     @callAllOnChangeAttributes_()
@@ -85,6 +89,7 @@ Smalruby.CharacterModalView = Backbone.View.extend
     @onChangeY(@model, @model.get('y'))
     @onChangeAngle(@model, @model.get('angle'))
     @onChangeCostumes(@model, @model.get('costumes'))
+    @onChangeRotationStyle(@model, @model.get('rotationStyle'))
 
   onChangeName: (model, value, options) ->
     @$el.find('input[name="character[name]"]').val(value)
@@ -103,11 +108,13 @@ Smalruby.CharacterModalView = Backbone.View.extend
     @$el.find('input[name="character[angle]"]').val(value)
     $('#character_angle_value').text("#{value}°")
     rotate = "rotate(#{value}deg)"
-    $('#character-modal-character').css
+    $('#character_angle_vector').css
       '-moz-transform': rotate
       '-webkit-transform': rotate
       transform: rotate
 
+    @model.rotateImage('#character-modal-character')
+
   onChangeCostumes: (model, value, options) ->
     img = $('<img>').attr
       src: model.costumeUrl()
@@ -123,6 +130,11 @@ Smalruby.CharacterModalView = Backbone.View.extend
     else
       @readImageSizeflag = true
 
+  onChangeRotationStyle: (model, value, options) ->
+    $('#character_rotation_style button.btn').removeClass('btn-primary')
+    $("#character_rotation_style_#{value}").addClass('btn-primary')
+    @onChangeAngle(@model, @model.get('angle'))
+
   onChange: (model, options) ->
     return unless @target
 
@@ -157,6 +169,15 @@ Smalruby.CharacterModalView = Backbone.View.extend
 
     @model.set(attrs)
 
+  onRotationStyleFree: ->
+    @model.set({ rotationStyle: 'free' })
+
+  onRotationStyleLeftRight: ->
+    @model.set({ rotationStyle: 'left_right' })
+
+  onRotationStyleNone: ->
+    @model.set({ rotationStyle: 'none' })
+
   onOk: ->
     @$el.modal('hide')
     if @target

data/app/assets/javascripts/views/character_selector_view.js.coffee

@@ -5,7 +5,7 @@ Smalruby.CharacterSelectorView = Backbone.View.extend({
   initialize: ->
     @klass = Smalruby.CharacterSelectorView
 
-    @listenTo(@model, name, @render) for name in ['add', 'remove', 'reset', 'change']
+    @listenTo(@model, name, @onChange) for name in ['add', 'remove', 'reset', 'change']
 
     @templateText = $('#character-selector-template').text()
 
@@ -49,15 +49,16 @@ Smalruby.CharacterSelectorView = Backbone.View.extend({
       if character.get('using')
         removeButton.hide()
 
-      rotate = "rotate(#{character.get('angle')}deg)"
       img = html.find('img')
-      img.css
-        '-moz-transform': rotate
-        '-webkit-transform': rotate
-        transform: rotate
+      character.rotateImage(img)
       img.on 'dragstart', (e) ->
         e.preventDefault()
 
+  onChange: ->
+    unless Smalruby.blocklyLoading
+      Smalruby.changedAfterTranslating = true
+      window.changed = true
+    @render()
 
   addBlock_: (character) ->
     newBlock = new Blockly.Block(Blockly.mainWorkspace, 'character_new')

data/app/assets/stylesheets/application.css

@@ -17,3 +17,11 @@ html, body {
     height: 100%;
     margin: 0;
 }
+
+body {
+    user-select: none;
+    -moz-user-select: none;
+    -khtml-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+}

data/app/assets/stylesheets/editor.css.scss

@@ -168,6 +168,11 @@ $left-pane-width: $character-size + $margin * 2;
                                 img, div {
                                     margin: -$border-size;
                                 }
+
+                                img {
+                                  max-width: $character-size;
+                                  max-height: $character-size;
+                                }
                             }
 
                             a.character:hover {
@@ -235,11 +240,11 @@ $left-pane-width: $character-size + $margin * 2;
 
     $attributes-height: 160px;
 
-    $left-pane-width: $preview-width;
+    $left-pane-width: $preview-width + 2px;
     $right-pane-width: $character-size * 3 + $modal-body-margin;
 
     $modal-width: $left-pane-width + $right-pane-width + $modal-margin * 2;
-    $modal-height: $preview-height + $attributes-height + $modal-margin * 2;
+    $modal-height: $preview-height + 2px + $attributes-height + $modal-margin * 2;
 
     width: $modal-width;
     height: $modal-height;
@@ -259,7 +264,8 @@ $left-pane-width: $character-size + $margin * 2;
 
                 width: $preview-width;
                 height: $preview-height;
-                background-color: black;
+                background-color: white;
+                border: 1px solid gray;
                 overflow: hidden;
 
                 #character-modal-character {
@@ -289,15 +295,19 @@ $left-pane-width: $character-size + $margin * 2;
                         margin-bottom: 8px;
 
                         .control-label {
-                            width: 100px;
+                            width: 50px;
                         }
 
                         .controls {
-                            margin-left: 100px + $modal-body-margin;
+                            margin-left: 50px + $modal-body-margin;
 
                             input[type=range] {
                                 padding: 0;
                             }
+
+                            span#character_angle_vector {
+                                display: inline-block;
+                            }
                         }
                     }
                 }

data/app/controllers/application_controller.rb

@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+
+require 'smalruby_editor'
+
 class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
@@ -24,13 +27,7 @@ class ApplicationController < ActionController::Base
 
   # Raspberry Piかどうかを返す
   def raspberrypi?
-    if Rails.env != 'test' &&
-        (ENV['SMALRUBY_EDITOR_RASPBERRYPI_MODE'] ||
-         File.exist?(Rails.root.join('tmp', 'raspberrypi')))
-      true
-    else
-      RbConfig::CONFIG['arch'] == 'armv6l-linux-eabihf'
-    end
+    SmalrubyEditor.raspberrypi?
   end
 
   def check_whether_standalone

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

@@ -4,7 +4,7 @@ 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*$',
+      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*$',
                 statement: true
       # rubocop:enable LineLength
 
@@ -13,12 +13,14 @@ module RubyToBlock
       attr_accessor :x
       attr_accessor :y
       attr_accessor :angle
+      attr_accessor :rotation_style
 
       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])
+                                         x: md2[3], y: md2[4], angle: md2[5],
+                                         rotation_style: md2[6] || 'free')
 
         true
       end
@@ -29,13 +31,19 @@ module RubyToBlock
         @x = options[:x]
         @y = options[:y]
         @angle = options[:angle]
+        @rotation_style = options[:rotation_style]
       end
 
       def to_xml(parent)
-        parent.add_element('character',
-                           'name' => @name,
-                           'x' => @x, 'y' => @y, 'angle' => @angle,
-                           'costumes' => @costumes.join(','))
+        attrs = {
+          'name' => @name,
+          'x' => @x,
+          'y' => @y,
+          'angle' => @angle,
+          'costumes' => @costumes.join(',')
+        }
+        attrs['rotationStyle'] = @rotation_style if @rotation_style != 'free'
+        parent.add_element('character', attrs)
       end
     end
   end