rackjson 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/rackjson/collection.rb

@@ -0,0 +1,58 @@
+module Rack::JSON
+  class Collection
+    def initialize(collection)
+      @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
+    end
+
+    def save(document)
+      @collection.save(document)
+    end
+
+    def update(selector, document, query={})
+      if exists?(prepared(selector).merge(query))
+        @collection.update(prepared(selector).merge(query), document, :upsert => false)
+      else
+        false
+      end
+    end
+
+    private
+
+    def prepared selector
+      if selector.is_a? Hash
+        selector
+      else
+        {:_id => selector}
+      end
+    end
+
+  end
+end

data/lib/rackjson/document.rb

@@ -9,21 +9,24 @@ module Rack::JSON
       end
     end
 
+    def add_attributes(pair)
+      @document.attributes.merge!(pair)
+    end
+
     def method_missing(name, *args)
       @document.send(name, *args)
     end
 
-    def to_json
+    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
         end
       end
-      @json ||= JSON.generate gen_attrs
+      gen_attrs.to_json
     end
   end
 end

data/lib/rackjson/filter.rb

@@ -0,0 +1,44 @@
+module Rack::JSON
+  class Filter
+
+    def initialize(app, options)
+      @app = app
+      @collections = options[:collections]
+      @filters = options[:filters]
+    end
+
+    def call(env)
+      request = Rack::JSON::Request.new(env)
+      if bypass? request
+        @app.call(env)
+      else
+        apply_filters(request)
+      end
+    end
+
+    private
+
+    def append_filters_to_document_in request
+      document = Rack::JSON::Document.new(request.json)
+      document.add_attributes(request.session.reject { |key, value| !@filters.include?(key.to_sym) })
+      request.set_body(document.to_json)
+    end
+
+    def apply_filters(request)
+      @filters.each do |filter|
+        return pre_condition_not_met unless request.session[filter.to_s]
+        request.add_query_param "[?#{filter}=#{request.session[filter.to_s]}]"
+      end
+      append_filters_to_document_in request if request.post? || request.put?
+      @app.call(request.env)
+    end
+
+    def bypass?(request)
+      request.collection.empty? || !(@collections.include? request.collection.to_sym)
+    end
+
+    def pre_condition_not_met
+      Rack::JSON::Response.new("pre condition not met", :status => 412, :head => true).to_a
+    end
+  end
+end

data/lib/rackjson/request.rb

@@ -1,10 +1,18 @@
 module Rack::JSON
   class Request < Rack::Request
     include Rack::Utils
+
+    attr_reader :env
+
     def initialize(env)
+      @env = env
       super(env)
     end
 
+    def add_query_param(param)
+      self.query_string << param
+    end
+
     def collection
       self.path_info.split('/')[1] || ""
     end
@@ -34,5 +42,14 @@ module Rack::JSON
         id_string.match(/^\d+$/) ? id_string.to_i : id_string
       end
     end
+
+    def session
+      @env['rack.session']
+    end
+
+    def set_body json
+      @env['rack.input'] = StringIO.new(json)
+      @env['rack.input'].rewind
+    end
   end
 end

data/lib/rackjson/resource.rb

@@ -13,7 +13,7 @@ module Rack::JSON
       if bypass? request
         @app.call(env)
       else
-        @collection = @db[request.collection]
+        @collection = Rack::JSON::Collection.new(@db[request.collection])
         send(request.request_method.downcase, request)
       end
     end
@@ -21,12 +21,12 @@ module Rack::JSON
     private
 
     def bypass?(request)
-      !(@collections.include? request.collection.to_sym)
+      request.collection.empty? || !(@collections.include? request.collection.to_sym)
     end
 
     def delete(request)
       if request.member_path?
-        if @collection.remove({:_id => request.resource_id})
+        if @collection.delete({:_id => request.resource_id})
           render "{'ok': true}"
         end
       else
@@ -37,12 +37,11 @@ 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?
-        rows = []
-        @collection.find(request.query.selector, request.query.options).each { |row| rows << Rack::JSON::Document.new(row).attributes }
-        if rows.empty? && 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(rows), :head => (method == :head)
+          render JSON.generate(documents), :head => (method == :head)
         end
       end
     end
@@ -58,18 +57,14 @@ module Rack::JSON
 
     def post(request)
       document = Rack::JSON::Document.new(request.json)
-      @collection.insert(document.attributes)
+      @collection.create(document.attributes)
       render document.to_json, :status => 201
     rescue JSON::ParserError => error
       render (error.class.to_s + " :" + error.message), :status => 422
     end
 
     def put(request)
-      @collection.find_one(:_id => request.resource_id) ? status = 200 : status = 201
-      document = Rack::JSON::Document.new(request.json)
-      document.add_id(request.resource_id)
-      @collection.save(document.attributes)
-      render document.to_json, :status => status
+      @collection.exists?(request.resource_id) ? update(request) : upsert(request)
     rescue JSON::ParserError => error
       render (error.class.to_s + " :" + error.message), :status => 422
     end
@@ -78,8 +73,25 @@ module Rack::JSON
       Rack::JSON::Response.new(body, options).to_a
     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
+      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
+    end
+
     METHODS_NOT_ALLOWED.each do |method|
-      define_method method do
+      define_method method do |request|
         render "", :status => 405
       end
     end

data/lib/rackjson/response.rb

@@ -10,7 +10,7 @@ module Rack::JSON
     end
 
     def to_a
-      [@status, @headers, @body]
+      [@status, @headers, [@body]]
     end
 
     private

data/lib/rackjson.rb

@@ -1,40 +1,22 @@
-module Rack #:nodoc:
-  class Builder
-
-    # Setup resource collections hosted behind OAuth and OpenID auth filters.
-    #
-    # ===Example
-    #   contain :notes, :projects
-    #
-    # def contain(*args)
-    #   @ins << lambda do |app|
-    #     Rack::Session::Pool.new(
-    #       CloudKit::OAuthFilter.new(
-    #         CloudKit::OpenIDFilter.new(
-    #           CloudKit::Service.new(app, :collections => args.to_a))))
-    #   end
-    #   @last_cloudkit_id = @ins.last.object_id
-    # end
-
-    def private_resource
-      @ins << lambda do |app|
-        Rack::JSON::UserFilter.new(
-          Rack::JSON::Resource.new(app, args.first),
-          args.first
-        )
-      end
+class Hash
+  def symbolize_keys
+    inject({}) do |options, (key, value)|
+      options[(key.to_sym rescue key) || key] = value
+      options
     end
+  end
 
-    # Setup resource collections without authentication.
-    #
-    # ===Example
-    #   expose_resources :collections => [:notes, :projects], :db => Mongo::Connection.new.db("my_mongodb")
-    #
-    def expose_resource(*args)
-      @ins << lambda do |app|
-        Rack::JSON::Resource.new(app, args.first)
-      end
-    end
+  def symbolize_keys!
+    self.replace(self.symbolize_keys)
+  end
+
+  def recursive_symbolize_keys!
+    symbolize_keys!
+    # symbolize each hash in .values
+    values.each{|h| h.recursive_symbolize_keys! if h.is_a?(Hash) }
+    # symbolize each hash inside an array in .values
+    values.select{|v| v.is_a?(Array) }.flatten.each{|h| h.recursive_symbolize_keys! if h.is_a?(Hash) }
+    self
   end
 end
 
@@ -46,6 +28,8 @@ require 'time'
 
 module Rack::JSON
 
+  autoload :Collection, 'rackjson/collection'
+  autoload :Filter, 'rackjson/filter'
   autoload :Document, 'rackjson/document'
   autoload :JSONDocument, 'rackjson/json_document'
   autoload :JSONQuery, 'rackjson/json_query'

data/rackjson.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rackjson}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oliver Nightingale"]
-  s.date = %q{2010-04-25}
+  s.date = %q{2010-04-26}
   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,7 +24,9 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/rackjson.rb",
+     "lib/rackjson/collection.rb",
      "lib/rackjson/document.rb",
+     "lib/rackjson/filter.rb",
      "lib/rackjson/json_document.rb",
      "lib/rackjson/json_query.rb",
      "lib/rackjson/mongo_document.rb",
@@ -34,7 +36,9 @@ 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",
      "test/test_json_query.rb",
      "test/test_mongo_document.rb",
@@ -44,13 +48,14 @@ 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.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{A rack end point for storing json documents.}
   s.test_files = [
     "test/helper.rb",
      "test/suite.rb",
-     "test/test_builder.rb",
+     "test/test_collection.rb",
      "test/test_document.rb",
+     "test/test_filter.rb",
      "test/test_json_document.rb",
      "test/test_json_query.rb",
      "test/test_mongo_document.rb",

data/test/helper.rb

@@ -3,6 +3,7 @@ require 'test/unit'
 require 'rack'
 require 'rack/test'
 require 'timecop'
+require 'uri'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/test/test_collection.rb

@@ -0,0 +1,109 @@
+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
+
+  def test_finding_a_single_document_by_id
+    mongo_document = @mongo_collection.save({:testing => true, :rating => 5, :title => 'testing', :_id => 1})
+    assert_equal @collection.find(1).attributes, @mongo_collection.find_one(:_id => 1)
+    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).first.attributes, mongo_results.first
+    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, mongo_results.first
+  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

data/test/test_document.rb

@@ -11,6 +11,13 @@ class DocumentTest < Test::Unit::TestCase
     @collection.drop
   end
 
+  def test_adding_attributes_to_the_document
+    json = '{"test":"hello"}'
+    document = Rack::JSON::Document.new(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)

data/test/test_filter.rb

@@ -0,0 +1,58 @@
+require 'helper'
+
+class FilterTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+  include Rack::Utils
+
+  def app
+    Rack::Session::Cookie.new(
+      Rack::JSON::Filter.new lambda { |env|
+        request = Rack::JSON::Request.new(env)
+        env['rack.session'] = {}
+        env['rack.session']['user_id'] = 1
+        [200, {'Content-Length' => request.json.length.to_s, 'Content-Type' => 'text/plain'}, [request.json]]
+      },  :collections => [:testing], :filters => [:user_id]
+    )
+  end
+
+  def test_adding_user_id_query_parameter
+    get '/login'
+    get '/testing'
+    assert_equal "[?user_id=1]", last_request.query_string
+  end
+
+  def test_not_overriding_existing_query_parameters
+    get '/login'
+    get '/testing?[?title=awesome]'
+    assert_equal '[?title=awesome][?user_id=1]', URI.decode(last_request.query_string)
+  end
+
+  def test_reject_request_if_no_session_var
+    get '/testing'
+    assert_equal 412, last_response.status
+  end
+
+  def test_setting_query_params_on_post
+    get '/login'
+    post '/testing', '{ "title": "hello!" }'
+    assert_equal "[?user_id=1]", last_request.query_string
+  end
+
+  def test_setting_query_params_on_put
+    get '/login'
+    put '/testing/1', '{ "title": "hello!" }'
+    assert_equal "[?user_id=1]", last_request.query_string
+  end
+
+  def test_setting_query_params_on_delete
+    get '/login'
+    delete '/testing'
+    assert_equal "[?user_id=1]", last_request.query_string
+  end
+
+  def test_appending_query_param_to_document
+    get '/login'
+    post '/testing', '{ "title": "hello!" }'
+    assert_match /"user_id":1/, last_response.body
+  end
+end

data/test/test_resource.rb

@@ -14,15 +14,25 @@ class ResourceTest < Test::Unit::TestCase
 
   def app
     Rack::JSON::Resource.new lambda { |env| 
-      [404, {'Content-Length' => '9', 'Content-Type' => 'text/plain'}, "Not Found"]
+      [404, {'Content-Length' => '9', 'Content-Type' => 'text/plain'}, ["Not Found"]]
     },  :collections => [:testing], :db => @db 
   end
 
-  def test_non_existing_resource
+  def test_get_non_existing_resource
     get '/blah'
     assert_equal 404, last_response.status
   end
 
+  def test_post_non_existing_resource
+    post '/blah', '{ "title": "hello!" }'
+    assert_equal 404, last_response.status
+  end
+
+  def test_get_root
+    get '/'
+    assert_equal 404, last_response.status
+  end
+
   def test_index_method
     @collection.save({:testing => true})
     get '/testing'
@@ -39,7 +49,7 @@ class ResourceTest < Test::Unit::TestCase
 
   def test_show_a_single_document
     put '/testing/1', '{"title": "testing first"}'
-    put '/testing/2', '{"title": "testing second"}'
+    post '/testing', '{"title": "testing second"}'
     get '/testing/1'
     assert last_response.ok?
     assert_match /"title":"testing first"/, last_response.body
@@ -87,6 +97,22 @@ class ResourceTest < Test::Unit::TestCase
     assert_match /"title":"testing update"/, last_response.body
   end
 
+  def test_updating_a_document_with_matching_query_params
+    @collection.save({:title => 'testing', :_id => 1, :user_id => 1})
+    put '/testing/1?[?user_id=1]', '{"title": "testing update"}'
+    assert last_response.ok?
+    assert_match /"_id":1/, last_response.body
+    assert_match /"title":"testing update"/, last_response.body
+  end
+
+  def test_updating_a_document_with_non_matching_query_params
+    @collection.save({:title => 'testing', :_id => 1, :user_id => 2})
+    put '/testing/1?[?user_id=1]', '{"title": "testing update"}'
+    assert_equal 404, last_response.status
+    assert_equal @collection.find_one(:_id => 1)["title"], 'testing'
+    assert_nil @collection.find_one(:_id => 1, :user_id => 1)
+  end
+
   def test_deleting_a_document
     @collection.save({:title => 'testing', :_id => 1})
     assert @collection.find_one({:_id => 1})

data/test/test_response.rb

@@ -18,7 +18,7 @@ class ResponseTest < Test::Unit::TestCase
 
   def test_response_body
     response = Rack::JSON::Response.new("test")
-    assert_equal("test", response.to_a[2])
+    assert_equal(["test"], response.to_a[2])
   end
 
   def test_setting_the_content_length
@@ -33,12 +33,12 @@ class ResponseTest < Test::Unit::TestCase
 
   def test_sending_json
     response = Rack::JSON::Response.new("{'title': 'hello'}")
-    assert_equal("{'title': 'hello'}", response.to_a[2])
+    assert_equal(["{'title': 'hello'}"], response.to_a[2])
   end
 
   def test_head_response
     response = Rack::JSON::Response.new("test", :head => true)
-    assert_equal("", response.to_a[2])
+    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"])
   end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rackjson
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Oliver Nightingale
@@ -14,65 +9,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 +01:00
+date: 2010-04-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 19
-        - 1
         version: 0.19.1
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mongo_ext
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 19
-        - 1
         version: 0.19.1
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: json
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 3
         version: 1.2.3
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
-  type: :runtime
-  version_requirements: *id004
+    version: 
 description: A rack end point for storing json documents.
 email: oliver.n@new-bamboo.co.uk
 executables: []
@@ -90,7 +69,9 @@ files:
 - Rakefile
 - VERSION
 - lib/rackjson.rb
+- lib/rackjson/collection.rb
 - lib/rackjson/document.rb
+- lib/rackjson/filter.rb
 - lib/rackjson/json_document.rb
 - lib/rackjson/json_query.rb
 - lib/rackjson/mongo_document.rb
@@ -100,7 +81,9 @@ 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
 - test/test_json_query.rb
 - test/test_mongo_document.rb
@@ -119,28 +102,27 @@ 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.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A rack end point for storing json documents.
 test_files: 
 - test/helper.rb
 - test/suite.rb
-- test/test_builder.rb
+- test/test_collection.rb
 - test/test_document.rb
+- test/test_filter.rb
 - test/test_json_document.rb
 - test/test_json_query.rb
 - test/test_mongo_document.rb

data/test/test_builder.rb

@@ -1,17 +0,0 @@
-require 'helper'
-require 'rack/builder'
-
-class BuilderTest < Test::Unit::TestCase
-
-  def test_expose_resource_shortcut
-    app = Rack::Builder.new do
-      expose_resource :collections => [:testing], :db => Mongo::Connection.new.db("test")
-      run lambda { |env| 
-        [404, {'Content-Length' => '9', 'Content-Type' => 'text/plain'}, "Not Found"]
-      }      
-    end
-
-    response = Rack::MockRequest.new(app).get('/testing')
-    assert response.ok?
-  end
-end