dripdrop 0.10.0.beta2 → 0.10.0

data/.gitignore

@@ -0,0 +1,31 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+*.swo
+*.swn
+
+## PROJECT::GENERAL
+coverage
+rdoc
+doc
+pkg
+
+#RBX
+*.rbc
+
+## PROJECT::SPECIFIC
+.rvmrc
+Gemfile.lock
+.bundle
+*.gem

data/Gemfile

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in dripdrop.gemspec
+gemspec
+

data/README.md

@@ -2,11 +2,11 @@
 
 ## INSTALLATION NOTES:
 
-1. Install with 'gem install dripdrop --pre' as you probably want the beta gem.
-2. Build eventmachine from [git master](https://github.com/eventmachine/eventmachine). It fixes a ZeroMQ bug that will cause you much pain if you don't have it.
-3. Build zeromq2 from [git master](https://github.com/zeromq/zeromq2)
-4. You probably want the yajl-ruby (or json-java if you're on jRuby) gem installed for optimal JSON generation. You don't have to use JSON with DripDrop, but it is the default.
-5. If you have any problems, open an issue, a lot of stuff is in flux!
+1. This does NOT work with 1.8.7. 1.9.2/RBX/jRuby only.
+2. Build zeromq2 from [git master](https://github.com/zeromq/zeromq2) if you haven't already.
+3. Install with 'gem install dripdrop'.
+4. If on jRuby, http servers will be unavailable unless you have a jruby with cext support, and manually `gem install eventmachine_httpserver`
+5. If on 1.9.x `gem install ffi`
 
 ## About
 

data/Rakefile

@@ -1,35 +1,11 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "dripdrop"
-    gem.summary = %Q{Evented framework for ZeroMQ and EventMachine Apps.}
-    gem.description = %Q{Evented framework for ZeroMQ and EventMachine Apps. }
-    gem.email = "andrew@andrewvc.com"
-    gem.homepage = "http://github.com/andrewvc/dripdrop"
-    gem.authors = ["Andrew Cholakian"]
-    gem.add_dependency('eventmachine', '>= 0.12.10')
-    gem.add_dependency('em-websocket')
-    gem.add_dependency('em-zeromq', '>= 0.2.0')
-    gem.add_development_dependency('rspec', '>= 2.4.0')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-task :test => :check_dependencies
-
-task :default => :test
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rake/rdoctask'
+require 'dripdrop/version'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "dripdrop #{version}"
+  rdoc.title = "dripdrop #{DripDrop::VERSION}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
@@ -37,4 +13,4 @@ end
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
 end
-
+task :default => :spec

data/dripdrop.gemspec

@@ -1,104 +1,37 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "dripdrop/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{dripdrop}
-  s.version = "0.10.0.beta2"
-
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andrew Cholakian"]
-  s.date = %q{2011-03-01}
-  s.description = %q{Evented framework for ZeroMQ and EventMachine Apps. }
-  s.email = %q{andrew@andrewvc.com}
+  s.name        = "dripdrop"
+  s.version     = DripDrop::VERSION
+  s.platform    = RUBY_PLATFORM[/java/] || Gem::Platform::RUBY
+  s.authors     = ["Andrew Cholakian"]
+  s.email       = ["andrew@andrewvc.com"]
+  s.homepage    = "https://github.com/andrewvc/dripdrop"
+  s.summary     = %q{Evented framework for ZeroMQ and EventMachine Apps.}
+  s.description = %q{Evented framework for ZeroMQ and EventMachine Apps.}
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
   ]
-  s.files = [
-    ".document",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "dripdrop.gemspec",
-    "example/agent_test.rb",
-    "example/combined.rb",
-    "example/complex/README",
-    "example/complex/client.rb",
-    "example/complex/server.rb",
-    "example/complex/service.rb",
-    "example/complex/websocket.rb",
-    "example/http.rb",
-    "example/pubsub.rb",
-    "example/pushpull.rb",
-    "example/subclass.rb",
-    "example/xreq_xrep.rb",
-    "js/dripdrop.html",
-    "js/dripdrop.js",
-    "js/qunit.css",
-    "js/qunit.js",
-    "lib/dripdrop.rb",
-    "lib/dripdrop/agent.rb",
-    "lib/dripdrop/handlers/base.rb",
-    "lib/dripdrop/handlers/http_client.rb",
-    "lib/dripdrop/handlers/http_server.rb",
-    "lib/dripdrop/handlers/mongrel2.rb",
-    "lib/dripdrop/handlers/websocket_server.rb",
-    "lib/dripdrop/handlers/zeromq.rb",
-    "lib/dripdrop/message.rb",
-    "lib/dripdrop/node.rb",
-    "lib/dripdrop/node/nodelet.rb",
-    "spec/gimite-websocket.rb",
-    "spec/message_spec.rb",
-    "spec/node/http_spec.rb",
-    "spec/node/nodelet_spec.rb",
-    "spec/node/routing_spec.rb",
-    "spec/node/websocket_spec.rb",
-    "spec/node/zmq_m2_spec.rb",
-    "spec/node/zmq_pushpull_spec.rb",
-    "spec/node/zmq_xrepxreq_spec.rb",
-    "spec/node_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/andrewvc/dripdrop}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
-  s.summary = %q{Evented framework for ZeroMQ and EventMachine Apps.}
-  s.test_files = [
-    "spec/gimite-websocket.rb",
-    "spec/message_spec.rb",
-    "spec/node/http_spec.rb",
-    "spec/node/nodelet_spec.rb",
-    "spec/node/routing_spec.rb",
-    "spec/node/websocket_spec.rb",
-    "spec/node/zmq_m2_spec.rb",
-    "spec/node/zmq_pushpull_spec.rb",
-    "spec/node/zmq_xrepxreq_spec.rb",
-    "spec/node_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.rubyforge_project = "dripdrop"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
-      s.add_runtime_dependency(%q<em-websocket>, [">= 0"])
-      s.add_runtime_dependency(%q<em-zeromq>, [">= 0.2.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.4.0"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-      s.add_dependency(%q<em-websocket>, [">= 0"])
-      s.add_dependency(%q<em-zeromq>, [">= 0.2.0"])
-      s.add_dependency(%q<rspec>, [">= 2.4.0"])
-    end
+  s.add_dependency "eventmachine", ">= 0.12.10"
+  s.add_dependency "em-websocket", ">= 0"
+  s.add_dependency "em-zeromq", ">= 0.2.1"
+  if s.platform.to_s == "java"
+    s.add_dependency "json", ">= 1.5.1" 
   else
-    s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-    s.add_dependency(%q<em-websocket>, [">= 0"])
-    s.add_dependency(%q<em-zeromq>, [">= 0.2.0"])
-    s.add_dependency(%q<rspec>, [">= 2.4.0"])
+    s.add_dependency "yajl-ruby", ">= 0.8.1"
+    s.add_dependency "eventmachine_httpserver", ">= 0.2.1"
   end
+  s.add_development_dependency "rspec", ">= 2.4.0"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
 

data/lib/dripdrop/handlers/websocket_server.rb

@@ -21,10 +21,13 @@ class DripDrop
         ws.onopen  { @onopen_handler.call(dd_conn) if @onopen_handler }
         ws.onclose { @onclose_handler.call(dd_conn) if @onclose_handler }
         ws.onerror {|reason|
-          e = SocketError.new
-          e.reason     = reason
-          e.connection = dd_conn
-          handle_error(e)
+          begin
+            raise SocketError, reason
+          rescue SocketError => e
+            e.reason     = reason
+            e.connection = dd_conn
+            handle_error(e,dd_conn)
+          end
         }
         
         ws.onmessage { |message|

data/lib/dripdrop/node.rb

@@ -65,7 +65,7 @@ class DripDrop
       if @block
         self.instance_eval(&@block)
       else
-        raise "Could not start, no block or specified"
+        raise "Could not start, no block or action specified"
       end
     end
 

data/lib/dripdrop/version.rb

@@ -0,0 +1,3 @@
+class DripDrop
+  VERSION = "0.10.0"
+end

data/spec/node/http_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 require 'set'
 
+if defined?(EM::HttpServer)
 describe "http" do
   
   def http_send_messages(to_send,addr=rand_addr('http'),&block)
@@ -73,3 +74,4 @@ describe "http" do
     it_should_behave_like "all http nodes"
   end
 end
+end

data/spec/node_spec.rb

@@ -72,6 +72,7 @@ describe DripDrop::Node do
     class TestException < StandardError; end
      
     it "should rescue exceptions in the EM reactor" do
+      pending "Not sure why em-java doesn't support this" if RUBY_PLATFORM == 'java'
       expectations = an_instance_of(TestException)
       reactor = run_reactor do
         self.class.should_receive(:error_handler).with(expectations)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dripdrop
 version: !ruby/object:Gem::Version 
-  prerelease: 7
-  version: 0.10.0.beta2
+  prerelease: 
+  version: 0.10.0
 platform: ruby
 authors: 
 - Andrew Cholakian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-12 23:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,22 +43,45 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: yajl-ruby
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.1
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: eventmachine_httpserver
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.1
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.4.0
   type: :development
-  version_requirements: *id004
-description: "Evented framework for ZeroMQ and EventMachine Apps. "
-email: andrew@andrewvc.com
+  version_requirements: *id006
+description: Evented framework for ZeroMQ and EventMachine Apps.
+email: 
+- andrew@andrewvc.com
 executables: []
 
 extensions: []
@@ -68,10 +91,11 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- .gitignore
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - dripdrop.gemspec
 - example/agent_test.rb
 - example/combined.rb
@@ -100,6 +124,7 @@ files:
 - lib/dripdrop/message.rb
 - lib/dripdrop/node.rb
 - lib/dripdrop/node/nodelet.rb
+- lib/dripdrop/version.rb
 - spec/gimite-websocket.rb
 - spec/message_spec.rb
 - spec/node/http_spec.rb
@@ -112,7 +137,7 @@ files:
 - spec/node_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/andrewvc/dripdrop
+homepage: https://github.com/andrewvc/dripdrop
 licenses: []
 
 post_install_message: 
@@ -129,25 +154,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.5.3
+rubyforge_project: dripdrop
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Evented framework for ZeroMQ and EventMachine Apps.
-test_files: 
-- spec/gimite-websocket.rb
-- spec/message_spec.rb
-- spec/node/http_spec.rb
-- spec/node/nodelet_spec.rb
-- spec/node/routing_spec.rb
-- spec/node/websocket_spec.rb
-- spec/node/zmq_m2_spec.rb
-- spec/node/zmq_pushpull_spec.rb
-- spec/node/zmq_xrepxreq_spec.rb
-- spec/node_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-0.10.0.beta2