rack-api 1.0.2 → 1.1.0

data/Gemfile

@@ -1,2 +1,4 @@
 source :rubygems
+gem "rack-test", :git => "https://github.com/brynary/rack-test.git"
+
 gemspec

data/Gemfile.lock

@@ -1,53 +1,58 @@
+GIT
+  remote: https://github.com/brynary/rack-test.git
+  revision: cab8eb929b45d9e32474fad1b6806c2ab8f6bea8
+  specs:
+    rack-test (0.6.1)
+      rack (>= 1.0)
+
 PATH
   remote: .
   specs:
-    rack-api (1.0.2)
-      activesupport (>= 3.0.0)
+    rack-api (1.1.0)
+      activesupport (>= 3.0)
+      i18n
       rack (>= 1.0.0)
       rack-mount (>= 0.6.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.9)
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.4)
-    diff-lcs (1.1.2)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    rack (1.3.2)
-    rack-mount (0.6.14)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    awesome_print (1.0.2)
+    coderay (1.0.5)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    method_source (0.7.1)
+    multi_json (1.2.0)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    rack (1.4.1)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rake (0.9.2)
-    redis (2.2.1)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
+    rake (0.9.2.2)
+    redis (2.2.2)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    slop (2.4.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
+  pry
   rack-api!
-  rack-test (~> 0.5.7)
+  rack-test!
   rake (~> 0.9)
   redis (~> 2.2.0)
   rspec (~> 2.6)
-  ruby-debug19

data/lib/rack/api/controller.rb

@@ -53,7 +53,7 @@ module Rack
       #
       attr_accessor :rescuers
 
-      def initialize(options)
+      def initialize(options = {})
         options.each do |name, value|
           instance_variable_set("@#{name}", value)
         end

data/lib/rack/api/runner.rb

@@ -1,12 +1,12 @@
 module Rack
   class API
     class Runner
-      HTTP_METHODS = %w[get post put delete head]
+      HTTP_METHODS = %w[get post put delete head patch options]
 
       DELEGATE_METHODS = %w[
         version use prefix basic_auth rescue_from
         helper respond_to default_url_options
-        get post put delete head
+        get post put delete head patch options
       ]
 
       attr_accessor :settings
@@ -214,7 +214,7 @@ module Rack
       # path are recognized.
       #
       # You're better off using all verb shortcut methods. Implemented verbs are
-      # +get+, +post+, +put+, +delete+ and +head+.
+      # +get+, +post+, +put+, +delete+, +head+ and +patch+.
       #
       #   class MyAPI < Rack::API
       #     version "v1" do
@@ -250,7 +250,9 @@ module Rack
       # your world will explode.
       #
       def route(method, path, requirements = {}, &block)
-        path = Rack::Mount::Strexp.compile mount_path(path), requirements, %w[ / . ? ]
+        separator = requirements.delete(:separator) { %w[ / . ? ] }
+
+        path = Rack::Mount::Strexp.compile mount_path(path), requirements, separator
         controller_class = Controller
 
         if requirements[:to]
@@ -274,7 +276,7 @@ module Rack
       #
       #   rescue_from ActiveRecord::RecordNotFound, :status => 404
       #   rescue_from Exception, :status => 500
-      #   rescue_from Exception do
+      #   rescue_from Exception do |error|
       #     $logger.error error.inspect
       #     [500, {"Content-Type" => "text/plain"}, []]
       #   end

data/lib/rack/api/version.rb

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

data/rack-api.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "rack/api"
+require "rack/api/version"
 
 Gem::Specification.new do |s|
   s.name        = "rack-api"
@@ -19,10 +19,12 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rack", ">= 1.0.0"
   s.add_dependency "rack-mount", ">= 0.6.0"
-  s.add_dependency "activesupport", ">= 3.0.0"
+  s.add_dependency "activesupport", ">= 3.0"
+  s.add_dependency "i18n"
   s.add_development_dependency "rspec", "~> 2.6"
   s.add_development_dependency "rack-test", "~> 0.5.7"
   s.add_development_dependency "redis", "~> 2.2.0"
   s.add_development_dependency "rake", "~> 0.9"
-  s.add_development_dependency "ruby-debug19" if RUBY_VERSION >= "1.9"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "awesome_print"
 end

data/spec/rack-api/http_methods_spec.rb

@@ -9,6 +9,8 @@ describe Rack::API, "HTTP Methods" do
         put("put") { {:put => true} }
         delete("delete") { {:delete => true} }
         head("head") { {:head => true} }
+        patch("patch") { {:patch => true} }
+        options("options") { {:options => true} }
       end
     end
   end

data/spec/rack-api/method_delegation_spec.rb

@@ -3,6 +3,10 @@ require "spec_helper"
 describe Rack::API, "delegators" do
   subject { Rack::API }
 
+  specify "sanity check for delegate methods" do
+    Rack::API::Runner::DELEGATE_METHODS.size.should == 15
+  end
+
   it { should respond_to(:version) }
   it { should respond_to(:use) }
   it { should respond_to(:prefix) }
@@ -15,4 +19,6 @@ describe Rack::API, "delegators" do
   it { should respond_to(:put) }
   it { should respond_to(:delete) }
   it { should respond_to(:head) }
+  it { should respond_to(:patch) }
+  it { should respond_to(:options) }
 end

data/spec/rack-api/runner_spec.rb

@@ -1,17 +1,14 @@
 require "spec_helper"
 
 describe Rack::API::Runner do
-  specify "sanity check for delegate methods" do
-    # remember to update spec/method_delegation_spec.rb
-    Rack::API::Runner::DELEGATE_METHODS.size.should == 13
-  end
-
   it "responds to http methods" do
     subject.should respond_to(:get)
     subject.should respond_to(:post)
     subject.should respond_to(:put)
     subject.should respond_to(:delete)
     subject.should respond_to(:head)
+    subject.should respond_to(:options)
+    subject.should respond_to(:patch)
   end
 
   it "sets available formats" do
@@ -50,7 +47,11 @@ describe Rack::API::Runner do
       :handler => proc {}
     }
 
-    Rack::API::Controller.should_receive(:new).with(hash_including(expected)).once
+    Rack::API::Controller
+      .should_receive(:new)
+      .with(hash_including(expected))
+      .and_return(mock.as_null_object)
+
     subject.version("v1") do
       respond_to :fffuuu
       prefix "api"

data/spec/rack-api/separators_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+
+describe Rack::API, "separators" do
+   before do
+    Rack::API.app do
+      get("/no-dots/:name(.:format)") { params }
+      get("/dots/:name", :separator => %w[/?]) { params }
+    end
+  end
+
+  context "/no-dots/:name" do
+    it "stops on /" do
+      get "/no-dots/foo/"
+      last_response.body.should == {:name => "foo"}.to_json
+    end
+
+    it "stops on ?" do
+      get "/no-dots/foo?a=1"
+      last_response.body.should == {:a => "1", :name => "foo"}.to_json
+    end
+
+    it "stops on ." do
+      get "/no-dots/foo.json"
+      last_response.body.should == {:name => "foo", :format => "json"}.to_json
+    end
+  end
+
+  context "/dots/:name" do
+    it "stops on /" do
+      get "/dots/foo/"
+      last_response.body.should == {:name => "foo"}.to_json
+    end
+
+    it "stops on ?" do
+      get "/dots/foo?a=1"
+      last_response.body.should == {:a => "1", :name => "foo"}.to_json
+    end
+
+    it "stops on ." do
+      get "/dots/foo.json"
+      last_response.body.should == {:name => "foo.json"}.to_json
+    end
+  end
+end

data/spec/rack-api/url_for_spec.rb

@@ -54,7 +54,7 @@ describe Rack::API::Controller, "#url_for" do
 
   it "adds query string" do
     actual = subject.url_for(:format => :json, :filters => [:name, :age])
-    actual.should == "http://example.org/v1?filters[]=name&filters[]=age&format=json"
+    actual.should == "http://example.org/v1?filters%5B%5D=name&filters%5B%5D=age&format=json"
   end
 
   it "uses host from request" do

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+require "bundler"
+Bundler.setup(:default, :development)
+Bundler.require
+
 require "rack/test"
 require "rspec"
 require "rack/api"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000 Z
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2269556480 !ruby/object:Gem::Requirement
+  requirement: &70274063249420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2269556480
+  version_requirements: *70274063249420
 - !ruby/object:Gem::Dependency
   name: rack-mount
-  requirement: &2269555880 !ruby/object:Gem::Requirement
+  requirement: &70274063248740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,32 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2269555880
+  version_requirements: *70274063248740
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2269554780 !ruby/object:Gem::Requirement
+  requirement: &70274063248280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2269554780
+  version_requirements: *70274063248280
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70274063247900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70274063247900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2269553440 !ruby/object:Gem::Requirement
+  requirement: &70274063247320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2269553440
+  version_requirements: *70274063247320
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2269483040 !ruby/object:Gem::Requirement
+  requirement: &70274063246820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 0.5.7
   type: :development
   prerelease: false
-  version_requirements: *2269483040
+  version_requirements: *70274063246820
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2269482580 !ruby/object:Gem::Requirement
+  requirement: &70274063246340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *2269482580
+  version_requirements: *70274063246340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2269481900 !ruby/object:Gem::Requirement
+  requirement: &70274063245860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,21 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2269481900
+  version_requirements: *70274063245860
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70274063245480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70274063245480
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &2269481220 !ruby/object:Gem::Requirement
+  name: awesome_print
+  requirement: &70274063245020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2269481220
+  version_requirements: *70274063245020
 description: Create web app APIs that respond to one or more formats using an elegant
   DSL.
 email:
@@ -154,6 +176,7 @@ files:
 - spec/rack-api/paths_spec.rb
 - spec/rack-api/rescue_from_spec.rb
 - spec/rack-api/runner_spec.rb
+- spec/rack-api/separators_spec.rb
 - spec/rack-api/settings_spec.rb
 - spec/rack-api/short_circuit_spec.rb
 - spec/rack-api/ssl_spec.rb
@@ -179,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -629518363732307002
+      hash: -2011021662254464063
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -188,10 +211,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -629518363732307002
+      hash: -2011021662254464063
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Create web app APIs that respond to one or more formats using an elegant
@@ -211,6 +234,7 @@ test_files:
 - spec/rack-api/paths_spec.rb
 - spec/rack-api/rescue_from_spec.rb
 - spec/rack-api/runner_spec.rb
+- spec/rack-api/separators_spec.rb
 - spec/rack-api/settings_spec.rb
 - spec/rack-api/short_circuit_spec.rb
 - spec/rack-api/ssl_spec.rb