grape 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 72606de0cb9865b1f2b38a60f10c235438fc2976
+  data.tar.gz: 313a37b54a0f42d95c1ad2f2272dc5fd8f00165d
+SHA512:
+  metadata.gz: da5f6c376c6a9a80b99974a432805cc80c8562e7889a42e5d9e1c2075b460b7ad526dd0566b3cd92bf302b9407aaeda99d04681d39d4b1f61a117231d49e12f1
+  data.tar.gz: 71ad5651560cb226feaed879480cdd217eb78a274d66587a3f1f6ec4e160cf72ba3aec46c11041fa006f53ac49f30f15f7c3955973ec24b4df35c23156085951

data/.gitignore

@@ -30,6 +30,7 @@ pkg
 .yardoc/*
 dist
 Gemfile.lock
+tmp
 
 ## Rubinius
 .rbx

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
+  - 2.0.0
   - 1.8.7
   - 1.9.2
   - 1.9.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.3.1 (2/25/2013)
+=================
+
+* [#351](https://github.com/intridea/grape/issues/351): Compatibility with Ruby 2.0 - [@mbleigh](https://github.com/mbleigh).
+
 0.3.0 (02/21/2013)
 ==================
 

data/README.md

@@ -12,8 +12,8 @@ content negotiation, versioning and much more.
 
 ## Stable Release
 
-You're reading the documentation for the next release of Grape, which should be 0.3.
-The current stable release is [0.2.6](https://github.com/intridea/grape/blob/v0.2.6/README.markdown).
+You're reading the documentation for the next release of Grape, which should be 0.3.1.
+The current stable release is [0.3.0](https://github.com/intridea/grape/blob/v0.3.0/README.md).
 
 ## Project Tracking
 
@@ -1145,7 +1145,7 @@ features and discuss issues.
 * Fork the project
 * Write tests for your new feature or a test that reproduces a bug
 * Implement your feature or make a bug fix
-* Add a line to `CHANGELOG.markdown` describing your change
+* Add a line to `CHANGELOG.md` describing your change
 * Commit, push and make a pull request. Bonus points for topic branches.
 
 ## License

data/Rakefile

@@ -19,18 +19,18 @@ task :default => :spec
 
 begin
   require 'yard'
-  DOC_FILES = ['lib/**/*.rb', 'README.markdown']
-  
+  DOC_FILES = ['lib/**/*.rb', 'README.md']
+
   YARD::Rake::YardocTask.new(:doc) do |t|
     t.files   = DOC_FILES
   end
-  
+
   namespace :doc do
     YARD::Rake::YardocTask.new(:pages) do |t|
       t.files   = DOC_FILES
       t.options = ['-o', '../grape.doc']
     end
-    
+
     namespace :pages do
       desc 'Generate and publish YARD docs to GitHub pages.'
       task :publish => ['doc:pages'] do

data/lib/grape/api.rb

@@ -298,7 +298,7 @@ module Grape
       def mount(mounts)
         mounts = { mounts => '/' } unless mounts.respond_to?(:each_pair)
         mounts.each_pair do |app, path|
-          if app.respond_to?(:inherit_settings)
+          if app.respond_to?(:inherit_settings, true)
             app_settings = settings.clone
             mount_path = Rack::Mount::Utils.normalize_path([ settings[:mount_path], path ].compact.join("/"))
             app_settings.set :mount_path, mount_path

data/lib/grape/middleware/formatter.rb

@@ -101,10 +101,19 @@ module Grape
 
         def mime_array
           accept = headers['accept'] or return []
+          accept_into_mime_and_quality = %r(
+            (
+              \w+/[\w+.-]+)     # eg application/vnd.example.myformat+xml
+            (?:
+             (?:;[^,]*?)?       # optionally multiple formats in a row
+             ;\s*q=([\d.]+)     # optional "quality" preference (eg q=0.5)
+            )?
+          )x  # x = extended regular expression with comments etc
+          vendor_prefix_pattern = %r(vnd\.[^+]+\+)
 
-          accept.gsub(/\b/,'').scan(%r((\w+/[\w+.-]+)(?:(?:;[^,]*?)?;\s*q=([\d.]+))?)).sort_by { |_, q| -q.to_f }.map {|mime, _|
-            mime.sub(%r(vnd\.[^+]+\+), '')
-          }
+          accept.scan(accept_into_mime_and_quality).
+            sort_by { |_, quality_preference| -quality_preference.to_f }.
+            map {|mime, _| mime.sub(vendor_prefix_pattern, '') }
         end
 
     end

data/lib/grape/version.rb

@@ -1,3 +1,3 @@
 module Grape
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/grape/api_spec.rb

@@ -1535,6 +1535,7 @@ describe Grape::API do
 
           mount app
         end
+
         get '/v1/cool/awesome'
         last_response.body.should == 'yo'
       end

data/spec/grape/entity_spec.rb

@@ -146,15 +146,15 @@ describe Grape::Entity do
 
     end
 
-    it 'presents with xml' do 
+    it 'presents with xml' do
       entity = Class.new(Grape::Entity)
       entity.root "examples", "example"
       entity.expose :name
 
       subject.format :xml
 
-      subject.get '/example' do 
-        c = Class.new do 
+      subject.get '/example' do
+        c = Class.new do
           attr_reader :name
           def initialize(args)
             @name = args[:name] || "no name set"
@@ -175,15 +175,15 @@ describe Grape::Entity do
 XML
     end
 
-    it 'presents with json' do 
+    it 'presents with json' do
       entity = Class.new(Grape::Entity)
       entity.root "examples", "example"
       entity.expose :name
 
       subject.format :json
 
-      subject.get '/example' do 
-        c = Class.new do 
+      subject.get '/example' do
+        c = Class.new do
           attr_reader :name
           def initialize(args)
             @name = args[:name] || "no name set"
@@ -196,6 +196,32 @@ XML
       last_response.headers['Content-type'].should == "application/json"
       last_response.body.should == '{"example":{"name":"johnnyiller"}}'
     end
+
+    it 'presents with jsonp and a custom formatter' do
+      entity = Class.new(Grape::Entity)
+      entity.root "examples", "example"
+      entity.expose :name
+
+      subject.content_type :jsonp, 'application/javascript'
+      subject.formatter :jsonp, lambda { |object, env| object.to_json }
+      subject.format :jsonp
+
+      subject.get '/example' do
+        c = Class.new do
+          attr_reader :name
+          def initialize(args)
+            @name = args[:name] || "no name set"
+          end
+        end
+
+        present c.new({:name => "johnnyiller"}), :with => entity
+      end
+      get '/example'
+      last_response.status.should == 200
+      last_response.headers['Content-type'].should == "application/javascript"
+      last_response.body.should == '{"example":{"name":"johnnyiller"}}'
+    end
+
   end
 
-end
+end

metadata

@@ -1,116 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-mount
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-accept
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,119 +111,104 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: grape-entity
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -246,7 +216,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -254,17 +223,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby framework for rapid API development with great conventions.
@@ -365,63 +332,26 @@ files:
 homepage: https://github.com/intridea/grape
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1796003249167814741
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1796003249167814741
 requirements: []
 rubyforge_project: grape
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
-test_files:
-- spec/grape/api_spec.rb
-- spec/grape/endpoint_spec.rb
-- spec/grape/entity_spec.rb
-- spec/grape/exceptions/invalid_formatter_spec.rb
-- spec/grape/exceptions/invalid_versioner_option_spec.rb
-- spec/grape/exceptions/missing_mime_type_spec.rb
-- spec/grape/exceptions/missing_option_spec.rb
-- spec/grape/exceptions/unknown_options_spec.rb
-- spec/grape/exceptions/unknown_validator_spec.rb
-- spec/grape/middleware/auth/basic_spec.rb
-- spec/grape/middleware/auth/digest_spec.rb
-- spec/grape/middleware/auth/oauth2_spec.rb
-- spec/grape/middleware/base_spec.rb
-- spec/grape/middleware/error_spec.rb
-- spec/grape/middleware/exception_spec.rb
-- spec/grape/middleware/formatter_spec.rb
-- spec/grape/middleware/versioner/header_spec.rb
-- spec/grape/middleware/versioner/param_spec.rb
-- spec/grape/middleware/versioner/path_spec.rb
-- spec/grape/middleware/versioner_spec.rb
-- spec/grape/util/hash_stack_spec.rb
-- spec/grape/validations/coerce_spec.rb
-- spec/grape/validations/presence_spec.rb
-- spec/grape/validations/regexp_spec.rb
-- spec/grape/validations/zh-CN.yml
-- spec/grape/validations_spec.rb
-- spec/shared/versioning_examples.rb
-- spec/spec_helper.rb
-- spec/support/basic_auth_encode_helpers.rb
-- spec/support/versioned_helpers.rb
+test_files: []
 has_rdoc: