smalruby-editor 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2620d7583988f8aefecfcc4f43372e8004f857b0
-  data.tar.gz: 4f036dff3d6161cba3afeb944f6b01bd1c56aac1
+  metadata.gz: d71a9e4754ddc023b99130576187b13e97cca3ce
+  data.tar.gz: 4ed1b62b217727d2a96bfa9c337049a8850e2684
 SHA512:
-  metadata.gz: 08e39ce807c337397b59f6545dd9a61a435c67df594b14803520f38ac2edf19010d8c76ee53b925e592bf1f0beaf82b15cc713de292843aa5ad484855cb4c13f
-  data.tar.gz: 54a24bf5fb9714e12ef9721dd5ce0079470758f6774c3591a4459814608084df3215e575541bd317dae91f11dbcb1529ed874dca25e46d3d056259aa623e8237
+  metadata.gz: bb60b2b55e43a4403b29441647b3eae78b6ae563be42d2b84c5c6f4971eccd10875fe131bac0013042d641a0aa5165b564472cf1cc3db5039fadb54ac688e9f5
+  data.tar.gz: 77272e287ef54a97a9c8fdf70e9da1c02a7a62eee9cf5e05df6413b0ae4285b6686616aa35020ebe64735e1ead930cb80e1d00840f193c4a24250bc49661f237

data/.gitignore

@@ -22,3 +22,4 @@
 /.env
 /coverage
 /pkg
+/features

data/.rspec

@@ -1,3 +1,4 @@
 --color
 --format documentation
--r turnip/rspec
+--drb
+-r turnip/rspec

data/.rubocop.yml

@@ -0,0 +1,18 @@
+AllCops:
+  Excludes:
+    - db/seeds.rb
+
+AsciiComments:
+  Enabled: false
+
+# メソッドの戻り値としてブロックの値を使う場合にもエラーになるため無効
+# にしている
+Blocks:
+  Enabled: false
+
+Documentation:
+  Enabled: false
+
+# WindowsだとEndOfLine copが動作しないため無効にしている
+EndOfLine:
+  Enabled: false

data/.travis.yml

@@ -1,23 +1,24 @@
-language: ruby
-
-rvm:
-  - 2.0.0
-
-before_script:
-  - cp config/database.yml.travis config/database.yml
-  - mysql -e 'create database myapp_test;'
-
-script:
-  - export SECRET_KEY_BASE='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-  - export COVERALLS='1'
-  - RAILS_ENV=test bundle exec rake db:migrate --trace
-  - bundle exec rake db:test:prepare
-  - bundle exec rake
-
-deploy:
-  provider: heroku
-  api_key:
-    secure: HqZ7FylThjaB3XguCZJbccu7dB8CvWIWFlZpWLLfJwfUkjvoEC1F6VPFakFbwjLXLsvaKlYLakzL+bhaLnxu+HyeNmCrvpIRR2j8EuHmSkxdWrlxAZRV2ojHuDpZuVNaEzd7YtcBCoPiTvqnxWzhAfzZWbPrZfCdA1f+5t5/So0=
-  app: smalruby
-  on:
-    repo: smalruby/smalruby-editor
+language: ruby
+
+rvm:
+  - 2.0.0
+
+before_script:
+  - cp config/database.yml.travis config/database.yml
+  - mysql -e 'create database myapp_test;'
+
+script:
+  - export SECRET_KEY_BASE='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+  - export COVERALLS='1'
+  - RAILS_ENV=test bundle exec rake db:migrate --trace
+  - bundle exec rake db:test:prepare
+  - bundle exec rake
+
+deploy:
+  provider: heroku
+  api_key:
+    secure: HqZ7FylThjaB3XguCZJbccu7dB8CvWIWFlZpWLLfJwfUkjvoEC1F6VPFakFbwjLXLsvaKlYLakzL+bhaLnxu+HyeNmCrvpIRR2j8EuHmSkxdWrlxAZRV2ojHuDpZuVNaEzd7YtcBCoPiTvqnxWzhAfzZWbPrZfCdA1f+5t5/So0=
+  app: smalruby
+  on:
+    repo: smalruby/smalruby-editor
+  run: "rake db:migrate"

data/LEGAL

@@ -0,0 +1,13 @@
+LEGAL NOTICE INFORMATION
+------------------------
+
+All the files in this distribution are covered under either the
+smalruby-editor's license (see the file LICENSE) except some files
+mentioned below.
+
+public/fonts/FontAwesome.otf, public/fonts/fontawesome-webfont.eot,
+public/fonts/fontawesome-webfont.ttf,
+public/fonts/fontawesome-webfont.woff:
+
+  These's license is SIL Open Font License (OFL) 1.1:
+  http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL .

data/README.rdoc

@@ -1,5 +1,6 @@
 == smalruby-editor
 
+{<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]
 {<img src="https://codeclimate.com/github/smalruby/smalruby-editor.png" />}[https://codeclimate.com/github/smalruby/smalruby-editor]

data/Rakefile

@@ -4,3 +4,6 @@
 require File.expand_path('../config/application', __FILE__)
 
 SmalrubyEditor::Application.load_tasks
+
+task(:default).clear
+task default: [:rubocop, :spec]

data/app/assets/javascripts/application.js

@@ -14,7 +14,7 @@
 //= require jquery_ujs
 //= require turbolinks
 //= require ace/ace
-//= require ace/theme-clouds.js
+//= require ace/theme-github.js
 //= require ace/mode-ruby.js
 //= require bootstrap.js
 //= require jquery-fileupload/basic

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

@@ -2,11 +2,22 @@
 # All this logic will automatically be available in application.js.
 # You can use CoffeeScript in this file: http://coffeescript.org/
 
+changed = false
+
 $ ->
+  saving = false
+
   textEditor = ace.edit('text-editor')
-  textEditor.setTheme('ace/theme/clouds')
+  textEditor.setTheme('ace/theme/github')
   textEditor.setShowInvisibles(true)
 
+  textEditor.focus()
+  textEditor.gotoLine(0, 0)
+
+  textEditor.on('change', (e) ->
+    changed = true
+  )
+
   session = textEditor.getSession()
   session.setMode('ace/mode/ruby')
   session.setTabSize(2)
@@ -20,18 +31,40 @@ $ ->
     e.preventDefault()
     false
 
-  $('#save-button').click ->
+  $('#check-button').click (e) ->
+    e.preventDefault()
+    data =
+      source_code:
+        data: session.getDocument().getValue()
+    success = (data, textStatus, jqXHR) ->
+      for errorInfo in data
+        do (errorInfo) ->
+          msg = $('<div class="alert alert-error" style="display: none">')
+            .append('<button type="button" class="close" data-dismiss="alert">×</button>')
+            .append('<h4><i class="icon-exclamation-sign"></i>エラー</h4>')
+            .append("#{errorInfo.row}行")
+          if errorInfo.column > 0
+            msg.append("、#{errorInfo.column}文字")
+          msg.append(": #{errorInfo.message}")
+          $('#messages').append(msg)
+          msg.fadeIn('slow')
+    $.post('/source_codes/check', data, success, 'json')
+
+  $('#save-button').click (e) ->
+    e.preventDefault()
     filename = $.trim($('#filename').val())
     if filename.length <= 0
       $('#filename').focus()
     else
       data =
-        filename: filename
-        source: session.getDocument().getValue()
-      location.href = '/editor/save_file?' + $.param(data)
-
-  $('#load-button').click ->
-    $(@).parent().find('input[name="load_file"]').click()
+        source_code:
+          filename: filename
+          data: session.getDocument().getValue()
+      success = (data, textStatus, jqXHR) ->
+        saving = true
+        changed = false
+        $('#download-link').click()
+      $.post('/source_codes/', data, success, 'json')
 
   $('#filename').keypress (e) ->
     e = window.event if !e
@@ -41,20 +74,32 @@ $ ->
     else
       true
 
+  $('#load-button').click (e) ->
+    e.preventDefault()
+    if changed
+      return unless confirm('まだセーブしていないのでロードするとプログラムが消えてしまうよ！それでもロードしますか？')
+    $(@).parent().find('input[name="source_code[file]"]').click()
+
   $('#file-form').fileupload(
     dataType: 'json'
-    add: (e, data) ->
-      data.submit()
     done: (e, data) ->
-      file = data.result
-      if file.error
+      info = data.result.source_code
+      if info.error
         msg = $('<div class="alert alert-error" style="display: none">')
           .append('<button type="button" class="close" data-dismiss="alert">×</button>')
           .append('<h4><i class="icon-exclamation-sign"></i>エラー</h4>')
-          .append(file.name + 'は' + file.error)
+          .append(info.filename + 'は' + info.error)
         $('#messages').append(msg)
         msg.fadeIn('slow').delay(5000).fadeOut('slow')
       else
-        $('#filename').val(file.name)
-        session.getDocument().setValue(file.source)
+        $('#filename').val(info.filename)
+        session.getDocument().setValue(info.data)
+        changed = false
   )
+
+  window.onbeforeunload = (event) ->
+    if !saving && session.getDocument().getValue().length > 0
+      return '作成中のプログラムが消えてしまいます。'
+    else
+      saving = false
+      return

data/app/assets/stylesheets/application.css

@@ -8,8 +8,7 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require flatstrap
- *= require font-awesome
+ *= require flatstrap-custom
  *= require_self
  *= require_tree .
  */

data/app/assets/stylesheets/flatstrap-custom.css.scss

@@ -0,0 +1,2 @@
+$fontAwesomePath: "/fonts";
+@import "flatstrap";

data/app/controllers/editor_controller.rb

@@ -1,29 +1,5 @@
 # -*- coding: utf-8 -*-
-require 'nkf'
-
 class EditorController < ApplicationController
   def index
   end
-
-  def save_file
-    send_data(params[:source], filename: params[:filename],
-              disposition: 'attachment', type: 'text/plain; charset=utf-8')
-  end
-
-  def load_file
-    f = params['load_file']
-    mime_type = MIME.check(f.path)
-    content_type = mime_type.try(:content_type) || f.content_type
-    res = {
-      name: f.original_filename,
-      type: content_type,
-      size: f.size,
-    }
-    if /\Atext\/plain/ =~ content_type
-      res[:source] = NKF.nkf('-w', f.read)
-    else
-      res[:error] = 'Rubyのプログラムではありません'
-    end
-    render json: res, content_type: request.format
-  end
 end

data/app/controllers/source_codes_controller.rb

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+require 'nkf'
+
+class SourceCodesController < ApplicationController
+  def check
+    render json: SourceCode.new(source_code_params).check_syntax
+  end
+
+  def create
+    source_code = SourceCode.create!(source_code_params)
+    session[:source_code] = {
+      id: source_code.id,
+      digest: source_code.digest,
+    }
+    render json: { source_code: { id: source_code.id } }
+  end
+
+  def download
+    source_code = SourceCode.find(session[:source_code][:id])
+    unless source_code.digest == session[:source_code][:digest]
+      fail ActiveRecord::RecordNotFound
+    end
+
+    send_data(source_code.data,
+              filename: encode_filename(source_code.filename),
+              disposition: 'attachment',
+              type: 'text/plain; charset=utf-8')
+
+    source_code.destroy
+
+    session[:source_code] = nil
+  end
+
+  def load
+    f = params[:source_code][:file]
+    info = get_file_info(f)
+    if /\Atext\/plain/ =~ info[:type]
+      info[:data] = NKF.nkf('-w', f.read)
+    else
+      info[:error] = 'Rubyのプログラムではありません'
+    end
+
+    render json: { source_code: info }, content_type: request.format
+  end
+
+  private
+
+  def source_code_params
+    params.require(:source_code).permit(:data, :filename)
+  end
+
+  def get_file_info(file)
+    {
+      filename: file.original_filename,
+      type: MIME.check(file.path).try(:content_type) || file.content_type,
+      size: file.size,
+    }
+  end
+
+  def encode_filename(filename)
+    if request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/
+      return ERB::Util.url_encode(filename)
+    else
+      filename
+    end
+  end
+end

data/app/models/source_code.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+require 'tempfile'
+require 'open3'
+require 'digest/sha2'
+
+# ソースコードを表現するモデル
+class SourceCode < ActiveRecord::Base
+  validates :filename, presence: true
+  validates :data, presence: true, allow_blank: true
+
+  # シンタックスをチェックする
+  def check_syntax
+    _, stderr_str, status = *open3_capture3_ruby_c
+    return [] if status.success?
+
+    stderr_str.lines.each.with_object([]) { |line, res|
+      if (md = /^.*:(\d+): (.*)$/.match(line))
+        res << { row: md[1].to_i, column: 0, message: md[2] }
+      elsif (md = /( +)\^$/.match(line))
+        res[-1][:column] = md[1].length
+      end
+    }
+  end
+
+  # ハッシュ値を計算する
+  def digest
+    Digest::SHA256.hexdigest(data)
+  end
+
+  private
+
+  def open3_capture3_ruby_c
+    tempfile = Tempfile.new('smalruby-editor')
+    tempfile.write(data)
+    path = tempfile.path
+    tempfile.close
+    ruby_cmd = File.join(RbConfig::CONFIG['bindir'],
+                         RbConfig::CONFIG['RUBY_INSTALL_NAME'])
+    Open3.capture3("#{ruby_cmd} -c #{path}")
+  end
+end

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

@@ -4,11 +4,13 @@
       <li class="active"><a id="ruby-tab" href="#">Ruby</a></li>
     </ul>
 
-    <%= form_tag(editor_load_file_path, id: "file-form", class: "navbar-form pull-right", method: "post", multipart: true) do %>
+    <%= form_tag(source_codes_load_path, id: "file-form", class: "navbar-form pull-right", method: "post", multipart: true) do %>
+      <button id="check-button" type="button" class="btn btn-primary">チェック</button>
       <input id="filename" type="text" class="span4" placeholder="プログラムの名前を入れてね（例：01.rb）">
       <button id="save-button" type="button" class="btn btn-primary">セーブ</button>
-      <a id="load-button" class="btn btn-primary">ロード</a>
-      <input id="load-file" type="file" name="load_file" style="display: none">
+      <%= link_to '', source_codes_download_path, id: 'download-link', style: 'display: none', 'data-method' => 'delete' %>
+      <button id="load-button" class="btn btn-primary">ロード</button>
+      <input id="load-file" type="file" name="source_code[file]" style="display: none">
     <% end %>
   </div>
 </div>

data/bin/smalruby-editor

@@ -17,6 +17,7 @@ require 'smalruby_editor'
 Dir.chdir(File.expand_path('../../', APP_PATH))
 require 'rails/commands/server'
 
+# rubocop:disable all
 module Rails
   class Server < ::Rack::Server
     def start
@@ -35,6 +36,15 @@ module Rails
         console.level = Rails.logger.level
 
         Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
+
+        if ActiveRecord::Migrator.needs_migration?
+          ActiveRecord::Migration.verbose = true
+          begin
+            ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths)
+          ensure
+            ActiveRecord::Migration.verbose = false
+          end
+        end
       end
 
       uri = "http://localhost:#{options[:Port]}"
@@ -71,3 +81,4 @@ Rails::Server.new.tap do |server|
   Dir.chdir(Rails.application.root)
   server.start
 end
+# rubocop:enable all