esapiserver 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d29610e65e8c9fd785f760e9996c5bbcd43d291a
-  data.tar.gz: 3934d0c162adfdf35952d5e63afe4ff068082ddf
+  metadata.gz: 10db36d732326c30b1ea10d9a4508ae74d69cbed
+  data.tar.gz: 20b8649043caa2e7be49d4ac46d8096a5a898a2e
 SHA512:
-  metadata.gz: 7f774209bcf0cdf3db811011d47221d9f24dbe076ad04ad93d8d491f821a2fedd9b338bfb562ef49fb9a7728fc9f289ddaad51933cd84cb6d5149ef025dca850
-  data.tar.gz: 5b5989832c12b42cef4255ddb2360ce4e4ee3d3d7dad8bafb3c017ea6d9a68010c5e8525b3e84c9fa73632551abf8b8af0e38889b355c9c9108cc7628d2b94a4
+  metadata.gz: 262b1ee728134ed4e3e2295b85c32e4a8a91473b5538395f60f58e082900cf53a298e43f1afffde663eeb871ce52994bce7410d5ee53357576c3b4123e165128
+  data.tar.gz: 8612b62082502e511729ea1c0ad2ae963041ab0e11de12344a55eb7eb2963f4084d0b68cadb1bf6dea3575c79e5bba7181ef6077adb6f0e2633732e57c631e86

data/lib/esapiserver.rb

@@ -79,15 +79,14 @@ module Esapiserver
       if request.query_string.empty?
         result = collection.find.to_a.map{|t| fromBsonId(t, params[:model])}.to_json
       else
-        if request.query_string.include? 'ids[]' or request.query_string.include? 'ids%5B%5D' #don't know why it does not get unescaped
+        if request.query_string.include? 'ids[]' or request.query_string.include? 'ids%5B%5D'
           ids = []
-          
           if request.query_string.include? '&'
             queries = request.query_string.split('&')            
             queries.each do |q|
               key, value = q.split('=')
-              if key != 'ids[]' and key != 'ids%5B%5D' #check to see if all the keys match
-                throw 'multiple query parameters not supported yet, except for _ids[]='
+              if key != 'ids[]' and key != 'ids%5B%5D'
+                throw 'multiple query parameters that also have _ids[]= parameters not supported yet'
               end
               ids << toBsonId(value)
             end            
@@ -97,7 +96,14 @@ module Esapiserver
           end
           query = {"_id" => { "$in" => ids }}
         elsif request.query_string.include? '&'
-          throw 'multiple query parameters not supported yet, except _ids[]='
+          conditions = []
+          queries = request.query_string.split('&')
+          queries.each do |q|
+              key, value = q.split('=')
+              conditions << {modelName(params[:model]) + "." + key => value}
+          end
+          query = {"$and" => conditions }
+          puts query
         else
           key, value = request.query_string.split('=')
           query = {modelName(params[:model]) + "." + key => value}

data/lib/esapiserver/version.rb

@@ -1,3 +1,3 @@
 module Esapiserver
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/esapiserver_spec.rb

@@ -41,7 +41,7 @@ describe 'esapiserver that' do
     end
     
     #http://127.0.0.1:4567/api/focusareas?ids%5B%5D=53d7781819cfd232f4000085&ids%5B%5D=53d778e319cfd232f4000087
-    it 'returns a list of models that matches a specific query' do
+    it 'returns a list of models that matches a list of ids' do
       #create another post
       payload = '{"post": {"name": "test1"}}'
       post '/api/posts', payload, "CONTENT_TYPE" => "application/json"
@@ -61,6 +61,10 @@ describe 'esapiserver that' do
       #TODO should check to see if it is parsable by json      
     end
     
+    it 'returns a list of models that matches a specific query' do
+      pending  
+    end
+    
     #http://localhost:4567/api/posts?name=test1
     it 'returns a model with a specific key/value' do
       get '/api/posts?name=test1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esapiserver
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - William Miles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler