rack-api 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    rack-api (0.2.0)
-      activesupport (~> 3.0.7)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
+    rack-api (0.2.1)
+      activesupport (>= 3.0.0)
+      rack (>= 1.0.0)
+      rack-mount (>= 0.6.0)
 
 GEM
   remote: http://rubygems.org/

data/README.rdoc

@@ -187,7 +187,7 @@ Build an URL by merging segments, default URL options and hash with parameters.
 
 === Rack::API::Middleware::SSL
 
-This middleware will accept only HTTPS requests. Any request on HTTP will be dropped.
+This middleware will accept only HTTPS requests. Any request over HTTP will be dropped.
 
   Rack::API.app do
     use Rack::API::Middleware::SSL

data/lib/rack/api/app.rb

@@ -49,11 +49,11 @@ module Rack
       attr_accessor :url_options
 
       def initialize(options)
-        @url_options = {}
-
         options.each do |name, value|
           instance_variable_set("@#{name}", value)
         end
+
+        @url_options ||= {}
       end
 
       # Always log to the standard output.
@@ -98,9 +98,9 @@ module Rack
       #
       # Valid options are:
       #
-      # # <tt>:status</tt>: a HTTP status code. Defaults to 403.
-      # # <tt>:message</tt>: a message that will be rendered as the response body. Defaults to "Forbidden".
-      # # <tt>:headers</tt>: the response headers. Defaults to <tt>{"Content-Type" => "text/plain"}</tt>.
+      # * <tt>:status</tt>: a HTTP status code. Defaults to 403.
+      # * <tt>:message</tt>: a message that will be rendered as the response body. Defaults to "Forbidden".
+      # * <tt>:headers</tt>: the response headers. Defaults to <tt>{"Content-Type" => "text/plain"}</tt>.
       #
       # You can also provide a object that responds to <tt>to_rack</tt>. In this case, this
       # method must return a valid Rack response (a 3-item array).
@@ -186,8 +186,8 @@ module Rack
       #   url_for :users, :filters => [:name, :age]
       #   #=> /users?filters[]=name&filters[]=age
       #
-      # URL segments can be any kind of object, first checking it responds to the
-      # <tt>to_param</tt> method. If not, converts object to string by using the
+      # URL segments can be any kind of object. First it'll be checked if it responds to
+      # the <tt>to_param</tt> method. If not, converts object to string by using the
       # <tt>to_s</tt> method.
       #
       def url_for(*args)

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

@@ -26,24 +26,24 @@ module Rack
         end
 
         private
-        def authorized?
+        def authorized? # :nodoc:
           count = redis.incr(key)
           redis.expire(key, 3600)
 
           count <= options[:limit] || redis.sismember("api:whitelist", identifier)
         end
 
-        def redis
+        def redis # :nodoc:
           options[:with]
         end
 
-        def identifier
+        def identifier # :nodoc:
           @identifier ||= begin
             options[:key].respond_to?(:call) ? options[:key].call(env).to_s : env[options[:key].to_s]
           end
         end
 
-        def key
+        def key # :nodoc:
           @key ||= begin
             "api:#{identifier}:#{Time.now.strftime("%Y%m%d%H")}"
           end

data/lib/rack/api/runner.rb

@@ -94,6 +94,8 @@ module Rack
       # * <tt>:port</tt> – Optionally specify the port to connect to.
       # * <tt>:base_path</tt> – Optionally specify a base path.
       #
+      # Some usage examples:
+      #
       #   default_url_options :host => "myhost.com"
       #   #=> http://myhost.com
       #

data/lib/rack/api/version.rb

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

data/lib/rack/api.rb

@@ -50,7 +50,7 @@ module Rack
     # Initialize a new Rack::API::Middleware instance, so
     # we can use it on other class methods.
     #
-    def self.runner
+    def self.runner # :nodoc:
       @runner ||= Runner.new
     end
   end

data/rack-api.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rack", "~> 1.2.1"
-  s.add_dependency "rack-mount", "~> 0.6.14"
-  s.add_dependency "activesupport", "~> 3.0.7"
+  s.add_dependency "rack", ">= 1.0.0"
+  s.add_dependency "rack-mount", ">= 0.6.0"
+  s.add_dependency "activesupport", ">= 3.0.0"
   s.add_development_dependency "rspec", "~> 2.5.0"
   s.add_development_dependency "rack-test", "~> 0.5.7"
   s.add_development_dependency "redis", "~> 2.2.0"

data/spec/rack-api/url_for_spec.rb

@@ -21,6 +21,14 @@ describe Rack::API::App, "#url_for" do
     subject.url_for.should == "http://example.org/v1"
   end
 
+  it "sets default url options hash" do
+    subject = Rack::API::App.new(:version => "v1", :url_options => nil, :env => Rack::MockRequest.env_for("/v1"))
+
+    expect {
+      subject.url_for(:things, 1)
+    }.to_not raise_error
+  end
+
   it "uses a different host" do
     subject.url_options.merge!(:host => "mysite.com")
     subject.url_for.should == "http://mysite.com/v1"

metadata

@@ -2,7 +2,7 @@
 name: rack-api
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Nando Vieira
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 Z
+date: 2011-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -18,9 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -29,9 +29,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.14
+        version: 0.6.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.7
+        version: 3.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency