vayacondios-server 0.0.7 → 0.0.8

data/README.md

@@ -1,3 +1,5 @@
+# WARNING! THIS DOCUMENT IS OUTDATED AND MAY NOT REFLECT ACTUAL CODE! GO READ THE SPECS FOR BEHAVIORS!
+
 # Vaya con Dios
 
 > "Data goes in. The right thing happens."

data/app/http_shim.rb

@@ -12,34 +12,31 @@ class HttpShim < Goliath::API
   use Goliath::Rack::Render, 'json'     # auto-negotiate response format
 
   def response(env)
+    # Validate path_params
     path_params = parse_path(env[Goliath::Request::REQUEST_PATH])
+    return [400, {}, {error: "Bad Request"}] if !path_params.present?
+      
+    # Look up handler using inflection
+    klass = ('vayacondios/' + path_params[:type] + '_handler').camelize.constantize
 
-    if path_params.present?
-      klass = ('vayacondios/' + path_params[:type] + '_handler').camelize.constantize
-
-      if method_name == :get && !path_params[:topic].present?
-        return [400, {}, {error: "Bad Request"}]
-      end
-      begin
+    begin
       if method_name == :update
         record = klass.new(mongo).update(env.params, path_params)
       elsif method_name == :get
         record = klass.find(mongo, path_params)
       end
+    rescue Vayacondios::Error::BadRequest => ex
+      return [400, {}, {error: "Bad Request"}]
+    rescue Exception => ex
+      puts ex
+      ex.backtrace.each{|l| puts l}
+    end
 
-      rescue Exception => ex
-        puts ex
-        ex.backtrace.each{|l| puts l}
-      end
-
-      if record.present?
-        [200, {}, record]
-      else
-        [404, {}, {error: "Not Found"}]
-      end
-    else
-      [400, {}, {error: "Bad Request"}]
+    if !record.present?
+      [404, {}, {error: "Not Found"}]
     end
+      
+    [200, {}, record]
   end
 
   private

data/lib/vayacondios/server/errors/bad_request.rb

@@ -0,0 +1,6 @@
+class Vayacondios
+  module Error
+    class BadRequest < Exception
+    end
+  end
+end

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

@@ -12,6 +12,9 @@ class Vayacondios
     end
 
     def update(document, options={})
+      raise Error::BadRequest.new unless options[:topic] && options[:id]
+      raise Error::BadRequest.new if /\W/ =~ options[:id]
+      
       existing_document = ConfigDocument.find(@mongo, options)
       if existing_document
         existing_document.update(document)
@@ -21,6 +24,7 @@ class Vayacondios
 
       {
         topic: existing_document.topic,
+        id: existing_document.id,
         cargo: existing_document.body,
         status: :success
       }

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

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

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

@@ -10,12 +10,13 @@ require 'vayacondios/server/model/document'
 # work while Goliath is in a streaming context.
 
 class Vayacondios::ConfigDocument < Vayacondios::Document
-  attr_reader :organization, :topic, :body
+  attr_reader :organization, :topic, :body, :id
 
   def initialize(mongodb, options = {})
     super options
     @mongo = mongodb
     options = sanitize_options(options)
+    @id = options[:id]
 
     @body         = nil
     @field        = options[:field] ||= options[:id]
@@ -34,10 +35,8 @@ class Vayacondios::ConfigDocument < Vayacondios::Document
   end
 
   def find
-    fields = {}
-    fields[@field] = 1 if @field
+    result = @collection.find_one({_id: @topic})
 
-    result = @collection.find_one({_id: @topic}, {fields: @fields})
     if result.present?
       result.delete("_id")
       @body = result
@@ -49,11 +48,7 @@ class Vayacondios::ConfigDocument < Vayacondios::Document
   end
 
   def update(document)
-    # MongoDB always wants a Hash. If we POST to /org/topic/users/jim/username
-    # with "jimmy", we transform the document to {username: "jimmy"}
-    if !document.is_a?(Hash)
-      document = {@field.split(/\W/).last.to_sym => document}
-    end
+    raise Error::BadRequest.new if !document.is_a?(Hash)
 
     # Merge ourselves
     document = body.deep_merge(document) if body

data/lib/vayacondios/version.rb

@@ -1,3 +1,3 @@
 class Vayacondios
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/vayacondios-server.rb

@@ -11,6 +11,8 @@ require 'gorillib/string/constantize'
 require 'gorillib/string/inflections'
 require 'multi_json'
 
+require 'vayacondios/server/errors/bad_request'
+
 require 'vayacondios/server/model/config_document'
 require 'vayacondios/server/model/event_document'
 

data/spec/server/config_spec.rb

@@ -7,9 +7,31 @@ require File.join(File.dirname(__FILE__), '../../', 'app/http_shim')
 describe HttpShim do
   include Goliath::TestHelper
 
-  let(:err) { Proc.new{ |c| fail "HTTP Request Failed #{c.response}" } }
+  let(:err) { Proc.new{ |c| fail "HTTP Request Failed #{c.error}" } }
 
   context 'Configuration management' do
+    it 'requires a topic' do
+      with_api(HttpShim) do |api|
+        post_request({
+          :path => '/v1/infochimps/config/',
+          :body => {:level=>"awesome"}
+        }, err) do |c|
+          c.response_header.status.should == 400
+        end
+      end
+    end
+    
+    it 'requires an id' do
+      with_api(HttpShim) do |api|
+        post_request({
+          :path => '/v1/infochimps/config/power',
+          :body => {:level=>"awesome"}
+        }, err) do |c|
+          c.response_header.status.should == 400
+        end
+      end
+    end
+    
     it 'stores configuration' do
       with_api(HttpShim) do |api|
         post_request({
@@ -19,15 +41,35 @@ describe HttpShim do
           c.response_header.status.should == 200
           MultiJson.load(c.response).should eql ({
             "topic" => "power",
+            "id" => "level",
             "status" => "success",
             "cargo" => {
               "level" => "awesome"
             }
           })
         end
+        
+        get_mongo_db do |db|
+          db.collection("infochimps.config").find_one({:_id => "power"}).should eql({"_id" => "power", "level" => "awesome"})
+        end
       end
     end
-
+    
+    it 'rejects deep IDs' do
+      with_api(HttpShim) do |api|
+        post_request({
+          :path => '/v1/infochimps/config/power/level/is/invalid',
+          :body => {:level=>"awesome"}
+        }, err) do |c|
+          c.response_header.status.should == 400
+        end
+        
+        get_mongo_db do |db|
+          db.collection("infochimps.config").find_one({:_id => "power"}).should be_nil
+        end
+      end
+    end
+    
     it 'retrieves configuration' do
       with_api(HttpShim) do |api|
         post_request({
@@ -37,7 +79,7 @@ describe HttpShim do
       end
       with_api(HttpShim) do |api|
         get_request({:path => '/v1/infochimps/config/power/level'}, err) do |c|
-          c.response_header.status.should == 200
+          c.response_header.status.should == 200 
           MultiJson.load(c.response).should eql({"level" => "awesome"})
         end
       end
@@ -46,18 +88,18 @@ describe HttpShim do
     it 'merge deep configuration' do
       with_api(HttpShim) do |api|
         post_request({
-          :path => '/v1/infochimps/config/mergetest',
+          :path => '/v1/infochimps/config/merge/test',
           :body => { :foo => { :bar => 3 } }
         }, err)
       end
       with_api(HttpShim) do |api|
         post_request({
-          :path => '/v1/infochimps/config/mergetest',
+          :path => '/v1/infochimps/config/merge/test',
           :body => { :foo => { :baz => 7 } }
         }, err)
       end
       with_api(HttpShim) do |api|
-        get_request({:path => '/v1/infochimps/config/mergetest'}, err) do |c|
+        get_request({:path => '/v1/infochimps/config/merge/test'}, err) do |c|
           c.response_header.status.should == 200
           MultiJson.load(c.response).should eql({
             "foo" => {

data/spec/server/event_spec.rb

@@ -10,6 +10,54 @@ describe HttpShim do
   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|
+        post_request({
+          :path => '/v1/infochimps/event/',
+          :body => {:level=>"awesome"}
+        }, err) do |c|
+          c.response_header.status.should == 400
+        end
+      end
+    end
+    
+    it 'does not require an id' do
+      with_api(HttpShim) do |api|
+        post_request({
+          :path => '/v1/infochimps/event/power',
+          :body => {:level=>"awesome"}
+        }, err) do |c|
+          c.response_header.status.should == 200
+        end
+      end
+    end
+
+    it 'will accept an id' do
+      with_api(HttpShim) do |api|
+        post_request({
+          :path => '/v1/infochimps/event/power/level',
+          :body => {:level=>"awesome"}
+        }, err) do |c|
+          c.response_header.status.should == 200
+        end
+      end
+    end
+
+    it 'rejects deep IDs' do
+      with_api(HttpShim) do |api|
+        post_request({
+          :path => '/v1/infochimps/event/power/level/is/invalid',
+          :body => {:level=>"awesome"}
+        }, err) do |c|
+          c.response_header.status.should == 400
+        end
+        
+        get_mongo_db do |db|
+          db.collection("infochimps.config").find_one({:_id => "power"}).should be_nil
+        end
+      end
+    end
+
     it 'stores events' do
       with_api(HttpShim) do |api|
         post_request({
@@ -19,6 +67,13 @@ describe HttpShim do
           c.response_header.status.should == 200
           MultiJson.load(c.response).should eql ({"level" => "awesome"})
         end
+        
+        get_mongo_db do |db|
+          doc = db.collection("infochimps.power.events").find_one({:_id => "level"})
+          doc["_id"].should eql "level"
+          doc["d"].should eql ({"level" => "awesome"})
+          doc["t"].should be_within(1).of Time.now
+        end
       end
     end
 

data/spec/support/mongo_cleaner.rb

@@ -8,13 +8,19 @@ Settings.define 'mongo.port', :default => '27017',       :description => 'Mongo
 Settings.read(File.join File.dirname(__FILE__), '..', '..', 'config', 'vayacondios.yaml')
 Settings.resolve!
 
-def clean_mongo
+def get_mongo_db &block
+  fail unless block
   conn = Mongo::Connection.new(Settings[:mongo][:host],Settings[:mongo][:port])
-  mongo = conn.db(Settings[:mongo][:database])
-  mongo.collections.select {|c| c.name !~ /system/ }.each { |c| c.drop }
+  yield conn.db(Settings[:mongo][:database])
   conn.close
 end
 
+def clean_mongo
+  get_mongo_db do |db|
+    db.collections.select {|c| c.name !~ /system/ }.each { |c| c.drop }
+  end
+end
+
 RSpec.configure do |config|
   config.before :each do
     clean_mongo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vayacondios-server
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -204,6 +204,7 @@ files:
 - lib/vayacondios/client/configliere.rb
 - lib/vayacondios/client/http_client.rb
 - lib/vayacondios/client/notifier.rb
+- lib/vayacondios/server/errors/bad_request.rb
 - lib/vayacondios/server/handlers/config_handler.rb
 - lib/vayacondios/server/handlers/event_handler.rb
 - lib/vayacondios/server/model/config_document.rb
@@ -240,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3434748867277747031
+      hash: -662112230859084251
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -249,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3434748867277747031
+      hash: -662112230859084251
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23