dripdrop 0.9.9 → 0.9.10

data/Rakefile

@@ -13,9 +13,7 @@ begin
     gem.add_dependency('ffi-rzmq', '>= 0.7.1')
     gem.add_dependency('eventmachine', '>= 0.12.10')
     gem.add_dependency('em-websocket')
-    gem.add_dependency('eventmachine_httpserver')
     gem.add_dependency('em-zeromq', '>= 0.1.2')
-    gem.add_dependency('yajl-ruby')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.10

data/dripdrop.gemspec

@@ -1,11 +1,11 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dripdrop}
-  s.version = "0.9.9"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Cholakian"]
@@ -14,97 +14,89 @@ Gem::Specification.new do |s|
   s.email = %q{andrew@andrewvc.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "doc_img/topology.png",
-     "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.rb",
-     "lib/dripdrop/handlers/websockets.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_pushpull_spec.rb",
-     "spec/node/zmq_xrepxreq_spec.rb",
-     "spec/node_spec.rb",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "doc_img/topology.png",
+    "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/websockets.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_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.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.1}
   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_pushpull_spec.rb",
+    "spec/node/zmq_xrepxreq_spec.rb",
     "spec/node_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/gimite-websocket.rb",
-     "spec/message_spec.rb",
-     "spec/node/nodelet_spec.rb",
-     "spec/node/zmq_pushpull_spec.rb",
-     "spec/node/zmq_xrepxreq_spec.rb",
-     "spec/node/routing_spec.rb",
-     "spec/node/websocket_spec.rb",
-     "spec/node/http_spec.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ffi-rzmq>, [">= 0.7.1"])
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_runtime_dependency(%q<em-websocket>, [">= 0"])
-      s.add_runtime_dependency(%q<eventmachine_httpserver>, [">= 0"])
       s.add_runtime_dependency(%q<em-zeromq>, [">= 0.1.2"])
-      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
     else
       s.add_dependency(%q<ffi-rzmq>, [">= 0.7.1"])
       s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
       s.add_dependency(%q<em-websocket>, [">= 0"])
-      s.add_dependency(%q<eventmachine_httpserver>, [">= 0"])
       s.add_dependency(%q<em-zeromq>, [">= 0.1.2"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0"])
     end
   else
     s.add_dependency(%q<ffi-rzmq>, [">= 0.7.1"])
     s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
     s.add_dependency(%q<em-websocket>, [">= 0"])
-    s.add_dependency(%q<eventmachine_httpserver>, [">= 0"])
     s.add_dependency(%q<em-zeromq>, [">= 0.1.2"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0"])
   end
 end
 

data/lib/dripdrop/handlers/http_client.rb

@@ -0,0 +1,38 @@
+class DripDrop
+  class HTTPClientHandler < BaseHandler
+    attr_reader :address, :opts
+    
+    def initialize(uri, opts={})
+      @uri     = uri
+      @address = @uri.to_s
+      @opts    = opts
+      @message_class = @opts[:message_class] || DripDrop.default_message_class
+    end
+    
+    def send_message(message,&block)
+      dd_message = dd_messagify(message)
+      if dd_message.is_a?(DripDrop::Message)
+        uri_path = @uri.path.empty? ? '/' : @uri.path
+        
+        req = EM::Protocols::HttpClient.request(
+          :host => @uri.host, :port => @uri.port,
+          :request => uri_path, :verb => 'POST',
+          :contenttype => 'application/json',
+          :content => dd_message.encode_json
+        )
+        req.callback do |response|
+          begin
+            # Hack to fix evma http
+            response[:content] =~ /(\{.*\})/ 
+            fixed_body = $1
+            block.call(@message_class.decode(fixed_body)) if block
+          rescue StandardError => e
+            handle_error(e)
+          end
+        end
+      else
+        raise "Unsupported message type '#{dd_message.class}'"
+      end
+    end
+  end
+end

data/lib/dripdrop/handlers/{http.rb → http_server.rb}

@@ -1,4 +1,3 @@
-require 'eventmachine'
 require 'evma_httpserver'
 
 class DripDrop
@@ -57,42 +56,4 @@ class DripDrop
       self
     end
   end
-
-
-  class HTTPClientHandler < BaseHandler
-    attr_reader :address, :opts
-    
-    def initialize(uri, opts={})
-      @uri     = uri
-      @address = @uri.to_s
-      @opts    = opts
-      @message_class = @opts[:message_class] || DripDrop.default_message_class
-    end
-    
-    def send_message(message,&block)
-      dd_message = dd_messagify(message)
-      if dd_message.is_a?(DripDrop::Message)
-        uri_path = @uri.path.empty? ? '/' : @uri.path
-        
-        req = EM::Protocols::HttpClient.request(
-          :host => @uri.host, :port => @uri.port,
-          :request => uri_path, :verb => 'POST',
-          :contenttype => 'application/json',
-          :content => dd_message.encode_json
-        )
-        req.callback do |response|
-          begin
-            # Hack to fix evma http
-            response[:content] =~ /(\{.*\})/ 
-            fixed_body = $1
-            block.call(@message_class.decode(fixed_body)) if block
-          rescue StandardError => e
-            handle_error(e)
-          end
-        end
-      else
-        raise "Unsupported message type '#{dd_message.class}'"
-      end
-    end
-  end
 end

data/lib/dripdrop/node.rb

@@ -10,7 +10,15 @@ require 'dripdrop/node/nodelet'
 require 'dripdrop/handlers/base'
 require 'dripdrop/handlers/zeromq'
 require 'dripdrop/handlers/websockets'
-require 'dripdrop/handlers/http'
+require 'dripdrop/handlers/http_client'
+
+begin
+  require 'dripdrop/handlers/http_server'
+rescue LoadError => e
+  $stderr.write "Could not load http server, your probably don't have eventmachine_httpserver installed\n"
+  $stderr.write e.message + "\n"
+  $stderr.write e.backtrace.join("\t\n")
+end
 
 class DripDrop
   class Node

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dripdrop
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 9
-    - 9
-  version: 0.9.9
+  prerelease: 
+  version: 0.9.10
 platform: ruby
 authors: 
   - Andrew Cholakian
@@ -25,10 +21,6 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 7
-              - 1
             version: 0.7.1
     type: :runtime
     version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 12
-              - 10
             version: 0.12.10
     type: :runtime
     version_requirements: *id002
@@ -55,52 +43,20 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: eventmachine_httpserver
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
-    type: :runtime
-    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: em-zeromq
     prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
+    requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 1
-              - 2
             version: 0.1.2
     type: :runtime
-    version_requirements: *id005
-  - !ruby/object:Gem::Dependency 
-    name: yajl-ruby
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
-    type: :runtime
-    version_requirements: *id006
+    version_requirements: *id004
 description: "Evented framework for ZeroMQ and EventMachine Apps. "
 email: andrew@andrewvc.com
 executables: []
@@ -112,7 +68,6 @@ extra_rdoc_files:
   - README.md
 files: 
   - .document
-  - .gitignore
   - LICENSE
   - README.md
   - Rakefile
@@ -138,7 +93,8 @@ files:
   - lib/dripdrop.rb
   - lib/dripdrop/agent.rb
   - lib/dripdrop/handlers/base.rb
-  - lib/dripdrop/handlers/http.rb
+  - lib/dripdrop/handlers/http_client.rb
+  - lib/dripdrop/handlers/http_server.rb
   - lib/dripdrop/handlers/websockets.rb
   - lib/dripdrop/handlers/zeromq.rb
   - lib/dripdrop/message.rb
@@ -159,8 +115,8 @@ homepage: http://github.com/andrewvc/dripdrop
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-  - --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -168,32 +124,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Evented framework for ZeroMQ and EventMachine Apps.
 test_files: 
-  - spec/node_spec.rb
-  - spec/spec_helper.rb
   - spec/gimite-websocket.rb
   - spec/message_spec.rb
+  - spec/node/http_spec.rb
   - spec/node/nodelet_spec.rb
-  - spec/node/zmq_pushpull_spec.rb
-  - spec/node/zmq_xrepxreq_spec.rb
   - spec/node/routing_spec.rb
   - spec/node/websocket_spec.rb
-  - spec/node/http_spec.rb
+  - spec/node/zmq_pushpull_spec.rb
+  - spec/node/zmq_xrepxreq_spec.rb
+  - spec/node_spec.rb
+  - spec/spec_helper.rb

data/.gitignore

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