rackjson 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/rackjson/collection.rb

@@ -47,11 +47,7 @@ module Rack::JSON
     private
 
     def prepared selector
-      if selector.is_a? Hash
-        selector
-      else
-        {:_id => selector}
-      end
+      selector.is_a?(Hash) ? selector : {:_id => selector}
     end
 
   end

data/lib/rackjson/end_point.rb

@@ -0,0 +1,22 @@
+module Rack::JSON
+  module EndPoint
+
+    private
+
+    def bypass? request
+      request.collection.empty? || !(@collections.include? request.collection.to_sym)
+    end
+
+    def bypass_path? request
+      bypass? request
+    end
+
+    def bypass_method? request
+      !@methods.include?(request.request_method.downcase.to_sym)
+    end
+
+    def render body, options={}
+      Rack::JSON::Response.new(body, options).to_a
+    end
+  end
+end

data/lib/rackjson/filter.rb

@@ -1,15 +1,17 @@
 module Rack::JSON
   class Filter
+    include Rack::JSON::EndPoint
 
     def initialize(app, options)
       @app = app
       @collections = options[:collections]
       @filters = options[:filters]
+      @methods = options[:methods]
     end
 
     def call(env)
       request = Rack::JSON::Request.new(env)
-      if bypass? request
+      if bypass_path?(request) || bypass_method?(request)
         @app.call(env)
       else
         apply_filters(request)
@@ -26,19 +28,15 @@ module Rack::JSON
 
     def apply_filters(request)
       @filters.each do |filter|
-        return pre_condition_not_met unless request.session[filter.to_s]
+        return pre_condition_not_met unless request.session.keys.include? 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
+      render "pre condition not met", :status => 412, :head => true
     end
   end
 end

data/lib/rackjson/resource.rb

@@ -1,5 +1,6 @@
 module Rack::JSON
   class Resource
+    include Rack::JSON::EndPoint
     METHODS_NOT_ALLOWED = [:trace, :connect]
 
     def initialize(app, options)
@@ -20,10 +21,6 @@ module Rack::JSON
 
     private
 
-    def bypass?(request)
-      request.collection.empty? || !(@collections.include? request.collection.to_sym)
-    end
-
     def delete(request)
       if request.member_path?
         if @collection.delete({:_id => request.resource_id})
@@ -69,10 +66,6 @@ module Rack::JSON
       render (error.class.to_s + " :" + error.message), :status => 422
     end
 
-    def render(body, options={})
-      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)

data/lib/rackjson.rb

@@ -1,25 +1,3 @@
-class Hash
-  def symbolize_keys
-    inject({}) do |options, (key, value)|
-      options[(key.to_sym rescue key) || key] = value
-      options
-    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
-
 require 'rubygems'
 require 'json'
 require 'rack'
@@ -28,6 +6,7 @@ require 'time'
 
 module Rack::JSON
 
+  autoload :EndPoint, 'rackjson/end_point'
   autoload :Collection, 'rackjson/collection'
   autoload :Filter, 'rackjson/filter'
   autoload :Document, 'rackjson/document'

data/rackjson.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rackjson}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oliver Nightingale"]
-  s.date = %q{2010-04-26}
+  s.date = %q{2010-04-29}
   s.description = %q{A rack end point for storing json documents.}
   s.email = %q{oliver.n@new-bamboo.co.uk}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "lib/rackjson.rb",
      "lib/rackjson/collection.rb",
      "lib/rackjson/document.rb",
+     "lib/rackjson/end_point.rb",
      "lib/rackjson/filter.rb",
      "lib/rackjson/json_document.rb",
      "lib/rackjson/json_query.rb",

data/test/helper.rb

@@ -10,4 +10,16 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rackjson'
 
 class Test::Unit::TestCase
+  def self.test(name, &block)
+    test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+    defined = instance_method(test_name) rescue false
+    raise "#{test_name} is already defined in #{self}" if defined
+    if block_given?
+      define_method(test_name, &block)
+    else
+      define_method(test_name) do
+        flunk "No implementation provided for #{name}"
+      end
+    end
+  end
 end

data/test/test_collection.rb

@@ -11,7 +11,7 @@ class CollectionTest < Test::Unit::TestCase
     @collection.delete_all
   end
 
-  def test_finding_a_single_document_by_id
+  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, @mongo_collection.find_one(:_id => 1)
     assert_kind_of Rack::JSON::Document, @collection.find(1)

data/test/test_filter.rb

@@ -11,46 +11,60 @@ class FilterTest < Test::Unit::TestCase
         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]
+      },  :collections => [:testing], :filters => [:user_id], :methods => @test_methods || [:get, :post, :put, :delete]
     )
   end
 
-  def test_adding_user_id_query_parameter
+  test "adding a user id query parameter" do
     get '/login'
     get '/testing'
     assert_equal "[?user_id=1]", last_request.query_string
   end
 
-  def test_not_overriding_existing_query_parameters
+  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)
   end
 
-  def test_reject_request_if_no_session_var
+  test "reject request if no session var" do
     get '/testing'
     assert_equal 412, last_response.status
   end
 
-  def test_setting_query_params_on_post
+  test "setting query parameters on a post request" do
     get '/login'
     post '/testing', '{ "title": "hello!" }'
     assert_equal "[?user_id=1]", last_request.query_string
   end
 
-  def test_setting_query_params_on_put
+  test "setting query params on put requests" do
     get '/login'
     put '/testing/1', '{ "title": "hello!" }'
     assert_equal "[?user_id=1]", last_request.query_string
   end
 
-  def test_setting_query_params_on_delete
+  test "setting query params on delete requests" do
     get '/login'
     delete '/testing'
     assert_equal "[?user_id=1]", last_request.query_string
   end
 
-  def test_appending_query_param_to_document
+  test "setting query params on get requests" do
+    @test_methods = [:get]
+    get '/login'
+    get '/testing'
+    assert_equal "[?user_id=1]", last_request.query_string
+  end
+
+  test "not adding methods when the request method is not filterable" do
+    @test_methods = [:post]
+    get '/login'
+    get '/testing'
+    assert_not_equal "[?user_id=1]", last_request.query_string
+  end
+
+  test "appending query params to a document" do
     get '/login'
     post '/testing', '{ "title": "hello!" }'
     assert_match /"user_id":1/, last_response.body

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rackjson
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Oliver Nightingale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 +01:00
+date: 2010-04-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - lib/rackjson.rb
 - lib/rackjson/collection.rb
 - lib/rackjson/document.rb
+- lib/rackjson/end_point.rb
 - lib/rackjson/filter.rb
 - lib/rackjson/json_document.rb
 - lib/rackjson/json_query.rb