rack-api 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-api (0.1.1)
+    rack-api (0.1.2)
       activesupport (~> 3.0.6)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.14)

data/README.rdoc

@@ -80,7 +80,7 @@ Then you can go to your spec file, say, <tt>spec/api_spec.rb</tt>. You need to d
 
     it "renders status page" do
       get "/api/v1/status"
-      JSON.load(last_response.body).should == {:status => "running"}
+      last_response.body.should == {:status => "running"}.to_json
       last_response.status.should == 200
     end
   end

data/lib/rack/api/middleware.rb

@@ -2,6 +2,7 @@ module Rack
   class API
     module Middleware
       autoload :Format, "rack/api/middleware/format"
+      autoload :SSL, "rack/api/middleware/ssl"
     end
   end
 end

data/lib/rack/api/middleware/ssl.rb

@@ -0,0 +1,21 @@
+module Rack
+  class API
+    module Middleware
+      class SSL
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          request = Rack::Request.new(env)
+
+          if env["rack.url_scheme"] == "https"
+            @app.call(env)
+          else
+            [400, {"Content-Type" => "text/plain"}, ["Only HTTPS requests are supported by now."]]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rack/api/runner.rb

@@ -211,7 +211,7 @@ module Rack
         builder.use Rack::API::Middleware::Format, option(:formats)
 
         # Add middlewares to executation stack.
-        option(:middlewares, :merged).each {|middleware| builder.use(*middleware)}
+        option(:middlewares, :merge).each {|middleware| builder.use(*middleware)}
 
         # Apply helpers to app.
         helpers = option(:helpers)

data/lib/rack/api/version.rb

@@ -3,7 +3,7 @@ module Rack
     module Version
       MAJOR = 0
       MINOR = 1
-      PATCH = 1
+      PATCH = 2
       STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     end
   end

data/spec/rack-api/basic_auth_spec.rb

@@ -43,7 +43,7 @@ describe Rack::API, "Basic Authentication" do
       get "/v1/", {}, "HTTP_AUTHORIZATION" => basic_auth("admin", "test")
 
       last_response.status.should == 200
-      JSON.load(last_response.body).should == {"success" => true}
+      last_response.body.should == {"success" => true}.to_json
     end
   end
 
@@ -52,7 +52,7 @@ describe Rack::API, "Basic Authentication" do
       get "/v2/"
 
       last_response.status.should == 200
-      JSON.load(last_response.body).should == {"success" => true}
+      last_response.body.should == {"success" => true}.to_json
     end
   end
 
@@ -69,17 +69,17 @@ describe Rack::API, "Basic Authentication" do
       get "/v3/", {}, "HTTP_AUTHORIZATION" => basic_auth("john", "test")
 
       last_response.status.should == 200
-      JSON.load(last_response.body).should == {"success" => true}
+      last_response.body.should == {"success" => true}.to_json
     end
   end
 
   it "returns credentials" do
     get "/v2/credentials", {}, "HTTP_AUTHORIZATION" => basic_auth("admin", "test")
-    JSON.load(last_response.body).should == ["admin", "test"]
+    last_response.body.should == ["admin", "test"].to_json
   end
 
   it "returns empty array when no credentials are provided" do
     get "/v2/credentials"
-    JSON.load(last_response.body).should == []
+    last_response.body.should == [].to_json
   end
 end

data/spec/rack-api/format_spec.rb

@@ -62,14 +62,14 @@ describe Rack::API, "Format" do
       get "/v1", :format => "json"
 
       last_response.status.should == 200
-      JSON.load(last_response.body).should == {"success" => true}
+      last_response.body.should == {"success" => true}.to_json
     end
 
     it "renders when set through extension" do
       get "/v1/users.json"
 
       last_response.status.should == 200
-      JSON.load(last_response.body).should == {"users" => []}
+      last_response.body.should == {"users" => []}.to_json
     end
 
     it "sends header" do

data/spec/rack-api/helpers_spec.rb

@@ -23,11 +23,11 @@ describe Rack::API, "Helpers" do
 
   it "adds module helper" do
     get "/v1"
-    JSON.load(last_response.body).should include("module")
+    json(last_response.body).should include("module")
   end
 
   it "adds block helper" do
     get "/v1"
-    JSON.load(last_response.body).should include("block")
+    json(last_response.body).should include("block")
   end
 end

data/spec/rack-api/http_methods_spec.rb

@@ -17,7 +17,7 @@ describe Rack::API, "HTTP Methods" do
     it "renders #{method}" do
       send method, "/v1/#{method}"
       last_response.status.should == 200
-      JSON.load(last_response.body).should == {method => true}
+      last_response.body.should == {method => true}.to_json
     end
   end
 

data/spec/rack-api/inheritance_spec.rb

@@ -7,6 +7,6 @@ describe Rack::API do
 
   it "renders action from MyApp" do
     get "/v1"
-    JSON.load(last_response.body).should == {"myapp" => true}
+    last_response.body.should == {"myapp" => true}.to_json
   end
 end

data/spec/rack-api/middlewares_spec.rb

@@ -3,6 +3,8 @@ require "spec_helper"
 describe Rack::API, "Middlewares" do
    before do
     Rack::API.app do
+      use ZOMGMiddleware
+
       version :v1 do
         use AwesomeMiddleware
         get("/") {}
@@ -13,5 +15,6 @@ describe Rack::API, "Middlewares" do
   it "sends custom headers" do
     get "/v1"
     last_response.headers["X-Awesome"].should == "U R Awesome"
+    last_response.headers["X-ZOMG"].should == "ZOMG!"
   end
 end

data/spec/rack-api/params_spec.rb

@@ -12,16 +12,16 @@ describe Rack::API, "Params" do
 
   it "detects optional names from routing params" do
     get "/v1/users/1.json"
-    JSON.load(last_response.body).should == {"id" => "1", "format" => "json"}
+    json(last_response.body).should == {"id" => "1", "format" => "json"}
   end
 
   it "detects query string params" do
     get "/v1/users/1?include=articles"
-    JSON.load(last_response.body).should == {"id" => "1", "include" => "articles"}
+    json(last_response.body).should == {"id" => "1", "include" => "articles"}
   end
 
   it "detects post params" do
     post "/v1/users", :name => "John Doe"
-    JSON.load(last_response.body).should == {"name" => "John Doe"}
+    last_response.body.should == {"name" => "John Doe"}.to_json
   end
 end

data/spec/rack-api/ssl_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+
+describe Rack::API::Middleware::SSL do
+  let(:action) { proc {|env| [200, {}, ["success"]] } }
+
+  it "denies http requests" do
+    env = Rack::MockRequest.env_for("/v1", "rack.url_scheme" => "http")
+    status, headers, response = Rack::API::Middleware::SSL.new(action).call(env)
+
+    status.should == 400
+    headers["Content-Type"].should == "text/plain"
+    response.should include("Only HTTPS requests are supported by now.")
+  end
+
+  it "accepts https requests" do
+    env = Rack::MockRequest.env_for("/v1", "rack.url_scheme" => "https")
+    status, headers, response = Rack::API::Middleware::SSL.new(action).call(env)
+
+    status.should == 200
+  end
+end

data/spec/support/helpers.rb

@@ -6,4 +6,8 @@ module Helpers
   def basic_auth(username, password)
     "Basic " + Base64.encode64("#{username}:#{password}")
   end
+
+  def json(string)
+    JSON.load(string)
+  end
 end

data/spec/support/zomg_middleware.rb

@@ -0,0 +1,10 @@
+class ZOMGMiddleware
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    status, headers, response = @app.call(env)
+    [status, headers.merge("X-ZOMG" => "ZOMG!"), response]
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: rack-api
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nando Vieira
@@ -110,6 +110,7 @@ files:
 - lib/rack/api/formatter/jsonp.rb
 - lib/rack/api/middleware.rb
 - lib/rack/api/middleware/format.rb
+- lib/rack/api/middleware/ssl.rb
 - lib/rack/api/response.rb
 - lib/rack/api/runner.rb
 - lib/rack/api/version.rb
@@ -126,11 +127,13 @@ files:
 - spec/rack-api/runner_spec.rb
 - spec/rack-api/settings_spec.rb
 - spec/rack-api/short_circuit_spec.rb
+- spec/rack-api/ssl_spec.rb
 - spec/spec_helper.rb
 - spec/support/awesome_middleware.rb
 - spec/support/core_ext.rb
 - spec/support/helpers.rb
 - spec/support/myapp.rb
+- spec/support/zomg_middleware.rb
 homepage: http://rubygems.org/gems/rack-api
 licenses: []
 
@@ -171,8 +174,10 @@ test_files:
 - spec/rack-api/runner_spec.rb
 - spec/rack-api/settings_spec.rb
 - spec/rack-api/short_circuit_spec.rb
+- spec/rack-api/ssl_spec.rb
 - spec/spec_helper.rb
 - spec/support/awesome_middleware.rb
 - spec/support/core_ext.rb
 - spec/support/helpers.rb
 - spec/support/myapp.rb
+- spec/support/zomg_middleware.rb