nyoibo 0.0.1 → 0.0.2

data/app/helpers/nyoibo_helper.rb

@@ -3,11 +3,6 @@ module NyoiboHelper
     options[:html] ||= {}
     options[:html][:id] ||= 'ws-form'
     output = ''
-    output << javascript_tag(<<EOS)
-  WEB_SOCKET_DEBUG = true;
-  WEB_SOCKET_SWF_LOCATION = '/WebSocketMain.swf';
-  var nyoibo =  #{I18n.t('nyoibo').to_json};
-EOS
     output << form_for(model, options, &block)
     output << content_tag(:div, '', :id => 'ws-progress')
     output.html_safe

data/lib/generators/nyoibo/install_generator.rb

@@ -1,8 +1,9 @@
 require 'rails'
 require 'rails/generators'
+
 module Nyoibo
   module Generators
-    class InstallGenerator < Rails::Generators::Base
+    class InstallGenerator < ::Rails::Generators::Base
       source_root File.expand_path("../templates", __FILE__)
 
       desc "Creates a Nyoibo initializer and copy javascript and locale files to your application."
@@ -10,10 +11,10 @@ module Nyoibo
         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 "../../../../vendor/html5jp/progress.js", "app/assets/javascripts/progress.js"
-        template "../../../../vendor/web-socket-js/web_socket.js", "app/assets/javascripts/web_socket.js"
-        template "../../../../vendor/web-socket-js/swfobject.js", "app/assets/javascripts/swfobject.js"
-        template "../../../../vendor/web-socket-js/WebSocketMain.swf", "public/WebSocketMain.swf"
+        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"
+        copy_file "../../../../vendor/web-socket-js/WebSocketMain.swf", "public/WebSocketMain.swf"
       end
     end
   end

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

@@ -1,6 +1,30 @@
+`WEB_SOCKET_DEBUG = true;
+ WEB_SOCKET_SWF_LOCATION = '/WebSocketMain.swf';`
+
+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 ($)->
-  progress = new html5jp.progress("ws-progress")
-  progress.draw()
+  if $("#ws-progress").length > 0
+    progress = new html5jp.progress("ws-progress")
+    progress.draw()
 
   form = $('#ws-form')
   progress_bar = $("#ws-progress")
@@ -35,6 +59,8 @@ jQuery ($)->
       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
           ws.send("JSON: " + JSON.stringify(params))
         when 'OK Bye'
           ws.close()

data/lib/nyoibo/version.rb

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

data/nyoibo.gemspec

@@ -23,4 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency("json", "~>1.5.3")
   s.add_development_dependency('em-http-request', '~> 0.2.6')
   s.add_development_dependency('railties')
+  s.add_development_dependency('coffee-script')
+  s.add_development_dependency('sinatra')
+  s.add_development_dependency('sinatra-reloader')
 end

data/test/example.rb

@@ -0,0 +1,60 @@
+require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../app/helpers/nyoibo_helper', __FILE__)
+require 'sinatra'
+require 'sinatra/reloader'
+require 'action_view'
+require 'active_model'
+require 'coffee-script'
+include ActionView::Helpers::FormHelper
+extend NyoiboHelper
+
+class Post
+  extend ActiveModel::Naming
+  attr_accessor :file
+
+  include Nyoibo::Callback
+  uploaded "/" do |params, binary|
+    File.open('/tmp/test.jpg', 'w:binary') do |f|
+      f.write(binary)
+    end
+
+    File.open('/tmp/test.json', 'w:binary') do |f|
+      f.write(params)
+    end
+  end
+end
+Nyoibo.configure do
+  host 'localhost'
+  port 3030
+end
+Process.fork do
+  Nyoibo.run
+end
+get '/' do
+  @post = Post.new
+  erubis <<EOS
+<!DOCTYPE html>
+<html>
+<head>
+<title>nyoibo</title>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
+<script>
+#{File.read 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>
+</head>
+<body>
+
+
+<form id="ws-form">
+  <input type="file">
+  <input type="submit">
+  <input type="text" name="name" value="yalab">
+</form>
+<div id="ws-progress"></div>
+</body>
+EOS
+
+end

metadata

@@ -2,7 +2,7 @@
 name: nyoibo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - yalab
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 Z
+date: 2011-07-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: em-websocket
@@ -56,6 +56,39 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: coffee-script
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sinatra-reloader
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: ""
 email: 
 - rudeboyjet@gmail.com
@@ -83,6 +116,7 @@ files:
 - lib/nyoibo/railtie.rb
 - lib/nyoibo/version.rb
 - nyoibo.gemspec
+- test/example.rb
 - test/fixtures/test.jpg
 - test/test_helper.rb
 - test/unit/callback_test.rb