warden-github-rails 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94c4bcff3c0978874ae4233194457aa095b6ec98
-  data.tar.gz: 952a958502aef15b84ca89c4912d7577ea4ab0f4
+  metadata.gz: e4b21d7a28bf42f74da5eafddadfad17630e05a0
+  data.tar.gz: aa412e1be503469bc2771ee0cb51a820445f0268
 SHA512:
-  metadata.gz: df68ab5d8e005762758a1c42ebf734a5dd477dc3b9e553658bdad6518af55b9d5ec924b9b205a924ec0f5e95b5f236bddbb2d8e4473a7db2623531a20fa58e02
-  data.tar.gz: a5ca3a4d19fb32f664b3ae819df6243a557f252b01b59382965507b49cb99d88be888b1c9cdf0eb8d931205a541f480c2b337441f8ba7303d16c4639eafc4c2e
+  metadata.gz: 5e5c27ca1244250f732b1ea0ce6065006d0c46134d7bb451aa96e76e7d3014b23e1d707886d8602539774865b402165631671c5adccefe78d9a006d7f2048621
+  data.tar.gz: 2d8abd4c0e093228ca14cd82fb29b7914ceb8670d6950cdf3f9d8ccf6f9e391dc069d18c23e7658e5aafdc4dc4ddcb2980db17d4ae48d23b2da85a29499f2462

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
+cache: bundler
 script: "bundle exec rspec"
 rvm:
-  - 1.9.2
-  - 1.9.3
+  - 2.1.0
   - 2.0.0
+  - 1.9.3
   - ruby-head
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode
+  - jruby-19mode
+  - rbx-2.1.1
 env:
   - "RAILS_VERSION=3.1.0"
   - "RAILS_VERSION=3.2.0"
@@ -16,8 +17,3 @@ matrix:
   allow_failures:
     - env: "RAILS_VERSION=master"
     - rvm: ruby-head
-  exclude:
-    - rvm: 1.9.2
-      env: "RAILS_VERSION=master"
-    - rvm: 1.9.2
-      env: "RAILS_VERSION=4.0.0"

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.1.1
+
+- Transform string to integer when stubbing team membership
+- Place redirect helper in correct rack module
+
 ## v1.1.0
 
 - Upgrade to octokit.rb version 2

data/Gemfile

@@ -25,3 +25,8 @@ group :development do
     gem 'ruby-debug', platforms: :ruby_18, require: false
   end
 end
+
+platforms :rbx do
+  gem 'rubysl'
+  gem 'racc'
+end

data/README.md

@@ -1,9 +1,11 @@
 # warden-github-rails
 
-[![Build Status](https://travis-ci.org/fphilipe/warden-github-rails.png)](https://travis-ci.org/fphilipe/warden-github-rails)
-[![Gem Version](https://badge.fury.io/rb/warden-github-rails.png)](http://badge.fury.io/rb/warden-github-rails)
-[![Dependency Status](https://gemnasium.com/fphilipe/warden-github-rails.png)](https://gemnasium.com/fphilipe/warden-github-rails)
-[![Code Climate](https://codeclimate.com/github/fphilipe/warden-github-rails.png)](https://codeclimate.com/github/fphilipe/warden-github-rails)
+[![Build Status][build-image]][build-link]
+[![Gem Version][gem-image]][gem-link]
+[![Dependency Status][deps-image]][deps-link]
+[![Code Climate][gpa-image]][gpa-link]
+[![Coverage Status][cov-image]][cov-link]
+[![Bitdeli Badge][stats-image]][stats-link]
 
 A gem for rails that provides easy GitHub OAuth integration.
 It is built on top of [warden-github](https://github.com/atmos/warden-github), which gives you an easy to use [warden](https://github.com/hassox/warden) strategy to authenticate GitHub users.
@@ -108,12 +110,12 @@ Here's how such a config might look like:
 Warden::GitHub::Rails.setup do |config|
   config.add_scope :user,  client_id:     'foo',
                            client_secret: 'bar',
-                           scope:         'user'
+                           scope:         'user:email'
 
   config.add_scope :admin, client_id:     'abc',
                            client_secret: 'xyz',
                            redirect_uri:  '/admin/login/callback',
-                           scope:         'repo'
+                           scope:         'read:org'
 
   config.default_scope = :admin
 
@@ -262,10 +264,29 @@ This functionality is used in this gem in order to setup the github strategy for
     - [warden](https://github.com/hassox/warden)
     - [octokit](https://github.com/octokit/octokit.rb)
 
-### Maintainers
+### Author
 
-- Philipe Fatio ([@fphilipe](https://github.com/fphilipe))
+Philipe Fatio ([@fphilipe][fphilipe twitter])
+
+[![Support via Gittip][tip-image]][tip-link]
 
 ### License
 
 MIT License. Copyright 2013 Philipe Fatio
+
+[build-image]: https://travis-ci.org/fphilipe/warden-github-rails.png
+[build-link]:  https://travis-ci.org/fphilipe/warden-github-rails
+[gem-image]:   https://badge.fury.io/rb/warden-github-rails.png
+[gem-link]:    https://rubygems.org/gems/warden-github-rails
+[deps-image]:  https://gemnasium.com/fphilipe/warden-github-rails.png
+[deps-link]:   https://gemnasium.com/fphilipe/warden-github-rails
+[gpa-image]:   https://codeclimate.com/github/fphilipe/warden-github-rails.png
+[gpa-link]:    https://codeclimate.com/github/fphilipe/warden-github-rails
+[cov-image]:   https://coveralls.io/repos/fphilipe/warden-github-rails/badge.png
+[cov-link]:    https://coveralls.io/r/fphilipe/warden-github-rails
+[stats-image]: https://d2weczhvl823v0.cloudfront.net/fphilipe/warden-github-rails/trend.png
+[stats-link]:  https://bitdeli.com/
+[tip-image]:   https://rawgithub.com/twolfson/gittip-badge/0.1.0/dist/gittip.png
+[tip-link]:    https://www.gittip.com/fphilipe/
+
+[fphilipe twitter]: https://twitter.com/fphilipe

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/warden/github/rails/test_helpers.rb

@@ -18,11 +18,10 @@ module Warden
   end
 end
 
-# Add a method to Rack::Response to easily determine if a request resulted in an
-# OAuth redirect to GitHub.
-class Rack::Response
+# Add a method to Rack::Response::Helpers to easily determine if a request
+# resulted in an OAuth redirect to GitHub.
+module Rack::Response::Helpers
   def github_oauth_redirect?
-    redirect? and
-      location.start_with?('https://github.com/login/oauth/authorize')
+    redirect? && %r{https?://[^/]+/login/oauth/authorize\b} =~ location
   end
 end

data/lib/warden/github/rails/test_helpers/mock_user.rb

@@ -12,7 +12,9 @@ module Warden
 
           def stub_membership(args)
             args.each do |type, values|
-              memberships.fetch(type).concat(Array(values))
+              values = Array(values)
+              values.map!(&:to_i) if type == :team
+              memberships.fetch(type).concat(values)
             end
           end
 

data/spec/spec_helper.rb

@@ -1,8 +1,14 @@
-unless ENV['CI']
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter '/spec'
-    add_filter '/example'
+if RUBY_ENGINE == 'ruby'
+  if ENV['CI']
+    require 'coveralls'
+    Coveralls::Output.silent = true
+    Coveralls.wear! do
+      add_filter 'spec/'
+      add_filter 'example/'
+    end
+  else
+    require 'simplecov'
+    SimpleCov.start
   end
 end
 

data/spec/unit/mock_user_spec.rb

@@ -11,7 +11,7 @@ describe Warden::GitHub::Rails::TestHelpers::MockUser do
       expect(user).not_to be_team_member(456)
       expect(user).not_to be_organization_member('foobar')
 
-      user.stub_membership(org: 'foobar', team: [123, 456])
+      user.stub_membership(org: 'foobar', team: [123, '456'])
 
       expect(user).to be_team_member(123)
       expect(user).to be_team_member(456)

data/warden-github-rails.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
 
   gem.add_development_dependency 'rspec', '~> 2.14'
-  gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rails', '>= 3.2'
   gem.add_development_dependency 'rack-test', '~> 0.6'
   gem.add_development_dependency 'addressable', '~> 2.3'
+  gem.add_development_dependency 'coveralls' if RUBY_ENGINE == 'ruby'
 
   gem.add_dependency 'warden-github', '~> 1.0'
   gem.add_dependency 'railties', '>= 3.1'

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: warden-github-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: warden-github
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 description: An easy drop in solution for rails to use GitHub authentication.
@@ -115,9 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -170,17 +171,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An easy drop in solution for rails to use GitHub authentication.