carnivore-http 0.1.0 → 0.1.2

data/CHANGELOG.md

@@ -1,2 +1,7 @@
+# v0.1.2
+* Include query parameters
+* Start basic test coverage
+* Update message confirmation behavior
+
 # v0.1.0
 * Initial release

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,50 @@
+PATH
+  remote: .
+  specs:
+    carnivore-http (0.1.1)
+      blockenspiel
+      carnivore (>= 0.1.8)
+      reel
+
+PATH
+  remote: ../carnivore
+  specs:
+    carnivore (0.1.11)
+      celluloid
+      mixlib-config
+      multi_json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    blockenspiel (0.4.5)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    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)
+      http (>= 0.5.0)
+      http_parser.rb (>= 0.6.0.beta.2)
+      websocket_parser (>= 0.1.4)
+    timers (1.1.0)
+    websocket_parser (0.1.4)
+      http
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  carnivore!
+  carnivore-http!

data/README.md

@@ -31,6 +31,6 @@ end.start!
 ```
 
 # Info
-* Carnivore: https://github.com/heavywater/carnivore
-* Repository: https://github.com/heavywater/carnivore-http
-* IRC: Freenode @ #heavywater
+* Carnivore: https://github.com/carnivore-rb/carnivore
+* Repository: https://github.com/carnivore-rb/carnivore-http
+* IRC: Freenode @ #carnivore

data/carnivore-http.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.summary = 'Message processing helper'
   s.author = 'Chris Roberts'
   s.email = 'chrisroberts.code@gmail.com'
-  s.homepage = 'https://github.com/heavywater/carnivore-http'
+  s.homepage = 'https://github.com/carnivore-rb/carnivore-http'
   s.description = 'Carnivore HTTP source'
   s.require_path = 'lib'
   s.add_dependency 'carnivore', '>= 0.1.8'

data/lib/carnivore-http/http.rb

@@ -1,11 +1,14 @@
 require 'reel'
 require 'carnivore/source'
+require 'carnivore-http/utils'
 
 module Carnivore
   class Source
 
     class Http < Source
 
+      include Carnivore::Http::Utils::Params
+
       attr_reader :args
 
       def setup(args={})
@@ -20,24 +23,59 @@ module Carnivore
         }.merge(args)
       end
 
-      def transmit(message, orignal_message_or_connection, args={})
-        if(original_message_or_connection.is_a?(Message))
-          con = original_message_or_connection[:connection]
+      # Transmit can be one of two things:
+      # 1. Response back to an open connection
+      # 2. Request to a remote source
+      def transmit(message, *extra)
+        options = extra.detect{|x| x.is_a?(Hash)} || {}
+        orig = extra.detect{|x| x.is_a?(Carnivore::Message)}
+        con = options[:connection]
+        if(orig && con.nil?)
+          con = orig[:message][:connection]
+        end
+        if(con) # response
+          payload = message.is_a?(String) ? message : MultiJson.dump(message)
+          # TODO: add `options` options for marshaling: json/xml/etc
+          debug "Transmit response type with payload: #{payload}"
+          con.respond(options[:code] || :ok, payload)
+        else # request
+          url = File.join("http://#{args[:bind]}:#{args[:port]}", options[:path].to_s)
+          method = (options[:method] || :post).to_sym
+          if(options[:headers])
+            base = HTTP.with_headers(options[:headers])
+          else
+            base = HTTP
+          end
+          payload = message.is_a?(String) ? message : MultiJson.dump(message)
+          debug "Transmit request type with payload: #{payload}"
+          base.send(method, url, :body => payload)
+        end
+      end
+
+      def confirm(message, args={})
+        if(args[:response_body] || args[:code])
+          debug "Confirming #{message} with: #{args.inspect}"
+          message[:message][:connection].respond(
+            args[:code] || :ok, args[:response_body] || 'Thanks!'
+          )
         else
-          con = original_message_or_connection[:connection]
+          debug "Confirming #{message}. No arguments provided so no response taken."
         end
-        # TODO: add `args` options for marshaling: json/xml/etc
-        con.respond(args[:code] || :ok, message)
       end
 
       def process(*process_args)
         srv = Reel::Server.supervise(args[:bind], args[:port]) do |con|
           while(req = con.request)
             begin
-              msg = format(:request => req, :body => req.body, :connection => con)
+              msg = format(
+                :request => req,
+                :body => req.body.to_s,
+                :connection => con,
+                :query => parse_query_string(req.query_string)
+              )
               callbacks.each do |name|
                 c_name = callback_name(name)
-                debug "Dispatching message<#{msg[:message].object_id}> to callback<#{name} (#{c_name})>"
+                debug "Dispatching #{msg} to callback<#{name} (#{c_name})>"
                 Celluloid::Actor[c_name].async.call(msg)
               end
               con.respond(:ok, 'So long, and thanks for all the fish!') if args[:auto_respond]

data/lib/carnivore-http/http_endpoints.rb

@@ -60,7 +60,12 @@ module Carnivore
         srv = Reel::Server.supervise(args[:bind], args[:port]) do |con|
           con.each_request do |req|
             begin
-              msg = format(:request => req, :body => req.body, :connection => con)
+              msg = format(
+                :request => req,
+                :body => req.body.to_s,
+                :connection => con,
+                :query => parse_query_string(req.query_string)
+              )
               unless(@points.deliver(msg))
                 con.respond(:ok, 'So long, and thanks for all the fish!')
               end

data/lib/carnivore-http/point_builder.rb

@@ -9,6 +9,7 @@ module Carnivore
     class Endpoint
 
       include Celluloid
+      include Carnivore::Utils::Params
       include Carnivore::Utils::Logging
 
       attr_reader :endpoint, :type
@@ -16,7 +17,7 @@ module Carnivore
       def initialize(type, endpoint, block)
         @endpoint = endpoint
         @type = type
-        define_singleton_method(:run, &block)
+        define_singleton_method(:execute, &block)
       end
 
       def to_s
@@ -66,10 +67,10 @@ module Carnivore
         end
         if(match)
           if(static[type][match][:async])
-            Celluloid::Actor[callback_name(match, type)].async.run(msg)
-            false
+            Celluloid::Actor[callback_name(match, type)].async.execute(msg)
+            true
           else
-            Celluloid::Actor[callback_name(match, type)].run(msg)
+            Celluloid::Actor[callback_name(match, type)].execute(msg)
             true
           end
         end
@@ -83,12 +84,12 @@ module Carnivore
             [point, res.first.is_a?(Array) ? res.first : []]
           end
         end.compact.first
-        unless(match.empty?)
+        if(match && !match.empty?)
           if(regex[type][match.first][:async])
-            Celluloid::Actor[callback_name(match.first, type)].async.run([msg] + match.last)
-            false
+            Celluloid::Actor[callback_name(match.first, type)].async.execute(*([msg] + match.last))
+            true
           else
-            Celluloid::Actor[callback_name(match.first, type)].run([msg] + match.last)
+            Celluloid::Actor[callback_name(match.first, type)].execute(*([msg] + match.last))
             true
           end
         end

data/lib/carnivore-http/utils.rb

@@ -0,0 +1,66 @@
+module Carnivore
+  module Http
+    module Utils
+      module Params
+
+        class << self
+
+          def included(klass)
+            require 'cgi'
+          end
+
+        end
+
+        # string:: HTTP query string
+        # Return Hash of parsed query string
+        def parse_query_string(string)
+          unless(string.to_s.empty?)
+            args = CGI.parse(string)
+            format_query_args(args)
+          else
+            {}
+          end
+        end
+
+        # args:: HTTP query string Hash
+        # Return formatted hash with inferred types
+        def format_query_args(args)
+          new_args = {}
+          args.each do |k, v|
+            k = k.to_sym
+            case v
+            when Hash
+              new_args[k] = format_query_args(v)
+            when Array
+              v = v.map{|obj| format_query_type(obj)}
+              new_args[k] = v.size == 1 ? v.first : v
+            else
+              new_args[k] = format_query_type(v)
+            end
+          end
+          new_args
+        end
+
+        # obj:: object
+        # Attempts to return true type
+        def format_query_type(obj)
+          case obj
+          when 'true'
+            true
+          when 'false'
+            false
+          else
+            if(obj.to_i.to_s == obj)
+              obj.to_i
+            elsif(obj.to_f.to_s == obj)
+              obj.to_f
+            else
+              obj
+            end
+          end
+        end
+
+      end
+    end
+  end
+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.0')
+    VERSION = Version.new('0.1.2')
   end
 end

data/test/spec.rb

@@ -0,0 +1 @@
+require 'carnivore/spec_helper'

data/test/specs/http.rb

@@ -0,0 +1,66 @@
+require 'http'
+require 'minitest/autorun'
+require 'carnivore-http'
+
+describe 'Carnivore::Source::Http' do
+
+  describe 'Building an HTTP based source' do
+
+    it 'returns the source' do
+      Carnivore::Source.build(
+        :type => :http,
+        :args => {
+          :name => :http_source,
+          :bind => '127.0.0.1',
+          :port => '8705'
+        }
+      )
+      t = Thread.new{ Carnivore.start! }
+      source_wait
+      Celluloid::Actor[:http_source].wont_be_nil
+      t.terminate
+    end
+
+  end
+
+  describe 'HTTP source based communication' do
+    before do
+      MessageStore.init
+      Carnivore::Source.build(
+        :type => :http,
+        :args => {
+          :name => :http_source,
+          :bind => '127.0.0.1',
+          :port => '8705'
+        }
+      ).add_callback(:store) do |message|
+        MessageStore.messages.push(message[:message][:body])
+      end
+      @runner = Thread.new{ Carnivore.start! }
+      source_wait
+    end
+
+    after do
+      @runner.terminate
+    end
+
+    describe 'message transmissions' do
+      it 'should accept message transmits' do
+        Celluloid::Actor[:http_source].transmit('test message')
+      end
+
+      it 'should receive messages' do
+        Celluloid::Actor[:http_source].transmit('test message 2')
+        source_wait
+        MessageStore.messages.pop.must_equal 'test message 2'
+      end
+
+      it 'should accept http requests' do
+        HTTP.get('http://127.0.0.1:8705/')
+        source_wait
+        MessageStore.messages.pop.wont_be_nil
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-http
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
@@ -68,12 +68,17 @@ files:
 - lib/carnivore-http/point_builder.rb
 - lib/carnivore-http/version.rb
 - lib/carnivore-http/http.rb
+- lib/carnivore-http/utils.rb
 - lib/carnivore-http/http_endpoints.rb
 - lib/carnivore-http.rb
+- test/spec.rb
+- test/specs/http.rb
+- Gemfile
 - README.md
 - carnivore-http.gemspec
 - CHANGELOG.md
-homepage: https://github.com/heavywater/carnivore-http
+- Gemfile.lock
+homepage: https://github.com/carnivore-rb/carnivore-http
 licenses: []
 post_install_message: 
 rdoc_options: []