google_auth_bridge 0.1.0 → 0.1.1

data/.gitignore

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

data/README.md

@@ -50,5 +50,5 @@ file.
 The credentials file should contain the client id and the client secret.
 
     ---
-    google_client_id: "client id"
-    google_client_secret: "client secret"
+    :google_client_id: "client id"
+    :google_client_secret: "client secret"

data/google_auth_bridge.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/google_auth_bridge/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = %w(ssatish)
-  gem.email = %w(seema.satish@digital.cabinet-office.gov.uk)
+  gem.authors       = ["GOV.UK Dev"]
+  gem.email = %w(govuk-dev@digital.cabinet-office.gov.uk)
   gem.description   = "bridge for supporting multiple google authentication libraries" 
   gem.summary       = "bridge for supporting multiple google authentication libraries"  
   gem.homepage      = "https://github.com/alphagov/google-auth-bridge"
@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("rake")
   gem.add_development_dependency("rspec")
   gem.add_development_dependency("ci_reporter")
+  gem.add_development_dependency("simplecov")
   gem.add_development_dependency("gem_publisher", "~> 1.1.1")
 
 end

data/lib/google_auth_bridge.rb

@@ -7,10 +7,12 @@ module GoogleAuthenticationBridge
 
     def self.create_from_config_file(scope, file_name, token_file)
       config = YAML.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?
       GoogleAuthentication.new(
           scope,
-          config["google_client_id"],
-          config["google_client_secret"],
+          client_id,
+          client_secret,
           token_file)
     end
 
@@ -40,10 +42,7 @@ module GoogleAuthenticationBridge
 
       begin
         token_data = YAML.load_file(@token_file)
-        token = token_data[:refresh_token]
-
-        raise InvalidFileFormatError.new(@token_file) unless token
-        token
+        token_data[:refresh_token] or raise
       rescue
         raise InvalidFileFormatError.new(@token_file)
       end

data/lib/google_auth_bridge/version.rb

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

data/spec/google_auth_bridge_spec.rb

@@ -1,54 +1,109 @@
+require "simplecov"
+SimpleCov.start
+
 require_relative "../lib/google_auth_bridge"
 require "tempfile"
 
-describe "Google Authentication Client" do
-  before(:each) do
-    @filename = "/tmp/test.token"
-    @auth = GoogleAuthenticationBridge::GoogleAuthentication.new(nil, nil, nil, @filename)
-    @yaml_content = "---\n:refresh_token: foo bar\n"
-    @yaml_pattern = /---\s?\n:refresh_token: foo bar\n/
+module GoogleAuthenticationBridge
+  class GoogleAuthentication
+    attr_reader :client_id, :client_secret
   end
+end
 
-  after(:each) do
-    File.delete(@filename) if File.exists? @filename
-  end
+describe "Google Authentication Client" do
+  describe "Config file" do
 
-  it "should save refresh token to file as yaml" do
-    File.exists?(@filename).should be_false
-    @auth.save_token_to_file("foo bar")
-    File.exists?(@filename).should be_true
-    File.read(@filename).should match(@yaml_pattern)
-  end
+    before(:each) do
+      @filename = "/tmp/config-test.yaml"
+    end
 
-  it "should raise an InvalidTokenError exception if the refresh token is nil" do
-    lambda {
-      @auth.save_token_to_file(nil)
-    }.should raise_error(GoogleAuthenticationBridge::InvalidTokenError)
-  end
+    after(:each) do
+      File.unlink(@filename) if File.exist?(@filename)
+    end
 
-  it "should load refresh token from yaml file" do
-    File.open(@filename, 'w') {|f| f.write(@yaml_content) }
-    @auth.load_token_from_file.should == "foo bar"
-  end
+    it "should read the client id and the client secret" do
+      File.open(@filename, "w") { |f| f.write("---\n:google_client_id: foo bar\n:google_client_secret: very secret\n") }
+      auth = GoogleAuthenticationBridge::GoogleAuthentication.create_from_config_file(nil, @filename, nil)
 
-  it "should raise a FileNotFoundError exception if the file is not there" do
-    lambda {
-      @auth.load_token_from_file
-    }.should raise_error(GoogleAuthenticationBridge::FileNotFoundError)
-  end
+      auth.client_id.should == "foo bar"
+      auth.client_secret.should == "very secret"
+    end
+
+    it "should raise an error when client id is missing" do
+      File.open(@filename, "w") { |f| f.write("---\n:google_client_secret: very secret\n") }
+
+      -> {
+        GoogleAuthenticationBridge::GoogleAuthentication.create_from_config_file(nil, @filename, nil)
+      }.should raise_error(GoogleAuthenticationBridge::InvalidFileFormatError)
+
+    end
+
+    it "should raise an error when client secret is missing" do
+      File.open(@filename, "w") { |f| f.write("---\n:google_client_secret: very secret\n") }
+
+      -> {
+        GoogleAuthenticationBridge::GoogleAuthentication.create_from_config_file(nil, @filename, nil)
+      }.should raise_error(GoogleAuthenticationBridge::InvalidFileFormatError)
+
+    end
+
+    it "should raise an error when config file is missing" do
+      -> {
+        GoogleAuthenticationBridge::GoogleAuthentication.create_from_config_file(nil, @filename, nil)
+      }.should raise_error
+    end
 
-  it "should raise an InvalidFileFormatError exception if the file is badly formatted" do
-    File.open(@filename, 'w') {|f| f.write("bad content") }
-    lambda {
-      @auth.load_token_from_file
-    }.should raise_error(GoogleAuthenticationBridge::InvalidFileFormatError)
   end
 
+  describe "Token file" do
+    before(:each) do
+      @filename = "/tmp/test.token"
+      @auth = GoogleAuthenticationBridge::GoogleAuthentication.new(nil, nil, nil, @filename)
+      @yaml_content = "---\n:refresh_token: foo bar\n"
+      @yaml_pattern = /---\s?\n:refresh_token: foo bar\n/
+    end
+
+    after(:each) do
+      File.delete(@filename) if File.exists? @filename
+    end
+
+    it "should save refresh token to file as yaml" do
+      File.exists?(@filename).should be_false
+      @auth.save_token_to_file("foo bar")
+      File.exists?(@filename).should be_true
+      File.read(@filename).should match(@yaml_pattern)
+    end
+
+    it "should raise an InvalidTokenError exception if the refresh token is nil" do
+      lambda {
+        @auth.save_token_to_file(nil)
+      }.should raise_error(GoogleAuthenticationBridge::InvalidTokenError)
+    end
+
+    it "should load refresh token from yaml file" do
+      File.open(@filename, 'w') { |f| f.write(@yaml_content) }
+      @auth.load_token_from_file.should == "foo bar"
+    end
+
+    it "should raise a FileNotFoundError exception if the file is not there" do
+      lambda {
+        @auth.load_token_from_file
+      }.should raise_error(GoogleAuthenticationBridge::FileNotFoundError)
+    end
+
+    it "should raise an InvalidFileFormatError exception if the file is badly formatted" do
+      File.open(@filename, 'w') { |f| f.write("bad content") }
+      lambda {
+        @auth.load_token_from_file
+      }.should raise_error(GoogleAuthenticationBridge::InvalidFileFormatError)
+    end
+
 
-  it "should raise an InvalidFileFormatError exception if the file does not contain refresh token" do
-    File.open(@filename, 'w') {|f| f.write("---\n:refresh_token: \n") }
-    lambda {
-      @auth.load_token_from_file
-    }.should raise_error(GoogleAuthenticationBridge::InvalidFileFormatError)
+    it "should raise an InvalidFileFormatError exception if the file does not contain refresh token" do
+      File.open(@filename, 'w') { |f| f.write("---\n:refresh_token: \n") }
+      lambda {
+        @auth.load_token_from_file
+      }.should raise_error(GoogleAuthenticationBridge::InvalidFileFormatError)
+    end
   end
 end

metadata

@@ -2,15 +2,15 @@
 name: google_auth_bridge
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
-- ssatish
+- GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-08-24 00:00:00 Z
+date: 2012-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth2
@@ -68,8 +68,19 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: gem_publisher
+  name: simplecov
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: gem_publisher
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,10 +88,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 description: bridge for supporting multiple google authentication libraries
 email: 
-- seema.satish@digital.cabinet-office.gov.uk
+- govuk-dev@digital.cabinet-office.gov.uk
 executables: []
 
 extensions: []
@@ -111,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2931254444280982549
+      hash: 4326175119099848763
       segments: 
       - 0
       version: "0"
@@ -120,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2931254444280982549
+      hash: 4326175119099848763
       segments: 
       - 0
       version: "0"