smalruby-editor 0.1.7-x86-mingw32 → 0.1.8-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd06fb1b52286227744f48188c8f7da643f328e
-  data.tar.gz: 9f26a444410952686966a504032f23732dfc80f4
+  metadata.gz: edec97ac558b50d9f8a584877c28f7eb47cfd540
+  data.tar.gz: 8f01ea062d5bc69b15473dea885ac0465681c8e6
 SHA512:
-  metadata.gz: 147b02a2fa9819acd85149a19b8346d1e420eafe80ed8a6b846cdfe6dd0b54ccaa3b04e852fdc1de9f6e191bc7ae3a929dfdf2fefc9ce57e9ec541910d21934d
-  data.tar.gz: 3e6f91f3cfd1837d861cf488f757097d9afaec3d6eb0b9c0ebd07b1e96c9512d84147e3eae9764d5b45996fb8ead1252cc38ed743c27b86cb991caba2fc489f7
+  metadata.gz: 9f02262b6d649a6596a54b2a239e47b2707430934c50303e253b6850c798c72653b829984ba73ad319faa72f609c83d53b00d7ee11a42dffb540a45b39b0d71d
+  data.tar.gz: edd6604201dd45e0ca641d1b6a17e223dcb6e380c0f52598e67d9c690cebddbd311bfeecba183e22225c0907c9f5983cf14cf6712e5c8d2f886a7ed7fdecb0ba

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

@@ -44,6 +44,8 @@ window.Smalruby =
       model: @Collections.CharacterSet
     @Views.CharacterModalView = new Smalruby.CharacterModalView
       el: $('#character-modal')
+    @Views.LoadModalView = new Smalruby.LoadModalView
+      el: $('#load-modal')
 
     Smalruby.downloading = false
     window.onbeforeunload = (event) ->

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

@@ -0,0 +1,126 @@
+# ロードダイアログを表現するビュー
+Smalruby.LoadModalView = Backbone.View.extend
+  events:
+    'click #load-modal-ok-button': 'onOk'
+
+  initialize: ->
+    @$el.find('#load-modal-find-from-computer').click (e) =>
+      e.preventDefault()
+      @onFindFromComputerClick.call(@, e)
+
+  render: ->
+    @type = null
+    @program = null
+    @unselect()
+
+    elLocalPrograms = @$el.find('#load-modal-local-programs')
+    elLocalPrograms.empty()
+
+    elDemoPrograms = @$el.find('#load-modal-demo-programs')
+    elDemoPrograms.empty()
+
+    @$el.find('.modal-body').block
+      message: null
+
+    unblock = =>
+      @$el.find('.modal-body').unblock()
+
+    @$el.modal('show')
+
+    dfr = $.Deferred()
+    $.ajax
+      url: '/source_codes/'
+      type: 'GET'
+      dataType: 'json'
+      success: (data, textStatus, jqXHR) -> dfr.resolve(data)
+      error: dfr.reject
+    dfr.promise()
+      .then (data) =>
+        for program in data.localPrograms
+          do (program) =>
+            html = @programToHtml(program, @onLocalProgramClick)
+            elLocalPrograms.append(html)
+
+        for program in data.demoPrograms
+          do (program) =>
+            html = @programToHtml(program, @onDemoProgramClick)
+            elDemoPrograms.append(html)
+
+      .then(unblock, unblock)
+      .fail =>
+        @$el.modal('hide')
+        errorMessage('ロードに失敗しました')
+
+  onOk: ->
+    switch @type
+      when 'local'
+        $.ajax
+          url: '/source_codes/load_local'
+          type: 'POST'
+          data:
+            source_code:
+              filename: @program.filename
+          dataType: 'json'
+          success: (data, textStatus, jqXHR) ->
+            Smalruby.Views.MainMenuView.load(data.source_code)
+
+      when 'demo'
+        $.ajax
+          url: '/source_codes/load_demo'
+          type: 'POST'
+          data:
+            source_code:
+              filename: @program.filename
+          dataType: 'json'
+          success: (data, textStatus, jqXHR) ->
+            Smalruby.Views.MainMenuView.load(data.source_code)
+
+      when 'find-from-computer'
+        $('input#load-file[name="source_code[file]"]').click()
+
+    @$el.modal('hide')
+
+  onLocalProgramClick: (e, program) ->
+    @select(e.currentTarget, 'local', program)
+
+  onDemoProgramClick: (e, program) ->
+    @select(e.currentTarget, 'demo', program)
+
+  onFindFromComputerClick: (e) ->
+    @select(e.currentTarget, 'find-from-computer')
+
+  select: (anchor, type, program = null) ->
+    @unselect()
+    $(anchor).addClass('active')
+    @type = type
+    @program = program
+
+  unselect: ->
+    @$el.find('a.thumbnail').removeClass('active')
+
+  programToHtml: (program, onclick) ->
+    if program.imageUrl
+      img = "<img src=\"#{program.imageUrl}\">"
+    else
+      img = "<h1 class=\"icon\"><i class=\"icon-file\" /></h1>"
+
+    html = """
+    <li>
+      <a class="thumbnail">
+        #{img}
+        <blockquote>
+          <p>
+            #{program.title}
+          </p>
+          <small>#{program.filename}</small>
+        </blockquote>
+      </div>
+    </li>
+    """
+
+    html = $(html)
+    html.find('a.thumbnail').click (e) =>
+      e.preventDefault()
+      onclick.call(@, e, program)
+
+    html

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

@@ -7,6 +7,7 @@ Smalruby.MainMenuView = Backbone.View.extend
     'click #ruby-mode-button': 'onRubyMode'
     'click #run-button': 'onRun'
     'click #download-button': 'onDownload'
+    'click #load-local-button': 'onLoadLocal'
     'click #load-button': 'onLoad'
     'click #save-button': 'onSave'
     'click #check-button': 'onCheck'
@@ -23,37 +24,8 @@ Smalruby.MainMenuView = Backbone.View.extend
 
     $('#file-form').fileupload
       dataType: 'json'
-      done: (e, data) ->
-        info = data.result.source_code
-        if info.error
-          window.errorMessage(info.filename + 'は' + info.error)
-        else
-          filename = info.filename
-          if filename.match(/\.xml$/)
-            unless window.blockMode
-              window.blockMode = true
-              $('#tabs a[href="#block-tab"]').tab('show')
-
-            filename = filename.replace(/(\.rb)?\.xml$/, '.rb')
-            Smalruby.blocklyLoading = true
-            Smalruby.loadXml(info.data)
-            info.data = Blockly.Ruby.workspaceToCode()
-          else
-            Smalruby.Collections.CharacterSet.reset()
-            Blockly.mainWorkspace.clear()
-
-            if window.blockMode
-              window.blockMode = false
-              $('#tabs a[href="#ruby-tab"]').tab('show')
-              window.textEditor.focus()
-
-          $('#filename').val(filename)
-          window.textEditor.getSession().getDocument().setValue(info.data)
-          window.textEditor.moveCursorTo(0, 0)
-          # TODO: window.changed -> Smalruby.Models.SourceCode.changed
-          window.changed = false
-          Smalruby.changedAfterTranslating = true
-          window.successMessage('ロードしました')
+      done: (e, data) =>
+        @load(data.result.source_code)
 
   onBlockMode: (e) ->
     e.preventDefault()
@@ -187,6 +159,15 @@ Smalruby.MainMenuView = Backbone.View.extend
       .fail ->
         window.errorMessage('ダウンロードできませんでした')
 
+  onLoadLocal: (e) ->
+    e.preventDefault()
+
+    # TODO: window.changed -> Smalruby.Models.SourceCode.changed
+    if window.changed
+      return unless confirm('まだセーブしていないのでロードするとプログラムが消えてしまうよ！\nそれでもロードしますか？')
+
+    Smalruby.Views.LoadModalView.render()
+
   onLoad: (e) ->
     e.preventDefault()
 
@@ -336,3 +317,34 @@ Smalruby.MainMenuView = Backbone.View.extend
       else
         canceled.call()
         $.Deferred().reject().promise()
+
+  load: (info) ->
+    if info.error
+      window.errorMessage(info.filename + 'は' + info.error)
+    else
+      filename = info.filename
+      if filename.match(/\.xml$/)
+        unless window.blockMode
+          window.blockMode = true
+          $('#tabs a[href="#block-tab"]').tab('show')
+
+        filename = filename.replace(/(\.rb)?\.xml$/, '.rb')
+        Smalruby.blocklyLoading = true
+        Smalruby.loadXml(info.data)
+        info.data = Blockly.Ruby.workspaceToCode()
+      else
+        Smalruby.Collections.CharacterSet.reset()
+        Blockly.mainWorkspace.clear()
+
+        if window.blockMode
+          window.blockMode = false
+          $('#tabs a[href="#ruby-tab"]').tab('show')
+          window.textEditor.focus()
+
+      $('#filename').val(filename)
+      window.textEditor.getSession().getDocument().setValue(info.data)
+      window.textEditor.moveCursorTo(0, 0)
+      # TODO: window.changed -> Smalruby.Models.SourceCode.changed
+      window.changed = false
+      Smalruby.changedAfterTranslating = true
+      window.successMessage('ロードしました')

data/app/assets/stylesheets/load-modal.css.scss

@@ -0,0 +1,56 @@
+#load-modal {
+    $modal-frame-size: 1px;
+    $modal-body-margin: 15px;
+
+    $modal-margin: $modal-frame-size + $modal-body-margin;
+    $modal-body-width: 700px;
+    $modal-body-height: 400px;
+
+    $modal-width: $modal-body-width + $modal-margin * 2;
+    $modal-height: $modal-body-height + $modal-margin * 2;
+
+    width: $modal-width;
+    height: $modal-height;
+    margin-left: -($modal-width / 2);
+
+    .modal-body {
+        position: relative;
+        height: 100%;
+        max-height: $modal-height - $modal-body-margin * 2;
+
+        .list-programs {
+            .thumbnail {
+                width: 200px;
+                cursor: pointer;
+
+                h1.icon {
+                    font-size: 64px;
+                    text-align: center;
+                }
+
+                img {
+                    max-width: 80px;
+                    max-height: 80px;
+                }
+
+                blockquote {
+                    margin: 0 0 0;
+                    word-break: break-all;
+                }
+            }
+            a.thumbnail {
+                color: black;
+                text-decoration: none;
+            }
+
+            a.thumbnail.active {
+                color: white;
+                background-color: #0088cc;
+
+                blockquote small {
+                    color: gainsboro;
+                }
+            }
+        }
+    }
+}

data/app/controllers/editor_controller.rb

@@ -4,6 +4,6 @@ class EditorController < ApplicationController
   end
 
   def demo
-    @filename = (File.basename(params[:filename]) || 'default') + '.xml'
+    @filename = (File.basename(params[:filename]) || 'default') + '.rb.xml'
   end
 end

data/app/controllers/source_codes_controller.rb

@@ -2,7 +2,39 @@
 require 'nkf'
 
 class SourceCodesController < ApplicationController
-  before_filter :check_whether_standalone, only: [:write, :run]
+  before_filter :check_whether_standalone, only: [:write, :run, :load_local]
+
+  def index
+    res = {
+      localPrograms: [],
+      demoPrograms: [],
+    }
+    if standalone?
+      local_program_paths.each do |path|
+        # TODO: XMLからタイトルを抽出する
+        # TODO: XMLからキャラクターの画像を抽出する
+        filename = rb_basename(path)
+        res[:localPrograms] << {
+          title: filename,
+          filename: filename,
+        }
+      end
+    end
+
+    # TODO: XMLから情報を抽出する
+    res[:demoPrograms] << {
+      title: '車のおいかけっこ',
+      filename: 'default.rb',
+      imageUrl: '/smalruby/assets/car2.png',
+    }
+    res[:demoPrograms] << {
+      title: 'ライトをぴかっとさせるでよ',
+      filename: 'rgb_led_anode.rb',
+      imageUrl: '/smalruby/assets/frog1.png',
+    }
+
+    render json: res
+  end
 
   def check
     render json: SourceCode.new(source_code_params).check_syntax
@@ -51,6 +83,22 @@ class SourceCodesController < ApplicationController
     render json: { source_code: info }, content_type: request.format
   end
 
+  def load_local
+    filename = source_code_params[:filename]
+    program_path = local_program_paths.find { |path|
+      rb_basename(path) == filename
+    }
+    load_local_file(program_path)
+  end
+
+  def load_demo
+    filename = source_code_params[:filename]
+    program_path = demo_program_paths.find { |path|
+      rb_basename(path) == filename
+    }
+    load_local_file(program_path)
+  end
+
   def run
     source_code = SourceCode.new(source_code_params)
     path = Pathname("~/#{source_code.filename}").expand_path
@@ -120,4 +168,36 @@ class SourceCodesController < ApplicationController
 
     session[:source_code] = nil
   end
+
+  def local_program_paths
+    Pathname.glob(Pathname('~/*.rb.xml').expand_path)
+  end
+
+  def demo_program_paths
+    Pathname.glob(Rails.root.join('demos/*.rb.xml'))
+  end
+
+  def rb_basename(path)
+    path = path.basename.to_s
+    path = path[0...-4] if /\.xml\z/ =~ path
+    path
+  end
+
+  def load_local_file(path)
+    if path
+      info = {
+        filename: path.basename.to_s,
+        type: MIME.check(path.to_s).try(:content_type) || 'text/plain',
+        data: NKF.nkf('-w', path.read),
+        size: path.size,
+      }
+    else
+      info = {
+        filename: source_code_params[:filename],
+        error: 'ありません',
+      }
+    end
+
+    render json: { source_code: info }, content_type: request.format
+  end
 end

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

@@ -31,6 +31,7 @@
             %div
 
 = render 'character_modal'
+= render 'load_modal'
 
 %script#character-selector-template{:type => 'text/template'}
   .item

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

@@ -0,0 +1,35 @@
+#load-modal{:class => "modal hide fade", :tabindex => "-1",
+            :role => "dialog", :"aria-hidden" => "true"}
+  .modal-body
+    %ul.thumbnails{:id => "load-modal-local-programs",
+                   :class => "list-programs"}
+
+    .page-header
+      %h3<
+        %i.icon-th-large
+        いろいろなプログラム
+    %ul.thumbnails{:id => "load-modal-demo-programs",
+                   :class => "list-programs"}
+
+    .page-header
+      %h3<
+        %i.icon-search
+        プログラムをさがす
+    %ul.thumbnails{:class => "list-programs"}
+      %li
+        %a#load-modal-find-from-computer.thumbnail
+          %h1.icon
+            %i.icon-folder-open-alt
+          %blockquote
+            %p
+              このコンピュータ
+            %small
+              Computer
+
+  .modal-footer
+    %button.btn{:"data-dismiss" => "modal", :"aria-hidden" => "true"}<
+      %i.icon-remove
+      やめる
+    %button#load-modal-ok-button{:class => "btn btn-primary"}<
+      %i.icon-circle-blank
+      決めた！

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

@@ -29,7 +29,11 @@
           %i.icon-reorder
         %ul.dropdown-menu{:class => "pull-right"}
           %li
-            %a#load-button
+            - if standalone?
+              - load_id = 'load-local-button'
+            - else
+              - load_id = 'load-button'
+            %a{:id => "#{load_id}"}
               %h4
                 %i.icon-folder-open
                 ロード

data/config/routes.rb

@@ -5,10 +5,12 @@ SmalrubyEditor::Application.routes.draw do
   match '/demo(/:filename)' => 'editor#demo',
         defaults: { filename: 'default' }, via: :get
 
-  resources :source_codes, only: [:create]
+  resources :source_codes, only: [:create, :index]
   post 'source_codes/check'
   delete 'source_codes/download'
   post 'source_codes/load'
+  post 'source_codes/load_local'
+  post 'source_codes/load_demo'
   delete 'source_codes/write'
   post 'source_codes/run'
   post 'source_codes/to_blocks'

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
 module SmalrubyEditor
-  VERSION =  '0.1.7'
+  VERSION =  '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smalruby-editor
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: x86-mingw32
 authors:
 - Kouji Takao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -273,10 +273,12 @@ files:
 - app/assets/javascripts/views/.keep
 - app/assets/javascripts/views/character_modal_view.js.coffee
 - app/assets/javascripts/views/character_selector_view.js.coffee
+- app/assets/javascripts/views/load_modal_view.js.coffee
 - app/assets/javascripts/views/main_menu_view.js.coffee
 - app/assets/stylesheets/application.css
 - app/assets/stylesheets/editor.css.scss
 - app/assets/stylesheets/flatstrap-custom.css.scss
+- app/assets/stylesheets/load-modal.css.scss
 - app/assets/stylesheets/toolbox.css.scss.erb
 - app/assets/templates/.keep
 - app/controllers/application_controller.rb
@@ -352,6 +354,7 @@ files:
 - app/models/source_code.rb
 - app/views/editor/_block_tab.html.haml
 - app/views/editor/_character_modal.html.haml
+- app/views/editor/_load_modal.html.haml
 - app/views/editor/_toolbox.html.haml
 - app/views/editor/demo.html.erb
 - app/views/editor/index.html.haml
@@ -386,8 +389,8 @@ files:
 - db/migrate/20131219045113_add_filename_to_source_code.rb
 - db/schema.rb
 - db/seeds.rb
-- demos/default.xml
-- demos/rgb_led_anode.xml
+- demos/default.rb.xml
+- demos/rgb_led_anode.rb.xml
 - lib/assets/.keep
 - lib/smalruby_editor.rb
 - lib/smalruby_editor/version.rb
@@ -569,10 +572,10 @@ files:
 - vendor/assets/javascripts/blockly/msg/js/ja.js
 - vendor/assets/javascripts/jquery.blockUI.js
 - vendor/assets/stylesheets/.keep
-- public/assets/application-28b7bed56c5389dfa372e972c75b6676.css
-- public/assets/application-28b7bed56c5389dfa372e972c75b6676.css.gz
-- public/assets/application-4f747690ebc8ec4815ae36021fdb2c44.js
-- public/assets/application-4f747690ebc8ec4815ae36021fdb2c44.js.gz
+- public/assets/application-3ee566927dc437f1406e5e903da1baf5.js
+- public/assets/application-3ee566927dc437f1406e5e903da1baf5.js.gz
+- public/assets/application-5f1777e683ca5d3cf4e0f0374eab6fac.css
+- public/assets/application-5f1777e683ca5d3cf4e0f0374eab6fac.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