sinatra-rest-helpers 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/sinatra/rest_helpers.rb

@@ -1,6 +1,12 @@
 require 'rack'
 
 module Sinatra
+  # 
+  # Include it with:
+  #   class App < Sinatra::Base
+  #     helpers Sinatra::RestHelpers
+  #   end
+  # 
   module RestHelpers
     INFINITY = 1/0.0
     # e.g.:
@@ -18,7 +24,8 @@ module Sinatra
       end.compact.map do |f|
         generate_type_hash.call(f)
       end
-      accepted_formats = request.accept.split(/,\s*/).map do |f| 
+      # request.accept is an Array
+      accepted_formats = request.accept.map do |f| 
         generate_type_hash.call(f)
       end
       selected_format = supported_formats.detect{ |supported_format| 

data/sinatra-rest-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-rest-helpers}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril Rohr"]
-  s.date = %q{2009-10-20}
+  s.date = %q{2009-10-21}
   s.description = %q{A set of helpers for sinatra apps that expose REST resources.}
   s.email = %q{cyril.rohr@gmail.com}
   s.extra_rdoc_files = [
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/sinatra/rest_helpers.rb",
      "sinatra-rest-helpers.gemspec",
-     "spec/sinatra-rest-helpers_spec.rb",
+     "spec/sinatra_rest_helpers_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/cryx/sinatra-rest-helpers}
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Adds useful helpers for REST applications developed with Sinatra.}
   s.test_files = [
-    "spec/sinatra-rest-helpers_spec.rb",
+    "spec/sinatra_rest_helpers_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/{sinatra-rest-helpers_spec.rb → sinatra_rest_helpers_spec.rb}

@@ -25,13 +25,13 @@ describe "SinatraRestHelpers" do
     Rack::Mime::MIME_TYPES.clear
   end
   it "should throw a 406 if the client requested only unsupported formats" do
-    request = mock("request", :accept => "application/json")
+    request = mock("request", :accept => ["application/json"])
     app = App.new(request)
     app.should_receive(:halt).with(406, "")
     app.test_provides!(:json)
   end
   it "should not throw a 406 if the client requested a supported format" do
-    request = mock("request", :accept => "application/json")
+    request = mock("request", :accept => ["application/json"])
     mime :json, "application/json"
     app = App.new(request)
     app.should_not_receive(:halt)
@@ -39,51 +39,54 @@ describe "SinatraRestHelpers" do
     app.response.headers['Content-Type'].should == "application/json"
   end
   it "should be case insensitive" do
-    request = mock("request", :accept => "application/json")
+    request = mock("request", :accept => ["application/json"])
     app = App.new(request)
     app.should_not_receive(:halt)
     app.test_provides!("application/JSON")
     app.response.headers['Content-Type'].should == "application/JSON"
   end
   it "should not accept a request with a type level lower than what is supported" do
-    request = mock("request", :accept => "application/json;level=1")
+    request = mock("request", :accept => ["application/json;level=1"])
     app = App.new(request)
     app.should_receive(:halt).with(406, "application/json;level=3, application/json;level=2")
     app.test_provides!("application/json;level=3", "application/json;level=2")
   end
   it "should accept a request having a supported mime type, but with no level" do
-    request = mock("request", :accept => "application/json")
+    request = mock("request", :accept => ["application/json"])
     app = App.new(request)
     app.should_not_receive(:halt)
     app.test_provides!("application/json;level=2")
     app.response.headers['Content-Type'].should == "application/json;level=2"
   end
   it "should select the first type matching the criteria" do
-    request = mock("request", :accept => "application/json;level=2, application/xml, application/vnd.fr.grid5000.api.Cluster+json;level=2")
+    request = mock("request", :accept => ["application/json;level=2", "application/xml", "application/vnd.fr.grid5000.api.Cluster+json;level=2"])
     app = App.new(request)
     app.should_not_receive(:halt)
     app.test_provides!("application/json;level=3", "application/vnd.fr.grid5000.api.Cluster+json;level=2")
     app.response.headers['Content-Type'].should == "application/vnd.fr.grid5000.api.Cluster+json;level=2"
   end
   it "should accept requests with a level, even if the developer didn't explicitely defined one" do
-    request = mock("request", :accept => "application/json;level=1")
+    request = mock("request", :accept => ["application/json;level=1"])
     app = App.new(request)
     app.should_not_receive(:halt)
     app.test_provides!("application/json")
     app.response.headers['Content-Type'].should == "application/json"
   end
   it "should correctly deal with widlcard characters [client-side, I]" do
-    request = mock("request", :accept => "application/vnd.fr.grid5000.api.*+json")
+    request = mock("request", :accept => ["application/vnd.fr.grid5000.api.*+json"])
     app = App.new(request)
     app.should_not_receive(:halt)
     app.test_provides!("application/vnd.fr.grid5000.api.Cluster+json;level=1")
     app.response.headers['Content-Type'].should == "application/vnd.fr.grid5000.api.Cluster+json;level=1"
   end
   it "should correctly deal with widlcard characters [client-side, II]" do
-    request = mock("request", :accept => "application/*")
+    request = mock("request", :accept => ["application/*"])
     app = App.new(request)
     app.should_not_receive(:halt)
     app.test_provides!("application/vnd.fr.grid5000.api.Cluster+json;level=1")
     app.response.headers['Content-Type'].should == "application/vnd.fr.grid5000.api.Cluster+json;level=1"
   end
+  it "should description" do
+    
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-rest-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 +02:00
+date: 2009-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -31,7 +31,7 @@ files:
 - VERSION
 - lib/sinatra/rest_helpers.rb
 - sinatra-rest-helpers.gemspec
-- spec/sinatra-rest-helpers_spec.rb
+- spec/sinatra_rest_helpers_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/cryx/sinatra-rest-helpers
@@ -62,5 +62,5 @@ signing_key:
 specification_version: 3
 summary: Adds useful helpers for REST applications developed with Sinatra.
 test_files: 
-- spec/sinatra-rest-helpers_spec.rb
+- spec/sinatra_rest_helpers_spec.rb
 - spec/spec_helper.rb