carnivore-http 0.1.2 → 0.1.4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.1.4
+* Include custom `connect` to start source
+* Pull query from body if found
+* Fix worker size argument access
+* Cleanup point matching implementation
+
 # v0.1.2
 * Include query parameters
 * Start basic test coverage

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    carnivore-http (0.1.1)
+    carnivore-http (0.1.3)
       blockenspiel
       carnivore (>= 0.1.8)
       reel
@@ -26,11 +26,9 @@ GEM
     http (0.5.0)
       http_parser.rb
     http_parser.rb (0.6.0.beta.2)
-    http_parser.rb (0.6.0.beta.2-java)
     mixlib-config (2.0.0)
     multi_json (1.8.2)
     nio4r (0.5.0)
-    nio4r (0.5.0-java)
     reel (0.4.0)
       celluloid (>= 0.15.1)
       celluloid-io (>= 0.15.0)

data/lib/carnivore-http/http.rb

@@ -76,7 +76,7 @@ module Carnivore
               callbacks.each do |name|
                 c_name = callback_name(name)
                 debug "Dispatching #{msg} to callback<#{name} (#{c_name})>"
-                Celluloid::Actor[c_name].async.call(msg)
+                callback_supervisor[c_name].async.call(msg)
               end
               con.respond(:ok, 'So long, and thanks for all the fish!') if args[:auto_respond]
             rescue => e

data/lib/carnivore-http/http_endpoints.rb

@@ -56,6 +56,10 @@ module Carnivore
         set_points
       end
 
+      def connect
+        async.process
+      end
+
       def process(*process_args)
         srv = Reel::Server.supervise(args[:bind], args[:port]) do |con|
           con.each_request do |req|
@@ -64,7 +68,7 @@ module Carnivore
                 :request => req,
                 :body => req.body.to_s,
                 :connection => con,
-                :query => parse_query_string(req.query_string)
+                :query => parse_query_string(req.query_string).merge(parse_query_string(req.body.to_s))
               )
               unless(@points.deliver(msg))
                 con.respond(:ok, 'So long, and thanks for all the fish!')

data/lib/carnivore-http/point_builder.rb

@@ -34,7 +34,7 @@ module Carnivore
     include Celluloid::Logger
     include Blockenspiel::DSL
 
-    attr_reader :static, :regex, :only, :except
+    attr_reader :static, :regex, :only, :except, :endpoint_supervisor
 
     def initialize(args)
       @only = args[:only]
@@ -42,7 +42,7 @@ module Carnivore
       @static = {}
       @regex = {}
       @callback_names = {}
-      @endpoint_supervisor = Celluloid::SupervisionGroup.run!
+      @endpoint_supervisor = Carnivore::Supervisor.create!.last
       load_endpoints!
     end
 
@@ -63,14 +63,14 @@ module Carnivore
     def static_points(msg, type, path)
       if(static[type])
         match = static[type].keys.detect do |point|
-          path.sub(%r{/$}, '') == point
+          !path.scan(/^#{Regexp.escape(point)}\/?(\?|$)/).empty?
         end
         if(match)
           if(static[type][match][:async])
-            Celluloid::Actor[callback_name(match, type)].async.execute(msg)
+            endpoint_supervisor[callback_name(match, type)].async.execute(msg)
             true
           else
-            Celluloid::Actor[callback_name(match, type)].execute(msg)
+            endpoint_supervisor[callback_name(match, type)].execute(msg)
             true
           end
         end
@@ -80,16 +80,18 @@ module Carnivore
     def regex_points(msg, type, path)
       if(regex[type])
         match = regex[type].keys.map do |point|
-          unless((res = path.scan(/^#{point}$/)).empty?)
-            [point, res.first.is_a?(Array) ? res.first : []]
+          unless((res = path.scan(/^(#{point})(\?|$)/)).empty?)
+            res = res.first
+            res.pop # remove empty EOS match
+            [point, res]
           end
         end.compact.first
         if(match && !match.empty?)
           if(regex[type][match.first][:async])
-            Celluloid::Actor[callback_name(match.first, type)].async.execute(*([msg] + match.last))
+            endpoint_supervisor[callback_name(match.first, type)].async.execute(*([msg] + match.last))
             true
           else
-            Celluloid::Actor[callback_name(match.first, type)].execute(*([msg] + match.last))
+            endpoint_supervisor[callback_name(match.first, type)].execute(*([msg] + match.last))
             true
           end
         end
@@ -114,12 +116,12 @@ module Carnivore
         static[request_type][regexp_or_string.sub(%r{/$}, '')] = args
       end
       if(args[:workers] && args[:workers].to_i > 1)
-        @endpoint_supervisor.pool(Endpoint,
-          as: callback_name(regexp_or_string, request_type), size: args[:workers.to_i],
+        endpoint_supervisor.pool(Endpoint,
+          as: callback_name(regexp_or_string, request_type), size: args[:workers].to_i,
           args: [request_type, regexp_or_string, block]
         )
       else
-        @endpoint_supervisor.supervise_as(
+        endpoint_supervisor.supervise_as(
           callback_name(regexp_or_string, request_type), Endpoint, request_type, regexp_or_string, block
         )
       end

data/lib/carnivore-http/version.rb

@@ -2,6 +2,6 @@ module Carnivore
   module Http
     class Version < Gem::Version
     end
-    VERSION = Version.new('0.1.2')
+    VERSION = Version.new('0.1.4')
   end
 end

data/test/specs/http.rb

@@ -17,7 +17,7 @@ describe 'Carnivore::Source::Http' do
       )
       t = Thread.new{ Carnivore.start! }
       source_wait
-      Celluloid::Actor[:http_source].wont_be_nil
+      Carnivore::Supervisor.supervisor[:http_source].wont_be_nil
       t.terminate
     end
 
@@ -46,11 +46,11 @@ describe 'Carnivore::Source::Http' do
 
     describe 'message transmissions' do
       it 'should accept message transmits' do
-        Celluloid::Actor[:http_source].transmit('test message')
+        Carnivore::Supervisor.supervisor[:http_source].transmit('test message')
       end
 
       it 'should receive messages' do
-        Celluloid::Actor[:http_source].transmit('test message 2')
+        Carnivore::Supervisor.supervisor[:http_source].transmit('test message 2')
         source_wait
         MessageStore.messages.pop.must_equal 'test message 2'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-http
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore