Upgrades to newest ghee gem, makes the necessary method changes

huboard · Mar 5, 2015 · 011268b · 011268b
1 parent 2bdfa17
commit 011268b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -25,7 +25,7 @@ gem 'rack-no-www'
 gem 'rdiscount'
 gem 'warden-github', :github => "atmos/warden-github"
 gem 'warden_strategies'
-gem 'ghee', '~> 0.11.16'
+gem 'ghee', '~> 0.12.16'
 gem 'rack-ssl'
 gem 'addressable'
 gem 'kgio'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -112,7 +112,7 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     encryptor (1.1.3)
     erubis (2.7.0)
-    ethon (0.7.2)
+    ethon (0.7.3)
       ffi (>= 1.3.0)
     eventmachine (1.0.4)
     excon (0.41.0)
@@ -200,7 +200,7 @@ GEM
       dotenv (~> 0.11.1)
       thor (~> 0.19.1)
     formatador (0.2.5)
-    ghee (0.11.16)
+    ghee (0.12.16)
       faraday (~> 0.9)
       faraday_middleware (~> 0.9)
       hashie (~> 3.3.2)
@@ -367,7 +367,7 @@ DEPENDENCIES
   faye-huboard
   faye-redis
   foreman
-  ghee (~> 0.11.16)
+  ghee (~> 0.12.16)
   i18n
   kgio
   memcachier

diff --git a/app/routes/api/profiles.rb b/app/routes/api/profiles.rb
@@ -10,7 +10,7 @@ class Profiles < Base
 
         get '/api/profiles/?' do
           user = gh.user.to_hash
-          orgs = gh.user.memberships.orgs("active").body
+          orgs = gh.user.memberships
 
           orgs.select!{|org| org["role"] == "admin"}
           orgs.map!{|org| org = org["organization"]}

diff --git a/app/routes/profiles.rb b/app/routes/profiles.rb
@@ -26,7 +26,7 @@ def protected!
         if account_type == "User"
           is_admin = gh.user["login"] == @user
         elsif account_type == "Organization"
-          orgs = gh.user.memberships.orgs("active").body
+          orgs = gh.user.memberships
           orgs_list = orgs.select{|org| org["role"] == "admin"}
           is_admin = orgs_list.any?{|org| org["organization"]["login"] == @user }
         end

diff --git a/lib/use_cases/private_repo.rb b/lib/use_cases/private_repo.rb
@@ -46,10 +46,9 @@ def has_subscription?(params)
     :private
     def user_is_owner(params)
       if @repo_owner["type"] == "Organization"
-        @u ||= @gh.orgs(@repo_owner["login"]).memberships(@gh.user["login"]) do |req|
-          req.headers["Accept"] = "application/vnd.github.moondragon+json"
-        end
-        return @u["role"] == "admin"
+        @user ||= @gh.orgs(@repo_owner["login"])
+          .memberships(@gh.user["login"])
+        return @user["role"] == "admin"
       end
       @repo_owner['login'] == @gh.user['login']
     end