rackjson 0.3.1 → 0.3.2

data/README.markdown

@@ -23,6 +23,16 @@ In your rackup file:
 
 This will set up a RESTful resource called 'notes' at /notes which will store any JSON document.
 
+### Options
+
+Currently you can choose which HTTP verbs the resource will support using the `:only` and `:except` options.  For example this will expose the notes resource to only get methods:
+
+    expose_resource :collections => [:notes], :db => Mongo::Connection.new.db("mydb"), :only => [:get]
+
+And to allow every kind of method except deletes:
+
+    expose_resource :collections => [:notes], :db => Mongo::Connection.new.db("mydb"), :except => [:delete]
+
 ### Restricting Access
 
 There are three ways of mounting a restful resource with rackjson:
@@ -88,7 +98,7 @@ RackJSON will assign an id to this resource as _id.  This can be used to access
     Content-Type: application/json
     Content-Length: 147
     
-    [{"updated_at":"Sun Apr 11 11:14:17 UTC 2010","title":"hello world!","_id":"4bc1af0934701204fd000001","created_at":"Sun Apr 11 11:14:17 UTC 2010"}]
+    {"updated_at":"Sun Apr 11 11:14:17 UTC 2010","title":"hello world!","_id":"4bc1af0934701204fd000001","created_at":"Sun Apr 11 11:14:17 UTC 2010"}
 
 This resource will also appear in the index of notes resources
 

data/Rakefile

@@ -10,9 +10,9 @@ begin
     gem.email = "oliver.n@new-bamboo.co.uk"
     gem.homepage = "http://github.com/olivernn/rackjson"
     gem.authors = ["Oliver Nightingale"]
-    gem.add_dependency('mongo', '>=0.19.1')
+    gem.add_dependency('mongo', '>=1.0.0')
     gem.add_dependency('mongo_ext', '>=0.19.1')
-    gem.add_dependency('json', '>=1.2.3')
+    gem.add_dependency('json', '=1.2.3')
     gem.add_dependency('rack', '>=1.0.1')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/rackjson.rb

@@ -19,5 +19,7 @@ module Rack::JSON
   autoload :Request, 'rackjson/request'
   autoload :Resource, 'rackjson/resource'
   autoload :Response, 'rackjson/response'
+  autoload :ObjectID, 'rackjson/extensions/bson/object_id'
+  autoload :OrderedHash, 'rackjson/extensions/bson/ordered_hash'
 
 end

data/lib/rackjson/collection.rb

@@ -4,41 +4,29 @@ module Rack::JSON
       @collection = collection
     end
 
-    def all(options={})
-      @collection.find({}, options).to_a
-    end
-
-    def create(document)
-      @collection.save(document)
-    end
-
     def delete(selector={})
       @collection.remove(prepared(selector))
     end
 
-    def delete_all
-      @collection.remove
-    end
-
     def exists?(selector)
       !@collection.find(prepared(selector)).to_a.empty?
     end
 
     def find(selector, options={})
-      if selector.is_a? Hash
-        @collection.find(selector, options).inject([]) {|documents, row| documents << Rack::JSON::Document.new(row)}
-      else
-        Rack::JSON::Document.new(@collection.find_one(:_id => selector))
-      end
+      @collection.find(selector, options).inject([]) {|documents, row| documents << Rack::JSON::Document.create(row)}
+    end
+
+    def find_one(selector, options={})
+      find(prepared(selector), options).first
     end
 
     def save(document)
-      @collection.save(document)
+      @collection.save(document.to_h)
     end
 
     def update(selector, document, query={})
       if exists?(prepared(selector).merge(query))
-        @collection.update(prepared(selector).merge(query), document, :upsert => false)
+        @collection.update(prepared(selector).merge(query), document.to_h, :upsert => false)
       else
         false
       end
@@ -49,6 +37,5 @@ module Rack::JSON
     def prepared selector
       selector.is_a?(Hash) ? selector : {:_id => selector}
     end
-
   end
 end

data/lib/rackjson/document.rb

@@ -1,32 +1,46 @@
 module Rack::JSON
   class Document
 
-    def initialize(doc)
+    attr_accessor :attributes
+
+    class BadDocumentFormatError < ArgumentError ; end
+
+    def self.create(doc)
       if doc.is_a? String
-        @document = Rack::JSON::JSONDocument.new(doc)
-      else doc.is_a? OrderedHash
-        @document = Rack::JSON::MongoDocument.new(doc)
+        Rack::JSON::JSONDocument.new(doc)
+      elsif doc.is_a? BSON::OrderedHash
+        Rack::JSON::MongoDocument.new(doc)
+      else
+        raise Rack::JSON::Document::BadDocumentFormatError
       end
     end
 
+
     def add_attributes(pair)
-      @document.attributes.merge!(pair)
+      attributes.merge!(pair)
+    end
+
+    def set_id(val)
+      add_attributes('_id' => val) unless attributes.keys.include? '_id'
     end
 
-    def method_missing(name, *args)
-      @document.send(name, *args)
+    def to_h
+      attributes
     end
 
-    def to_json(*a)
-      unless @json
-        gen_attrs = @document.attributes
-        gen_attrs.each_pair do |key, value|
-          if value.is_a? BSON::ObjectID
-            gen_attrs[key] = gen_attrs[key].to_s
-          end
+    def to_json(options={})
+      attributes.to_json
+    end
+
+    private
+
+    def set_attributes
+      private_methods.each do |method|
+        if method.match /^set_attribute_\w*$/
+          send method
         end
       end
-      gen_attrs.to_json
     end
+
   end
 end

data/lib/rackjson/end_point.rb

@@ -19,6 +19,10 @@ module Rack::JSON
       render (error.class.to_s + " :" + error.message), :status => 422
     end
 
+    def method_not_allowed? request
+      bypass_method? request
+    end
+
     def render body, options={}
       Rack::JSON::Response.new(body, options).to_a
     end

data/lib/rackjson/extensions/BSON/object_id.rb

@@ -0,0 +1,7 @@
+module BSON
+  class ObjectID
+    def to_json
+      to_s
+    end
+  end
+end

data/lib/rackjson/extensions/BSON/ordered_hash.rb

@@ -0,0 +1,9 @@
+class BSON::OrderedHash
+  def to_h
+    inject({}) { |acc, element| k,v = element; acc[k] = (if v.class == BSON::OrderedHash then v.to_h else v end); acc }
+  end
+
+  def to_json
+    to_h.to_json
+  end
+end

data/lib/rackjson/filter.rb

@@ -21,7 +21,7 @@ module Rack::JSON
     private
 
     def append_filters_to_document_in request
-      document = Rack::JSON::Document.new(request.json)
+      document = Rack::JSON::Document.create(request.json)
       document.add_attributes(request.session.reject { |key, value| !@filters.include?(key.to_sym) })
       request.set_body(document.to_json)
     end

data/lib/rackjson/json_document.rb

@@ -1,36 +1,33 @@
 module Rack::JSON
-  class JSONDocument
-    include Rack::JSON::BaseDocument
-
-    attr_reader :attributes
+  class JSONDocument < Rack::JSON::Document
 
     def initialize(doc)
       @attributes = JSON.parse(doc)
       set_attributes
     end
 
-    def add_id(id)
-      @attributes["_id"] = id unless @attributes["_id"]
-    end
-
     private
 
     def set_attribute_dates
-      @attributes.each_pair do |key, value|
+      attributes.each_pair do |key, value|
         if value.class == String && value.match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/)
-          @attributes[key] = Time.parse(value)
+          attributes[key] = Time.parse(value)
         end
       end
     end
 
     def set_attribute_ids
-      @attributes["_id"] = BSON::ObjectID.from_string(@attributes["_id"].to_s)
+      attributes["_id"] = BSON::ObjectID.from_string(attributes["_id"].to_s)
     rescue BSON::InvalidObjectID
       return false
     end
 
+    def set_attribute_created_at
+      attributes["created_at"] = Time.now unless attributes["created_at"]
+    end
+
     def set_attribute_updated_at
-      @attributes["updated_at"] = Time.now
+      attributes["updated_at"] = Time.now
     end
   end
 end

data/lib/rackjson/mongo_document.rb

@@ -1,8 +1,5 @@
 module Rack::JSON
-  class MongoDocument
-    include Rack::JSON::BaseDocument
-
-    attr_accessor :attributes
+  class MongoDocument < Rack::JSON::Document
 
     def initialize(row)
       @attributes = row
@@ -12,7 +9,7 @@ module Rack::JSON
     private
 
     def set_attribute_ids
-      @attributes["_id"] = @attributes["_id"].to_s if (@attributes["_id"].is_a? BSON::ObjectID)
+      attributes["_id"] = attributes["_id"].to_s if (attributes["_id"].is_a? BSON::ObjectID)
     end
   end
 end

data/lib/rackjson/resource.rb

@@ -1,18 +1,21 @@
 module Rack::JSON
   class Resource
     include Rack::JSON::EndPoint
-    METHODS_NOT_ALLOWED = [:trace, :connect]
+    HTTP_METHODS = [:get, :post, :put, :delete]
 
     def initialize(app, options)
       @app = app
       @collections = options[:collections]
       @db = options[:db]
+      @methods = options[:only] || HTTP_METHODS - (options[:except] || [])
     end
 
     def call(env)
       request = Rack::JSON::Request.new(env)
       if bypass? request
         @app.call(env)
+      elsif method_not_allowed? request
+        render "", :status => 405
       else
         @collection = Rack::JSON::Collection.new(@db[request.collection])
         send(request.request_method.downcase, request)
@@ -33,16 +36,28 @@ module Rack::JSON
 
     [:get, :head].each do |method|
       define_method method do |request|
-        request.query.selector.merge!({:_id => request.resource_id}) if request.member_path?
-        documents = @collection.find(request.query.selector, request.query.options)
-        if documents.empty? && request.member_path?
-          render "document not found", :status => 404, :head => (method == :head)
-        else
-          render JSON.generate(documents), :head => (method == :head)
-        end
+        request.member_path? ? get_member(request, method) : get_collection(request, method)
       end
     end
 
+    def get_member(request, method)
+      request.query.selector.merge!({:_id => request.resource_id})
+      document = @collection.find_one(request.query.selector, request.query.options)
+      if document
+        render document, :head => (method == :head)
+      else
+        render "document not found", :status => 404, :head => (method == :head)
+      end
+    end
+
+    def get_collection(request, method)
+      render @collection.find(request.query.selector, request.query.options)
+    end
+
+    def not_allowed?(request)
+      
+    end
+
     def options(request)
       if request.collection_path?
         headers = { "Allow" => "GET, POST" }
@@ -53,9 +68,9 @@ module Rack::JSON
     end
 
     def post(request)
-      document = Rack::JSON::Document.new(request.json)
-      @collection.create(document.attributes)
-      render document.to_json, :status => 201
+      document = Rack::JSON::Document.create(request.json)
+      @collection.save(document)
+      render document, :status => 201
     rescue JSON::ParserError => error
       invalid_json error
     end
@@ -67,26 +82,21 @@ module Rack::JSON
     end
 
     def update(request)
-      document = Rack::JSON::Document.new(request.json)
-      document.add_id(request.resource_id)
-      if @collection.update(request.resource_id, document.attributes, request.query.selector)
-        render document.to_json, :status => 200
+      document = Rack::JSON::Document.create(request.json)
+      document.set_id(request.resource_id)
+      if @collection.update(request.resource_id, document, request.query.selector)
+        render document, :status => 200
       else
         render "document not found", :status => 404
       end
     end
 
     def upsert(request)
-      document = Rack::JSON::Document.new(request.json)
-      document.add_id(request.resource_id)
-      @collection.save(document.attributes)
-      render document.to_json, :status => 201
+      document = Rack::JSON::Document.create(request.json)
+      document.set_id(request.resource_id)
+      @collection.save(document)
+      render document, :status => 201
     end
 
-    METHODS_NOT_ALLOWED.each do |method|
-      define_method method do |request|
-        render "", :status => 405
-      end
-    end
   end
 end

data/lib/rackjson/response.rb

@@ -1,16 +1,21 @@
 module Rack::JSON
   class Response
+
+    class Rack::JSON::Response::BodyFormatError < ArgumentError ; end
+
+    attr_reader :status, :headers, :body
+
     def initialize(body, options={})
       @status = options[:status] || 200
-      @body = body
       @head = options[:head] || false
       @headers = options[:headers] || {}
+      parse_body(body)
       set_headers
       head_response if @head
     end
 
     def to_a
-      [@status, @headers, [@body]]
+      [status, headers, [body]]
     end
 
     private
@@ -19,15 +24,20 @@ module Rack::JSON
       @body = ""
     end
 
-    def set_headers
-      @headers["Content-Length"] = @body.length.to_s
-      begin
-        JSON.parse(@body)
+    def parse_body(body)
+      if body.is_a?(Rack::JSON::Document) || body.is_a?(Array)
+        @body = body.to_json
         @headers["Content-Type"] = "application/json"
-      rescue JSON::ParserError => error
-        # the response will only ever be either json or plain text
+      elsif body.is_a? String
+        @body = body
         @headers["Content-Type"] = "text/plain"
+      else
+        raise Rack::JSON::Response::BodyFormatError
       end
     end
+
+    def set_headers
+      @headers["Content-Length"] = body.length.to_s
+    end
   end
 end

data/rackjson.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rackjson}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oliver Nightingale"]
-  s.date = %q{2010-05-12}
+  s.date = %q{2010-08-17}
   s.description = %q{A rack end point for storing json documents.}
   s.email = %q{oliver.n@new-bamboo.co.uk}
   s.extra_rdoc_files = [
@@ -24,10 +24,11 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/rackjson.rb",
-     "lib/rackjson/base_document.rb",
      "lib/rackjson/collection.rb",
      "lib/rackjson/document.rb",
      "lib/rackjson/end_point.rb",
+     "lib/rackjson/extensions/BSON/object_id.rb",
+     "lib/rackjson/extensions/BSON/ordered_hash.rb",
      "lib/rackjson/filter.rb",
      "lib/rackjson/json_document.rb",
      "lib/rackjson/json_query.rb",
@@ -39,7 +40,6 @@ Gem::Specification.new do |s|
      "rackjson.gemspec",
      "test/helper.rb",
      "test/suite.rb",
-     "test/test_collection.rb",
      "test/test_document.rb",
      "test/test_filter.rb",
      "test/test_json_document.rb",
@@ -52,12 +52,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/olivernn/rackjson}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A rack end point for storing json documents.}
   s.test_files = [
     "test/helper.rb",
      "test/suite.rb",
-     "test/test_collection.rb",
      "test/test_document.rb",
      "test/test_filter.rb",
      "test/test_json_document.rb",
@@ -65,6 +64,7 @@ Gem::Specification.new do |s|
      "test/test_mongo_document.rb",
      "test/test_rack_builder.rb",
      "test/test_resource.rb",
+     "test/test_resource_modifier.rb",
      "test/test_response.rb"
   ]
 
@@ -73,20 +73,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongo>, [">= 0.19.1"])
+      s.add_runtime_dependency(%q<mongo>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<mongo_ext>, [">= 0.19.1"])
-      s.add_runtime_dependency(%q<json>, [">= 1.2.3"])
+      s.add_runtime_dependency(%q<json>, ["= 1.2.3"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0.1"])
     else
-      s.add_dependency(%q<mongo>, [">= 0.19.1"])
+      s.add_dependency(%q<mongo>, [">= 1.0.0"])
       s.add_dependency(%q<mongo_ext>, [">= 0.19.1"])
-      s.add_dependency(%q<json>, [">= 1.2.3"])
+      s.add_dependency(%q<json>, ["= 1.2.3"])
       s.add_dependency(%q<rack>, [">= 1.0.1"])
     end
   else
-    s.add_dependency(%q<mongo>, [">= 0.19.1"])
+    s.add_dependency(%q<mongo>, [">= 1.0.0"])
     s.add_dependency(%q<mongo_ext>, [">= 0.19.1"])
-    s.add_dependency(%q<json>, [">= 1.2.3"])
+    s.add_dependency(%q<json>, ["= 1.2.3"])
     s.add_dependency(%q<rack>, [">= 1.0.1"])
   end
 end

data/test/test_document.rb

@@ -13,14 +13,14 @@ class DocumentTest < Test::Unit::TestCase
 
   def test_adding_attributes_to_the_document
     json = '{"test":"hello"}'
-    document = Rack::JSON::Document.new(json)
+    document = Rack::JSON::Document.create(json)
     document.add_attributes("user_id" => 1)
     assert_equal(1, document.attributes["user_id"])
   end
 
   def test_creating_from_json
     json = '{"test":"hello"}'
-    document = Rack::JSON::Document.new(json)
+    document = Rack::JSON::Document.create(json)
     assert_equal("hello", document.attributes["test"])
     assert_equal(Time.now.to_s, document.attributes["created_at"].to_s)
     assert_equal(Time.now.to_s, document.attributes["updated_at"].to_s)
@@ -28,7 +28,7 @@ class DocumentTest < Test::Unit::TestCase
 
   def test_creating_from_json_with_id
     json = '{"_id": "4b9f783ba040140525000001", "test":"hello"}'
-    document = Rack::JSON::Document.new(json)
+    document = Rack::JSON::Document.create(json)
     assert_equal(BSON::ObjectID.from_string('4b9f783ba040140525000001'), document.attributes["_id"])
     assert_equal("hello", document.attributes["test"])
     assert_equal(Time.now.to_s, document.attributes["created_at"].to_s)
@@ -37,7 +37,7 @@ class DocumentTest < Test::Unit::TestCase
 
   def test_creating_from_json_with_non_object_id
     json = '{"_id": 1, "test":"hello"}'
-    document = Rack::JSON::Document.new(json)
+    document = Rack::JSON::Document.create(json)
     assert_equal(1, document.attributes["_id"])
     assert_equal("hello", document.attributes["test"])
     assert_equal(Time.now.to_s, document.attributes["created_at"].to_s)
@@ -46,14 +46,14 @@ class DocumentTest < Test::Unit::TestCase
 
   test "creating from json with single nested document" do
     json = '{"test":"hello", "nested":{"foo":"bar"}}'
-    document = Rack::JSON::Document.new(json)
+    document = Rack::JSON::Document.create(json)
     assert document.attributes['nested'].is_a?(Hash)
     assert_equal 'bar', document.attributes['nested']['foo']
   end
 
   test "creating from json with multiple nested documents" do
     json = '{"test":"hello", "nested":[{"foo":"bar"}, {"boo":"far"}]}'
-    document = Rack::JSON::Document.new(json)
+    document = Rack::JSON::Document.create(json)
     assert document.attributes['nested'].is_a?(Array)
     assert_equal({'foo' => 'bar'}, document.attributes['nested'][0])
     assert_equal 'far', document.attributes['nested'][1]['boo']
@@ -61,9 +61,9 @@ class DocumentTest < Test::Unit::TestCase
 
   def test_adding_id
     json = '{"test":"hello"}'
-    document = Rack::JSON::Document.new(json)
+    document = Rack::JSON::Document.create(json)
     id = @collection.insert(document.attributes)
-    document.add_id(id)
+    document.set_id(id)
     assert_equal(id.to_s, document.attributes[:_id].to_s)
   end
 
@@ -71,13 +71,13 @@ class DocumentTest < Test::Unit::TestCase
     @collection.insert({"test"=>"hello"})
     rows = []
     @collection.find.each { |r| rows << r }
-    document = Rack::JSON::Document.new(rows.first)
+    document = Rack::JSON::Document.create(rows.first)
     assert_equal("hello", document.attributes["test"])
   end
 
   def test_document_created_at
     json = '{"test":"hello", "created_at": "01/01/2010"}'
-    document = Rack::JSON::Document.new(json)
+    document = Rack::JSON::Document.create(json)
     assert_equal("hello", document.attributes["test"])
     assert_equal("01/01/2010", document.attributes["created_at"])
     assert_equal(Time.now.to_s, document.attributes["updated_at"].to_s)

data/test/test_json_document.rb

@@ -32,23 +32,7 @@ class JSONDocumentTest < Test::Unit::TestCase
     doc = JSON.generate hash
     assert_equal(hash["_id"], Rack::JSON::JSONDocument.new(doc).attributes["_id"])
   end
-  
-  def test_adding_an_id
-    hash = { "test" => "I don't have an ID" }
-    doc = JSON.generate hash
-    json_doc = Rack::JSON::JSONDocument.new(doc)
-    json_doc.add_id(1)
-    assert_equal(1, json_doc.attributes["_id"])
-  end
-  
-  def test_not_overriding_an_id
-    hash = { "test" => "I do have an ID", "_id" => 2 }
-    doc = JSON.generate hash
-    json_doc = Rack::JSON::JSONDocument.new(doc)
-    json_doc.add_id(1)
-    assert_equal(2 , json_doc.attributes["_id"])
-  end
-  
+
   def test_adding_timestamps
     hash = { "_id" => 1 }
     doc = JSON.generate hash

data/test/test_resource.rb

@@ -6,6 +6,7 @@ class ResourceTest < Test::Unit::TestCase
   def setup
     @db = Mongo::Connection.new.db("test")
     @collection = @db['testing']
+    use_basic_resource
   end
 
   def teardown
@@ -13,56 +14,87 @@ class ResourceTest < Test::Unit::TestCase
   end
 
   def app
-    Rack::JSON::Resource.new lambda { |env| 
+    Rack::JSON::Resource.new lambda { |env|
       [404, {'Content-Length' => '9', 'Content-Type' => 'text/plain'}, ["Not Found"]]
-    },  :collections => [:testing], :db => @db 
+    },  :collections => [:testing], :db => @db
   end
 
-  test "test get non existing resource" do
+  def basic_app
+    Rack::JSON::Resource.new lambda { |env|
+      [404, {'Content-Length' => '9', 'Content-Type' => 'text/plain'}, ["Not Found"]]
+    },  :collections => [:testing], :db => @db
+  end
+
+  def get_only_app
+    Rack::JSON::Resource.new lambda { |env|
+      [404, {'Content-Length' => '9', 'Content-Type' => 'text/plain'}, ["Not Found"]]
+    },  :collections => [:testing], :db => @db, :only => [:get]
+  end
+
+  def no_delete_app
+    Rack::JSON::Resource.new lambda { |env|
+      [404, {'Content-Length' => '9', 'Content-Type' => 'text/plain'}, ["Not Found"]]
+    },  :collections => [:testing], :db => @db, :except => [:delete]
+  end
+
+  def use_basic_resource
+    ResourceTest.class_eval { def app; basic_app; end }
+  end
+
+  def use_get_only_resource
+    ResourceTest.class_eval { def app; get_only_app; end }
+  end
+
+  def use_no_delete_resource
+    ResourceTest.class_eval { def app; no_delete_app; end }
+  end
+
+  test "get non existing resource" do
     get '/blah'
     assert_equal 404, last_response.status
   end
 
-  test "test post non existing resource" do
+  test "post non existing resource" do
     post '/blah', '{ "title": "hello!" }'
     assert_equal 404, last_response.status
   end
 
-  test "test get root" do
+  test "get root" do
     get '/'
     assert_equal 404, last_response.status
   end
 
-  test "test index method" do
+  test "index method" do
     @collection.save({:testing => true})
     get '/testing'
     assert last_response.ok?
     assert_match /"testing":true/, last_response.body
   end
 
-  test "test creating a document" do
+  test "creating a document" do
     put '/testing/1', '{"title": "testing"}'
     assert_equal 201, last_response.status
     assert_match /"_id":1/, last_response.body
     assert_match /"title":"testing"/, last_response.body
   end
 
-  test "test show a single document" do
+  test "show a single document" do
     put '/testing/1', '{"title": "testing first"}'
     post '/testing', '{"title": "testing second"}'
     get '/testing/1'
     assert last_response.ok?
     assert_match /"title":"testing first"/, last_response.body
     assert_no_match /"title":"testing second"/, last_response.body
+    assert_instance_of Hash, JSON.parse(last_response.body)
   end
 
-  test "test not finding a specific document" do
+  test "not finding a specific document" do
     get '/testing/1'
     assert_equal 404, last_response.status
     assert_equal "document not found", last_response.body
   end
 
-  test "test index method with query parameters" do
+  test "index method with query parameters" do
     @collection.save({:testing => true, :rating => 5, :title => 'testing'})
     get '/testing?[?title=testing]'
     assert last_response.ok?
@@ -72,7 +104,7 @@ class ResourceTest < Test::Unit::TestCase
     assert_match /"title":"testing"/, last_response.body
   end
 
-  test "test index method with sort" do
+  test "index method with sort" do
     @collection.save({:testing => true, :rating => 5, :title => 'testing'})
     get '/testing?[/title]'
     assert last_response.ok?
@@ -82,22 +114,21 @@ class ResourceTest < Test::Unit::TestCase
     assert_match /"title":"testing"/, last_response.body
   end
 
-  test "test putting a new document" do
+  test "putting a new document" do
     put '/testing/1', '{"title": "testing update"}'
     assert_equal 201, last_response.status
     assert_match /"_id":1/, last_response.body
     assert_match /"title":"testing update"/, last_response.body
   end
 
-  test "test updating a document" do
+  test "updating a document" do
     @collection.save({:title => 'testing', :_id => 1})
     put '/testing/1', '{"title": "testing update"}'
-    assert last_response.ok?
     assert_match /"_id":1/, last_response.body
     assert_match /"title":"testing update"/, last_response.body
   end
 
-  test "test updating a document with matching query params" do
+  test "updating a document with matching query params" do
     @collection.save({:title => 'testing', :_id => 1, :user_id => 1})
     put '/testing/1?[?user_id=1]', '{"title": "testing update"}'
     assert last_response.ok?
@@ -105,7 +136,7 @@ class ResourceTest < Test::Unit::TestCase
     assert_match /"title":"testing update"/, last_response.body
   end
 
-  test "test updating a document with non matching query params" do
+  test "updating a document with non matching query params" do
     @collection.save({:title => 'testing', :_id => 1, :user_id => 2})
     put '/testing/1?[?user_id=1]', '{"title": "testing update"}'
     assert_equal 404, last_response.status
@@ -113,7 +144,7 @@ class ResourceTest < Test::Unit::TestCase
     assert_nil @collection.find_one(:_id => 1, :user_id => 1)
   end
 
-  test "test deleting a document" do
+  test "deleting a document" do
     @collection.save({:title => 'testing', :_id => 1})
     assert @collection.find_one({:_id => 1})
     delete '/testing/1'
@@ -121,12 +152,12 @@ class ResourceTest < Test::Unit::TestCase
     assert_nil @collection.find_one({:_id => 1})
   end
 
-  test "test deleting only with member path" do
+  test "deleting only with member path" do
     delete '/testing'
     assert_equal 405, last_response.status
   end
 
-  test "test posting a document" do
+  test "posting a document" do
     post '/testing', '{"title": "testing"}'
     assert last_response.status == 201
     assert_match /"title":"testing"/, last_response.body
@@ -141,4 +172,18 @@ class ResourceTest < Test::Unit::TestCase
     assert_no_match /"foo":"bar"/, last_response.body
     assert_match /"title":"testing"/, last_response.body
   end
+
+  test "restricting the http methods supported using the 'only' option" do
+    use_get_only_resource
+
+    post '/testing', '{"title": "testing"}'
+    assert last_response.status == 405
+  end
+
+  test "restricting the http methods supported using the 'except' option" do
+    use_no_delete_resource
+
+    delete 'testing/1'
+    assert last_response.status == 405
+  end
 end

data/test/test_resource_modifier.rb

@@ -0,0 +1,73 @@
+# require 'helper'
+# 
+# class ResourceModifierTest < Test::Unit::TestCase
+#   include Rack::Test::Methods
+#   include Rack::Utils
+# 
+#   def setup
+#     @db = Mongo::Connection.new.db("test")
+#     @collection = @db['testing']
+#     @doc = @collection.save(:_id => 1, :count => 0, :likers => [])
+#   end
+# 
+#   def teardown
+#     @collection.drop
+#   end
+# 
+#   def app
+#     Rack::JSON::ResourceModifier.new lambda { |env|
+#       [404, {'Content-Length' => '9', 'Content-Type' => 'text/plain'}, ["Not Found"]]
+#     },  :collections => [:testing], :db => @db
+#   end
+# 
+#   test "ignore non matched resources" do
+#     put '/foo/1'
+#     assert_status_not_found last_response
+#   end
+# 
+#   test "ignore non modifier resources" do
+#     put '/testing/1'
+#     assert_status_not_found last_response
+#   end
+# 
+#   test "ignoring modifier requests with the wrong method" do
+#     post '/testing/1/inc?field=count'
+#     assert_status_not_found last_response
+#   end
+# 
+#   test "incrementing a value" do
+#     put '/testing/1/inc?field=count'
+#     assert_status_ok last_response
+#     assert_equal 1, @collection.find_one({:_id => 1})["count"]
+#   end
+# 
+#   test "decrementing a value" do
+#     put '/testing/1/dec?field=count'
+#     assert_status_ok last_response
+#     assert_equal -1, @collection.find_one({:_id => 1})["count"]
+#   end
+# 
+#   test "incrementing a non-existant field" do
+#     put '/testing/1/inc?field=non_existant'
+#     assert_status_ok last_response
+#     assert_equal 0, @collection.find_one({:_id => 1})["count"]
+#     assert_equal 1, @collection.find_one({:_id => 1})["non_existant"]
+#   end
+# 
+#   test "decrementing a non-existent field" do
+#     put '/testing/1/dec?field=non_existant'
+#     assert_status_ok last_response
+#     assert_equal 0, @collection.find_one({:_id => 1})["count"]
+#     assert_equal -1, @collection.find_one({:_id => 1})["non_existant"]
+#   end
+# 
+#   test "pushing a value onto the end of an array" do
+#     testing/1/counter/_inc
+#     testing/1/counter/_dec
+#     testing/1/likers?operation
+#     put '/testing/1/push?field=asdfa' '{"value": [123] }'
+#     put '/testing/1/push', '{"field": "likers", "value": 1}'
+#     assert_status_ok last_response
+#     assert_equal [1], @collection.find_one({:_id => 1})['likers']
+#   end
+# end

data/test/test_response.rb

@@ -8,38 +8,40 @@ class ResponseTest < Test::Unit::TestCase
 
   def test_default_http_status_to_200
     response = Rack::JSON::Response.new("test")
-    assert_equal(200, response.to_a[0])
+    assert_equal(200, response.status)
   end
 
   def test_setting_http_status_code
     response = Rack::JSON::Response.new("test", :status => 422)
-    assert_equal(422, response.to_a[0])
+    assert_equal(422, response.status)
   end
 
   def test_response_body
     response = Rack::JSON::Response.new("test")
-    assert_equal(["test"], response.to_a[2])
+    assert_equal("test", response.body)
   end
 
   def test_setting_the_content_length
     response = Rack::JSON::Response.new("test")
-    assert_equal("4", response.to_a[1]["Content-Length"])
+    assert_equal("4", response.headers["Content-Length"])
   end
 
   def test_setting_the_content_type
     response = Rack::JSON::Response.new("test")
-    assert_equal("text/plain", response.to_a[1]["Content-Type"])
+    assert_equal("text/plain", response.headers["Content-Type"])
   end
 
-  def test_sending_json
-    response = Rack::JSON::Response.new("{'title': 'hello'}")
-    assert_equal(["{'title': 'hello'}"], response.to_a[2])
+  test "sending document" do
+    h = BSON::OrderedHash.new
+    h[:title] = 'Hello'
+    response = Rack::JSON::Response.new(Rack::JSON::Document.create(h))
+    assert_match(JSON.parse(response.body)['title'], 'Hello')
   end
 
   def test_head_response
     response = Rack::JSON::Response.new("test", :head => true)
     assert_equal([""], response.to_a[2])
     assert_equal("4", response.to_a[1]["Content-Length"])
-    assert_equal("text/plain", response.to_a[1]["Content-Type"])
+    assert_equal("text/plain", response.headers["Content-Type"])
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rackjson
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Oliver Nightingale
@@ -9,49 +14,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 +01:00
+date: 2010-08-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.19.1
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mongo_ext
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 19
+        - 1
         version: 0.19.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 3
         version: 1.2.3
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: A rack end point for storing json documents.
 email: oliver.n@new-bamboo.co.uk
 executables: []
@@ -69,10 +90,11 @@ files:
 - Rakefile
 - VERSION
 - lib/rackjson.rb
-- lib/rackjson/base_document.rb
 - lib/rackjson/collection.rb
 - lib/rackjson/document.rb
 - lib/rackjson/end_point.rb
+- lib/rackjson/extensions/BSON/object_id.rb
+- lib/rackjson/extensions/BSON/ordered_hash.rb
 - lib/rackjson/filter.rb
 - lib/rackjson/json_document.rb
 - lib/rackjson/json_query.rb
@@ -84,7 +106,6 @@ files:
 - rackjson.gemspec
 - test/helper.rb
 - test/suite.rb
-- test/test_collection.rb
 - test/test_document.rb
 - test/test_filter.rb
 - test/test_json_document.rb
@@ -106,25 +127,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A rack end point for storing json documents.
 test_files: 
 - test/helper.rb
 - test/suite.rb
-- test/test_collection.rb
 - test/test_document.rb
 - test/test_filter.rb
 - test/test_json_document.rb
@@ -132,4 +154,5 @@ test_files:
 - test/test_mongo_document.rb
 - test/test_rack_builder.rb
 - test/test_resource.rb
+- test/test_resource_modifier.rb
 - test/test_response.rb

data/lib/rackjson/base_document.rb

@@ -1,18 +0,0 @@
-module Rack::JSON
-  module BaseDocument
-
-    private
-
-    def set_attribute_created_at
-      @attributes["created_at"] = Time.now unless @attributes["created_at"]
-    end
-
-    def set_attributes
-      private_methods.each do |method|
-        if method.match /^set_attribute_\w*$/
-          send method
-        end
-      end
-    end
-  end
-end

data/test/test_collection.rb

@@ -1,111 +0,0 @@
-require 'helper'
-
-class CollectionTest < Test::Unit::TestCase
-  def setup
-    @db = Mongo::Connection.new.db("test")
-    @mongo_collection = @db['testing']
-    @collection = Rack::JSON::Collection.new(@mongo_collection)
-  end
-
-  def teardown
-    @collection.delete_all
-  end
-
-  test "finding a single document by id" do
-    mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    assert_equal @collection.find(1).attributes['testing'], @mongo_collection.find_one(:_id => 1)['testing']
-    assert_equal @collection.find(1).attributes['rating'], @mongo_collection.find_one(:_id => 1)['rating']
-    assert_equal @collection.find(1).attributes['title'], @mongo_collection.find_one(:_id => 1)['title']
-    assert_kind_of Rack::JSON::Document, @collection.find(1)
-  end
-
-  def test_finding_documents_using_search_conditions
-    mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    mongo_results = []
-    @mongo_collection.find(:testing => true).each { |row| mongo_results << row }
-    assert_equal @collection.find(:testing => true, :rating => 5).first.attributes['testing'], mongo_results.first['testing']
-    assert_kind_of Rack::JSON::Document, @collection.find(:testing => true).first
-  end
-
-  def test_finding_documents_using_multiple_search_conditions
-    mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    mongo_results = []
-    @mongo_collection.find(:testing => true, :rating => 5).each { |row| mongo_results << row }
-    assert_equal @collection.find(:testing => true, :rating => 5).length, mongo_results.length
-    assert_equal @collection.find(:testing => true, :rating => 5).first.attributes['testing'], mongo_results.first['testing']
-  end
-
-  def test_finding_no_documents_using_search_conditions
-    mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    assert_equal @collection.find(:testing => false, :rating => 5), []
-  end
-
-  def test_finding_documents_with_options
-    first_mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    second_mongo_document = @mongo_collection.save({:testing => true, :rating => 10, :title => 'testing', :_id => 2})
-    third_mongo_document = @mongo_collection.save({:testing => false, :rating => 10, :title => 'testing', :_id => 3})
-    assert_equal @collection.find({:testing => true}, {:sort => [:rating, :desc]}).length, 2
-    assert_equal @collection.find({:testing => true}, {:sort => [:rating, :desc]}).first.attributes["rating"], 10
-    assert_equal @collection.find({:testing => true}, {:sort => [:rating, :desc]}).first.attributes["testing"], true
-  end
-
-  def test_finding_all_documents_with_options
-    first_mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    second_mongo_document = @mongo_collection.save({:testing => true, :rating => 10, :title => 'testing', :_id => 2})
-    assert_equal @collection.all({:sort => [:rating, :desc]}).length, 2
-    assert_equal @collection.all({:sort => [:rating, :desc]}).first["rating"], 10
-  end
-
-  def test_finding_all_documents
-    first_mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    second_mongo_document = @mongo_collection.save({:testing => true, :rating => 10, :title => 'testing', :_id => 2})
-    assert_equal @collection.all.length, 2
-  end
-
-  def test_removing_a_document
-    first_mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    second_mongo_document = @mongo_collection.save({:testing => true, :rating => 10, :title => 'testing', :_id => 2})
-    assert_equal @collection.all.length, 2
-    @collection.delete(1)
-    assert_equal @collection.all.length, 1
-    assert_equal @collection.all.first["_id"], 2 
-  end
-
-  def test_removing_all_documents
-    first_mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    second_mongo_document = @mongo_collection.save({:testing => true, :rating => 10, :title => 'testing', :_id => 2})
-    assert_equal @collection.all.length, 2
-    @collection.delete
-    assert_equal @collection.all.length, 0
-  end
-
-  def test_whether_a_document_exists
-    first_mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    assert_equal @collection.all.length, 1
-    assert @collection.exists?(1)
-    assert !@collection.exists?(2)
-  end
-
-  def test_creating_a_document
-    assert_equal @collection.all.length, 0
-    assert @collection.create({:_id => 1, :title => 'testing'})
-    assert_equal @collection.all.length, 1
-    assert_equal @collection.find(1).attributes["title"], "testing"
-  end
-
-  def test_updating_an_existing_document_by_id
-    first_mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    assert_equal @collection.all.length, 1
-    assert @collection.exists?(1)
-    assert @collection.update(1, {:testing => false})
-    assert_equal @collection.find(1).attributes["testing"], false
-  end
-
-  def test_updating_an_existing_document_but_selector_fails
-    first_mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
-    assert_equal @collection.all.length, 1
-    assert @collection.exists?(1)
-    assert !@collection.update(1, {:testing => false}, {:rating => 6})
-    assert_equal @collection.find(1).attributes["testing"], true
-  end
-end