git_hub_bub 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c21c6a37d5be72502e3f589b9c6ad01dc1f7482
-  data.tar.gz: a4b590a320c721a3f8be2aab3d14c4a80ecd07d7
+  metadata.gz: 3d31891a90b22df2a157da85e2158361b8205e2b
+  data.tar.gz: 9520dc67097429c0d153f0157431330a1385a9d3
 SHA512:
-  metadata.gz: 23c4836932ced10d6aba5555328b0e7609cf480770e9e772f70ae9417c07bb9ccdc382d86e8fd4059d2f8be8426dac8c3f035a33cd0ff16389762039f6aa8c60
-  data.tar.gz: 8419b8819b7da37d0d99b8bede074f7c43f058db07cb05bc380aabaa1cb025405ffe2532929a5db60fc9ba9151f08f5112f4bc6bcab0642701bf25940086b09a
+  metadata.gz: 1f64c2a1f22a8fb729643473d982218a00d76f35b5f6955ed564f3951048b80d984b22148d01d2140047bd63d1ed8d02e409f1e7c9f4363d4ea380a850e22371
+  data.tar.gz: 5998e107923099f197273716ef8fbe106f00782793e4a45ef80a78f857026a22296f4b1edfe7282a4772f8833fd3bae6ca816aeea7d50b2a1d5f5aadbc0360fa

data/git_hub_bub.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "rrrretry"
   gem.add_dependency "excon"
+  gem.add_development_dependency "mocha"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "vcr",     '~> 2.5.0'
   gem.add_development_dependency "webmock", '~> 1.11.0'

data/lib/git_hub_bub.rb

@@ -13,7 +13,7 @@ module GitHubBub
   class << self
 
     def valid_token?(token)
-      Request.get("https://#{ENV['GITHUB_APP_ID']}:#{ENV['GITHUB_APP_SECRET']}@api.github.com/applications/#{ENV['GITHUB_APP_ID']}/tokens/#{token}", {token: nil})
+      Request.get("https://#{ENV['GITHUB_APP_ID']}:#{ENV['GITHUB_APP_SECRET']}@api.github.com/applications/#{ENV['GITHUB_APP_ID']}/tokens/#{token}", {}, {skip_token: true})
       true
     rescue GitHubBub::RequestError
       false

data/lib/git_hub_bub/request.rb

@@ -13,11 +13,16 @@ module GitHubBub
 
     def initialize(url, query = {}, options = {})
       self.url               = url =~ /^http(\w?)\:\/\// ? url : File.join(BASE_URI, url)
+      @skip_token            = options.delete(:skip_token)
       self.options           = BASE_OPTIONS.merge(options || {})
-      self.options[:query]   = query   if query && !query.empty?
+      self.options[:query]   = query if query && !query.empty?
       self.options[:headers] = BASE_HEADERS.merge(options[:headers]|| {})
     end
 
+    def skip_token?
+      @skip_token
+    end
+
     def self.head(url, query = {}, options = {})
       self.new(url, query, options).head
     end
@@ -82,7 +87,7 @@ module GitHubBub
 
     def wrap_request(&block)
       before_callbacks!
-      set_auth_from_token!
+      set_auth_from_token! unless skip_token?
       query_to_json_body!
       response = RETRIES.times.retry do
         GitHubBub::Response.create(yield)

data/lib/git_hub_bub/version.rb

@@ -1,3 +1,3 @@
 module GitHubBub
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/fixtures/vcr_cassettes/PATCH_user.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://api.github.com/user?name=USER_NAME
+    uri: https://api.github.com/user?name=<USER_NAME>
     body:
       encoding: UTF-8
       string: '{"name":"<USER_NAME>"}'

data/test/git_hub_bub/valid_token_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class ValidTokenTest < Test::Unit::TestCase
+  include WebMock::API
+
+  def teardown
+    GitHubBub::Request.clear_callbacks
+  end
+
+  def test_does_not_add_token_to_header
+    token    = "foo"
+    url      = "https://#{ENV['GITHUB_APP_ID']}:#{ENV['GITHUB_APP_SECRET']}@api.github.com/applications/#{ENV['GITHUB_APP_ID']}/tokens/#{token}"
+    stub_get = stub_request(:get, url)
+
+    GitHubBub::Request.any_instance.expects(:token).never
+
+    GitHubBub.valid_token?(token)
+    assert_requested stub_get
+  end
+
+end

data/test/test_helper.rb

@@ -5,6 +5,8 @@ Dotenv.load
 
 require 'git_hub_bub'
 require 'test/unit'
+require 'mocha/test_unit'
+require 'webmock'
 
 def schneems_orgs_data
   {:body=>"[{\"login\":\"gowalla\",\"id\":317884,\"url\":\"https://api.github.com/orgs/gowalla\",\"repos_url\":\"https://api.github.com/orgs/gowalla/repos\",\"events_url\":\"https://api.github.com/orgs/gowalla/events\",\"members_url\":\"https://api.github.com/orgs/gowalla/members{/member}\",\"public_members_url\":\"https://api.github.com/orgs/gowalla/public_members{/member}\",\"avatar_url\":\"https://secure.gravatar.com/avatar/72746c59eaafb328456c345dc3b95999?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-org-420.png\"},{\"login\":\"austinonrails\",\"id\":43000,\"url\":\"https://api.github.com/orgs/austinonrails\",\"repos_url\":\"https://api.github.com/orgs/austinonrails/repos\",\"events_url\":\"https://api.github.com/orgs/austinonrails/events\",\"members_url\":\"https://api.github.com/orgs/austinonrails/members{/member}\",\"public_members_url\":\"https://api.github.com/orgs/austinonrails/public_members{/member}\",\"avatar_url\":\"https://secure.gravatar.com/avatar/da3ed72ff4f24a1670a5497d7b588bf4?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-org-420.png\"},{\"login\":\"heroku\",\"id\":23211,\"url\":\"https://api.github.com/orgs/heroku\",\"repos_url\":\"https://api.github.com/orgs/heroku/repos\",\"events_url\":\"https://api.github.com/orgs/heroku/events\",\"members_url\":\"https://api.github.com/orgs/heroku/members{/member}\",\"public_members_url\":\"https://api.github.com/orgs/heroku/public_members{/member}\",\"avatar_url\":\"https://secure.gravatar.com/avatar/e327d6043ba309e2bfc8b56110b6dbbe?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-org-420.png\"},{\"login\":\"opro\",\"id\":2106073,\"url\":\"https://api.github.com/orgs/opro\",\"repos_url\":\"https://api.github.com/orgs/opro/repos\",\"events_url\":\"https://api.github.com/orgs/opro/events\",\"members_url\":\"https://api.github.com/orgs/opro/members{/member}\",\"public_members_url\":\"https://api.github.com/orgs/opro/public_members{/member}\",\"avatar_url\":\"https://secure.gravatar.com/avatar/f1fd003752171548706b5a3a9e820f31?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-org-420.png\"},{\"login\":\"codetriage\",\"id\":2896855,\"url\":\"https://api.github.com/orgs/codetriage\",\"repos_url\":\"https://api.github.com/orgs/codetriage/repos\",\"events_url\":\"https://api.github.com/orgs/codetriage/events\",\"members_url\":\"https://api.github.com/orgs/codetriage/members{/member}\",\"public_members_url\":\"https://api.github.com/orgs/codetriage/public_members{/member}\",\"avatar_url\":\"https://secure.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-org-420.png\"},{\"login\":\"sumodocs\",\"id\":3372962,\"url\":\"https://api.github.com/orgs/sumodocs\",\"repos_url\":\"https://api.github.com/orgs/sumodocs/repos\",\"events_url\":\"https://api.github.com/orgs/sumodocs/events\",\"members_url\":\"https://api.github.com/orgs/sumodocs/members{/member}\",\"public_members_url\":\"https://api.github.com/orgs/sumodocs/public_members{/member}\",\"avatar_url\":\"https://secure.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-org-420.png\"},{\"login\":\"rails\",\"id\":4223,\"url\":\"https://api.github.com/orgs/rails\",\"repos_url\":\"https://api.github.com/orgs/rails/repos\",\"events_url\":\"https://api.github.com/orgs/rails/events\",\"members_url\":\"https://api.github.com/orgs/rails/members{/member}\",\"public_members_url\":\"https://api.github.com/orgs/rails/public_members{/member}\",\"avatar_url\":\"https://secure.gravatar.com/avatar/30f39a09e233e8369dddf6feb4be0308?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-org-420.png\"},{\"login\":\"sharpstone\",\"id\":3969584,\"url\":\"https://api.github.com/orgs/sharpstone\",\"repos_url\":\"https://api.github.com/orgs/sharpstone/repos\",\"events_url\":\"https://api.github.com/orgs/sharpstone/events\",\"members_url\":\"https://api.github.com/orgs/sharpstone/members{/member}\",\"public_members_url\":\"https://api.github.com/orgs/sharpstone/public_members{/member}\",\"avatar_url\":\"https://secure.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-org-420.png\"},{\"login\":\"centerforstudents\",\"id\":4041835,\"url\":\"https://api.github.com/orgs/centerforstudents\",\"repos_url\":\"https://api.github.com/orgs/centerforstudents/repos\",\"events_url\":\"https://api.github.com/orgs/centerforstudents/events\",\"members_url\":\"https://api.github.com/orgs/centerforstudents/members{/member}\",\"public_members_url\":\"https://api.github.com/orgs/centerforstudents/public_members{/member}\",\"avatar_url\":\"https://secure.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-org-420.png\"},{\"login\":\"railsgirls\",\"id\":1641104,\"url\":\"https://api.github.com/orgs/railsgirls\",\"repos_url\":\"https://api.github.com/orgs/railsgirls/repos\",\"events_url\":\"https://api.github.com/orgs/railsgirls/events\",\"members_url\":\"https://api.github.com/orgs/railsgirls/members{/member}\",\"public_members_url\":\"https://api.github.com/orgs/railsgirls/public_members{/member}\",\"avatar_url\":\"https://secure.gravatar.com/avatar/ae1295e0d53f3b81def634344b6644c1?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-org-420.png\"},{\"login\":\"ruby-no-kai\",\"id\":207834,\"url\":\"https://api.github.com/orgs/ruby-no-kai\",\"repos_url\":\"https://api.github.com/orgs/ruby-no-kai/repos\",\"events_url\":\"https://api.github.com/orgs/ruby-no-kai/events\",\"members_url\":\"https://api.github.com/orgs/ruby-no-kai/members{/member}\",\"public_members_url\":\"https://api.github.com/orgs/ruby-no-kai/public_members{/member}\",\"avatar_url\":\"https://secure.gravatar.com/avatar/ea5efa6071bc5fd5f9f74949cc743407?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-org-420.png\"}]", :headers=>{"Server"=>"GitHub.com", "Date"=>"Mon, 20 May 2013 19:49:07 GMT", "Content-Type"=>"application/json; charset=utf-8", "Connection"=>"keep-alive", "Status"=>"200 OK", "X-RateLimit-Limit"=>"5000", "X-RateLimit-Remaining"=>"4993", "Vary"=>"Accept, Authorization, Cookie, Accept-Encoding", "Cache-Control"=>"private, max-age=60, s-maxage=60", "Last-Modified"=>"Mon, 20 May 2013 19:42:52 GMT", "ETag"=>"\"0ecbc232dd0a0b86c82ad92050ea38aa\"", "X-OAuth-Scopes"=>"user:email", "X-Accepted-OAuth-Scopes"=>"repo, user", "X-GitHub-Media-Type"=>"github.beta; param=3.raw; format=json", "X-Content-Type-Options"=>"nosniff", "Content-Length"=>"5812", "Access-Control-Allow-Credentials"=>"true", "Access-Control-Expose-Headers"=>"Link, X-RateLimit-Limit, X-RateLimit-Remaining, X-OAuth-Scopes, X-Accepted-OAuth-Scopes", "Access-Control-Allow-Origin"=>"*"}, :status=>200, :remote_ip=>"207.97.227.243"}
@@ -30,7 +32,15 @@ VCR.configure do |c|
   c.cassette_library_dir = 'test/fixtures/vcr_cassettes'
   c.hook_into :webmock # or :fakeweb
 
-  'GITHUB_API_KEY OWNER REPO USER_NAME WATCH_OWNER WATCH_REPO GITHUB_APP_ID GITHUB_APP_SECRET'.split(' ').each do |secure|
+%W{
+  GITHUB_API_KEY
+  OWNER REPO
+  USER_NAME
+  WATCH_OWNER
+  WATCH_REPO
+  GITHUB_APP_ID
+  GITHUB_APP_SECRET
+}.each do |secure|
     sensitive = ENV[secure] ||= secure
     c.filter_sensitive_data("<#{secure}>") { sensitive }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_hub_bub
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Richard Schneeman
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,7 @@ files:
 - test/fixtures/vcr_cassettes/PUT_/repos/_owner/_repo/subscription.yml
 - test/git_hub_bub/request_test.rb
 - test/git_hub_bub/response_test.rb
+- test/git_hub_bub/valid_token_test.rb
 - test/test_helper.rb
 homepage: https://github.com/schneems/git_hub_bub
 licenses:
@@ -157,4 +172,5 @@ test_files:
 - test/fixtures/vcr_cassettes/PUT_/repos/_owner/_repo/subscription.yml
 - test/git_hub_bub/request_test.rb
 - test/git_hub_bub/response_test.rb
+- test/git_hub_bub/valid_token_test.rb
 - test/test_helper.rb