smalruby-editor 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f31eaf9af5535997978a26b3695281bea1b42f0b
-  data.tar.gz: b16de89a95361cfccf5442beff5574bcf5739cd1
+  metadata.gz: 091215afaa7483b700120a3d24768bd6096d3776
+  data.tar.gz: d73ff4f5e93cef3b0bc8a4dd2d272260a4dd205e
 SHA512:
-  metadata.gz: 0a98b1fafc323e05da037379b47f980af46bf674c4d2b414c0dd87df077e70aa02e936bfef4aca8446a90856813cb8220e7eb44ad10ec353118d038e54f326a2
-  data.tar.gz: 7e4027a9eed4347b503e2a7911c61b7d2393a13393ff1cafef19ce9831f18a455b4a7158d95002a362c9f44b7df6479dbc438b94e65999f19045566151175ada
+  metadata.gz: 968efc581b12c6b0454c89e9e5267588296f8445c8d27bc342df75c4a38a088dbafe27ee84a487fa19b861bf25f25adc9f3908c93487389c656c8bb954b9a048
+  data.tar.gz: f37a5af2ab674bd16758c78c604981fa8418eaa10c1684ccdae530feca73e8e215013cbf3e6bb60b8a1ff2388c2464c907255e9c3a46774d70fc8cb86201361d

data/.rubocop.yml

@@ -5,6 +5,7 @@ AllCops:
     - spec/fixtures/**
     - vendor/*
     - work/*
+    - bin/spring
   RunRailsCops: true
 
 # 日本語でのコメントを許可する

data/.simplecov

@@ -1,7 +1,7 @@
-if ENV['COVERALLS']
-  require 'coveralls'
-
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-end
-
-SimpleCov.start('rails')
+if ENV['COVERALLS']
+  require 'coveralls'
+
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+end
+
+SimpleCov.start('rails')

data/Guardfile

@@ -13,7 +13,7 @@ ignore(TEMPFILE_BY_EMACS)
 
 group :red_green_refactor, halt_on_fail: true do
   guard :rubocop, all_on_start: false do
-    ignore(%r{^db/(?:schema|seeds)\.rb$})
+    ignore(%r{^(?:db/(?:schema|seeds)\.rb|bin/spring)$})
 
     watch(%r{.+\.rb$})
     watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }

data/Procfile

@@ -1 +1 @@
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb

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

@@ -68,6 +68,9 @@ Blockly.Blocks['<%= n %>'] =
 
     @
 
+  getCharacter: ->
+    @character
+
 Blockly.Ruby['<%= n %>'] = (block) ->
   c = block.character
   Blockly.Ruby.defineCharacter(c)

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

@@ -106,7 +106,19 @@ Smalruby.FieldCharacter.dropdownChange = (value) ->
 
 Smalruby.FieldCharacter.NullCharacter =
   get: (name) ->
-    <%= bm('.no_character') %>
+    switch name
+      when 'name'
+        <%= bm('.no_character') %>
+      when 'costumes'
+        ['']
+      when 'costumeNames'
+        [<%= bm('.first_costume') %>]
+      when 'costumeIndex'
+        0
+      else
+        null
+  costumeName: (index) ->
+    ''
   on: -> $.noop
   off: -> $.noop
   link: -> $.noop

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

@@ -0,0 +1,84 @@
+<%
+  require 'smalruby_editor'
+  require 'smalruby_editor/blockly_message_helper'
+%>
+
+'use strict'
+
+goog.provide('Smalruby.FieldCostume')
+
+goog.require('Blockly.FieldDropdown')
+goog.provide('Smalruby.FieldCharacter')
+
+
+Smalruby.FieldCostume = (opt_character, opt_changeHandler) ->
+  @character = Smalruby.FieldCharacter.NullCharacter
+  @costumeIndex = 0
+  if opt_character
+    @setCharacter(opt_character)
+
+  if opt_changeHandler
+    changeHandler = (value) =>
+      retVal = Smalruby.FieldCostume.dropdownChange.call(@, value)
+      if retVal
+        newVal = retVal
+      else
+        retVal = @getValue()
+      opt_changeHandler.call(@, newVal)
+      retVal
+  else
+    changeHandler = Smalruby.FieldCostume.dropdownChange
+
+  Smalruby.FieldCostume.superClass_.constructor
+    .call(@, Smalruby.FieldCostume.dropdownCreate, changeHandler)
+
+goog.inherits(Smalruby.FieldCostume, Blockly.FieldDropdown)
+
+Smalruby.FieldCostume.prototype.setCharacter = (character) ->
+  return if character == @character
+
+  @character.off('change:costumeNames', @onCharacterChangeCostumeNames_, @)
+  @character = if character then character else Smalruby.FieldCharacter.NullCharacter
+  @character.on('change:costumeNames', @onCharacterChangeCostumeNames_, @)
+
+  @costumeIndex = 0
+  @setValue(@character.costumeName(@costumeIndex))
+
+Smalruby.FieldCostume.prototype.onCharacterChangeCostumeNames_ = (model, costumeNames, options) ->
+  if @costumeIndex < costumeNames.length
+    @setValue(costumeNames[@costumeIndex])
+  else
+    @setValue(costumeNames[0])
+    @costumeIndex = 0
+
+Smalruby.FieldCostume.prototype.clone = ->
+  new Smalruby.FieldCostume(null, @changeHandler_)
+
+Smalruby.FieldCostume.prototype.dispose = ->
+  @setCharacter(Smalruby.FieldCharacter.NullCharacter)
+
+  Blockly.FieldDropdown.prototype.dispose.call(@)
+
+Smalruby.FieldCostume.prototype.getCharacterFromParentBlocks_ = ->
+  block = @sourceBlock_
+  while block
+    if block.getCharacter
+      return block.getCharacter()
+    block = block.getSurroundParent()
+
+  Smalruby.FieldCharacter.NullCharacter
+
+Smalruby.FieldCostume.dropdownCreate = ->
+  @setCharacter(@getCharacterFromParentBlocks_())
+  ([costume, costume] for costume in @character.get('costumeNames'))
+
+Smalruby.FieldCostume.dropdownChange = (value) ->
+  costumeIndex = -1
+  if (costumeNames = @character.get('costumeNames'))
+    costumeIndex = _.indexOf(costumeNames, value)
+  if costumeIndex == -1
+    @costumeIndex = 0
+    null
+  else
+    @costumeIndex = costumeIndex
+    value

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

@@ -96,6 +96,32 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   Blockly.Ruby.characterMethodCall_("led(#{Blockly.Ruby.quote_(pin)}).<%= method %>")
 <% end %>
 
+# Adafruit Pixel
+<% subcategory = 'neo_pixel' %>
+
+<% n = "#{category}_#{subcategory}_set_rgb" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:looks] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_set_rgb") %>,
+                    ['PIN', new Blockly.FieldDropdown(pwmPinDropdown)],
+                    ['RED', ['Number'], Blockly.ALIGN_RIGHT],
+                    ['GREEN', ['Number'], Blockly.ALIGN_RIGHT],
+                    ['BLUE', ['Number'], Blockly.ALIGN_RIGHT],
+                    Blockly.ALIGN_RIGHT)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  pin = @getFieldValue('PIN')
+  red = Blockly.Ruby.valueToCode(@, 'RED', Blockly.Ruby.ORDER_NONE) || '0'
+  green = Blockly.Ruby.valueToCode(@, 'GREEN', Blockly.Ruby.ORDER_NONE) || '0'
+  blue = Blockly.Ruby.valueToCode(@, 'BLUE', Blockly.Ruby.ORDER_NONE) || '0'
+  Blockly.Ruby.characterMethodCall_("<%= subcategory %>(#{Blockly.Ruby.quote_(pin)}).set(color: [#{red}, #{green}, #{blue}])")
+
+
 # 「RGB LED」サブジャンル
 
 # RGB LED[▼アノード]コモン[▼PIN]を[カラー]にする

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

@@ -89,6 +89,38 @@ Blockly.Blocks['<%= n %>'] =
 Blockly.Ruby['<%= n %>'] = (block) ->
   Blockly.Ruby.characterMethodCall_('vanish')
 
+
+<% n = "#{category}_next_costume" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= color %>)
+    @appendDummyInput().appendField(<%= bm('.next_costume') %>)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  Blockly.Ruby.characterMethodCall_('next_costume')
+
+
+<% n = "#{category}_switch_costume" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= color %>)
+    @interpolateMsg(<%= bm('.switch_costume') %>,
+                    ['COSTUME', new Smalruby.FieldCostume()],
+                    Blockly.ALIGN_RIGHT)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  costume = Blockly.Ruby.quote_(@getFieldValue('COSTUME'))
+  Blockly.Ruby.characterMethodCall_("switch_costume(#{costume})")
+
+
 # 大きさを(　)％ずつ変える
 # 大きさを(　)％にする
 <%

data/app/assets/javascripts/generators/ruby.js.coffee.erb

@@ -62,8 +62,17 @@ Blockly.Ruby.defineCharacter = (c) ->
         rotationStyle = ', rotation_style: :none'
       else
         rotationStyle = ''
+    costumeParam = ['costume: ']
+    costumes = (Blockly.Ruby.quote_(costume) for costume in c.costumesWithName())
+    if costumes.length > 1
+      costumeParam.push("[#{costumes.join(', ')}]")
+    else
+      costumeParam.push(costumes[0])
+    costumeIndex = c.get('costumeIndex')
+    if costumeIndex > 0
+      costumeParam.push(", costume_index: #{costumeIndex}")
     Blockly.Ruby.definitions_[blockName] =
-      "#{name} = Character.new(costume: #{Blockly.Ruby.quote_(c.costume())}, x: #{c.get('x')}, y: #{c.get('y')}, angle: #{c.get('angle')}#{rotationStyle})"
+      "#{name} = Character.new(#{costumeParam.join('')}, x: #{c.get('x')}, y: #{c.get('y')}, angle: #{c.get('angle')}#{rotationStyle})"
 
 Blockly.Ruby.characterStack = ->
   @definitions_['character_stack']

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

@@ -2,6 +2,7 @@ Smalruby.Character = Backbone.Model.extend({
   defaults:
     name: null
     costumes: [],
+    costumeNames: [],
     costumeIndex: 0
     x: 0
     y: 0
@@ -14,6 +15,23 @@ Smalruby.Character = Backbone.Model.extend({
     @objects = []
     if @get('costumes').length == 0
       @set({ costumes: [Smalruby.Character.PRESET_COSTUMES[0]] })
+    else
+      costumes = []
+      costumeNames = []
+      index = 1
+      for costume in (costume.split(':') for costume in @get('costumes'))
+        do (costume) ->
+          if costume.length == 1
+            costumeNames.push("costume#{index}")
+            costumes.push(costume[0])
+          else
+            costumeNames.push(costume[0])
+            costumes.push(costume[1])
+          index++
+      @set({ costumes: costumes, costumeNames: costumeNames })
+
+    if @get('costumeNames').length == 0
+      @set({ costumeNames: ['costume1'] })
 
   validate: (attrs, options) ->
     errors = []
@@ -31,6 +49,23 @@ Smalruby.Character = Backbone.Model.extend({
         attr: 'name'
         message: 'Name is invalid'
 
+    i = 0
+    costumeNames = attrs.costumeNames
+    for name in costumeNames
+      do (name) ->
+        if _.isUndefined(name) || _.isNull(name) ||
+           (_.isString(name) && name.length == 0)
+          errors.push
+            attr: 'costumeNames'
+            index: i
+            message: 'costumeNames is required'
+        else if _.indexOf(costumeNames, name) != _.lastIndexOf(costumeNames, name)
+          errors.push
+            attr: 'costumeNames'
+            index: i
+            message: 'costumeNames is duplicated'
+        i++
+
     if errors.length > 0
       return errors
 
@@ -50,15 +85,19 @@ Smalruby.Character = Backbone.Model.extend({
   namePrefix: ->
     Smalruby.Character.costumeToNamePrefix(@get('name'))
 
-  costume: ->
-    @get('costumes')[@get('costumeIndex')]
+  costume: (index = @get('costumeIndex')) ->
+    @get('costumes')[index]
+
+  costumeName: (index = @get('costumeIndex')) ->
+    @get('costumeNames')[index]
+
+  costumesWithName: ->
+    costumeNames = @get('costumeNames')
+    ("#{costumeNames[i]}:#{costume}" for costume, i in @get('costumes'))
 
   costumeUrl: (index = @get('costumeIndex')) ->
     basename = @get('costumes')[index]
-    if _.indexOf(Smalruby.Character.PRESET_COSTUMES, basename) == -1
-      basename
-    else
-      "/smalruby/assets/#{basename}"
+    "/smalruby/assets/#{basename}"
 
   nextCostume: ->
     i = @get('costumeIndex') + 1

data/app/assets/javascripts/msg/en_us.js

@@ -191,6 +191,7 @@ Blockly.Msg.BLOCKS_RUBY_P = 'p %1';
 
 // blocks/field_character.js.coffee.erb
 Blockly.Msg.BLOCKS_FIELD_CHARACTER_NO_CHARACTER = 'no character';
+Blockly.Msg.BLOCKS_FIELD_CHARACTER_FIRST_COSTUME = 'first costume';
 
 
 // blocks/sound.js.coffee.erb
@@ -214,6 +215,8 @@ Blockly.Msg.BLOCKS_LOOKS_THINK_WITH_SECOND = 'think %1 for %2 secs';
 Blockly.Msg.BLOCKS_LOOKS_SHOW = 'show';
 Blockly.Msg.BLOCKS_LOOKS_HIDE = 'hide';
 Blockly.Msg.BLOCKS_LOOKS_VANISH = 'vanish';
+Blockly.Msg.BLOCKS_LOOKS_NEXT_COSTUME = 'next costume';
+Blockly.Msg.BLOCKS_LOOKS_SWITCH_COSTUME = 'switch costume to %1';
 
 
 // blocks/hardware.js.coffee.erb
@@ -224,6 +227,7 @@ Blockly.Msg.BLOCKS_HARDWARE_CATHODE = 'cathode';
 Blockly.Msg.BLOCKS_HARDWARE_LEFT = 'left';
 Blockly.Msg.BLOCKS_HARDWARE_RIGHT = 'right';
 Blockly.Msg.BLOCKS_HARDWARE_INIT_HARDWARE = 'setup hardware';
+Blockly.Msg.BLOCKS_HARDWARE_NEO_PIXEL_SET_RGB = 'Adfruit NeoPixel RGB LED %1 set color to red %2 green %3 blue %4';
 Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_SET_COLOR = 'set RGB LED %1 common %2 color to %3';
 Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_TURN_OFF = 'turn off RGB LED %1 common %2';
 Blockly.Msg.BLOCKS_HARDWARE_SEVEN_SEGMENT_DISPLAY_SHOW = 'show 7 segment display %1';

data/app/assets/javascripts/msg/ja.js

@@ -195,6 +195,7 @@ Blockly.Msg.BLOCKS_RUBY_P = '♠p %1';
 
 // blocks/field_character.js.coffee.erb
 Blockly.Msg.BLOCKS_FIELD_CHARACTER_NO_CHARACTER = 'キャラクターなし';
+Blockly.Msg.BLOCKS_FIELD_CHARACTER_FIRST_COSTUME = '最初のコスチューム';
 
 
 // blocks/sound.js.coffee.erb
@@ -218,6 +219,8 @@ Blockly.Msg.BLOCKS_LOOKS_THINK_WITH_SECOND = '★%1 と %2 秒と考える';
 Blockly.Msg.BLOCKS_LOOKS_SHOW = '★表示する';
 Blockly.Msg.BLOCKS_LOOKS_HIDE = '★隠す';
 Blockly.Msg.BLOCKS_LOOKS_VANISH = '★消滅する';
+Blockly.Msg.BLOCKS_LOOKS_NEXT_COSTUME = '★次のコスチュームにする';
+Blockly.Msg.BLOCKS_LOOKS_SWITCH_COSTUME = '★コスチュームを %1 にする';
 
 
 // blocks/hardware.js.coffee.erb
@@ -228,6 +231,7 @@ Blockly.Msg.BLOCKS_HARDWARE_CATHODE = 'カソード';
 Blockly.Msg.BLOCKS_HARDWARE_LEFT = ' 左';
 Blockly.Msg.BLOCKS_HARDWARE_RIGHT = '右';
 Blockly.Msg.BLOCKS_HARDWARE_INIT_HARDWARE = '♠ハードウェアを準備する';
+Blockly.Msg.BLOCKS_HARDWARE_NEO_PIXEL_SET_RGB = '★マイコン内蔵RGB LED %1 を赤 %2 緑 %3 青 %4 にする';
 Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_SET_COLOR = '★RGB LED %1 コモン %2 を %3 にする';
 Blockly.Msg.BLOCKS_HARDWARE_RGB_LED_TURN_OFF = '★RGB LED %1 コモン %2 をオフにする';
 Blockly.Msg.BLOCKS_HARDWARE_SEVEN_SEGMENT_DISPLAY_SHOW = '★7セグディスプレイに %1 を表示する';

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

@@ -135,6 +135,7 @@ window.Smalruby =
         c = new Smalruby.Character
           name: xmlChild.getAttribute('name')
           costumes: xmlChild.getAttribute('costumes').split(',')
+          costumeIndex: parseInt(xmlChild.getAttribute('costume_index') || 0, 10)
           x: parseInt(xmlChild.getAttribute('x'), 10)
           y: parseInt(xmlChild.getAttribute('y'), 10)
           angle: parseInt(xmlChild.getAttribute('angle'), 10)
@@ -152,7 +153,10 @@ window.Smalruby =
       e.setAttribute('x', c.get('x'))
       e.setAttribute('y', c.get('y'))
       e.setAttribute('name', c.get('name'))
-      e.setAttribute('costumes', c.get('costumes').join(','))
+      e.setAttribute('costumes', c.costumesWithName().join(','))
+      costumeIndex = c.get('costumeIndex')
+      if costumeIndex != 0
+        e.setAttribute('costume_index', costumeIndex)
       e.setAttribute('angle', c.get('angle'))
       rotationStyle = c.get('rotationStyle')
       if rotationStyle != 'free'