vayacondios-server 0.3.1 → 0.3.2

data/Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 # em-mongo is too loose with its dependencies; 2.0.0 bson breaks vcd
 gem 'bson', '1.9.2'
+# cookiejar 0.3.1 has busted file permissions WTF
+gem 'cookiejar', '0.3.0'
 
 gemspec name: 'vayacondios-server'
 gemspec name: 'vayacondios-client'

data/config/vcd-server.rb

@@ -10,10 +10,10 @@
 # The production environment uses EventMachine::Synchrony to define a
 # shared pool of open connections to the database. The size of this pool
 # can be on the command-line with the --database.connections option.
-Vayacondios::Server::DbConfig.overlay options[:database]
+Vayacondios::Server::DbConfig.overlay options
 
 environment(:production) do
-  db_options = Vayacondios::Server::DbConfig.env :production
+  db_options = Vayacondios::Server::DbConfig.env(:production)[:database]
   driver = Vayacondios::Server::Driver.retrieve db_options[:driver]
   logger.info("Opening #{db_options[:connections]} connections to #{db_options[:host]}:#{db_options[:port]} using #{driver}.")
   config['db'] = EventMachine::Synchrony::ConnectionPool.new(size: db_options[:connections]) do
@@ -23,14 +23,14 @@ end
 
 # The development environment uses a single database connection.
 environment(:development) do
-  db_options = Vayacondios::Server::DbConfig.env :development
+  db_options = Vayacondios::Server::DbConfig.env(:development)[:database]
   driver = Vayacondios::Server::Driver.retrieve db_options[:driver]
   logger.info("Connecting to #{db_options[:host]}:#{db_options[:port]} using #{driver}.")
   config['db'] = driver.connect db_options.merge(log: logger)
 end
 
 environment(:test) do
-  db_options = Vayacondios::Server::DbConfig.env :test
+  db_options = Vayacondios::Server::DbConfig.env(:test)[:database]
   driver = Vayacondios::Server::Driver.retrieve db_options[:driver]
   logger.info("Connecting to #{db_options[:host]}:#{db_options[:port]} using #{driver}.")
   config['db'] = driver.connect db_options.merge(log: logger)

data/features/events.feature

@@ -86,6 +86,146 @@ Feature: Events
     ]
     """
 
+  Scenario: Retrieving Existing Events with a Limit Query
+    Given the following Event exists under topic "topic" in the database:
+    """
+    {
+      "_id": "id1",
+      "_t": "2012-02-13T12:34:42.452Z",
+      "_d": {
+        "alignment": "good"
+      }
+    }
+    """
+    And   the following Event exists under topic "topic" in the database:
+    """
+    {
+      "_id": "id2",
+      "_t": "2012-02-13T12:34:42.452Z",
+      "_d": {
+        "alignment": "evil"
+      }
+    }
+    """
+    When  the client sends a GET request to "/v3/organization/events/topic" with the following body:
+    """
+    {
+      "sort": "alignment",
+      "order": "desc",
+      "limit": 1
+    }
+    """
+    Then  the response status should be 200
+    And   the response body should be:
+    """
+    [
+      {
+        "id": "id1",
+        "time": "2012-02-13T12:34:42.452Z",
+        "alignment": "good"
+      }
+    ]
+    """
+
+  Scenario: Retrieving Existing Events with a Sort Query
+    Given the following Event exists under topic "topic" in the database:
+    """
+    {
+      "_id": "id1",
+      "_t": "2012-02-13T12:34:43.452Z",
+      "_d": {
+        "alignment": "good"
+      }
+    }
+    """
+    And   the following Event exists under topic "topic" in the database:
+    """
+    {
+      "_id": "id2",
+      "_t": "2012-02-13T12:34:42.452Z",
+      "_d": {
+        "alignment": "neutral"
+      }
+    }
+    """
+    And   the following Event exists under topic "topic" in the database:
+    """
+    {
+      "_id": "id3",
+      "_t": "2012-02-13T12:34:45.452Z",
+      "_d": {
+        "alignment": "evil"
+      }
+    }
+    """
+    When  the client sends a GET request to "/v3/organization/events/topic" with the following body:
+    """
+    {
+      "sort": "alignment",
+      "order": "asc"
+    }
+    """
+    Then  the response status should be 200
+    And   the response body should be:
+    """
+    [
+      {
+        "id": "id3",
+        "time": "2012-02-13T12:34:45.452Z",
+        "alignment": "evil"
+      },
+      {
+        "id": "id1",
+        "time": "2012-02-13T12:34:43.452Z",
+        "alignment": "good"
+      },
+      {
+        "id": "id2",
+        "time": "2012-02-13T12:34:42.452Z",
+        "alignment": "neutral"
+      }
+    ]
+    """
+
+  Scenario: Retrieving Existing Events with a Fields Query
+    Given the following Event exists under topic "topic" in the database:
+    """
+    {
+      "_id": "id1",
+      "_t": "2012-02-13T12:34:42.452Z",
+      "_d": {
+        "alignment": "good"
+      }
+    }
+    """
+    And   the following Event exists under topic "topic" in the database:
+    """
+    {
+      "_id": "id2",
+      "_t": "2012-02-13T12:34:42.452Z",
+      "_d": {
+        "alignment": "evil"
+      }
+    }
+    """
+    When  the client sends a GET request to "/v3/organization/events/topic" with the following body:
+    """
+    {
+      "alignment": "good",
+      "fields": ["alignment", "id"]
+    }
+    """
+    Then  the response status should be 200
+    And   the response body should be:
+    """
+    [
+      {
+        "id": "id1",
+        "alignment": "good"
+      }
+    ]
+    """
+
   Scenario: Creating Events
     Given there are no Events under topic "topic" in the database
     When  the client sends a POST request to "/v3/organization/events/topic" with no body
@@ -136,7 +276,7 @@ Feature: Events
     }
     """
     And   there are no Events under topic "topic" in the database
-  
+
   Scenario: Deleting Events with a Time Query
     Given the following Event exists under topic "topic" in the database:
     """
@@ -157,7 +297,7 @@ Feature: Events
     When  the client sends a DELETE request to "/v3/organization/events/topic" with the following body:
     """
     {
-      "after": "2012-01-01T00:00:00.000Z"     
+      "after": "2012-01-01T00:00:00.000Z"
     }
     """
     Then  the response status should be 200

data/features/stashes.feature

@@ -49,21 +49,30 @@ Feature: Stashes
     """
     {
       "_id": "topic",
-      "root": { 
+      "root": {
         "b": 1
       }
     }
     """
+    And the following Stash exists in the database:
+    """
+    {
+      "_id": "topic",
+      "root": {
+        "b": 5
+      }
+    }
+    """
     When  the client sends a GET request to "/v3/organization/stashes" with the following body:
     """
-    { 
-      "root.b": 1 
+    {
+      "root.b": 1
     }
     """
     Then  the response status should be 200
     And   the response body should be:
     """
-    [ 
+    [
       {
         "topic": "topic",
         "root": {
@@ -88,7 +97,7 @@ Feature: Stashes
     """
     When  the client sends a GET request to "/v3/organization/stashes" with the following body:
     """
-    { 
+    {
       "root.b": 1,
       "fields": ["root.a"]
     }
@@ -108,6 +117,98 @@ Feature: Stashes
     ]
     """
 
+  Scenario: Retrieving Stashes using Sorting
+    Given the following Stash exists in the database:
+    """
+    {
+      "_id": "topic1",
+      "root": {
+        "a": {
+          "foo": 3
+        },
+        "b": 1
+      }
+    }
+    """
+    And the following Stash exists in the database:
+    """
+    {
+      "_id": "topic2",
+      "root": {
+        "a": {
+          "foo": 2
+        },
+        "b": 1
+      }
+    }
+    """
+    When  the client sends a GET request to "/v3/organization/stashes" with the following body:
+    """
+    {
+      "root.b": 1,
+      "sort": "root.a.foo",
+      "order": "asc"
+    }
+    """
+    Then  the response status should be 200
+    And   the response body should be:
+    """
+    [
+      {
+        "topic": "topic2",
+        "root": {
+          "a": {
+            "foo": 2
+          },
+          "b": 1
+        }
+      },
+      {
+        "topic": "topic1",
+        "root": {
+          "a": {
+            "foo": 3
+          },
+          "b": 1
+        }
+      }
+    ]
+    """
+
+  Scenario: Retrieving Stashes using Limits
+    Given the following Stash exists in the database:
+    """
+    {
+      "_id": "topic1",
+      "b": 1
+    }
+    """
+    And the following Stash exists in the database:
+    """
+    {
+      "_id": "topic2",
+      "b": 1
+    }
+    """
+    When  the client sends a GET request to "/v3/organization/stashes" with the following body:
+    """
+    {
+      "b": 1,
+      "limit": 1,
+      "order": "desc"
+    }
+    """
+    Then  the response status should be 200
+    And   the response body should be:
+    """
+    [
+      {
+        "topic": "topic2",
+        "b": 1
+      }
+    ]
+    """
+
   Scenario: Creating Stashes without a Query
     Given there are no matching Stashes in the database
     When  the client sends a POST request to "/v3/organization/stashes" with no body

data/lib/vayacondios.rb

@@ -3,7 +3,7 @@ module Vayacondios
   API_VERSION            = 'v3'
 
   # Gem version for both client and server
-  GEM_VERSION            = '0.3.1'
+  GEM_VERSION            = '0.3.2'
 
   # Default port to find/connect to for the server
   DEFAULT_SERVER_PORT    = 3467

data/lib/vayacondios/server/api_options.rb

@@ -29,9 +29,11 @@ module Vayacondios::Server
       opts.separator ''
       opts.separator 'Database options:'
 
-      options[:database] = {}
-      db_options = options[:database]
-      defaults = DbConfig.defaults[:development]
+      options[Goliath.env] ||= {}
+      options[Goliath.env][:database] ||= {}
+      db_options = options[Goliath.env][:database]
+
+      defaults = DbConfig.defaults[Goliath.env][:database]
       opts.on('-d', '--database.driver NAME', "Database driver (default: #{defaults[:driver]})") do |name|
         db_options[:driver] = name
       end

data/lib/vayacondios/server/configuration.rb

@@ -2,22 +2,24 @@ module Vayacondios::Server
   class Configuration < Vayacondios::Configuration
 
     def defaults
-      { 
-        development: {
+      %w[development test production].inject({}) do |default_conf, type|
+        default_conf[type.to_sym] = {}
+        default_conf[type.to_sym][:database] = {
           driver:      'mongo',
           host:        'localhost',
           port:        27017,
-          name:        'vayacondios_development',
+          name:        "vayacondios_#{type}",
           connections: 20,
         }
-      }      
+        default_conf
+      end
     end
 
     def env(handle = nil)
       handle ||= :development
       resolved_settings[handle.to_sym] || {}
-    end    
+    end
   end
-  
+
   DbConfig = Configuration.new('database.yml') unless defined? DbConfig
 end

data/lib/vayacondios/server/drivers/mongo.rb

@@ -50,10 +50,8 @@ module Vayacondios::Server
       sel = { }.tap do |sel|
         time = query.delete(:_t)
         sel[:_t] = time.inject({}){ |t, (k,v)| t[('$' + k.to_s).to_sym] = v ; t } if time
-        data = query.delete(:_d)
-        sel.merge! to_dotted_hash(_d: data)
-      end
-      query.merge(sel).compact_blank
+        sel.merge! to_dotted_hash(query)
+      end.compact_blank
     end
 
     def to_dotted_hash(hsh, key_string = '')
@@ -66,14 +64,19 @@ module Vayacondios::Server
         end
       end
     end
-    
+
     def projector query
-      if query[:sort] == 'time'
-        query[:sort] = '_t'
-      elsif query[:sort].present?
-        query[:sort] = '_d.' + query[:sort]
+      order = query.delete(:order)
+      if order.to_s.match(/^(a|de)sc$/i)
+        order = order.to_sym
+      else
+        raise Error.new("Search order must be 'asc' or 'desc'. Invalid search order: #{order}")
       end
-      query[:_reverse] if query.delete(:order) == 'descending'
+
+      fields = query[:fields]
+      fields.map!{|field| field.join('.') } if fields.is_a? Array
+
+      query[:sort] = [query[:sort].join('.'), order]
       query
     end
 

data/lib/vayacondios/server/models/document.rb

@@ -30,7 +30,7 @@ module Vayacondios::Server
     def format_response result
       from_document(result.symbolize_keys.compact).external_document
     end
-  
+
     # A class for errors that arise within documents due to internal or
     # IO errors.
     Error = Class.new(StandardError)
@@ -54,7 +54,15 @@ module Vayacondios::Server
         params.symbolize_keys!
         opts = {}
         [:limit, :order, :sort, :fields].each{ |opt| opts[opt] = params.delete opt }
-        opts.merge default_query_options
+        default_query_options.dup.merge(opts.compact).tap do |opts|
+          opts[:sort]   = opts[:sort].to_s.split('.')
+          if opts[:fields].is_a? Array
+            opts[:fields].map!{|field|
+              field = '_id' if field == 'id'
+              field.split('.')
+            }
+          end
+        end
       end
 
       def search(params, query, &driver)
@@ -63,7 +71,7 @@ module Vayacondios::Server
         result  = driver.call(action, action.filter, options)
         result.map{ |res| new.format_response res }
       end
-      
+
       def create(params, document, &driver)
         action = receive(params).prepare_create(document)
         result = driver.call(action)
@@ -76,7 +84,7 @@ module Vayacondios::Server
         return nil if result.nil?
         action.format_response result
       end
-      
+
       def destroy(params, document, &driver)
         action = receive(params).prepare_destroy(document.symbolize_keys)
         result = driver.call(action, action.filter)

data/lib/vayacondios/server/models/event.rb

@@ -10,7 +10,7 @@
 # POST /v2/coca_cola/event/ad_campaigns
 # { "impresions": 23829, "errors": 29 }
 # ```
-# 
+#
 # would result in a document in the `coca_cola.ad_campaigns.events`
 # collection with the following structure:
 #
@@ -53,9 +53,9 @@ module Vayacondios::Server
 
     # The default number of events returned when searching.
     LIMIT  = 50
-    
+
     # The default sort order when searching
-    ORDER  = 'descending'
+    ORDER  = 'desc'
 
     # The default sort field when searching.
     SORT   = 'time'
@@ -65,7 +65,21 @@ module Vayacondios::Server
     WINDOW = 3600
 
     def self.default_query_options
-      { limit: LIMIT, order: ORDER, sort: SORT } 
+      { limit: LIMIT, order: ORDER, sort: SORT }
+    end
+
+    def self.extract_query_options! opts
+      query = super
+      if query[:sort] == ['time']
+        query[:sort] = ['_t']
+      elsif query[:sort].present?
+        query[:sort].unshift '_d'
+      end
+      query[:fields].each{|field|
+        field.replace(['_t']) if field == ['time']
+        field.unshift('_d') unless %w[_id _t].include?(field.first)
+      } if query[:fields].present?
+      query
     end
 
     field :time, Time   # assigned or Time.now.utc
@@ -84,14 +98,14 @@ module Vayacondios::Server
       @time = format_time to_timestamp(t)
     end
 
-    # Parses an object into a timestamp.  
+    # Parses an object into a timestamp.
     #
     # @param [String, Numeric, Time, nil] obj
     # @param [Time] default the time value to return if none could be found in the `obj`
     # @return [Time]
     def to_timestamp(obj, default = Time.now)
       case obj
-      when String  then Time.parse(obj)        
+      when String  then Time.parse(obj)
       when Date    then obj.to_time
       when Time    then obj
       when Numeric then Time.at(obj)
@@ -130,7 +144,7 @@ module Vayacondios::Server
 
     # An event as presented to a user
     def external_document
-      { id: id, time: time.iso8601(3) }.merge(body)
+      { id: id, time: (time ? time.iso8601(3) : nil) }.merge(body).compact
     end
 
     # Returns a Hash that can be used for selection criteria in a query
@@ -193,6 +207,6 @@ module Vayacondios::Server
     def prepare_destroy query
       receive!(filter: event_filter(query))
       self
-    end  
+    end
   end
 end

data/lib/vayacondios/server/models/stash.rb

@@ -25,15 +25,15 @@ module Vayacondios::Server
     LIMIT = 50
 
     # The default sort order when searching.
-    SORT  = 'ascending'
-    ORDER = '_id'
+    SORT  = '_id'
+    ORDER = 'asc'
 
     # Returned as an acknowledgement of the request when there is no
     # better option (#destroy, #update_many, &c.)
     # OK = {ok: true}
 
     def self.default_query_options
-      { limit: LIMIT, order: ORDER, sort: SORT } 
+      { limit: LIMIT, order: ORDER, sort: SORT }
     end
 
     # The name of the collection this stash will store its data in.
@@ -52,16 +52,16 @@ module Vayacondios::Server
         d[:topic] = doc.delete(:_id)
         doc = nil if doc.empty?
         if body.nil?
-          new_body = doc 
+          new_body = doc
         else
           new_body = body.merge(doc || {})
-        end     
+        end
         d[:body]  =  new_body
       end
       receive! d
       self
     end
-    
+
     def external_document
       { topic: topic }.merge(body || {})
     end
@@ -76,7 +76,7 @@ module Vayacondios::Server
       if document.is_a? Hash
         document.symbolize_keys!
         raise Error.new ':topic is a reserved key and cannot be used in a stash document' if document.has_key?(:topic)
-      end    
+      end
       if id.blank?
         raise Error.new 'If not including an Id, the document must be a Hash' unless document.is_a? Hash
         receive!(body: document)

data/spec/server/api_options_spec.rb

@@ -23,7 +23,7 @@ describe Vayacondios::Server::ApiOptions do
     ARGV.replace %w[-d foo -h foo.com -D bar -o 1234 -n 10]
     api.options_parser(parser, settings)
     parser.parse!
-    settings[:database].should eq(driver:      'foo',
+    settings[:test][:database].should eq(driver:      'foo',
                                   connections: 10,
                                   host:        'foo.com',
                                   name:        'bar',

data/spec/server/configuration_spec.rb

@@ -3,11 +3,31 @@ require 'spec_helper'
 describe Vayacondios::Server::Configuration do
   its(:defaults) do
     should eq(development: {
-                driver:      'mongo',
-                host:        'localhost',
-                port:        27017,
-                name:        'vayacondios_development',
-                connections: 20,                
+                database: {
+                  driver:      'mongo',
+                  host:        'localhost',
+                  port:        27017,
+                  name:        'vayacondios_development',
+                  connections: 20,
+                }
+              },
+              test: {
+                database: {
+                  driver:      'mongo',
+                  host:        'localhost',
+                  port:        27017,
+                  name:        'vayacondios_test',
+                  connections: 20,
+                }
+              },
+              production: {
+                database: {
+                  driver:      'mongo',
+                  host:        'localhost',
+                  port:        27017,
+                  name:        'vayacondios_production',
+                  connections: 20,
+                }
               })
   end
 
@@ -17,11 +37,12 @@ describe Vayacondios::Server::Configuration do
 
   context '#env' do
     it 'allows hash access scoped by environment' do
-      subject.env(:development).should eq(driver:      'mongo',
-                                          host:        'localhost',
-                                          port:        27017,
-                                          name:        'vayacondios_development',
-                                          connections: 20)
+      subject.env(:development).should eq(database: {
+                                            driver:      'mongo',
+                                            host:        'localhost',
+                                            port:        27017,
+                                            name:        'vayacondios_development',
+                                            connections: 20 })
     end
   end
 end

data/spec/server/models/document_spec.rb

@@ -1,9 +1,56 @@
 require 'spec_helper'
 
 describe Vayacondios::Server::Document do
-  
-  let(:params){ { organization: 'organization', topic: 'topic' } }
 
-  subject(:document){ described_class.new(log, database, params) }
+  let(:params){ {
+    organization: 'organization',
+    topic:        'topic',
+    order:        'ascending',
+    sort:         'hostname.internal',
+    fields:       ['id', 'hostname.internal']
+  } }
+
+  subject(:document){ described_class.receive(params) }
+
+  context '.extract_query_options!' do
+    let(:model) do
+      klass = Class.new(document.class) do
+        def self.default_query_options
+          { limit: 5, order: 'descending', sort: 'time' }
+        end
+      end
+    end
+
+    let(:options) do
+      model.extract_query_options! params
+    end
+
+    it 'removes projection params' do
+      options.should have_key :limit
+      options.should have_key :sort
+      options.should have_key :order
+
+      params.should_not have_key :limit
+      params.should_not have_key :sort
+      params.should_not have_key :order
+
+      params.should have_key :organization
+      params.should have_key :topic
+    end
+
+    it 'uses defaults' do
+      options.should have_key :sort
+      options[:limit].should eq 5
+    end
+
+    it 'uses params when provided' do
+      options.should have_key :limit
+      options.should have_key :order
+
+      options[:sort].should eq ['hostname', 'internal']
+      options[:fields].should eq [['_id'], ['hostname', 'internal']]
+      options[:order].should eq 'ascending'
+    end
+  end
 
 end

data/vayacondios-server.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('configliere',     '>= 0.4.16')
   gem.add_dependency('gorillib',        '>= 0.4.2')
   gem.add_dependency('multi_json',      '>= 1.3.6')
-  gem.add_dependency('goliath-chimp',   '>= 0.0.2')
+  gem.add_dependency('goliath-chimp',   '>= 0.0.3')
 
   gem.add_dependency('eventmachine',    '~> 1.0')
   gem.add_dependency('goliath',         '~> 1.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vayacondios-server
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -69,7 +69,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +77,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 896732677727281912
+      hash: -1277258498442787077
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 896732677727281912
+      hash: -1277258498442787077
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23