nyoibo 0.0.2 → 0.0.3

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+doc/*

data/README.rdoc

@@ -0,0 +1,57 @@
+= Nyoibo
+
+A websocket file uploader with progressbar module.
+
+== Features
+
+=== Any frameworks
+You can use Rails or Sinatra and so on, especially this contains rails generator.
+
+== Install(gem)
+  $ gem install nyoibo
+
+== Install(bundler)
+Put this line in your Gemfile:
+  gem 'nyoibo'
+
+Then bundle:
+  $ bundle install
+
+== Usage(Rails 3.1)
+==== Generate config and coffee-script files
+  $ rails g nyoibo:install
+
+=== View
+  <%= ws_form_for(@post) do |f| %>
+    file:&nbsp;<%= f.file_field :photo, :size => 40 %><br>
+    comment:&nbsp;<%= f.text_field :comment, :size => 40 %><br>
+    <%= f.submit 'upload' %>
+  <% end %>
+
+=== Write callback on Controlller
+  class SomeController < ApplicationController
+    before_upload "/" do |params|
+      if params["confirm"] == false
+        return false # Not to start uploading if return false.
+      end
+    end
+
+    after_upload "/" do |params, binary|
+      File.open("/tmp/#{params['filename']}", "wb:binary") do |f|
+        f.write(binary)
+      end
+    end
+  end
+
+== Usage(Sinatra)
+See test/example.rb
+
+== Questions, Feedback
+
+Message me on Github (yalab) or Twitter (@yalab)
+
+== Licence
+MIT-LICENSE
+
+== Copyright
+Copyright (c) 2011 Atsushi Yoshida(yalab).

data/lib/generators/nyoibo/install_generator.rb

@@ -9,8 +9,8 @@ module Nyoibo
       desc "Creates a Nyoibo initializer and copy javascript and locale files to your application."
       def copy_initializer
         template "nyoibo.rb.erb", "config/initializers/nyoibo.rb"
-        template "nyoibo_en.yml", "config/locales/nyoibo_en.yml"
         template "nyoibo.js.coffee", "app/assets/javascripts/nyoibo.js.coffee"
+        template "upload.js.coffee", "app/assets/javascripts/upload.js.coffee"
         copy_file "../../../../vendor/html5jp/progress.js", "app/assets/javascripts/progress.js"
         copy_file "../../../../vendor/web-socket-js/web_socket.js", "app/assets/javascripts/web_socket.js"
         copy_file "../../../../vendor/web-socket-js/swfobject.js", "app/assets/javascripts/swfobject.js"

data/lib/generators/nyoibo/templates/nyoibo.js.coffee

@@ -1,77 +1,58 @@
-`WEB_SOCKET_DEBUG = true;
- WEB_SOCKET_SWF_LOCATION = '/WebSocketMain.swf';`
+class Nyoibo
+  constructor: (@url, id) ->
+    if $("##{id}").length > 0
+      @progressbar = new html5jp.progress(id)
+      @progressbar.draw()
+      @prepare_upload = -> true
+      @before_upload  = -> true
+      @after_upload   = -> true
+      @upload_abort   = -> true
+  upload: (file, params={}) ->
+    @errors = []
+    return false unless @prepare_upload.apply(@)
 
-jQuery.fn.serializeObject = () ->
-  arrayData = this.serializeArray()
-  objectData = {}
-
-  $.each arrayData, () ->
-    if this.value?
-      value = this.value
-    else
-      value = ''
-
-    if objectData[this.name]?
-      unless objectData[this.name].push
-        objectData[this.name] = [objectData[this.name]]
-
-      objectData[this.name].push value
-    else
-      objectData[this.name] = value
-
-  return objectData
-
-jQuery ($)->
-  if $("#ws-progress").length > 0
-    progress = new html5jp.progress("ws-progress")
-    progress.draw()
-
-  form = $('#ws-form')
-  progress_bar = $("#ws-progress")
-
-  fire = (obj, name, data) ->
-    event = $.Event(name)
-    obj.trigger(event, data)
-    return event.result != false
-
-  form.bind 'ws:upload', (event) ->
-    file = form.find('input[type=file]').get(0).files[0]
     try
-      max_length = file.size
+      filesize = file.size
     catch e
-      alert nyoibo.file_not_found
-      return
-    if max_length == 0
-      alert nyoibo.file_not_found
-      return
+      @errors.push "file not found"
+    if filesize == 0
+      @errors.push "file size is zero"
+
+    return false if @errors.length > 0
+
     chunk = 102400
     start = 0
-    ws = new WebSocket("ws://localhost:3030/")
 
-    fire(form, 'ws:before_upload')
+    ws = new WebSocket(@url)
+    @before_upload.apply(@)
+    ws.progressbar = @progressbar
+    ws.after_upload = @after_upload
+    ws.upload_abort = @upload_abort
     ws.onclose = ->
-      progress.set_val(100)
-      fire(form, 'ws:after_upload')
-      progress.reset()
+      ws.progressbar.reset()
       ws = null
 
     ws.onmessage = (evt) ->
       switch evt.data
         when 'OK Ready'
-          params = {filename: file.name, comment: $('#post_comment').val(), size: max_length, session_string:  $('#session_string').val()}
-          for k, v of form.serializeObject()
-            params[k] = v
+          params['filename'] = file.name
+          params['size']     = filesize
           ws.send("JSON: " + JSON.stringify(params))
         when 'OK Bye'
+          ws.progressbar.set_val(100)
+          ws.after_upload.apply(@)
           ws.close()
+        when 'ABORT'
+          ws.upload_abort.apply(@)
         when 'EMPTY'
           ws.send("QUIT")
+          ws.progressbar.set_val(100)
         when 'NEXT'
-          val = Math.floor(start / max_length * 100)
-          progress.set_val(val)
+          val = Math.floor(start / filesize * 100)
+          ws.progressbar.set_val(val)
           stop = start + chunk - 1
-          if stop >= max_length
-            stop = max_length
+          if stop >= filesize
+            stop = filesize
 
           blob = if typeof(file.mozSlice) == "function"
                    file.mozSlice(start, stop)
@@ -86,6 +67,4 @@ jQuery ($)->
             reader.readAsBinaryString(blob)
           , 300
 
-  $('#ws-form input[type=submit]').click ->
-    fire(form, 'ws:upload') if fire(form, 'ws:prepare_upload')
-    return false
+@Nyoibo = Nyoibo

data/lib/generators/nyoibo/templates/upload.js.coffee

@@ -0,0 +1,21 @@
+`WEB_SOCKET_DEBUG = true;
+ WEB_SOCKET_SWF_LOCATION = '/WebSocketMain.swf';`
+jQuery ($)->
+  nyoibo = new Nyoibo("ws://localhost:3030/", "ws-progress")
+  form = $('#ws-form')
+  nyoibo.prepare_upload = -> true
+  nyoibo.before_upload  = ->
+    form.hide()
+  nyoibo.after_upload   = ->
+    form.get(0).reset()
+    form.show()
+  nyoibo.upload_abort   = -> true
+
+  $('#ws-form input[type=submit]').click ->
+    params = {}
+    for i, input of form.serializeArray()
+      params[input.name] = input.value
+
+    unless nyoibo.upload(form.find('input[type=file]').get(0).files[0], params)
+      alert nyoibo.errors.join(", ")
+    return false

data/lib/nyoibo/callback.rb

@@ -1,27 +1,29 @@
 module Nyoibo
   module Callback
     def self.callbacks
-      @callbacks ||= {}
+      @callbacks ||= {:before => {}, :after => {}}
     end
     def self.included(base)
       base.extend ClassMethod
     end
 
     module ClassMethod
-      def uploaded(path, &block)
-        if ENV["NYOIBO_ENV"] == "production" && Nyoibo::Callback.callbacks[path]
-          raise "Already defined '#{path}' updated callback."
-        end
-        Nyoibo::Callback.callbacks[path] = block
-
-        Process.kill(:TERM, Nyoibo.pid) && Nyoibo.run if ENV["NYOIBO_ENV"] == "development"
+      [:before, :after].each do |prefix|
+        module_eval <<-EOS, __FILE__, __LINE__
+          def #{prefix}_upload(path, &block)
+            if ENV["NYOIBO_ENV"] == "production" && Nyoibo::Callback.callbacks[#{prefix}][path]
+              raise "Already defined #{prefix} updated callback."
+            end
+            Nyoibo::Callback.callbacks[:#{prefix}][path] = block
+          end
+        EOS
       end
     end
 
     module Runner
-      def run_callback(path="/", *args)
-        block = Nyoibo::Callback.callbacks[path]
-        block.call(*args)
+      def run_callback(prefix, path="/", *args)
+        block = Nyoibo::Callback.callbacks[prefix][path]
+        block.call(*args) if block
       end
     end
   end

data/lib/nyoibo/daemon.rb

@@ -12,7 +12,7 @@ module Nyoibo
             ws.send "OK Ready"
           }
           ws.onclose{
-            ws.send "OK Bye"
+            ws.close_websocket
           }
           ws.onmessage{|msg|
             @binary ||= ""
@@ -24,15 +24,20 @@ module Nyoibo
               elsif @binary.encoding == Encoding::UTF_8
                 @binary = @binary.unpack('U*').pack('c*')
               end
-              Nyoibo.run_callback(ws.request["path"], @json, @binary)
-              ws.close_connection
+              Nyoibo.run_callback(:after, ws.request["path"], @json, @binary)
+              @binary = @json = nil
+              ws.send("OK Bye")
             when CMD_JSON
               msg.gsub!(CMD_JSON, '')
               @json = JSON.parse(msg)
               @json['size'] = @json['size'].to_i
-              ws.send("NEXT")
+              if Nyoibo.run_callback(:before, ws.request["path"], @json, @binary) == false
+                ws.send("ABORT")
+                ws.close_websocket
+              else
+                ws.send("NEXT")
+              end
             else
-
               if msg =~ TYPE_BASE64
                 msg.gsub!(TYPE_BASE64, '')
                 @binary_type = 'base64'
@@ -52,6 +57,9 @@ module Nyoibo
         daemon.call
       else
         @pid = Process.fork &daemon
+        at_exit do
+          Process.kill(:KILL, Nyoibo.pid) if Nyoibo.pid
+        end
       end
     end
   end

data/lib/nyoibo/railtie.rb

@@ -4,5 +4,11 @@ class Nyoibo::Railtie < Rails::Railtie
   config.after_initialize do
     ENV["NYOIBO_ENV"] = Rails.env
     Nyoibo.run
+    ::ApplicationController.send(:prepend_before_filter, lambda{
+                                   if Rails.env == "development"
+                                     Process.kill(:INT, Nyoibo.pid)
+                                     Nyoibo.run
+                                   end
+                                   true})
   end
 end

data/lib/nyoibo/version.rb

@@ -1,3 +1,3 @@
 module Nyoibo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/example.rb

@@ -13,7 +13,7 @@ class Post
   attr_accessor :file
 
   include Nyoibo::Callback
-  uploaded "/" do |params, binary|
+  after_upload "/" do |params, binary|
     File.open('/tmp/test.jpg', 'w:binary') do |f|
       f.write(binary)
     end
@@ -22,6 +22,9 @@ class Post
       f.write(params)
     end
   end
+  before_upload "/" do |params|
+    params['name'] == "yalab"
+  end
 end
 Nyoibo.configure do
   host 'localhost'
@@ -30,6 +33,10 @@ end
 Process.fork do
   Nyoibo.run
 end
+
+
+set :public, File.expand_path('../../vendor/web-socket-js', __FILE__)
+
 get '/' do
   @post = Post.new
   erubis <<EOS
@@ -38,12 +45,18 @@ get '/' do
 <head>
 <title>nyoibo</title>
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
+<script src="/swfobject.js"></script>
+<script src="/web_socket.js"></script>
 <script>
-#{File.read File.expand_path('../../vendor/html5jp/progress.js', __FILE__)}
+#{File.read File.open(File.expand_path("../../vendor/html5jp/progress.js", __FILE__))}
 </script>
+
 <script>
 #{CoffeeScript.compile(File.read(File.expand_path('../../lib/generators/nyoibo/templates/nyoibo.js.coffee', __FILE__)))}
 </script>
+<script>
+#{CoffeeScript.compile(File.read(File.expand_path('../../lib/generators/nyoibo/templates/upload.js.coffee', __FILE__)))}
+</script>
 </head>
 <body>
 
@@ -52,6 +65,7 @@ get '/' do
   <input type="file">
   <input type="submit">
   <input type="text" name="name" value="yalab">
+  <input type="hidden" name="age" value="28">
 </form>
 <div id="ws-progress"></div>
 </body>

data/test/unit/callback_test.rb

@@ -2,16 +2,27 @@ require 'test_helper'
 class Nyoibo::CallbackTest < Test::Unit::TestCase
   class TestApp
     include Nyoibo::Callback
-    uploaded "/" do
+    after_upload "/" do
       "uploaded!"
     end
+    before_upload '/' do
+      "before"
+    end
   end
-  context "Run callback" do
+  context "Run after callback" do
     setup do
-      @response = Nyoibo.run_callback("/")
+      @response = Nyoibo.run_callback(:after, "/")
     end
     should "fetch response" do
       assert_equal "uploaded!", @response
     end
   end
+  context "Run before callback" do
+    setup do
+      @response = Nyoibo.run_callback(:before, "/")
+    end
+    should "fetch response" do
+      assert_equal "before", @response
+    end
+  end
 end

data/test/unit/daemon_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 class Nyoibo::DaemonTest < Test::Unit::TestCase
   class TestApp < Test::Unit::TestCase
     include Nyoibo::Callback
-    uploaded "/" do |json, binary|
+    after_upload "/" do |json, binary|
       File.open("/tmp/test.jpg", "w:binary"){|f|
         f.write(binary)
       }
@@ -31,6 +31,8 @@ class Nyoibo::DaemonTest < Test::Unit::TestCase
             case  msg
             when "OK Ready"
               http.send("JSON: " + {:filename => File.basename(@file.path), :size => @file.size}.to_json)
+            when "OK Bye"
+              http.close_connection
             when "NEXT"
               @end = @start + @sendsize
               @encoded ||= Base64.encode64(@file.read)

metadata

@@ -2,7 +2,7 @@
 name: nyoibo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - yalab
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 Z
+date: 2011-07-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: em-websocket
@@ -102,12 +102,13 @@ files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
+- README.rdoc
 - Rakefile
 - app/helpers/nyoibo_helper.rb
 - lib/generators/nyoibo/install_generator.rb
 - lib/generators/nyoibo/templates/nyoibo.js.coffee
 - lib/generators/nyoibo/templates/nyoibo.rb.erb
-- lib/generators/nyoibo/templates/nyoibo_en.yml
+- lib/generators/nyoibo/templates/upload.js.coffee
 - lib/nyoibo.rb
 - lib/nyoibo/callback.rb
 - lib/nyoibo/configure.rb

data/lib/generators/nyoibo/templates/nyoibo_en.yml

@@ -1,3 +0,0 @@
-en:
-  nyoibo:
-    file_not_found: `File is not exists`