smalruby-editor 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 110fbf90c4792bd8f54a5186633e8ffd33b3ed82
-  data.tar.gz: e3cfd0fa9043b7d3420fd9cc7eb129f4374b343e
+  metadata.gz: 99927a415bc25fde573504cb2ae6be3be491e914
+  data.tar.gz: c3e1cb20d8631cd71993c90b2ced00dc315d8601
 SHA512:
-  metadata.gz: 606b278152c481b67cead9cdb88c1858f72478ba7b3ed765996eca1c33785cb33900164a85a4061690369323ce58cf8dba7834a7a126a722f0d99948fc715572
-  data.tar.gz: c8ffe0e9d3a24b2242478cbbf57b518b34f905e3046e449e9813adef841b3c40571825aa0be38328c4a32c35389b0785b3eae14ef0c778b79e28d128612250ad
+  metadata.gz: b852e86c45becba327cb475022316d3f9724d69ada0740c3b914f3c5ae4e12c59a3ab708c910aa799af635b452f37bfc002e4c8f489cf86d972abf994cf3cb90
+  data.tar.gz: d555b00d3c9d27b045892e5424057847de2c9aa696014728f43bc2e3d592ae7c1a0f593812a2d509215955c8bec9463dead48364a9d9d5c5bf1b5e66864530a7

data/.rubocop.yml

@@ -20,8 +20,8 @@ EndOfLine:
   Enabled: false
 
 # diffが少なくなるためハッシュや配列の最後のカンマは許可する
-TrailingComma:
-  Enabled: false
+#TrailingComma:
+#  Enabled: false
 
 # デフォルトの10は短すぎる。80x25を基準として1画面に収まる長さとした。
 MethodLength:

data/README.rdoc

@@ -17,6 +17,8 @@ The Smalruby(smɔ́ːrúːbi) Project will provide a Ruby learning environment f
 
 == Installation (for User)
 
+Windows(only Japanese): https://github.com/smalruby/smalruby-installer-for-windows/wiki
+
 requirements:
 
 * Windows or UNIX like OS (Mac OS X, Linux, etc...)

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

@@ -257,6 +257,7 @@ $left-pane-width: $character-size + $margin * 2;
 
         #character-modal-left-pane {
             width: $left-pane-width;
+            height: $modal-height - $modal-body-margin * 2;
             overflow: hidden;
 
             #character-modal-preview {
@@ -295,11 +296,11 @@ $left-pane-width: $character-size + $margin * 2;
                         margin-bottom: 8px;
 
                         .control-label {
-                            width: 50px;
+                            width: 40px;
                         }
 
                         .controls {
-                            margin-left: 50px + $modal-body-margin;
+                            margin-left: 40px + 5px;
 
                             input[type=range] {
                                 padding: 0;
@@ -315,6 +316,8 @@ $left-pane-width: $character-size + $margin * 2;
         }
 
         #character-modal-right-pane {
+            height: $modal-height - $modal-body-margin * 2;
+
             overflow: hidden;
 
             #character-modal-costume-selector {

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

@@ -42,7 +42,7 @@ module RubyToBlock
           'angle' => @angle,
           'costumes' => @costumes.join(',')
         }
-        attrs['rotationStyle'] = @rotation_style if @rotation_style != 'free'
+        attrs['rotation_style'] = @rotation_style if @rotation_style != 'free'
         parent.add_element('character', attrs)
       end
     end

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

@@ -5,7 +5,8 @@ module RubyToBlock
     module CharacterOperation
       extend ActiveSupport::Concern
 
-      CHAR_RE = '(?:(\S+)\.)?'
+      CHAR_NAME_RE = '([a-z]\S*)'
+      CHAR_RE = '(?:' + CHAR_NAME_RE + '\.)?'
 
       attr_accessor :character
 

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

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class ControlBreak < Base
+      blocknize '^\s*break\s*$', statement: true, inline: true
+
+      def self.process_match_data(md, context)
+        context.add_block(new)
+        true
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@
 module RubyToBlock
   module Block
     class End < Base
-      blocknize '^\s*end$', statement: true
+      blocknize '^\s*end\s*$', statement: true
 
       def self.process_match_data(md, context)
         ends_num = 1

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

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class MotionGoToCharacter < CharacterMethodCall
+      blocknize '^\s*' + CHAR_RE + 'go_to\(' + CHAR_NAME_RE + '\)\s*$',
+                statement: true
+
+      def self.process_match_data(md, context)
+        md2 = regexp.match(md[type])
+
+        name = md2[2]
+        name.strip!
+        c = context.characters[name]
+        return false unless c
+
+        block = new(fields: { CHAR: name })
+        _, context.current_block =
+          *add_child_or_create_character_new_block(context, md2[1], block)
+
+        true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+module RubyToBlock
+  module Block
+    class MotionGoToMouse < CharacterMethodCall
+      blocknize '^\s*' + CHAR_RE + 'go_to\(:mouse\)\s*$',
+                statement: true
+    end
+  end
+end

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

@@ -2,7 +2,7 @@
 module RubyToBlock
   module Block
     class MotionPointTowardsCharacter < CharacterMethodCall
-      blocknize '^\s*' + CHAR_RE + 'point_towards\(([^:)]+)\)\s*$',
+      blocknize '^\s*' + CHAR_RE + 'point_towards\(' + CHAR_NAME_RE + '\)\s*$',
                 statement: true
 
       def self.process_match_data(md, context)

data/app/models/source_code.rb

@@ -74,14 +74,11 @@ class SourceCode < ActiveRecord::Base
 
   def ruby_cmd
     if SmalrubyEditor.osx?
-      dirs = [RbConfig::CONFIG['bindir']] + ENV['PATH'].split(';')
-      dirs.each do |dir|
-        path = Pathname('rsdl').expand_path(dir)
-        return path if path.exist?
-      end
+      Pathname(Gem.bin_path('rsdl', 'rsdl'))
+    else
+      Pathname(RbConfig::CONFIG['RUBY_INSTALL_NAME'])
+        .expand_path(RbConfig::CONFIG['bindir'])
     end
-    Pathname(RbConfig::CONFIG['RUBY_INSTALL_NAME'])
-      .expand_path(RbConfig::CONFIG['bindir'])
   end
 
   def open3_capture3_ruby_c

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

@@ -324,7 +324,7 @@
     -# 条件:偽
     %block{:type => "#{category}_false"}
 
-  -#%category{:name => '変数', :custom => 'VARIABLE'}
+  %category{:name => '変数', :custom => 'VARIABLE'}
 
   - category = 'ruby'
   %category{:name => 'Ruby'}

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

@@ -122,3 +122,7 @@
     #text-editor
 
 = render 'signin_modal'
+
+- if raspberrypi?
+  %script{type: "text/javascript"}
+    $(function() { $('div[id=":5"]').hide(); });

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
 module SmalrubyEditor
-  VERSION =  '0.1.16'
+  VERSION =  '0.1.17'
 end

data/smalruby-editor.gemspec

@@ -68,7 +68,7 @@ Gem::Specification.new do |spec|
      ['launchy'],
      ['mime-types', '~> 1.16'],
      ['haml-rails'],
-     ['smalruby', '~> 0.0.25'],
+     ['smalruby', '~> 0.0.26'],
     ]
   runtime_dependencies << ['therubyracer'] unless is_windows
   runtime_dependencies.each do |args|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby-editor
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.25
+        version: 0.0.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.25
+        version: 0.0.26
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -315,6 +315,7 @@ files:
 - app/models/concerns/ruby_to_block/block/character_method_call.rb
 - app/models/concerns/ruby_to_block/block/character_new.rb
 - app/models/concerns/ruby_to_block/block/character_operation.rb
+- app/models/concerns/ruby_to_block/block/control_beark.rb
 - app/models/concerns/ruby_to_block/block/control_if.rb
 - app/models/concerns/ruby_to_block/block/control_loop.rb
 - app/models/concerns/ruby_to_block/block/control_sleep.rb
@@ -341,6 +342,8 @@ files:
 - app/models/concerns/ruby_to_block/block/math_number.rb
 - app/models/concerns/ruby_to_block/block/motion_change_x_by.rb
 - app/models/concerns/ruby_to_block/block/motion_change_y_by.rb
+- app/models/concerns/ruby_to_block/block/motion_go_to_character.rb
+- app/models/concerns/ruby_to_block/block/motion_go_to_mouse.rb
 - app/models/concerns/ruby_to_block/block/motion_move.rb
 - app/models/concerns/ruby_to_block/block/motion_point_towards_character.rb
 - app/models/concerns/ruby_to_block/block/motion_point_towards_mouse.rb
@@ -604,10 +607,10 @@ files:
 - vendor/assets/javascripts/blockly/msg/js/ja.js
 - vendor/assets/javascripts/jquery.blockUI.js
 - vendor/assets/stylesheets/.keep
-- public/assets/application-7f560d8d6d224f87269691c57ca9a376.css
-- public/assets/application-7f560d8d6d224f87269691c57ca9a376.css.gz
 - public/assets/application-842ac8f5aa3fcc87bbb0e8b3a0fef5d7.js
 - public/assets/application-842ac8f5aa3fcc87bbb0e8b3a0fef5d7.js.gz
+- public/assets/application-b31ceba36a60591e488903231db4cb37.css
+- public/assets/application-b31ceba36a60591e488903231db4cb37.css.gz
 - public/assets/favicon-a37c90b368fd8ed436cb8f9e9396465c.ico
 - public/assets/jquery-ui/animated-overlay-c48c87b7a95316f4698484e3b85ee4aa.gif
 - public/assets/jquery-ui/ui-bg_flat_0_aaaaaa_40x100-58b63faadd031ca3db096dfdffd90224.png