smalruby-editor 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca2760262a800ae93179d68b1880d57f112c11e1
-  data.tar.gz: d06ed6ea197417608bc105a62eb51d7fd93398a6
+  metadata.gz: cb16d8aecfe041f7828d1eb715235f0ce8cc79e9
+  data.tar.gz: 6b6a21336c99739958984d7c0220fbaa3a211754
 SHA512:
-  metadata.gz: 452e8be3795c6dd12feb1428c8d81d6dd2d4514af99a4658dda2428761c170d58d4ca4c78d6c56843207936a37567cfff7c26f606471492dcc6e3023560b88cc
-  data.tar.gz: 5f8126ae92a0ccce0216007deedb91fd48eb4c31739f9f9fc0e006d616b14f55677aa53d09766fd33a2b4f092709df4c507c7da7d4cea3828f2d317ad8d40a41
+  metadata.gz: f6f20cea2500aad412b097b4f5bef82481f34fdf49aee63ff7c1b9279350408d7ecb9af83a3362f3e4c15bdfdeecfb3f9dd7b251a76a797e2c999345aa4b3807
+  data.tar.gz: c6aef9c719d5498d2bd10b64248b6485793fb73fe2114b4a040da07d295511234c88dacb753644e7304b740f6d930ca5f5b826d99b673423d6572a025bc2b21f

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

@@ -4,3 +4,48 @@
   category = 'pen'
   color = 160
 %>
+
+# ペンを下ろす
+# ペンを上げる
+# <%
+  [
+    ['down_pen', 'ペンを下ろす'],
+    ['up_pen', 'ペンを上げる'],
+  ].each do |suffix, label|
+    n = "#{category}_#{suffix}"
+%>
+
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= color %>)
+    @appendDummyInput()
+      .appendField('<%= label %>')
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  Blockly.Ruby.characterMethodCall_('<%= suffix %>')
+<% end %>
+
+# ペンの色を[カラー]にする
+<% n = "#{category}_set_pen_color" %>
+Blockly.Blocks['<%= n %>'] =
+  init: ()->
+    @setHelpUrl('')
+    @setColour(<%= color %>)
+    @appendDummyInput()
+      .appendField('ペンの色を')
+      .appendField(new Blockly.FieldColour('#ff0000'), 'COLOUR')
+      .appendField('にする')
+    @setPreviousStatement(true)
+    @setNextStatement(true)
+    @setTooltip('')
+
+Blockly.Ruby['<%= n %>'] = (block) ->
+  c = @getFieldValue('COLOUR')
+  red = parseInt(c[1..2], 16)
+  green = parseInt(c[3..4], 16)
+  blue = parseInt(c[5..6], 16)
+  Blockly.Ruby.characterSetVariable_('pen_color', "[#{red}, #{green}, #{blue}]")

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

@@ -21,7 +21,7 @@ Smalruby.SourceCode = Backbone.Model.extend
       if window.blockMode
         data = Blockly.Ruby.workspaceToCode()
       else
-        data =window.textEditor.getSession().getDocument().getValue()
+        data = window.textEditor.getSession().getDocument().getValue()
 
     @set('data', data)
 

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

@@ -2,6 +2,7 @@
 Smalruby.LoadModalView = Backbone.View.extend
   events:
     'click #load-modal-ok-button': 'onOk'
+    'click #load-modal-remix-button': 'onRemix'
 
   initialize: ->
     @$el.find('#load-modal-find-from-computer').click (e) =>
@@ -11,6 +12,7 @@ Smalruby.LoadModalView = Backbone.View.extend
   render: ->
     @type = null
     @program = null
+    @setRemix(false)
     @unselect()
 
     elLocalPrograms = @$el.find('#load-modal-local-programs')
@@ -60,6 +62,7 @@ Smalruby.LoadModalView = Backbone.View.extend
           data:
             source_code:
               filename: @program.filename
+              remix: @remix
           dataType: 'json'
           success: (data, textStatus, jqXHR) ->
             Smalruby.Views.MainMenuView.load(data.source_code)
@@ -71,6 +74,7 @@ Smalruby.LoadModalView = Backbone.View.extend
           data:
             source_code:
               filename: @program.filename
+              remix: @remix
           dataType: 'json'
           success: (data, textStatus, jqXHR) ->
             Smalruby.Views.MainMenuView.load(data.source_code)
@@ -80,6 +84,18 @@ Smalruby.LoadModalView = Backbone.View.extend
 
     @$el.modal('hide')
 
+  onRemix: ->
+    @setRemix(!@remix)
+
+  setRemix: (remix) ->
+    @remix = remix
+    e = $('#load-modal-remix-button')
+    buttonClass = 'btn-success'
+    if @remix
+      e.addClass(buttonClass)
+    else
+      e.removeClass(buttonClass)
+
   onLocalProgramClick: (e, program) ->
     @select(e.currentTarget, 'local', program)
 

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

@@ -28,6 +28,7 @@
     225
     264
     296
+    160
     33
     43
     43

data/app/controllers/source_codes_controller.rb

@@ -88,7 +88,7 @@ class SourceCodesController < ApplicationController
     program_path = local_program_paths.find { |path|
       rb_basename(path) == filename
     }
-    load_local_file(program_path)
+    load_local_file(program_path, source_code_params[:remix])
   end
 
   def load_demo
@@ -96,7 +96,7 @@ class SourceCodesController < ApplicationController
     program_path = demo_program_paths.find { |path|
       rb_basename(path) == filename
     }
-    load_local_file(program_path)
+    load_local_file(program_path, source_code_params[:remix])
   end
 
   def run
@@ -124,7 +124,7 @@ class SourceCodesController < ApplicationController
   private
 
   def source_code_params
-    params.require(:source_code).permit(:data, :filename)
+    params.require(:source_code).permit(:data, :filename, :remix)
   end
 
   def get_file_info(file)
@@ -194,10 +194,16 @@ class SourceCodesController < ApplicationController
     path
   end
 
-  def load_local_file(path)
+  def load_local_file(path, remix)
     if path
+      if remix == 'true'
+        filename = SourceCode.make_remix_filename("~/#{session[:username]}",
+                                                  path.basename.to_s)
+      else
+        filename = path.basename.to_s
+      end
       info = {
-        filename: path.basename.to_s,
+        filename: filename,
         type: MIME.check(path.to_s).try(:content_type) || 'text/plain',
         data: NKF.nkf('-w', path.read),
         size: path.size,

data/app/models/source_code.rb

@@ -16,6 +16,26 @@ class SourceCode < ActiveRecord::Base
   validate :validate_filename
   validates :data, presence: true, allow_blank: true
 
+  MAX_REMIX_COUNT = 1000
+
+  # リミックス用のファイル名を生成する
+  def self.make_remix_filename(home_dir, filename)
+    home_dir = Pathname(home_dir).expand_path
+    filename = filename.dup
+    ext = filename.slice!(/\.rb(\.xml)?$/)
+    filename.slice!(/(_remix(\d+)?)+$/)
+    basename = "#{filename}_remix"
+    MAX_REMIX_COUNT.times do |i|
+      suffix = (i == 0 ? '' : sprintf('%02d', i + 1))
+      remix_name = "#{basename}#{suffix}"
+      if !home_dir.join("#{remix_name}.rb").exist? &&
+          !home_dir.join("#{remix_name}.rb.xml").exist?
+        return "#{remix_name}#{ext}"
+      end
+    end
+    fail "reach max remix count...: #{filename}"
+  end
+
   # シンタックスをチェックする
   def check_syntax
     _, stderr_str, status = *open3_capture3_ruby_c

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

@@ -27,6 +27,10 @@
               Computer
 
   .modal-footer
+    .pull-left
+      %button#load-modal-remix-button.btn<
+        %i.icon-refresh
+        リミックス
     %button.btn{:"data-dismiss" => "modal", :"aria-hidden" => "true"}<
       %i.icon-remove
       やめる

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

@@ -134,6 +134,17 @@
     -# 変数:ボリューム
     -#%block{:type => "#{category}_volume"}
 
+  - category = 'pen'
+  %category{:name => 'ペン'}
+    -# ペンを下ろす
+    %block{:type => "#{category}_down_pen"}
+
+    -# ペンを上げる
+    %block{:type => "#{category}_up_pen"}
+
+    -# ペンの色を[カラー]にする
+    %block{:type => "#{category}_set_pen_color"}
+
   - category = 'events'
   %category{:name => '～のとき'}
     -# まずは

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
 module SmalrubyEditor
-  VERSION =  '0.1.14'
+  VERSION =  '0.1.15'
 end

data/smalruby-editor.gemspec

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

data/spec/models/source_code_spec.rb

@@ -13,6 +13,29 @@ describe SourceCode, 'Rubyのソースコードを表現するモデル' do
     end
   end
 
+  describe '.make_remix_filename', 'リミックス用のファイル名を生成する' do
+    subject {
+      home_dir = Rails.root.join('spec/fixtures/files')
+      SourceCode.make_remix_filename(home_dir.to_s, filename)
+    }
+
+    {
+      '01.rb' => '01_remix03.rb',
+      '01.rb.xml' => '01_remix03.rb.xml',
+      '01_remix.rb' => '01_remix03.rb',
+      '01_remix02.rb' => '01_remix03.rb',
+      '01_remix03.rb' => '01_remix03.rb',
+      '02.rb' => '02_remix.rb',
+      '02.rb.xml' => '02_remix.rb.xml',
+    }.each do |_filename, _expected|
+      describe _filename do
+        let(:filename) { _filename }
+
+        it { should eq(_expected) }
+      end
+    end
+  end
+
   describe '#check_syntax', 'シンタックスをチェックする' do
     let(:source_code) {
       SourceCode.new(data: data)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby-editor
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-01 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.22
+        version: 0.0.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.22
+        version: 0.0.23
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -554,6 +554,9 @@ files:
 - spec/controllers/source_codes_controller_spec.rb
 - spec/fixtures/files/01.rb
 - spec/fixtures/files/01.rb.xml
+- spec/fixtures/files/01_remix.rb
+- spec/fixtures/files/01_remix02.rb
+- spec/fixtures/files/01_remix10.rb.xml
 - spec/fixtures/files/favicon.ico
 - spec/helpers/editor_helper_spec.rb
 - spec/helpers/sessions_helper_spec.rb
@@ -598,10 +601,10 @@ files:
 - vendor/assets/javascripts/blockly/msg/js/ja.js
 - vendor/assets/javascripts/jquery.blockUI.js
 - vendor/assets/stylesheets/.keep
-- public/assets/application-53d651da3309caa498cc0ca6616dbead.css
-- public/assets/application-53d651da3309caa498cc0ca6616dbead.css.gz
-- public/assets/application-d60babdd5a50329b329487cf793c2e29.js
-- public/assets/application-d60babdd5a50329b329487cf793c2e29.js.gz
+- public/assets/application-51ab300acd1779bfba20b099e7000b7e.css
+- public/assets/application-51ab300acd1779bfba20b099e7000b7e.css.gz
+- public/assets/application-dc485e2270d6c5fce20c149d1e2c4f8d.js
+- public/assets/application-dc485e2270d6c5fce20c149d1e2c4f8d.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
@@ -730,6 +733,9 @@ test_files:
 - spec/controllers/source_codes_controller_spec.rb
 - spec/fixtures/files/01.rb
 - spec/fixtures/files/01.rb.xml
+- spec/fixtures/files/01_remix.rb
+- spec/fixtures/files/01_remix02.rb
+- spec/fixtures/files/01_remix10.rb.xml
 - spec/fixtures/files/favicon.ico
 - spec/helpers/editor_helper_spec.rb
 - spec/helpers/sessions_helper_spec.rb