worochi 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10d262c628a03073fc9acaeed754af4c9cd65508
-  data.tar.gz: c2627ca0440adea26112bff91dab7ab4062f8419
+  metadata.gz: a16bf51d367b8b62f009a425dd929ed96d38f376
+  data.tar.gz: 9e24cbc3ebee89c808a6f1c9e5622ab78b67680f
 SHA512:
-  metadata.gz: 69db7642802200e9139ddcd003b877d064ed3c4f765d16b98383311c65801c5b4d4814b061f9d53adf56fee0c5986f7370afbf6bd7cb3b0f91e0589712d32aed
-  data.tar.gz: 2dfc7077f6b7a3b581549fc1a271e3563eb732a63f8ba3394297044424079b4fbee57e73dac6e13b024d087cbfda772df3a8b22ed272870433e61b96d04d2194
+  metadata.gz: 2cbfcb2ba4fc6d306bedfde432eae0f8cc66586a84f7a06b3b156235cf8762ada3da0ef09ee56d9dea665755b10ccea8d572bda49f76e5f8b336186b9709a8e3
+  data.tar.gz: d28e49ee2f24e2eae8d982d3706407c4f76019d51f80f118c771e8833829d0bfa7e1dd2cab9effa292bd07563e4180e0bc57c92d006bfb2c230f2bf0241c4911

data/lib/worochi/config/google_drive.yml

@@ -0,0 +1,11 @@
+id: 3
+
+display_name: Google Drive
+dir: /
+oauth:
+  id_env: GOOGLE_ID
+  secret_env: GOOGLE_SECRET
+  token_url: /1/oauth2/token
+  authorize_url: /o/oauth2/auth
+  site: https://accounts.google.com
+  scope: https://www.googleapis.com/auth/drive

data/lib/worochi/configurator.rb

@@ -36,7 +36,8 @@ class Worochi
         @services = files.map do |file|
           File.basename(file, '.yml').to_sym
         end
-        @services
+        @all_services = @services.clone.freeze
+        @services.freeze
       end
 
       # Array of service meta information.
@@ -52,6 +53,24 @@ class Worochi
         end
       end
 
+      # Only enable the list of services specified instead of all supported
+      # services.
+      #
+      # @return [Array<Symbol>] enabled services
+      def enable_services(list)
+        @all_services || services
+        @services = @all_services.reject { |service| !list.include?(service) }
+        @services.freeze
+      end
+
+      # Re-enable all supported services.
+      #
+      # @return [Array<Symbol>] enabled services
+      def reset_services
+        @services || services
+        @services = @all_services.clone
+      end
+
       # Returns display name for the service.
       #
       # @overload service_display_name(service)

data/lib/worochi/oauth.rb

@@ -43,12 +43,24 @@ class Worochi
       client.site = options.token_site || options.site
       opts = {}
       opts[:redirect_uri] = options.redirect_uri if options.redirect_uri
-      token = client.auth_code.get_token(code, opts)
-      Hashie::Mash.new(token.to_hash)
+      Hashie::Mash.new(client.auth_code.get_token(code, opts).to_hash)
     end
 
     alias_method :get_token, :flow_end
 
+    # Refreshes the access token using the refresh token.
+    #
+    # @param hash [Hash] stored hash for the token
+    # @return [Hashie::Mash] Updated OAuth2 token
+    def refresh!(hash)
+      token = OAuth2::AccessToken.from_hash(@client, hash)
+      begin
+        token.refresh!
+      rescue OAuth2::Error
+      end
+      Hashie::Mash.new(token.to_hash)
+    end
+
   private
     # @return [String] scope
     def scope

data/lib/worochi/version.rb

@@ -1,4 +1,4 @@
 class Worochi
   # Current version of the gem
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

data/spec/cassettes/Worochi_OAuth/_refresh/tries_to_refresh_the_access_token.yml

@@ -0,0 +1,56 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://github.com/login/oauth/access_token
+    body:
+      encoding: US-ASCII
+      string: client_id=<GITHUB_ID>&client_secret=<GITHUB_SECRET>&grant_type=refresh_token&refresh_token=bbbbb
+    headers:
+      User-Agent:
+      - Faraday v0.8.8
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Mon, 19 Aug 2013 18:24:37 GMT
+      Content-Type:
+      - application/x-www-form-urlencoded; charset=utf-8
+      Connection:
+      - keep-alive
+      Status:
+      - 200 OK
+      Cache-Control:
+      - private, max-age=0, must-revalidate
+      Strict-Transport-Security:
+      - max-age=2592000
+      X-Frame-Options:
+      - deny
+      Set-Cookie:
+      - dotcom_user=; path=/; expires=Thu, 01-Jan-1970 00:00:00 GMT
+      - logged_in=no; domain=.github.com; path=/; expires=Fri, 19-Aug-2033 18:24:37
+        GMT; secure; HttpOnly
+      X-Runtime:
+      - '8'
+      Etag:
+      - '"ed2cf91250498a9276e3b4fa6de2c2b6"'
+      Content-Length:
+      - '27'
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: UTF-8
+      string: error=bad_verification_code
+    http_version: 
+  recorded_at: Mon, 19 Aug 2013 18:24:37 GMT
+recorded_with: VCR 2.5.0

data/spec/worochi/config_spec.rb

@@ -7,6 +7,10 @@ class Worochi
         expect(Config.services.class).to be(Array)
         expect(Config.services.first.class).to be(Symbol)
       end
+      it 'is frozen' do
+        list = Config.services
+        expect{list << :test}.to raise_error(RuntimeError)
+      end
     end
 
     describe '.list_services' do
@@ -18,6 +22,26 @@ class Worochi
       end
     end
 
+    describe '.enable_services' do
+      it 'disables all services not in the given list' do
+        all_services = Config.services
+        Config.enable_services([all_services.first])
+        expect(Config.services).not_to eq(all_services)
+        expect(Config.services).to include(all_services.first)
+        Config.enable_services(all_services)
+        expect(Config.services).to eq(all_services)
+      end
+    end
+
+    describe '.reset_services' do
+      it 'enables all supported services' do
+        all_services = Config.services
+        Config.enable_services([all_services.first])
+        Config.reset_services
+        expect(Config.services).to eq(all_services)
+      end
+    end
+
     describe '.service_display_name' do
       it 'returns display name given an ID' do
         expect(Config.service_display_name(1)).to eq('GitHub')

data/spec/worochi/oauth_spec.rb

@@ -30,4 +30,16 @@ describe Worochi::OAuth do
       expect{auth.flow_end('abc')}.to raise_error(OAuth2::Error)
     end
   end
+
+  describe '#refresh', :vcr do
+    it 'tries to refresh the access token' do
+      token = {
+        token_type: "bearer",
+        access_token: "aaaaa",
+        refresh_token: "bbbbb",
+        expires_at: 1376702712
+      }
+      expect(auth.refresh!(token)).to include(:refresh_token)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worochi
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Raven Jiang
@@ -217,6 +217,7 @@ files:
 - lib/worochi/version.rb
 - lib/worochi/configurator.rb
 - lib/worochi.rb
+- lib/worochi/config/google_drive.yml
 - lib/worochi/config/box.yml
 - lib/worochi/config/github.yml
 - lib/worochi/config/dropbox.yml
@@ -281,6 +282,7 @@ files:
 - spec/cassettes/Worochi_Item/_open/opens_a_single_file/with_String_parameter.yml
 - spec/cassettes/Worochi_Item/_open/opens_a_single_file/with_Hash_parameter.yml
 - spec/cassettes/Worochi_OAuth/_flow_end/rejects_bad_code.yml
+- spec/cassettes/Worochi_OAuth/_refresh/tries_to_refresh_the_access_token.yml
 homepage: https://github.com/Pixelapse/worochi
 licenses:
 - MIT
@@ -366,4 +368,5 @@ test_files:
 - spec/cassettes/Worochi_Item/_open/opens_a_single_file/with_String_parameter.yml
 - spec/cassettes/Worochi_Item/_open/opens_a_single_file/with_Hash_parameter.yml
 - spec/cassettes/Worochi_OAuth/_flow_end/rejects_bad_code.yml
+- spec/cassettes/Worochi_OAuth/_refresh/tries_to_refresh_the_access_token.yml
 has_rdoc: