rack-mongoid_adapter 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d729b10b99a641d5ce49303bbe71325eb59a9701
-  data.tar.gz: fb6323b7d5d935c8c6a50d71cd0564322bb255ae
+  metadata.gz: 102e4ece3407cbf13e0b951505d9bc0fc0befb28
+  data.tar.gz: 495da19c17ef093f7e1c87984647e5c6b4291547
 SHA512:
-  metadata.gz: 7330079aed1a4d7401548a4e75b697a1f48e928e2b7ad449c1f092bd7c4c6438a79337ea0ce40c015d1c83b147a5ab44c611425c0ccedc792fb831dea0cff76b
-  data.tar.gz: a89e4e991c6e74df10d25c504291569996f22724f2377844da87c1b386097401c08a50ccb6b6a3ddbd8dcc1795fc236f36ba50719d5e2e164eeff6b6989e745f
+  metadata.gz: 1315d24bba545128f170ce477ebf72f4f43a18a59ba80200e6fb982ee9e273e21844fdba04ea639210448cba11ad5a7c7440621b441f2852cc99e07e8cf5e3a0
+  data.tar.gz: 8dd54c5e31c9508a5702ac1264766d7fcdadc86067fcfd7d3611329e6b3814f63984d130b8830da31db9059ac15680b3027b5c0cd6f08f41ad3e6fc335f67fd4

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## 0.0.2
+* Accepts JSON request body on POST and PUT request
+* Return response body on PUT and DELETE request
+
+## 0.0.1
+* 1st release

data/README.md

@@ -2,7 +2,8 @@
 Provides RESTful interface for MongoDB as a rack middleware.
 
 ## Usage
-Here is the simplest example for Heroku with MongoLab plugin.
+Here is the simplest example for Heroku with MongoLab plugin.  
+You can try this example via [r7kamura/rack-mongoid_adapter-example](https://github.com/r7kamura/rack-mongoid_adapter-example).
 
 ### Operation
 ```
@@ -23,13 +24,6 @@ $ git push heroku master
 ### Code
 ```yaml
 # config/mongoid.yml
-development:
-  sessions:
-    default:
-      database: default
-      hosts:
-        - localhost:27017
-
 production:
   sessions:
     default:
@@ -48,7 +42,7 @@ source "https://rubygems.org"
 gem "rack-mongoid_adapter"
 ```
 
-### POST /{resource_type} - Create a new entry
+### POST /{resource_name} - Create a new entry
 ```
 $ curl http://my-test-app.herokuapp.com/entries -d "attributes[foo]=bar" -i
 HTTP/1.1 201 Created
@@ -60,7 +54,7 @@ Connection: keep-alive
 {"foo":"bar","_id":"53188c5b3536340002000000"}
 ```
 
-### GET /{resource_type} - Get all entries
+### GET /{resource_name} - Get all entries
 ```
 $ curl http://my-test-app.herokuapp.com/entries -i
 HTTP/1.1 200 OK
@@ -72,7 +66,7 @@ Connection: keep-alive
 [{"foo":"bar","_id":"53188c5b3536340002000000"}]
 ```
 
-### GET /{resource_type}/{id} - Get the entry
+### GET /{resource_name}/{id} - Get the entry
 ```
 $ curl http://my-test-app.herokuapp.com/entries/53188c5b3536340002000000 -i
 HTTP/1.1 200 OK
@@ -84,20 +78,24 @@ Connection: keep-alive
 {"foo":"bar","_id":"53188c5b3536340002000000"}
 ```
 
-### PUT /{resource_type}/{id} - Update the entry
+### PUT /{resource_name}/{id} - Update the entry
 ```
 $ curl http://my-test-app.herokuapp.com/entries/53188c5b3536340002000000 -X PUT -d "attributes[foo]=baz" -i
-HTTP/1.1 204 No Content
+HTTP/1.1 200 OK
 Date: Thu, 06 Mar 2014 14:59:04 GMT
 Server: WEBrick/1.3.1 (Ruby/2.0.0/2014-02-24)
 Connection: keep-alive
+
+{"foo":"baz","_id":"53188c5b3536340002000000"}
 ```
 
-### DELETE /{resource_type}/{id} - Delete the entry
+### DELETE /{resource_name}/{id} - Delete the entry
 ```
 $ curl http://my-test-app.herokuapp.com/entries/53188c5b3536340002000000 -X DELETE -i
-HTTP/1.1 204 No Content
+HTTP/1.1 200 OK
 Date: Thu, 06 Mar 2014 14:59:50 GMT
 Server: WEBrick/1.3.1 (Ruby/2.0.0/2014-02-24)
 Connection: keep-alive
+
+{"foo":"bar","_id":"53188c5b3536340002000000"}
 ```

data/lib/rack/mongoid_adapter/controllers/base.rb

@@ -25,7 +25,7 @@ module Rack
         end
 
         def response_header
-          {}
+          { "Content-Type" => "application/json" }
         end
 
         def response_body
@@ -44,20 +44,27 @@ module Rack
           @response ||= Rack::Response.new([response_body], response_status, response_header)
         end
 
-        def resource_type
-          request.params["resource_type"]
+        def resource_name
+          request.params["resource_name"]
         end
 
         def connection
-          ::Mongoid.default_session[resource_type]
+          ::Mongoid.default_session[resource_name]
         end
 
         def params
-          request.params
+          case
+          when request.request_method == "GET"
+            request.GET
+          when !request_body.empty?
+            JSON.parse(request_body)
+          else
+            {}
+          end
         end
 
-        def given_attributes
-          params["attributes"]
+        def request_body
+          @request_body ||= request.body.read.tap { request.body.rewind }
         end
       end
     end

data/lib/rack/mongoid_adapter/controllers/create_controller.rb

@@ -9,7 +9,7 @@ module Rack
         end
 
         def response_body
-          attributes = given_attributes.merge(_id: BSON::ObjectId.new.to_s)
+          attributes = params.merge(_id: BSON::ObjectId.new.to_s)
           connection.insert(attributes)
           attributes.to_json
         end

data/lib/rack/mongoid_adapter/controllers/destroy_controller.rb

@@ -4,7 +4,7 @@ module Rack
       class DestroyController < SingleResourceController
         def response_status
           if resource
-            204
+            200
           else
             404
           end
@@ -13,7 +13,7 @@ module Rack
         def response_body
           if resource
             connection.find(_id: id).remove
-            ""
+            resource.to_json
           else
             response_body_for_not_found
           end

data/lib/rack/mongoid_adapter/controllers/update_controller.rb

@@ -6,7 +6,7 @@ module Rack
 
         def response_status
           if resource
-            204
+            200
           else
             404
           end
@@ -14,9 +14,9 @@ module Rack
 
         def response_body
           if resource
-            attributes = resource.merge(given_attributes)
+            attributes = resource.merge(params)
             connection.find(_id: id).update(attributes)
-            ""
+            attributes.to_json
           else
             response_body_for_not_found
           end

data/lib/rack/mongoid_adapter/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class MongoidAdapter
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/rack/mongoid_adapter.rb

@@ -44,11 +44,11 @@ module Rack
 
     def router
       @router ||= Rack::Multiplexer.new(@app) do
-        get "/:resource_type", Controllers::IndexController
-        get "/:resource_type/:id", Controllers::ShowController
-        post "/:resource_type", Controllers::CreateController
-        put "/:resource_type/:id", Controllers::UpdateController
-        delete "/:resource_type/:id", Controllers::DestroyController
+        get "/:resource_name", Controllers::IndexController
+        get "/:resource_name/:id", Controllers::ShowController
+        post "/:resource_name", Controllers::CreateController
+        put "/:resource_name/:id", Controllers::UpdateController
+        delete "/:resource_name/:id", Controllers::DestroyController
       end
     end
   end

data/spec/rack/mongoid_adapter_spec.rb

@@ -32,25 +32,38 @@ describe Rack::MongoidAdapter do
     resource["_id"]
   end
 
-  let(:resource_type) do
+  let(:resource_name) do
     "recipes"
   end
 
   let(:resource) do
-    post "/#{resource_type}", { attributes: { name: "test" } }, env
+    post "/#{resource_name}", { name: "test" }.to_json, env
     JSON.parse(last_response.body)
   end
 
-  describe "GET /:resource_type" do
+  let(:request_body) do
+    case method
+    when "POST", "PUT"
+      params.to_json
+    else
+      params
+    end
+  end
+
+  subject do
+    send method.downcase, path, request_body, env
+    response.status
+  end
+
+  describe "GET /:resource_name" do
     let(:method) do
-      :get
+      "GET"
     end
 
     let(:path) do
-      "/#{resource_type}"
+      "/#{resource_name}"
     end
 
-
     context "with valid condition" do
       it "returns 200 with an array of resources" do
         should == 200
@@ -59,13 +72,13 @@ describe Rack::MongoidAdapter do
     end
   end
 
-  describe "GET /:resource_type/:id" do
+  describe "GET /:resource_name/:id" do
     let(:method) do
-      :get
+      "GET"
     end
 
     let(:path) do
-      "/#{resource_type}/#{id}"
+      "/#{resource_name}/#{id}"
     end
 
     context "when resource is not found" do
@@ -87,61 +100,70 @@ describe Rack::MongoidAdapter do
     end
   end
 
-  describe "POST /:resource_type" do
+  describe "POST /:resource_name" do
     before do
-      params[:attributes] = { name: "test" }
+      params[:name] = "test"
     end
 
     let(:method) do
-      :post
+      "POST"
     end
 
     let(:path) do
-      "/#{resource_type}"
+      "/#{resource_name}"
     end
 
     context "with valid condition" do
       it "returns 201 with a newly-created resource" do
         should == 201
-        response.body.should be_json_as(params[:attributes].merge(_id: String))
+        response.body.should be_json_as(
+          _id: String,
+          name: "test"
+        )
       end
     end
   end
 
-  describe "PUT /:resource_type/:id" do
+  describe "PUT /:resource_name/:id" do
     before do
-      params[:attributes] = { name: "test" }
+      params[:name] = "test"
     end
 
     let(:method) do
-      :put
+      "PUT"
     end
 
     let(:path) do
-      "/#{resource_type}/#{id}"
+      "/#{resource_name}/#{id}"
     end
 
     context "with valid condition" do
-      it "returns 204" do
-        should == 204
-        response.body.should be_empty
+      it "returns 200" do
+        should == 200
+        response.body.should be_json_as(
+          _id: String,
+          name: "test",
+        )
       end
     end
   end
 
-  describe "DELETE /:resource_type/:id" do
+  describe "DELETE /:resource_name/:id" do
     let(:method) do
-      :delete
+      "DELETE"
     end
 
     let(:path) do
-      "/#{resource_type}/#{id}"
+      "/#{resource_name}/#{id}"
     end
 
     context "with valid condition" do
-      it "returns 204" do
-        should == 204
-        response.body.should be_empty
+      it "returns 200" do
+        should == 200
+        response.body.should be_json_as(
+          _id: String,
+          name: "test",
+        )
       end
     end
   end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: rack-mongoid_adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: mem
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0.alpha2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0.alpha2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-multiplexer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
@@ -126,14 +126,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -171,7 +171,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -200,17 +201,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A rack application working as an adapter for Mongoid