schemaless_rest_api 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbc856f4da6c97a932cf00591ae9330a8c11107f508394d7d17623bdba76427c
-  data.tar.gz: 1e3286aa8f268ccbb8ce21fb9cf155e213ecaaa7cbcb5c44253bc225829118b0
+  metadata.gz: 772e554afa1851f8a505754ce97e174218f28b2fdfa7cb8cea9e20483fe1a0a0
+  data.tar.gz: 442745cdc52411aa5e2db5d20fc9474188314ef94282db4b620675114a84f1ba
 SHA512:
-  metadata.gz: '0875ee228c90497a905699ea7c33e85dd4885178533be0551cec74000bfa743cb21630c7bba96322f88336c23dfce045fb0d372a7813d9ec85f2baf19da7cb37'
-  data.tar.gz: 77402ef68678360df7cee76aa40b21c80eba52c9b90154cff13ce50a8600522147bbd807f248da79b7349ff2f6871c444985db73613fa327708dde9ae0f85f3e
+  metadata.gz: 9c5f723fba1e431ee358afadfb6ed5d96bd081f8849d565fd23e31474c720c2ecf39b3f7e43e2eecef8bb896686e0e4d4a8a4837b4a1a35c565c253ab95015c1
+  data.tar.gz: cb903faf022ce6d7605ae3ea60e570a548f2db2b5c246d67a1fff1c405b85854d49b4dde11b89390b7f2b855dcbf75f7e0ec74cfd3dc99b90c0f5ad2cdec902b

data/lib/schemaless_rest_api/mongo_client.rb

@@ -7,27 +7,32 @@ module MongoClient
 
     def insert(model, data, id)
       collection = MongoClient.client[model]
-      collection.insert_one({ id: id, data: data})
+      collection.insert_one({ id: id, **data})
     end
 
     def find(model, id)
-      collection = MongoClient.client[model]
-      collection.find( { id: id } ).first
+      find_all(model, { id: id } )
     end
 
     def get_all(model)
       collection = MongoClient.client[model]
-      collection.find.collect { |match| match }
+      collection.find.collect do |match|
+        match.delete("_id")
+        match
+      end
     end
 
     def find_all(model, query)
       collection = MongoClient.client[model]
-      collection.find( query ).collect { |match| match }
+      collection.find( query ).collect do |match|
+        match.delete("_id")
+        match
+      end
     end
 
     def update(model, id, data)
       collection = MongoClient.client[model]
-      collection.update_one({ id: id }, { '$set' => data })
+      collection.update_one({ id: id }, { id: id, **data})
     end
 
     def delete(model, id)

data/lib/schemaless_rest_api/rest_server.rb

@@ -56,9 +56,10 @@ class RestServer < Sinatra::Base
     end
 
     get "/#{model.downcase}/:id" do |id|
+      puts request.path.downcase
       if ENV['mongodb']
-        results = MongoClient.find_all(model, { id: id})
-        return not_have(id) unless results
+        results = MongoClient.find(model, id)
+        return not_have(id) unless results.first
         JSON.generate(results.first)
       else
         return not_have(id) unless has_id?(model, id)
@@ -68,10 +69,11 @@ class RestServer < Sinatra::Base
     end
 
     put "/#{model.downcase}/:id" do |id|
+      puts request.path.downcase
       data = JSON.parse(request.body.read)
       if ENV['mongodb']
         results = MongoClient.find(model, id)
-        return not_have(id) unless results.count > 0
+        return not_have(id) unless results.first
         MongoClient.update(model, id, data)
       else
         return not_have(id) unless has_id?(model, id)
@@ -82,9 +84,10 @@ class RestServer < Sinatra::Base
     end
 
     delete "/#{model.downcase}/:id" do |id|
+      puts request.path.downcase
       if ENV['mongodb']
         results = MongoClient.find(model, id)
-        return not_have(id) unless results.count > 0
+        return not_have(id) unless results.first
         MongoClient.delete(model, id)
       else
         return not_have(id) unless has_id?(model, id)

data/lib/schemaless_rest_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SchemalessRestApi
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemaless_rest_api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Samuel Garratt