vayacondios-server 0.0.11 → 0.1.1

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/Gemfile

@@ -2,3 +2,10 @@ source 'http://rubygems.org'
 
 gemspec name: 'vayacondios-server'
 gemspec name: 'vayacondios-client'
+
+group :hadoop_monitor do
+  gem 'mongo'
+  gem 'bson_ext'
+  gem 'gorillib', require: 'gorillib/hash/slice'
+  gem 'json'
+end

data/Procfile

@@ -1,2 +1,2 @@
-listener:   ./app/http_shim.rb -sv -p 8000 -c $PWD/config/http_shim.rb
+listener:   bundle exec ./app/http_shim.rb -sv -p 8000 -c $PWD/config/http_shim.rb
 mongod:     mongod

data/app/http_shim.rb

@@ -1,98 +1,53 @@
 #!/usr/bin/env ruby
 
 require 'vayacondios-server'
-require 'multi_json'
 
 class HttpShim < Goliath::API
-  use Goliath::Rack::Tracer, 'X-Tracer' # log trace statistics
-  use Goliath::Rack::DefaultMimeType    # cleanup accepted media types
-  use Goliath::Rack::Formatters::JSON   # JSON output formatter
-  use Goliath::Rack::Render             # auto-negotiate response format
-  use Goliath::Rack::Heartbeat          # respond to /status with 200, OK (monitoring, etc)
+  use Goliath::Rack::Tracer, 'X-Tracer'                                  # log trace statistics
+  # /v1/infochimps/itemset/foo/1 -d '["foo","bar","baz"]'
+  # use Vayacondios::Rack::Versionator
+  # /v1/infochimps/itemset/foo/1 -d '{"items":["foo","bar","baz"]}' ... env[:vayacondios_version] = 1
+  # post_process()
+  # extract results = results[:results] from body for legacy
+  use Goliath::Rack::Params                                              # parse query string and message body into params hash
+  use Goliath::Rack::Validation::RequestMethod, %w[GET PUT PATCH DELETE] # only allow these methods
+  use Vayacondios::Rack::ExtractMethods                                  # interpolate GET, PUT into :create, :update, etc
+  use Vayacondios::Rack::Path                                            # parse path into parameterized pieces
+  use Vayacondios::Rack::PathValidation                                  # validate the existence of env[:vayacondios_path]
+  use Goliath::Rack::Formatters::JSON                                    # JSON output formatter
+  use Goliath::Rack::Render                                              # auto-negotiate response format
+  use Goliath::Rack::Heartbeat                                           # respond to /status with 200, OK (monitoring, etc)
 
   def response(env)
-    # Validate path_params
-    path_params = parse_path(env[Goliath::Request::REQUEST_PATH])
-    return [400, {}, MultiJson.dump({error: "Bad Request"})] if !path_params.present? || method_name(env).nil?
-
-    # TODO refactor a middlware
-    # Decode the document body
-    body = nil
-    begin
-      if env['rack.input']
-        body = env['rack.input'].read
-        body = MultiJson.decode(body) if !body.blank?
-        env['rack.input'].rewind
-      end
-    rescue MultiJson::DecodeError => ex
-      return [400, {}, MultiJson.dump({error: "Bad Request"})]
-    end
-    # Look up handler using inflection
+    path_params = env[:vayacondios_path]
     klass = ('vayacondios/' + path_params[:type] + '_handler').camelize.constantize
 
     begin
-      case method_name(env)
-
+      case env[:vayacondios_method]
+        
       when :show
         record = klass.find(mongo, path_params)
         [200, {}, MultiJson.dump(record.body)]
 
       when :update
-        record = klass.new(mongo).update(body, path_params)
+        record = klass.new(mongo).update(env['params'], path_params)
         [200, {}, nil]
         
       when :patch
-        record = klass.new(mongo).patch(body, path_params)
+        record = klass.new(mongo).patch(env['params'], path_params)
         [200, {}, nil]
 
       when :delete
-        record = klass.find(mongo, path_params).destroy(body)
+        record = klass.find(mongo, path_params).destroy(env['params'])
         [200, {}, MultiJson.dump(record.body)]
-      
-      when :create
-        return [405, ({'Allow' => "GET PUT PATCH DELETE"}), nil]
       end
     rescue Vayacondios::Error::NotFound => ex
-      return [404, {}, MultiJson.dump({error: "Not Found"})]
+      return [404, {}, MultiJson.dump({ error: "Not Found" })]
     rescue Vayacondios::Error::BadRequest => ex
-      return [400, {}, MultiJson.dump({error: "Bad Request"})]
+      return [400, {}, MultiJson.dump({ error: "Bad Request" })]
     rescue StandardError => ex
       puts ex
-      ex.backtrace.each{|l| puts l}
-    end
-  end
-
-  private
-
-  # Determine the organization, type of action (config or event), the topic,
-  # id, and format for the request.
-  def parse_path path
-    path_regex = /^\/v1\/(?<organization>[a-z]\w+)\/(?<type>config|event|itemset)(\/(?<topic>\w+)(\/(?<id>(\w+\/?)+))?)?(\/|\.(?<format>json))?$/i
-    if (match = path_regex.match(path))
-      {}.tap do |segments|
-        match.names.each do |segment|
-          segments[segment.to_sym] = match[segment]
-        end
-      end
-    end
-  end
-
-  def method_name env
-    case env['REQUEST_METHOD'].upcase
-    when "GET"
-      :show
-    when "PUT"
-      if env['HTTP_X_METHOD'] && env['HTTP_X_METHOD'].upcase == 'PATCH'
-        :patch
-      else
-        :update
-      end
-    when "POST"
-      :create
-    when "PATCH"
-      :patch
-    when "DELETE"
-      :delete
+      ex.backtrace.each{ |l| puts l }
     end
   end
 end

data/lib/vayacondios/client/http_client.rb

@@ -1,10 +1,10 @@
 class Vayacondios
   class HttpClient
-    include Gorillib::Builder
+    include Gorillib::Model
 
-    field :host,         String,  :default => 'localhost'
-    field :port,         Integer, :default => 8000
-    field :organization, String,  :default => 'infochimps'
+    field :host,         String, :default => 'localhost'
+    field :port,         String, :default => '8000'
+    field :organization, String, :default => 'infochimps'
     
     class Error < StandardError; end
 

data/lib/vayacondios/client/notifier.rb

@@ -20,6 +20,11 @@ class Vayacondios
     end
   end
 
+  class NullNotifier < Notifier
+    def notify topic, cargo={}
+    end
+  end
+
   class LogNotifier < Notifier
 
     def initialize(options = {})
@@ -53,27 +58,36 @@ class Vayacondios
     def self.receive(attrs = {})
       type = attrs.delete(:type)
       case type
-      when 'http' then HttpNotifier.new(attrs)
-      when 'log'  then LogNotifier.new(attrs)
+      when 'http'        then HttpNotifier.new(attrs)
+      when 'log'         then LogNotifier.new(attrs)
+      when 'none','null' then NullNotifier.new(attrs)
       else
         raise ArgumentError, "<#{type}> is not a valid build option"
       end
     end
   end
 
-  def self.default_notifier() NotifierFactory.receive(type: 'http') ; end
+  def self.default_notifier(log = nil) NotifierFactory.receive(type: 'log', log: log) ; end
 
   module Notifications
-    extend Gorillib::Concern
-    include Gorillib::Configurable
 
     def notify(topic, cargo = {})
       notifier.notify(topic, cargo)
     end
 
-    included do
-      class_eval do
-        config(:notifier, Vayacondios::NotifierFactory, default: Vayacondios.default_notifier)
+    def self.included klass
+      if klass.ancestors.include? Gorillib::Model
+        klass.class_eval do
+          field :notifier, Vayacondios::NotifierFactory, default: Vayacondios.default_notifier
+          
+          def receive_notifier params
+            params.merge!(log: try(:log)) if params[:type] == 'log'
+            @notifier = Vayacondios::NotifierFactory.receive(params)
+          end
+        end
+      else
+        klass.class_attribute :notifier
+        klass.notifier = Vayacondios.default_notifier try(:log)
       end
     end
 

data/lib/vayacondios/server/handlers/config_handler.rb

@@ -12,8 +12,8 @@ class Vayacondios
     end
 
     def update(document, options={})
-      raise Error::BadRequest.new unless options[:topic] && options[:id]
-      raise Error::BadRequest.new if /\W/ =~ options[:id]
+      raise Vayacondios::Error::BadRequest.new unless options[:topic] && options[:id]
+      raise Vayacondios::Error::BadRequest.new if /\W/ =~ options[:id]
       
       existing_document = ConfigDocument.find(@mongo, options)
       if existing_document
@@ -25,8 +25,8 @@ class Vayacondios
 
     def self.find(mongodb, options)
       existing_document = ConfigDocument.find(mongodb, options)
-      raise Error::NotFound.new unless existing_document
+      raise Vayacondios::Error::NotFound.new unless existing_document
       existing_document
     end
   end
-end
+end

data/lib/vayacondios/server/model/config_document.rb

@@ -48,7 +48,7 @@ class Vayacondios::ConfigDocument < Vayacondios::Document
   end
 
   def update(document)
-    raise Error::BadRequest.new if !document.is_a?(Hash)
+    raise Vayacondios::Error::BadRequest.new if !document.is_a?(Hash)
 
     # Merge ourselves
     document = body.deep_merge(document) if body

data/lib/vayacondios/server/model/itemset_document.rb

@@ -39,20 +39,17 @@ class Vayacondios::ItemsetDocument < Vayacondios::Document
     if result
       result.delete("_id")
       @body = result["d"]
-      self
+      self 
     else
       nil
     end
   end
 
   def update(document)
-    if !document.is_a?(Array)
-      puts "not an array: #{document}"
-    end
+    raise Vayacondios::Error::BadRequest.new unless document.is_a?(Hash)
 
-    raise Vayacondios::Error::BadRequest.new if !document.is_a?(Array)
+    @body = document['contents'] # should be items
 
-    @body = document
 
     @collection.update({:_id => @id}, {:_id => @id, 'd' => @body }, {upsert: true})
     
@@ -60,19 +57,19 @@ class Vayacondios::ItemsetDocument < Vayacondios::Document
   end
 
   def patch(document)
-    raise Vayacondios::Error::BadRequest.new if !document.is_a?(Array)
+    raise Vayacondios::Error::BadRequest.new unless document.is_a?(Hash)
 
     # Merge ourselves
     if @body
-      @body = body + document
+      @body = body + document['contents']
     else
-      @body = document
+      @body = document['contents']
     end
 
     @collection.update({:_id => @id}, {
       '$addToSet' => {
         'd' => {
-          '$each'=> document
+          '$each'=> document['contents']
         }
       }
     }, {upsert: true})
@@ -81,13 +78,13 @@ class Vayacondios::ItemsetDocument < Vayacondios::Document
   end
 
   def destroy(document)
-    raise Vayacondios::Error::BadRequest.new if !document.is_a?(Array)
+    raise Vayacondios::Error::BadRequest.new unless document.is_a?(Hash)
 
-    @body -= document
+    @body -= document['contents']
     
     @collection.update({:_id => @id}, {
       '$pullAll' => {
-        'd' => document
+        'd' => document['contents']
       }
     })
     

data/lib/vayacondios/server/rack/extract_methods.rb

@@ -0,0 +1,25 @@
+class Vayacondios
+  module Rack
+    class ExtractMethods
+      include Goliath::Rack::AsyncMiddleware
+      
+      def call(env)
+        method_name = extract_method(env)
+        super env.merge(vayacondios_method: method_name)
+      end
+      
+      def extract_method env        
+        return unless env['REQUEST_METHOD']
+        case env['REQUEST_METHOD'].upcase
+        when 'PUT'    then
+          (env['HTTP_X_METHOD'] && env['HTTP_X_METHOD'].upcase == 'PATCH') ? :patch : :update
+        when 'GET'    then :show
+        when 'POST'   then :create
+        when 'PATCH'  then :patch
+        when 'DELETE' then :delete
+        else nil
+        end
+      end
+    end
+  end
+end

data/lib/vayacondios/server/rack/path.rb

@@ -0,0 +1,23 @@
+class Vayacondios
+  module Rack
+    class Path
+      include Goliath::Rack::AsyncMiddleware
+      
+      def call(env)
+        path_params = parse_path(env[Goliath::Request::REQUEST_PATH])
+        super env.merge(vayacondios_path: path_params)
+      end
+      
+      def parse_path(path)
+        path_regex = /^\/v1\/(?<organization>[a-z]\w+)\/(?<type>config|event|itemset)(\/(?<topic>\w+)(\/(?<id>(\w+\/?)+))?)?(\/|\.(?<format>json))?$/i
+        if (match = path_regex.match(path))
+          {}.tap do |segments|
+            match.names.each do |segment|
+              segments[segment.to_sym] = match[segment]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vayacondios/server/rack/path_validation.rb

@@ -0,0 +1,22 @@
+class Vayacondios
+  module Rack   
+    class PathValidation
+      include Goliath::Rack::AsyncMiddleware
+      
+      def initialize(app, opts = {})
+        @app = app ; @opts = opts
+      end
+      
+      def call(env)
+        return [400, {}, MultiJson.dump({ error: "Bad Request. Format path is <host>/v1/<org>/event/<topic>" })] unless valid_paths? env[:vayacondios_path]
+        @app.call(env)
+      end
+      
+      def valid_paths?(path)
+        # use @opts for validation later
+        path.nil? ? false : true
+      end
+      
+    end
+  end
+end

data/lib/vayacondios/version.rb

@@ -1,3 +1,3 @@
 class Vayacondios
-  VERSION = '0.0.11'
+  VERSION = '0.1.1'
 end

data/lib/vayacondios-server.rb

@@ -20,4 +20,8 @@ require 'vayacondios/server/model/itemset_document'
 
 require 'vayacondios/server/handlers/config_handler'
 require 'vayacondios/server/handlers/event_handler'
-require 'vayacondios/server/handlers/itemset_handler'
+require 'vayacondios/server/handlers/itemset_handler'
+
+require 'vayacondios/server/rack/extract_methods'
+require 'vayacondios/server/rack/path'
+require 'vayacondios/server/rack/path_validation'

data/scripts/hadoop_monitor/configurable.rb

@@ -26,10 +26,12 @@ module Vayacondios
 
     def init_settings
       return if defined? @settings
-      
+
       @settings = Configliere::Param.new
       @settings.use :env_var, :config_file, :commandline
-      
+
+      @settings.define(:config_file,
+                       description: "Config file location")
       @settings.define(:sleep_seconds,
                        default: 5,
                        description: "Time to sleep in main loops")
@@ -60,9 +62,14 @@ module Vayacondios
       @settings.define(:machine_stats_size,
                        default: 100 * (1 << 20),
                        description: ("Size (in bytes) of machine stats collection"))
-      
+
       @settings.resolve!
 
+      if @settings.config_file
+        @settings.read(@settings.config_file)
+        @settings.resolve!
+      end
+
       @logger = Logger.new(STDERR)
       @logger.level = Logger.const_get(@settings.log_level.upcase.to_sym)
 

data/spec/server/config_spec.rb

@@ -14,7 +14,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/config/',
-          :body => MultiJson.dump({:level=>"awesome"})
+          :body => MultiJson.dump({:level=>"awesome"}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 400
         end
@@ -25,7 +26,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/config/power',
-          :body => MultiJson.dump({:level=>"awesome"})
+          :body => MultiJson.dump({:level=>"awesome"}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 400
         end
@@ -36,7 +38,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/config/power/level',
-          :body => MultiJson.dump({:level=>"awesome"})
+          :body => MultiJson.dump({:level=>"awesome"}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200
         end
@@ -51,7 +54,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/config/power/level/is/invalid',
-          :body => MultiJson.dump({:level=>"awesome"})
+          :body => MultiJson.dump({:level=>"awesome"}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 400
         end
@@ -66,7 +70,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/config/power/level',
-          :body => MultiJson.dump({:level=>"awesome"})
+          :body => MultiJson.dump({:level=>"awesome"}),
+          :head => { :content_type => 'application/json' }
         }, err)
       end
       with_api(HttpShim) do |api|
@@ -81,13 +86,15 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/config/merge/test',
-          :body => MultiJson.dump({ :foo => { :bar => 3 } })
+          :body => MultiJson.dump({ :foo => { :bar => 3 } }),
+          :head => { :content_type => 'application/json' }
         }, err)
       end
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/config/merge/test',
-          :body => MultiJson.dump({ :foo => { :baz => 7 } })
+          :body => MultiJson.dump({ :foo => { :baz => 7 } }),
+          :head => { :content_type => 'application/json' }
         }, err)
       end
       with_api(HttpShim) do |api|
@@ -103,4 +110,4 @@ describe HttpShim do
       end
     end
   end
-end
+end

data/spec/server/event_spec.rb

@@ -8,13 +8,14 @@ describe HttpShim do
   include Goliath::TestHelper
 
   let(:err) { Proc.new{ |c| fail "HTTP Request Failed #{c.response}" } }
-
+  
   context 'Event tracking' do
     it 'requires a topic' do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/event/',
-          :body => MultiJson.dump({:level=>"awesome"})
+          :body => MultiJson.dump({:level=>"awesome"}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 400
         end
@@ -25,7 +26,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/event/power',
-          :body => MultiJson.dump({:level=>"awesome"})
+          :body => MultiJson.dump({:level=>"awesome"}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200
         end
@@ -36,7 +38,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/event/power/level',
-          :body => MultiJson.dump({:level=>"awesome"})
+          :body => MultiJson.dump({:level=>"awesome"}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200
         end
@@ -47,7 +50,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/event/power/level/is/invalid',
-          :body => MultiJson.dump({:level=>"awesome"})
+          :body => MultiJson.dump({:level=>"awesome"}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 400
         end
@@ -62,7 +66,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/event/power/level',
-          :body => MultiJson.dump({:level=>"awesome"})
+          :body => MultiJson.dump({:level=>"awesome"}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200
         end
@@ -81,7 +86,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/event/power/level',
-          :body => MultiJson.dump({:level=>"awesome", :_timestamp => current_time})
+          :body => MultiJson.dump({:level=>"awesome", :_timestamp => current_time}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200
         end
@@ -94,4 +100,4 @@ describe HttpShim do
       end
     end
   end
-end
+end

data/spec/server/itemset_spec.rb

@@ -14,7 +14,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/',
-          :body => MultiJson.dump(["foo"])
+          :body => MultiJson.dump({:contents =>["foo"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 400
         end
@@ -25,7 +26,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power',
-          :body => MultiJson.dump(["foo"])
+          :body => MultiJson.dump({:contents =>["foo"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 400
         end
@@ -40,7 +42,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level/is/invalid',
-          :body => MultiJson.dump(["foo"])
+          :body => MultiJson.dump({:contents =>["foo"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 400
         end
@@ -53,13 +56,14 @@ describe HttpShim do
   end
     
   context 'handles PUT requests' do
-    it 'only accepts arrays' do
+    it 'only accepts hashes' do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => {"foo" => "bar"}
+          :body => MultiJson.dump(['foo', 'bar']),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
-          c.response_header.status.should == 400
+          c.response_header.status.should == 500
         end
         
         get_mongo_db do |db|
@@ -69,7 +73,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => "foo"
+          :body => "foo",
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 400
         end
@@ -84,7 +89,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => MultiJson.dump(["foo", "bar"]).to_s
+          :body => MultiJson.dump({:contents =>["foo", "bar"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200 # TODO Make this 201 Created
           c.response.should eql ""
@@ -100,7 +106,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => MultiJson.dump(["chimpanzee", "bonobo"])
+          :body => MultiJson.dump({:contents =>["chimpanzee", "bonobo"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200 # TODO Make this 204 No content
           c.response.should eql ""
@@ -115,7 +122,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => MultiJson.dump(["foo", "bar"])
+          :body => MultiJson.dump({:contents =>["foo", "bar"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200
           c.response.should eql ""
@@ -142,7 +150,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => MultiJson.dump(["foo", "bar"])
+          :body => MultiJson.dump({:contents =>["foo", "bar"]}),
+          :head => { :content_type => 'application/json' }
         }, err)
       end
       with_api(HttpShim) do |api|
@@ -159,7 +168,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         post_request({
           :path => '/v1/infochimps/itemset/post/unsupported',
-          :body => MultiJson.dump({ :totally => :ignored })
+          :body => MultiJson.dump({ :totally => :ignored }),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should eql 405
           c.response_header["ALLOW"].should_not be_nil
@@ -173,8 +183,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :head => ({'X-Method' => 'PATCH'}),
-          :body => MultiJson.dump(["bar"])
+          :head => ({'X-Method' => 'PATCH', :content_type => 'application/json' }),
+          :body => MultiJson.dump({:contents =>["bar"]})
         }, err) do |c|
           c.response_header.status.should eql 200 # TODO Make this 201 Created
           c.response.should eql ""
@@ -191,14 +201,15 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/merge/test',
-          :body => MultiJson.dump(["foo"])
+          :body => MultiJson.dump({:contents =>["foo"]}),
+          :head => { :content_type => 'application/json' }
         }, err)
       end
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/merge/test',
-          :head => ({'X-Method' => 'PATCH'}),
-          :body => MultiJson.dump(["bar"])
+          :head => ({'X-Method' => 'PATCH', :content_type => 'application/json' }),
+          :body => MultiJson.dump({:contents =>["bar"]})
         }, err)
       end
       with_api(HttpShim) do |api|
@@ -215,18 +226,20 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         delete_request({
           :path => '/v1/infochimps/itemset/merge/test',
-          :body => MultiJson.dump(["bar"])
+          :body => MultiJson.dump({:contents =>["bar"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 404
         end
       end
     end
       
-    it "will be ok to delete items that are don't exist" do
+    it "will be ok to delete items that don't exist" do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => MultiJson.dump(["foo"])
+          :body => MultiJson.dump({:contents =>["foo"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200 # TODO Make this 201 Created
         end
@@ -234,18 +247,20 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         delete_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => MultiJson.dump(["bar"])
+          :body => MultiJson.dump({:contents =>["bar"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200 # TODO Make this 204 No content
         end
       end
     end
     
-    it "will be delete items that exist" do
+    it "will delete items that do exist" do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => MultiJson.dump(["foo", "bar"])
+          :body => MultiJson.dump({:contents =>["foo", "bar"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200 # TODO Makes this 201 Created
         end
@@ -253,7 +268,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         delete_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => MultiJson.dump(["bar"])
+          :body => MultiJson.dump({:contents =>["bar"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200 # TODO Make this 204 No content
         end
@@ -265,12 +281,13 @@ describe HttpShim do
         end
       end
     end
-    # 
+    
     it "leaves behind an empty array if everything is deleted" do
       with_api(HttpShim) do |api|
         put_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => MultiJson.dump(["foo", "bar"])
+          :body => MultiJson.dump({:contents =>["foo", "bar"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200 # TODO Makes this 201 Created
         end
@@ -278,7 +295,8 @@ describe HttpShim do
       with_api(HttpShim) do |api|
         delete_request({
           :path => '/v1/infochimps/itemset/power/level',
-          :body => MultiJson.dump(["foo", "bar"])
+          :body => MultiJson.dump({:contents =>["foo", "bar"]}),
+          :head => { :content_type => 'application/json' }
         }, err) do |c|
           c.response_header.status.should == 200 # TODO Make this 204 No content
         end

data/spec/server/rack/extract_methods_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+require 'vayacondios/server/rack/extract_methods'
+
+describe Vayacondios::Rack::ExtractMethods do
+  let(:env){ { 'CONTENT_TYPE' => 'application/x-www-form-urlencoded; charset=utf-8' } }               
+  let(:app){ mock('app').as_null_object }
+  subject  { described_class.new(app)   }     
+    
+  it 'adds a key in env for :vayacondios_method' do
+    app.should_receive(:call).with do |app_env|
+      app_env.keys.should include(:vayacondios_method)
+    end
+    subject.call(env)
+  end
+  
+  context 'PUT' do    
+    context 'without http_x_method' do
+      it 'correctly extracts :update' do
+        env.merge!('REQUEST_METHOD' => 'PUT')
+        subject.extract_method(env).should == :update      
+      end
+    end
+    
+    context 'with http_x_method' do
+      it 'correctly extracts :patch' do
+        env.merge!('REQUEST_METHOD' => 'PUT', 'HTTP_X_METHOD' => 'PATCH')
+        subject.extract_method(env).should == :patch
+      end      
+    end
+  end
+
+  context 'GET' do
+    it 'correctly extracts :show' do
+      env.merge!('REQUEST_METHOD' => 'GET')
+      subject.extract_method(env).should == :show
+    end    
+  end
+
+  context 'POST' do
+    it 'correctly extracts :create' do
+      env.merge!('REQUEST_METHOD' => 'POST')
+      subject.extract_method(env).should == :create
+    end
+
+  end
+
+  context 'PATCH' do
+    it 'correctly extracts :patch' do
+      env.merge!('REQUEST_METHOD' => 'PATCH')
+      subject.extract_method(env).should == :patch
+    end
+  end
+
+  context 'DELETE' do
+    it 'correctly extracts :delete' do
+      env.merge!('REQUEST_METHOD' => 'DELETE')
+      subject.extract_method(env).should == :delete
+    end
+  end  
+end

data/spec/server/rack/path_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require 'vayacondios/server/rack/path'
+
+describe Vayacondios::Rack::Path do
+  let(:env) { { 'CONTENT_TYPE' => 'application/x-www-form-urlencoded; charset=utf-8' } }
+  let(:app) { mock('app').as_null_object }
+  subject   { described_class.new(app)   }     
+
+  it 'adds a key in env for :vayacondios_path' do
+    app.should_receive(:call).with do |app_env|
+      app_env.keys.should include(:vayacondios_path)
+    end
+    subject.call(env)
+  end
+  
+  context 'parse_path' do
+    it 'returns nil if the path is unparseable' do
+      subject.parse_path('/what/the:f/happened&here?').should be nil
+    end
+    it 'parses organizations and types correctly' do
+      subject.parse_path('/v1/infochimps/event').should include(organization: 'infochimps', type: 'event')
+    end
+
+    it 'parses topics correctly' do
+      subject.parse_path('/v1/infochimps/config/foo').should include(topic: 'foo')
+    end
+
+    it 'parses ids correctly' do
+      subject.parse_path('/v1/infochimps/itemset/bar/1').should include(id: '1')
+    end
+
+    it 'parses formats correctly' do
+      subject.parse_path('/v1/infochimps/event/baz/1.json').should include(format: 'json')
+    end
+  end
+end

data/spec/server/rack/path_validation_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'vayacondios/server/rack/path_validation'
+
+describe Vayacondios::Rack::PathValidation do
+  let(:env){ { 'CONTENT_TYPE' => 'application/x-www-form-urlencoded; charset=utf-8' } }               
+  let(:app){ mock('app').as_null_object }
+  subject  { described_class.new(app)   }     
+
+  it 'sets @opts when created' do
+    subject.instance_variable_get('@opts').should == {}
+  end
+
+  it 'returns a bad request when :vayacondios_path does not exist' do
+    subject.call(env).should == [400, {}, '{"error":"Bad Request. Format path is <host>/v1/<org>/event/<topic>"}']
+  end
+  
+  context 'valid_paths?' do
+    it 'validates the :vayacondios_path' do
+      subject.valid_paths?({}).should be_true
+    end
+  end
+end

data/spec/server/server_spec.rb

@@ -13,8 +13,8 @@ describe HttpShim do
     with_api(HttpShim) do |api|
       get_request({}, err) do |c|
         c.response_header.status.should == 400
-        MultiJson.load(c.response).should eql({"error" => "Bad Request"})
+        MultiJson.load(c.response).should eql({"error" => "Bad Request. Format path is <host>/v1/<org>/event/<topic>"})
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,4 @@
-require 'bundler'
-
-Bundler.setup
-Bundler.require
+require 'bundler/setup' ; Bundler.require
 
 Dir["spec/support/**/*.rb"].each {|f| require File.join(File.dirname(__FILE__), '..', f) }
 

data/vayacondios-client.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('configliere', '>= 0.4.16')
   gem.add_dependency('multi_json',  '~> 1.1')
-  # Gorillib versioning is borked
   gem.add_dependency('gorillib',    '~> 0.4.2')
 
   gem.add_development_dependency('rake')

data/vayacondios-server.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency('goliath',         '~> 1.0')
   gem.add_dependency('em-http-request', '~> 1.0')
   gem.add_dependency('em-mongo',        '~> 0.4.3')
-  gem.add_dependency('bson_ext',        '~> 1.6')
   gem.add_dependency('foreman')
 
   gem.add_development_dependency('rake')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vayacondios-server
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &70112437436680 !ruby/object:Gem::Requirement
+  requirement: &2170198080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.4.13
   type: :runtime
   prerelease: false
-  version_requirements: *70112437436680
+  version_requirements: *2170198080
 - !ruby/object:Gem::Dependency
   name: gorillib
-  requirement: &70112437436160 !ruby/object:Gem::Requirement
+  requirement: &2170196740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70112437436160
+  version_requirements: *2170196740
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70112437435700 !ruby/object:Gem::Requirement
+  requirement: &2170190120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70112437435700
+  version_requirements: *2170190120
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &70112437435240 !ruby/object:Gem::Requirement
+  requirement: &2170188640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112437435240
+  version_requirements: *2170188640
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70112437434760 !ruby/object:Gem::Requirement
+  requirement: &2170187920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112437434760
+  version_requirements: *2170187920
 - !ruby/object:Gem::Dependency
   name: em-mongo
-  requirement: &70112437450660 !ruby/object:Gem::Requirement
+  requirement: &2170187240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,21 +79,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70112437450660
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: &70112437450200 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70112437450200
+  version_requirements: *2170187240
 - !ruby/object:Gem::Dependency
   name: foreman
-  requirement: &70112437449820 !ruby/object:Gem::Requirement
+  requirement: &2170186560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +90,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112437449820
+  version_requirements: *2170186560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70112437449360 !ruby/object:Gem::Requirement
+  requirement: &2170185580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112437449360
+  version_requirements: *2170185580
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70112437448940 !ruby/object:Gem::Requirement
+  requirement: &2170184720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,7 +112,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112437448940
+  version_requirements: *2170184720
 description: Simple enough to use in a shell script, performant enough to use everywhere.
   Dios mío! Record that metric, ese!
 email: 
@@ -132,6 +121,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
@@ -164,6 +154,9 @@ files:
 - lib/vayacondios/server/model/document.rb
 - lib/vayacondios/server/model/event_document.rb
 - lib/vayacondios/server/model/itemset_document.rb
+- lib/vayacondios/server/rack/extract_methods.rb
+- lib/vayacondios/server/rack/path.rb
+- lib/vayacondios/server/rack/path_validation.rb
 - lib/vayacondios/version.rb
 - scripts/hadoop_monitor/configurable.rb
 - scripts/hadoop_monitor/hadoop_client.rb
@@ -178,6 +171,9 @@ files:
 - spec/server/config_spec.rb
 - spec/server/event_spec.rb
 - spec/server/itemset_spec.rb
+- spec/server/rack/extract_methods_spec.rb
+- spec/server/rack/path_spec.rb
+- spec/server/rack/path_validation_spec.rb
 - spec/server/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/mongo_cleaner.rb
@@ -197,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1278306223902219188
+      hash: -3537834639285918956
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,10 +202,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1278306223902219188
+      hash: -3537834639285918956
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Data goes in. The right thing happens
@@ -219,6 +215,9 @@ test_files:
 - spec/server/config_spec.rb
 - spec/server/event_spec.rb
 - spec/server/itemset_spec.rb
+- spec/server/rack/extract_methods_spec.rb
+- spec/server/rack/path_spec.rb
+- spec/server/rack/path_validation_spec.rb
 - spec/server/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/mongo_cleaner.rb