rackjson 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/rackjson/request.rb

@@ -18,11 +18,11 @@ module Rack::JSON
     end
 
     def collection_path?
-      self.path_info.match /^\/\w+$/
+      self.path_info.match /^\/[\w-]+$/
     end
 
     def member_path?
-      self.path_info.match /^\/\w+\/\w+$/
+      self.path_info.match /^\/\w+\/[\w-]+$/
     end
 
     def json

data/rackjson.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rackjson}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oliver Nightingale"]
-  s.date = %q{2010-05-06}
+  s.date = %q{2010-05-12}
   s.description = %q{A rack end point for storing json documents.}
   s.email = %q{oliver.n@new-bamboo.co.uk}
   s.extra_rdoc_files = [

data/test/test_resource.rb

@@ -18,36 +18,36 @@ class ResourceTest < Test::Unit::TestCase
     },  :collections => [:testing], :db => @db 
   end
 
-  def test_get_non_existing_resource
+  test "test get non existing resource" do
     get '/blah'
     assert_equal 404, last_response.status
   end
 
-  def test_post_non_existing_resource
+  test "test post non existing resource" do
     post '/blah', '{ "title": "hello!" }'
     assert_equal 404, last_response.status
   end
 
-  def test_get_root
+  test "test get root" do
     get '/'
     assert_equal 404, last_response.status
   end
 
-  def test_index_method
+  test "test index method" do
     @collection.save({:testing => true})
     get '/testing'
     assert last_response.ok?
     assert_match /"testing":true/, last_response.body
   end
 
-  def test_creating_a_document
+  test "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
 
-  def test_show_a_single_document
+  test "test show a single document" do
     put '/testing/1', '{"title": "testing first"}'
     post '/testing', '{"title": "testing second"}'
     get '/testing/1'
@@ -56,13 +56,13 @@ class ResourceTest < Test::Unit::TestCase
     assert_no_match /"title":"testing second"/, last_response.body
   end
 
-  def test_not_finding_a_specific_document
+  test "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
 
-  def test_index_method_with_query_parameters
+  test "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 +72,7 @@ class ResourceTest < Test::Unit::TestCase
     assert_match /"title":"testing"/, last_response.body
   end
 
-  def test_index_method_with_sort
+  test "test index method with sort" do
     @collection.save({:testing => true, :rating => 5, :title => 'testing'})
     get '/testing?[/title]'
     assert last_response.ok?
@@ -82,14 +82,14 @@ class ResourceTest < Test::Unit::TestCase
     assert_match /"title":"testing"/, last_response.body
   end
 
-  def test_putting_a_new_document
+  test "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
 
-  def test_updating_a_document
+  test "test updating a document" do
     @collection.save({:title => 'testing', :_id => 1})
     put '/testing/1', '{"title": "testing update"}'
     assert last_response.ok?
@@ -97,7 +97,7 @@ class ResourceTest < Test::Unit::TestCase
     assert_match /"title":"testing update"/, last_response.body
   end
 
-  def test_updating_a_document_with_matching_query_params
+  test "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 +105,7 @@ class ResourceTest < Test::Unit::TestCase
     assert_match /"title":"testing update"/, last_response.body
   end
 
-  def test_updating_a_document_with_non_matching_query_params
+  test "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 +113,7 @@ class ResourceTest < Test::Unit::TestCase
     assert_nil @collection.find_one(:_id => 1, :user_id => 1)
   end
 
-  def test_deleting_a_document
+  test "test deleting a document" do
     @collection.save({:title => 'testing', :_id => 1})
     assert @collection.find_one({:_id => 1})
     delete '/testing/1'
@@ -121,14 +121,24 @@ class ResourceTest < Test::Unit::TestCase
     assert_nil @collection.find_one({:_id => 1})
   end
 
-  def test_deleting_only_with_member_path
+  test "test deleting only with member path" do
     delete '/testing'
     assert_equal 405, last_response.status
   end
 
-  def test_posting_a_document
+  test "test posting a document" do
     post '/testing', '{"title": "testing"}'
     assert last_response.status == 201
     assert_match /"title":"testing"/, last_response.body
   end
+
+  test "using a string id for a document" do
+    put '/testing/string-id-1', '{"title": "testing"}'
+    put '/testing/another-string-id-2', '{"foo": "bar"}'
+    assert last_response.status == 201
+    get '/testing/string-id-1'
+    assert_equal 'testing', @collection.find_one({:_id => 'string-id-1'})['title']
+    assert_no_match /"foo":"bar"/, last_response.body
+    assert_match /"title":"testing"/, last_response.body
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rackjson
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Oliver Nightingale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +01:00
+date: 2010-05-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency