rackjson 0.4.1 → 0.4.2

data/README.markdown

@@ -18,7 +18,7 @@ In your rackup file:
     expose_resource :collections => [:notes], :db => Mongo::Connection.new.db("mydb")
     
     run lambda { |env| 
-      [404, {'Content-Length' => '9', 'Content-Type' => 'text/plain'}, "Not Found"]
+      [404, {'Content-Type' => 'text/plain'}, ["Not Found"]]
     }
 
 This will set up a RESTful resource called 'notes' at /notes which will store any JSON document.
@@ -45,9 +45,9 @@ Using `expose_resource` won't restrict access to the resource at all, all reques
 
 Using `public_resource` will allow everyone to perform GET requests against the resource, however to make POST, PUT or DELETE requests the requester must have a specific session param, and will only be able to make requests to documents which match this session param.  In the above example this session param is set to user_id and could be set when logging in.
 
-`public_resource :collections => [:notes], :filters => [:user_id], :db => Mongo::Connection.new.db("mydb")`
+`private_resource :collections => [:notes], :filters => [:user_id], :db => Mongo::Connection.new.db("mydb")`
 
-Private resource is very similar except that all requests, including GET requests must also satisfy the pre-condition of having a specific session param.
+`private_resource` is very similar except that all requests, including GET requests must also satisfy the pre-condition of having a specific session param.
 
 When creating resources with either the public or private resources the specified session param will be included in the document automatically.
 

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Oliver Nightingale"]
     gem.add_dependency('mongo', '>=1.1.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.4.1
+0.4.2

data/lib/rackjson.rb

@@ -6,6 +6,7 @@ require 'time'
 require 'rackjson/rack/builder'
 require 'rackjson/extensions/core/array'
 require 'rackjson/extensions/core/string'
+require 'rackjson/errors'
 
 module Rack::JSON
 

data/lib/rackjson/collection.rb

@@ -3,8 +3,6 @@ require 'enumerator'
 module Rack::JSON
   class Collection
 
-    class Rack::JSON::Collection::DataTypeError < TypeError ; end
-
     def initialize(collection)
       @collection = collection
     end

data/lib/rackjson/document.rb

@@ -3,15 +3,13 @@ module Rack::JSON
 
     attr_accessor :attributes
 
-    class BadDocumentFormatError < ArgumentError ; end
-
     def self.create(doc)
       if doc.is_a? String
         Rack::JSON::JSONDocument.new(doc)
       elsif doc.is_a? BSON::OrderedHash
         Rack::JSON::MongoDocument.new(doc)
       else
-        raise Rack::JSON::Document::BadDocumentFormatError
+        raise Rack::JSON::DocumentFormatError
       end
     end
 

data/lib/rackjson/errors.rb

@@ -0,0 +1,7 @@
+module Rack::JSON
+  class NoFilterError < ArgumentError ; end
+  class DataTypeError < TypeError ; end
+  class DocumentFormatError < ArgumentError ; end
+  class UnrecognisedPathTypeError < StandardError ; end
+  class BodyFormatError < ArgumentError ; end
+end

data/lib/rackjson/filter.rb

@@ -27,6 +27,7 @@ module Rack::JSON
     end
 
     def apply_filters(request)
+      raise Rack::JSON::NoFilterError if @filters.nil?
       @filters.each do |filter|
         return pre_condition_not_met unless request.session.keys.include? filter.to_s
         request.add_query_param "[?#{filter}=#{request.session[filter.to_s]}]"

data/lib/rackjson/rack/builder.rb

@@ -22,7 +22,7 @@ module Rack
       @ins << lambda do |app|
         Rack::JSON::Filter.new(
           Rack::JSON::Resource.new(app, options),
-        options.merge(:methods => [:post, :put, :delete]))
+          options.merge(:methods => [:post, :put, :delete]))
       end
     end
 
@@ -37,7 +37,7 @@ module Rack
       @ins << lambda do |app|
         Rack::JSON::Filter.new(
           Rack::JSON::Resource.new(app, options),
-        options.merge(:methods => [:get, :post, :put, :delete]))
+          options.merge(:methods => [:get, :post, :put, :delete]))
       end
     end
   end

data/lib/rackjson/request.rb

@@ -1,17 +1,8 @@
 module Rack::JSON
   class Request < Rack::Request
 
-    class Rack::JSON::Request::UnrecognisedPathTypeError < StandardError ; end
-
     include Rack::Utils
 
-    attr_reader :env
-
-    def initialize(env)
-      @env = env
-      super(env)
-    end
-
     def add_query_param(param)
       self.query_string << param
     end
@@ -56,7 +47,7 @@ module Rack::JSON
       elsif collection_path?
         :collection
       else
-        raise UnrecognisedPathTypeError
+        raise Rack::JSON::UnrecognisedPathTypeError
       end
     end
 
@@ -103,10 +94,6 @@ module Rack::JSON
       end
     end
 
-    def session
-      @env['rack.session'] || {}
-    end
-
     def set_body json
       @env['rack.input'] = StringIO.new(json)
       @env['rack.input'].rewind

data/lib/rackjson/response.rb

@@ -1,8 +1,6 @@
 module Rack::JSON
   class Response
 
-    class Rack::JSON::Response::BodyFormatError < ArgumentError ; end
-
     attr_reader :status, :headers, :body
 
     def initialize(body, options={})
@@ -10,8 +8,8 @@ module Rack::JSON
       @head = options[:head] || false
       @headers = options[:headers] || {}
       parse_body(body)
-      set_headers
       head_response if @head
+      set_headers
     end
 
     def to_a
@@ -32,7 +30,7 @@ module Rack::JSON
         @body = body.to_s
         @headers["Content-Type"] = "text/plain"
       else
-        raise Rack::JSON::Response::BodyFormatError
+        raise Rack::JSON::BodyFormatError
       end
     end
 

data/rackjson.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rackjson}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oliver Nightingale"]
-  s.date = %q{2010-10-06}
+  s.date = %q{2010-10-28}
   s.description = %q{A rack end point for storing json documents.}
   s.email = %q{oliver.n@new-bamboo.co.uk}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "lib/rackjson/collection.rb",
      "lib/rackjson/document.rb",
      "lib/rackjson/end_point.rb",
+     "lib/rackjson/errors.rb",
      "lib/rackjson/extensions/BSON/object_id.rb",
      "lib/rackjson/extensions/BSON/ordered_hash.rb",
      "lib/rackjson/extensions/core/array.rb",
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
      "test/suite.rb",
      "test/test_collection.rb",
      "test/test_document.rb",
+     "test/test_embeded_resource.rb",
      "test/test_filter.rb",
      "test/test_json_document.rb",
      "test/test_json_query.rb",
@@ -78,18 +80,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mongo>, [">= 1.1.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>, [">= 1.1.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>, [">= 1.1.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_embeded_resource.rb

@@ -0,0 +1,37 @@
+# require 'helper'
+# 
+# class EmbeddedResourceTest < Test::Unit::TestCase
+#   include Rack::Test::Methods
+#   include Rack::Utils
+#   def setup
+#     @db = Mongo::Connection.new.db("test")
+#     @collection = @db['testing']
+#     @doc = { :title => 'blah' }
+#     @collection.insert(@doc)
+#   end
+# 
+#   def teardown
+#     @collection.drop
+#   end
+# 
+#   def app
+#     Rack::JSON::EmbeddedResource.new lambda { |env|
+#       [404, {'Content-Length' => '9', 'Content-Type' => 'text/plain'}, ["Not Found"]]
+#     },  :collections => [:foo], :contains => [:bar], :db => @db
+#   end
+# 
+#   test "ignoring non embedded resource requests" do
+#     get '/foo/1'
+#     assert_equal 404, last_response.status
+# 
+#     get '/foo/1/not_bar'
+#     assert_equal 404, last_response.status
+#   end
+# 
+#   test "return all embedded objects on index path" do
+#     get '/foo/1/bar'
+# 
+#     assert_equal JSON.generate([@doc]), last_response.body
+#   end
+# 
+# end

data/test/test_filter.rb

@@ -15,6 +15,21 @@ class FilterTest < Test::Unit::TestCase
     )
   end
 
+  def app_without_filter
+    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], :methods => @test_methods || [:get, :post, :put, :delete]
+    )
+  end
+
+  def use_app_without_filter
+    FilterTest.class_eval { def app; app_without_filter; end }
+  end
+
   test "adding a user id query parameter" do
     get '/login'
     get '/testing'
@@ -23,8 +38,10 @@ class FilterTest < Test::Unit::TestCase
 
   test "dont override any existing query parameters" do
     get '/login'
-    get '/testing?[?title=awesome]'
-    assert_equal '[?title=awesome][?user_id=1]', URI.decode(last_request.query_string)
+    get '/testing?title=awesome]'
+    # this is using the incorrect jsonquery structure but rack-test seems to be dropping
+    # the first square bracket under ruby 1.8.7
+    assert_equal 'title=awesome][?user_id=1]', URI.decode(last_request.query_string)
   end
 
   test "reject request if no session var" do
@@ -75,4 +92,12 @@ class FilterTest < Test::Unit::TestCase
     post '/testing', 'invalid json'
     assert_equal 422, last_response.status
   end
+
+  test "should raise an error if no filters are passed" do
+    use_app_without_filter
+
+    assert_raise Rack::JSON::NoFilterError do
+      get '/testing'
+    end
+  end
 end

data/test/test_response.rb

@@ -46,7 +46,7 @@ class ResponseTest < Test::Unit::TestCase
   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("0", response.to_a[1]["Content-Length"])
     assert_equal("text/plain", response.headers["Content-Type"])
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Oliver Nightingale
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 +01:00
+date: 2010-10-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -93,6 +93,7 @@ files:
 - lib/rackjson/collection.rb
 - lib/rackjson/document.rb
 - lib/rackjson/end_point.rb
+- lib/rackjson/errors.rb
 - lib/rackjson/extensions/BSON/object_id.rb
 - lib/rackjson/extensions/BSON/ordered_hash.rb
 - lib/rackjson/extensions/core/array.rb
@@ -152,6 +153,7 @@ test_files:
 - test/suite.rb
 - test/test_collection.rb
 - test/test_document.rb
+- test/test_embeded_resource.rb
 - test/test_filter.rb
 - test/test_json_document.rb
 - test/test_json_query.rb