smalruby-editor 0.1.12-x86-mingw32 → 0.1.13-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b59afba0b94973c3b49c01f202a6d5ecdddcbd6b
-  data.tar.gz: 572b147e4981c89fe8d1152aa60aa22d296c491e
+  metadata.gz: ea860af8d152ce661712d2b5696e1da5f14eed75
+  data.tar.gz: 24813160f1c4ea98537adb67f341e29ee06240dd
 SHA512:
-  metadata.gz: 7dddfd0db8fe0fe57df540592c2093616712a1bf420554e37be1fdef074405531b7bd9c828e5318be6b9f0cfcc34b9d9e8c6aa0f045df6e241539e0b5d3c87b4
-  data.tar.gz: ce069671f43e9920548b5512a95739c23e3235f917880259636bfe3481067fc24ab3105573d0f207dff7067c7c2173382f361c81dce1af28f6016b968c54437d
+  metadata.gz: 6e32d9174b1ed8fed1b91bf4ead6af057312d185a27c9e9b80aad24481eed20ada7ee299b7e43303844ceab2d5b41b5d0acf6b163fa6b73cf384c0aee9e3f053
+  data.tar.gz: 9c88432632021567ae47c15c6c591bac795ffd1f255cf301c8a4fe700f8dcd256a4a74287c3a4dd33b2ab85240dc8bab03aaf2a11f6be64c2d34b28d4417c2bc

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

@@ -151,6 +151,10 @@ Blockly.Blocks['<%= n %>'] =
       ['猫2', 'cat2.png'],
       ['猫3', 'cat3.png'],
       ['かえる1', 'frog1.png'],
+      ['コウガ　リュウ1', 'ryu1.png'],
+      ['コウガ　リュウ2', 'ryu2.png'],
+      ['イタチのタイチ', 'taichi1.png'],
+      ['イタチのタイチ', 'taichi2.png'],
     ]
     @setHelpUrl('')
     @setColour(<%= color %>)

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

@@ -24,11 +24,11 @@ Blockly.Ruby['<%= n %>'] = (block) ->
   Blockly.Ruby.characterMethodCall_('move', "#{arg}")
 
 # 時計回りに(　)度回す
-# 半時計回りに(　)度回す
+# 反時計回りに(　)度回す
 <%
   [
     ['right', '', ''],
-    ['left', '半', '-'],
+    ['left', '反', '-'],
   ].each do |suffix, label_prefix, sign|
     n = "#{category}_rotate_#{suffix}"
 %>

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

@@ -80,6 +80,10 @@ Smalruby.Character = Backbone.Model.extend({
     'cat2.png'
     'cat3.png'
     'frog1.png'
+    'ryu1.png'
+    'ryu2.png'
+    'taichi1.png'
+    'taichi2.png'
   ]
 
   costumeToNamePrefix: (costume) ->

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

@@ -44,6 +44,17 @@ window.Smalruby =
       interpolate: /{{=([\s\S]+?)}}/
     })
 
+    # HACK: 一度開いたジャンルを2回クリックしても閉じないように修正
+    Blockly.Toolbox.TreeNode.prototype.onMouseDown = (e) ->
+      if @hasChildren() && @isUserCollapsible_
+        @toggle()
+        @select()
+      else if @isSelected()
+        #@getTree().setSelectedItem(null)
+      else
+        @select()
+      @updateRow()
+
     @Collections.CharacterSet = new Smalruby.CharacterSet()
 
     @Views.MainMenuView = new Smalruby.MainMenuView()

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

@@ -102,7 +102,7 @@ Smalruby.CharacterModalView = Backbone.View.extend
   onChangeAngle: (model, value, options) ->
     @$el.find('input[name="character[angle]"]').val(value)
     $('#character_angle_value').text("#{value}°")
-    rotate = "rotate(#{-value}deg)"
+    rotate = "rotate(#{value}deg)"
     $('#character-modal-character').css
       '-moz-transform': rotate
       '-webkit-transform': rotate

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

@@ -49,7 +49,7 @@ Smalruby.CharacterSelectorView = Backbone.View.extend({
       if character.get('using')
         removeButton.hide()
 
-      rotate = "rotate(#{character.get('angle') * -1}deg)"
+      rotate = "rotate(#{character.get('angle')}deg)"
       img = html.find('img')
       img.css
         '-moz-transform': rotate

data/app/controllers/application_controller.rb

@@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
-  helper_method :standalone?
+  helper_method :standalone?, :raspberrypi?
 
   private
 
@@ -22,6 +22,17 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  # 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
+  end
+
   def check_whether_standalone
     unless standalone?
       fail "#{self.class.name}##{action_name}はstandaloneモードのみの機能です"

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

@@ -5,7 +5,7 @@
       #character-modal-costume-selector
         .row-fluid
           %ul.thumbnails
-            - %w(car1 car2 car3 car4 cat1 cat2 cat3 frog1 ball1 ball2 ball3 ball4 ball5 ball6).each do |name|
+            - %w(car1 car2 car3 car4 cat1 cat2 cat3 frog1 ball1 ball2 ball3 ball4 ball5 ball6 ryu1 ryu2 taichi1 taichi2).each do |name|
               %li
                 %a.thumbnail
                   %img{:src => "/smalruby/assets/#{name}.png", :alt => "#{name}.png"}

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

@@ -58,7 +58,7 @@
     %block{:type => "#{category}_rotate_right"}
       = toolbox_number_value('ANGLE', 15)
 
-    -# 半時計回りに(　)度回す
+    -# 反時計回りに(　)度回す
     %block{:type => "#{category}_rotate_left"}
       = toolbox_number_value('ANGLE', 15)
 

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

@@ -24,47 +24,77 @@
           %i.icon-download-alt
           ダウンロード
 
-      .btn-group
-        %a#submenu-button{:class => "dropdown-toggle btn btn-primary", :"data-toggle" => "dropdown", :href => "#"}
-          %i.icon-reorder
-        %ul#submenu.dropdown-menu{:class => "pull-right"}
-          %li
+      - if raspberrypi?
+        - if standalone?
+          - load_id = 'load-local-button'
+        - else
+          - load_id = 'load-button'
+        %button.btn{id: "#{load_id}", class: "btn btn-primary"}<
+          %i.icon-folder-open
+          ロード
+        - if standalone?
+          %button#save-button.btn{class: "btn-primary"}<
+            %i.icon-hdd
+            セーブ
+        %button#check-button.btn{class: "btn-primary"}<
+          %i.icon-check
+          チェック
+        %button#reset-button.btn{class: "btn-primary"}<
+          %i.icon-off
+          リセット
+        - if standalone?
+          - if session[:username]
+            %button#signout-button.btn{class: "btn-primary"}<
+              %i.icon-eject
+              ログアウト
+          - else
+            %button#signout-button.btn{class: "btn-primary", style: "display: none"}<
+              %i.icon-eject
+              ログアウト
+
+      - else
+        .btn-group
+          %a#submenu-button{:class => "dropdown-toggle btn btn-primary", :"data-toggle" => "dropdown", :href => "#"}
+            %i.icon-reorder
+          %ul#submenu.dropdown-menu{:class => "pull-right"}
+            %li
+              - if standalone?
+                - load_id = 'load-local-button'
+              - else
+                - load_id = 'load-button'
+              %a{:id => "#{load_id}"}
+                %h4
+                  %i.icon-folder-open
+                  ロード
             - if standalone?
-              - load_id = 'load-local-button'
-            - else
-              - load_id = 'load-button'
-            %a{:id => "#{load_id}"}
-              %h4
-                %i.icon-folder-open
-                ロード
-          - if standalone?
+              %li
+                %a#save-button
+                  %h4
+                    %i.icon-hdd
+                    セーブ
             %li
-              %a#save-button
+              %a#check-button
                 %h4
-                  %i.icon-hdd
-                  セーブ
-          %li
-            %a#check-button
-              %h4
-                %i.icon-check
-                チェック
-          %li
-            %a#reset-button
-              %h4
-                %i.icon-off
-                リセット
-          - if standalone?
+                  %i.icon-check
+                  チェック
             %li
-              - if session[:username]
-                %a#signout-button
-                  %h4
-                    %i.icon-eject
-                    ログアウト
-              - else
-                %a#signout-button{style: "display: none"}
-                  %h4
-                    %i.icon-eject
-                    ログアウト
+              %a#reset-button
+                %h4
+                  %i.icon-off
+                  リセット
+            - if standalone?
+              %li
+                - if session[:username]
+                  %a#signout-button
+                    %h4
+                      %i.icon-eject
+                      ログアウト
+                - else
+                  %a#signout-button{style: "display: none"}
+                    %h4
+                      %i.icon-eject
+                      ログアウト
+
       - if standalone?
         - if session[:username]
           %button#signin-button{class: "btn btn-danger", style: "display: none"}<

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
-module SmalrubyEditor
-  VERSION =  '0.1.12'
-end
+module SmalrubyEditor
+  VERSION =  '0.1.13'
+end

data/smalruby-editor.gemspec

@@ -68,7 +68,7 @@ Gem::Specification.new do |spec|
      ['launchy'],
      ['mime-types', '~> 1.16'],
      ['haml-rails'],
-     ['smalruby', '~> 0.0.19'],
+     ['smalruby', '~> 0.0.21'],
     ]
   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.12
+  version: 0.1.13
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-16 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.19
+        version: 0.0.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.19
+        version: 0.0.21
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -452,6 +452,10 @@ files:
 - public/smalruby/assets/piano_re.wav
 - public/smalruby/assets/piano_si.wav
 - public/smalruby/assets/piano_so.wav
+- public/smalruby/assets/ryu1.png
+- public/smalruby/assets/ryu2.png
+- public/smalruby/assets/taichi1.png
+- public/smalruby/assets/taichi2.png
 - public/square.png
 - public/tiny.png
 - public/wide.png
@@ -580,10 +584,10 @@ files:
 - vendor/assets/javascripts/blockly/msg/js/ja.js
 - vendor/assets/javascripts/jquery.blockUI.js
 - vendor/assets/stylesheets/.keep
+- public/assets/application-0f9a877d144f84320a10770dfdc5ddd8.js
+- public/assets/application-0f9a877d144f84320a10770dfdc5ddd8.js.gz
 - public/assets/application-53d651da3309caa498cc0ca6616dbead.css
 - public/assets/application-53d651da3309caa498cc0ca6616dbead.css.gz
-- public/assets/application-669cbc2df60729c4b12d739af7595cc6.js
-- public/assets/application-669cbc2df60729c4b12d739af7595cc6.js.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