smalruby-editor 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 010d3215efbb5df0cd39317ecfb6a2ce0070a83b
-  data.tar.gz: 5344949c05c898a44509e9e55facd2cdfcaa3c3a
+  metadata.gz: 645036cf0ed6ff50503c110004694f94d2dc2450
+  data.tar.gz: cfc14cbb697365ad0486edd13332908dbed36bd1
 SHA512:
-  metadata.gz: a2c7f6ebbf7d2db584af2bef33d36fb0dfb5a35f2f3258b185afaab362c3829015fcf5c55ccc33f610f646db21860b64af40b74e8b1d0fd9bb176d8a2452faf9
-  data.tar.gz: 7f9c51dac3c909046814fa4e8acef7f8dfbc3519dca8192e71434adcefbef8e31bb50742e79944200ce45cf9a4dd869d7a1d81a06be1e61bea7b4b8f12bc0828
+  metadata.gz: 058b82bff868a8607dc1ca95231b211a8f8051be0fba58b7bdf150f4ab7002d462415f1c654699b04b318093aaec043ad8ac16ec9de4303655ae864b2e74a779
+  data.tar.gz: 5c634a86474b307b7ea46c76f9f013e006fbb74ead929e800ced8c3b6f2ec5df5b751cc1c0fcb29600d047da9014574b9e746899aee7b5a532df02042fe88ff8

data/.rubocop.yml

@@ -1,7 +1,10 @@
 AllCops:
   Excludes:
     - db/seeds.rb
+    - db/schema.rb
     - spec/fixtures/**
+    - vendor/*
+    - work/*
 
 # 日本語でのコメントを許可する
 AsciiComments:

data/Guardfile

@@ -9,17 +9,15 @@
 
 TEMPFILE_BY_EMACS = %r{/\.?\#[^\/]+$}
 
+ignore(TEMPFILE_BY_EMACS)
+
 group :red_green_refactor, halt_on_fail: true do
   guard :rubocop, all_on_start: false do
-    ignore(TEMPFILE_BY_EMACS)
-
     watch(%r{.+\.rb$})
     watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
   end
 
   guard :rspec, cmd: 'bundle exec bin/rspec' do
-    ignore(TEMPFILE_BY_EMACS)
-
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
     watch('spec/spec_helper.rb')  { "spec" }
@@ -42,8 +40,6 @@ group :red_green_refactor, halt_on_fail: true do
 end
 
 guard 'livereload' do
-  ignore(TEMPFILE_BY_EMACS)
-
   watch(%r{app/views/.+\.(erb|haml|slim)$})
   watch(%r{app/helpers/.+\.rb})
   watch(%r{public/.+\.(css|js|html)})

data/LEGAL

@@ -44,3 +44,9 @@ public/square.png, public/tiny.png, public/wide.png:
   Smalruby) 2013. このイメージキャラクター、もしくはその派生版は、Ｒｕ
   ｂｙプログラミング少年団とスモウルビー：Smalrubyに関連する文脈で誰で
   も自由に利用できるが、それらは荒川ひかりによる保証を示すものではない。
+
+vendor/assets/javascripts/strftime-min.js:
+
+  Copyright 2010 - 2013 Sami Samhuri sami@samhuri.net
+
+  MIT license (http://sjs.mit-license.org/)

data/README.rdoc

@@ -1,5 +1,7 @@
 == smalruby-editor
 
+{<img src="https://badges.gitter.im/Join%20Chat.svg" alt="Join the chat at https://gitter.im/smalruby/smalruby-editor">}[https://gitter.im/smalruby/smalruby-editor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge]
+
 {<img src="https://badge.fury.io/rb/smalruby-editor.png" alt="Gem Version" />}[http://badge.fury.io/rb/smalruby-editor]
 {<img src="https://travis-ci.org/smalruby/smalruby-editor.png?branch=master" alt="Build Status" />}[https://travis-ci.org/smalruby/smalruby-editor]
 {<img src="https://coveralls.io/repos/smalruby/smalruby-editor/badge.png?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/smalruby/smalruby-editor?branch=master]

data/app/assets/javascripts/application.js

@@ -15,6 +15,7 @@
 //= require jquery.ui.draggable
 //= require jquery.ui.droppable
 //= require jquery.blockUI
+//= require strftime-min
 //= require ace/ace
 //= require ace/theme-clouds.js
 //= require ace/mode-ruby.js

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

@@ -679,3 +679,40 @@ Blockly.Blocks['<%= n %>'] =
 Blockly.Ruby['<%= n %>'] = (block) ->
   lor = @getFieldValue('LOR')
   Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.#{lor}_ir_photoreflector_value")
+
+# Smalrubot s1 left/right dc motor power ratio
+<% n = "#{category}_#{subcategory}_dc_motor_power_ratio" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:sensing] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_dc_motor_power_ratio") %>,
+                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
+                    Blockly.ALIGN_RIGHT)
+    @setOutput(true, 'Number')
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  lor = @getFieldValue('LOR')
+  Blockly.Ruby.characterMethodCallInput_("<%= subcategory %>.#{lor}_dc_motor_power_ratio")
+
+# set Smalrubot s1 left/right dc motor power ratio
+<% n = "#{category}_#{subcategory}_dc_motor_set_power_ratio" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= colors[:motion] %>)
+    @interpolateMsg(<%= bm(".#{subcategory}_dc_motor_set_power_ratio") %>,
+                    ['LOR', new Blockly.FieldDropdown(lorDropdown)],
+                    ['SPEED', ['Number'], Blockly.ALIGN_RIGHT],
+                    Blockly.ALIGN_RIGHT)
+    @setInputsInline(true)
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  lor = @getFieldValue('LOR')
+  speed = Blockly.Ruby.valueToCode(@, 'SPEED', Blockly.Ruby.ORDER_NONE) || '100'
+  Blockly.Ruby.characterSetVariable_("<%= subcategory %>.#{lor}_dc_motor_power_ratio",
+                                     speed)

data/app/assets/javascripts/models/source_code.js

@@ -0,0 +1,123 @@
+/**
+ * ソースコードを表現するモデル
+ */
+Smalruby.SourceCode = Backbone.Model.extend({
+  defaults: {
+    filename: null,
+    data: null
+  },
+
+  initialize: function() {
+    if (!this.get('filename')) {
+      var filename = Smalruby.Views.MainMenuView.getFilename();
+      if (filename.length == 0) {
+        filename = Smalruby.SourceCode.defaultFilename();
+      }
+      this.set('filename', filename);
+    }
+
+    if (!this.get('data')) {
+      if (this.get('filename').match(/\.xml$/)) {
+        var data = Smalruby.dumpXml();
+      }
+      else {
+        if (window.blockMode) {
+          var data = Blockly.Ruby.workspaceToCode();
+        }
+        else {
+          var data = window.textEditor.getSession().getDocument().getValue();
+        }
+      }
+      this.set('data', data);
+    }
+  },
+
+  getRbxmlFilename: function() {
+    var filename = this.get('filename');
+    if (filename.match(/\.rb\.xml$/)) {
+      return filename;
+    }
+    else {
+      if (filename.match(/\.rb$/)) {
+        return filename + '.xml';
+      }
+      else if (filename.match(/\.xml$/)) {
+        return filename.replace(/\.xml$/, '.rb.xml');
+      }
+      else {
+        return filename + '.rb.xml';
+      }
+    }
+  },
+
+  run: function() {
+    return this.post_('run');
+  },
+
+  check: function() {
+    return this.post_('check');
+  },
+
+  save2: function() {
+    return this.post_('');
+  },
+
+  write: function(force) {
+    if (force == null) {
+      force = false;
+    }
+    var action = 'write';
+    if (force) {
+      action += '?force=1';
+    }
+    return this.delete_(action);
+  },
+
+  toBlocks: function() {
+    return this.post_('to_blocks', 'html');
+  },
+
+  post_:  function(action, dataType) {
+    if (dataType == null) {
+      dataType = 'json';
+    }
+    dfr = $.Deferred();
+    $.ajax({
+      url: '/source_codes/' + action,
+      type: 'POST',
+      data: {
+        source_code: {
+          filename: this.get('filename'),
+          data: this.get('data')
+        }
+      },
+      dataType: dataType,
+      success: function(data, textStatus, jqXHR) {
+        return dfr.resolve(data);
+      },
+      error: dfr.reject
+    });
+    return dfr.promise();
+  },
+
+  delete_: function(action) {
+    dfr = $.Deferred();
+    $.ajax({
+      url: '/source_codes/' + action,
+      type: 'DELETE',
+      dataType: 'json',
+      success: function(data, textStatus, jqXHR) {
+        return dfr.resolve(data);
+      },
+      error: dfr.reject
+    });
+    return dfr.promise();
+  }
+}, {
+  defaultFilename: function(now) {
+    if (now == null) {
+      now = new Date();
+    }
+    return strftime('program_%y%m%d_%H%M%S.rb', now);
+  }
+});

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

@@ -263,6 +263,8 @@ Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_LED_TURN_ON_OR_OFF = '%2 Smalrubot s1 %
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION = '%1 Smalrubot s1';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION_WITH_SEC = '%1 Smalrubot s1 for %2 secs';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_IR_PHOTOREFLECTOR_VALUE = 'Smalrubot s1 %1 IR Photoreflector';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_DC_MOTOR_POWER_RATIO = 'Smalrubot s1 %1 dc motor power ratio';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_DC_MOTOR_SET_POWER_RATIO = 'set Smalrubot s1 %1 dc motor power ratio to %2 %';
 
 
 // blocks/operators.js.coffee.erb

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

@@ -263,6 +263,8 @@ Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_LED_TURN_ON_OR_OFF = '★スモウル
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION = '■スモウルボットS1を %1';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_ACTION_WITH_SEC = '■スモウルボットS1を %2 秒 %1';
 Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_IR_PHOTOREFLECTOR_VALUE = '◎スモウルボットS1の %1 のセンサー';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_DC_MOTOR_POWER_RATIO = '◎スモウルボットS1の %1 DCモーターの速度(%)';
+Blockly.Msg.BLOCKS_HARDWARE_SMALRUBOT_S1_DC_MOTOR_SET_POWER_RATIO = '■スモウルボットS1の %1 DCモーターの速度を %2 (%) にする';
 
 
 // blocks/operators.js.coffee.erb

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

@@ -183,7 +183,7 @@ window.Smalruby =
       name
 
   addCharacterFromBeginning: ->
-    if @isEnabled('add_character_from_beginning')
+    if !@isEnabled('disabled_add_character_from_beginning')
       constume = 'cat1.png'
       c = new Smalruby.Character
         name: @Collections.CharacterSet.uniqueName(constume)

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

@@ -67,6 +67,8 @@ Smalruby.CharacterModalView = Backbone.View.extend
 
   render: ->
     @onChange(@model)
+    @$el.modal
+      backdrop: 'static'
     @$el.modal('show')
 
     # HACK: ダイアログを表示して500ms程度待たないと画像のサイズが取得できなかった

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

@@ -46,7 +46,7 @@ Smalruby.CharacterSelectorView = Backbone.View.extend({
       removeButton.click (e) =>
         e.preventDefault()
         @removeCharacter_(character)
-      if character.get('using')
+      if Smalruby.isEnabled('disabled_new_character') || character.get('using')
         removeButton.hide()
 
       img = html.find('img')
@@ -105,7 +105,7 @@ Smalruby.CharacterSelectorView = Backbone.View.extend({
     @prevXY = newBlock.getRelativeToSurfaceXY()
 
   removeCharacter_: (character) ->
-    unless character.get('using')
+    if !Smalruby.isEnabled('disabled_new_character') && !character.get('using')
       Smalruby.Collections.CharacterSet.remove(character)
 
 }, {

data/app/assets/javascripts/views/load_modal_view.js.coffee.erb

@@ -33,6 +33,8 @@ Smalruby.LoadModalView = Backbone.View.extend
       @$el.find('.modal-body').unblock()
       null # HACK: if return unblock(), does not call fail().
 
+    @$el.modal
+      backdrop: 'static'
     @$el.modal('show')
 
     dfr = $.Deferred()

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

@@ -4,6 +4,8 @@ Smalruby.ResetModalView = Backbone.View.extend
     'click #reset-modal-ok-button': 'onOk'
 
   render: ->
+    @$el.modal
+      backdrop: 'static'
     @$el.modal('show')
 
   onOk: (e) ->

data/app/assets/stylesheets/toolbox_raspberrypi.css.scss.erb

@@ -0,0 +1,32 @@
+<%
+  require 'smalruby_editor'
+  colors = SmalrubyEditor::COLORS
+
+  hues = [
+    colors[:motion],
+    colors[:looks],
+    colors[:sound],
+    colors[:data],
+    colors[:events],
+    colors[:control],
+    colors[:sensing],
+    colors[:operators],
+  ]
+
+  colors = hues.map { |h|
+    [SmalrubyEditor.hsv_to_rgb(h, 100, 80),
+     SmalrubyEditor.hsv_to_rgb(h, 100, 100)]
+  }
+
+  colors.each.with_index(1) do |(color, active_color), index|
+%>
+div[aria-level="1"][aria-posinset="<%= index %>"] {
+    .blocklyTreeRow {
+        background-color: #<%= color %> !important;
+    }
+
+    .blocklyTreeRow.blocklyTreeSelected {
+        background-color: #<%= active_color %> !important;
+    }
+}
+<% end %>

data/app/assets/stylesheets/toolbox_smalrubot_s1.css.scss.erb

@@ -10,6 +10,7 @@
     colors[:control],
     colors[:sensing],
     colors[:operators],
+    colors[:etc],
   ]
 
   colors = hues.map { |h|

data/app/helpers/application_helper.rb

@@ -4,6 +4,11 @@ module ApplicationHelper
     "modal hide#{raspberrypi? ? '' : ' fade'}"
   end
 
+  # default locale name for Blockly messages
+  def blockly_message_default_locale_name
+    'en_us'
+  end
+
   # Blocklyのメッセージのlocaleの名前を返す
   #
   # Blocklyではenがen_usであるため

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

@@ -0,0 +1,26 @@
+module RubyToBlock
+  module Block
+    class HardwareSmalrubotS1DcMotorPowerRatio < Value
+      include CharacterOperation
+      include HardwareOperation
+
+      blocknize '^\s*' + CHAR_RE +
+                'smalrubot_s1\.' +
+                LOR_RE + '_dc_motor_power_ratio\s*$',
+                value: true
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+
+        character = get_character(context, md2[1])
+        return false if context.receiver && context.receiver != character
+
+        block = new(fields: { LOR: md2[2] })
+        context.add_value(block)
+        block.character = character
+
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareSmalrubotS1DcMotorSetPowerRatio < CharacterMethodCall
+      include HardwareOperation
+
+      blocknize '^\s*' + CHAR_RE +
+                'smalrubot_s1\.' +
+                LOR_RE + '_dc_motor_power_ratio\s*=\s*(\S+)\s*$',
+                statement: true, inline: true
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        add_character_method_call_block(context, md2[1],
+                                        new(fields: { LOR: md2[2] }),
+                                        SPEED: md2[3])
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class HardwareSmalrubotV3MotorSetSpeed < CharacterMethodCall
+      include HardwareOperation
+
+      blocknize '^\s*' + CHAR_RE +
+                'smalrubot_v3\.' +
+                LOR_RE + '_motor_speed\s*=\s*(\S+)\s*$',
+                statement: true, inline: true
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+        add_character_method_call_block(context, md2[1],
+                                        new(fields: { LOR: md2[2] }),
+                                        SPEED: md2[3])
+        true
+      end
+    end
+  end
+end