google_auth_bridge 0.1.1 → 0.1.2

data/.gitignore

@@ -3,4 +3,5 @@ Gemfile.lock
 spec/reports
 .bundle
 *.gem
+*.swp
 coverage

data/lib/google_auth_bridge.rb

@@ -6,15 +6,19 @@ module GoogleAuthenticationBridge
     GOOGLE_REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob'
 
     def self.create_from_config_file(scope, file_name, token_file)
-      config = YAML.load_file(file_name)
+      config = load_file(file_name)
       client_id, client_secret = config[:google_client_id], config[:google_client_secret]
-      raise InvalidFileFormatError.new(@token_file) if client_id.nil? or client_secret.nil?
+      raise InvalidFileFormatError.new(token_file) if client_id.nil? or client_secret.nil?
       GoogleAuthentication.new(
           scope,
           client_id,
           client_secret,
           token_file)
     end
+    
+    def self.load_file(file_name)
+      YAML.load_file(file_name)
+    end
 
     def initialize(scope, client_id, client_secret, token_file)
       @scope = scope
@@ -23,6 +27,10 @@ module GoogleAuthenticationBridge
       @token_file = token_file
     end
 
+    def token_file_exists?
+      File.exists? @token_file
+    end
+
     def get_tokens(authorization_code=nil)
       client = Google::APIClient.new
       setup_credentials(client, authorization_code)
@@ -38,10 +46,10 @@ module GoogleAuthenticationBridge
     end
 
     def load_token_from_file
-      raise FileNotFoundError.new(@token_file) unless File.exists? @token_file
+      raise FileNotFoundError.new(@token_file) unless token_file_exists?
 
       begin
-        token_data = YAML.load_file(@token_file)
+        token_data = GoogleAuthentication.load_file(@token_file)
         token_data[:refresh_token] or raise
       rescue
         raise InvalidFileFormatError.new(@token_file)
@@ -74,7 +82,7 @@ module GoogleAuthenticationBridge
     end
 
     def refresh_tokens(client)
-      if File.exist? @token_file
+      if token_file_exists?
         client.authorization.update_token!(refresh_token: load_token_from_file)
         tokens = client.authorization.fetch_access_token
       else

data/lib/google_auth_bridge/version.rb

@@ -1,3 +1,3 @@
 module GoogleAuthenticationBridge
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: google_auth_bridge
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - GOV.UK Dev
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-29 00:00:00 Z
+date: 2012-12-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth2
@@ -122,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4326175119099848763
+      hash: -3681856484147130035
       segments: 
       - 0
       version: "0"
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4326175119099848763
+      hash: -3681856484147130035
       segments: 
       - 0
       version: "0"