gcevent 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7448318fcf34b51979ba1c1e91fb96fc4409e81f
-  data.tar.gz: 400af06a1fd0f1c9aa09a4db4e841bcb662d3b63
+  metadata.gz: a4ccbcb111bab108ce0af65e9bfbd701e8fa89a4
+  data.tar.gz: 25df7e074c26a58b78196ca6f6c8106c4a65a53a
 SHA512:
-  metadata.gz: 77a3d9fd1d90ffa9ec84ce0ce173a4482b521789196095a5046590381212ffc5627cfafa1a2e6ed9daa85f8195a183682b83df8ca84492ada2cbcf551eb333f1
-  data.tar.gz: 6abc18a284872a389be281e966ff7b6db660097aa05a6625852ad569523a3991c7549c988d7596b4372857ef9e2b9d144e6a78bf093bde68c7fc0c73a6863c61
+  metadata.gz: 46b9a6bfc10a4550dd997af2273296ff4b7b1d3c08b2f374644ae669f0e4dbf97584c4d359f6fe2ea5e608943b80b9dd6d272826642537c63139829abf3fc058
+  data.tar.gz: b230e8742bd4178cf8ebf2d2e8e073892d27a76949b13bdda68740cf1d316af54c07d48d8194300b7f0acefb82f2ed5126cdf0a4b37cc9ee7f68b1c142f0cacc

data/.travis.yml

@@ -1,5 +1,3 @@
 language: ruby
 rvm:
-  - 2.1.5
-  - 2.1.6
-  - 2.2.2
+  - 2.3.0

data/README.md

@@ -30,7 +30,8 @@ Or install it yourself as:
 Google::Calendar.id                  = "Id of a target Google Calendar"
 Google::Calendar.secret_key.path     = "Path of xxx-privatekey.p12"
 Google::Calendar.secret_key.password = "Password"
-Google::Calendar.client_id           = "ID of Client"
+Google::Calendar.client_secret_path  = "Path of client_secret_xxx.json"
+Google::Calendar.client_email        = "Email address of service account"
 ```
 
 ### Event#get

data/gcevent.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "gcevent"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["ogawatti"]
   spec.email         = ["ogawattim@gmail.com"]
   spec.summary       = %q{A wrapper of Google Calendar Event API.}

data/lib/google/calendar.rb

@@ -8,7 +8,7 @@ module Google
 
   module Calendar
     class << self
-      attr_accessor :id, :client_id
+      attr_accessor :id, :client_secret_path, :client_email
     end
 
     extend self
@@ -40,7 +40,7 @@ module Google
     end
 
     def service_account
-      Google::ServiceAccount.new(client_id)
+      Google::ServiceAccount.new(client_secret_path, client_email)
     end
 
     def signing_key

data/lib/google/service_account.rb

@@ -1,31 +1,22 @@
 module Google
   class ServiceAccount
-    CLIENT_ID_SUFFIX             = ".apps.googleusercontent.com"
-    CLIENT_EMAIL_DOMAIN          = "developer.gserviceaccount.com"
-    ACCOUNTS_GOOGLE_COM_BASE_URI = "https://accounts.google.com"
-    WWW_GOOGLEAPIS_COM_BASE_URI  = "https://www.googleapis.com"
+    SCOPE = 'https://www.googleapis.com/auth/calendar'
   
-    attr_reader :id
     attr_reader :auth_uri, :token_uri
     attr_reader :client_id, :client_email
     attr_reader :auth_provider_x509_cert_url, :client_x509_cert_url
+    attr_reader :project_id
     attr_reader :scope
 
-    def initialize(client_id)
-      @id = client_id.include?(CLIENT_ID_SUFFIX) ? scan_id(client_id) : client_id
-      @auth_uri                    = ACCOUNTS_GOOGLE_COM_BASE_URI + "/o/oauth2/auth"
-      @token_uri                   = ACCOUNTS_GOOGLE_COM_BASE_URI + "/o/oauth2/token"
-      @client_id                   = @id + CLIENT_ID_SUFFIX
-      @client_email                = @id + "@" + CLIENT_EMAIL_DOMAIN
-      @auth_provider_x509_cert_url = WWW_GOOGLEAPIS_COM_BASE_URI  + "/oauth2/v1/certs"
-      @client_x509_cert_url        = WWW_GOOGLEAPIS_COM_BASE_URI  + "/robot/v1/metadata/x509" + @client_email
-      @scope                       = WWW_GOOGLEAPIS_COM_BASE_URI  + "/auth/calendar"
-    end
-
-    private
-
-    def scan_id(client_id)
-      client_id.scan(/^(.*)#{CLIENT_ID_SUFFIX}$/).first.first
+    def initialize(secret_path, email)
+      JSON.parse(File.read(secret_path)).each do |key, secret|
+        secret.each do |k, v|
+          instance_varialbe_name = "@#{k}".to_sym
+          instance_variable_set(instance_varialbe_name, v)
+        end
+      end
+      @client_email ||= email
+      @scope = SCOPE
     end
   end
 end

data/spec/google/calendar/event_spec.rb

@@ -34,11 +34,21 @@ describe Google::Calendar::Event do
   let(:end_date)   { { date: Date.tomorrow } }
 
   before do
+    Google::Calendar.id = calendar_id
     allow(Google::APIClient::KeyUtils).to receive(:load_key) { OpenSSL::PKey::RSA.new }
     allow(File).to receive(:exist?) { true }
+    allow(File).to receive(:read) { 
+      {
+        installed: {
+          client_id:                   "100000000000000000000",
+          project_id:                  "test-project-000001",
+          auth_uri:                    "https://accounts.google.com/o/oauth2/auth",
+          token_uri:                   "https://accounts.google.com/o/oauth2/token",
+          auth_provider_x509_cert_url: "https://www.googleapis.com/oauth2/v1/certs"
+        }
+      }.to_json
+    }
     allow_any_instance_of(Signet::OAuth2::Client).to receive(:fetch_access_token!) { true }
-    Google::Calendar.client_id = client_id
-    Google::Calendar.id = calendar_id
     allow(Google::Calendar).to receive(:authorize?) { true }
   end
 

data/spec/google/calendar_spec.rb

@@ -8,8 +8,9 @@ describe Google::Calendar do
   before do
     allow(Google::APIClient::KeyUtils).to receive(:load_key) { OpenSSL::PKey::RSA.new }
     allow(File).to receive(:exist?) { true }
+    allow(File).to receive(:read) { { installed: { client_id: client_id } }.to_json }
     allow_any_instance_of(Signet::OAuth2::Client).to receive(:fetch_access_token!) { true }
-    Google::Calendar.client_id = client_id
+    Google::Calendar.client_secret_path = "testpath"
   end
 
   describe '.api' do

data/spec/google/service_account_spec.rb

@@ -1,52 +1,28 @@
 require 'spec_helper'
 
 describe Google::ServiceAccount do
-  let(:client_id_suffix)             { ".apps.googleusercontent.com" }
-  let(:client_email_domain)          { "developer.gserviceaccount.com" } 
-  let(:accounts_google_com_base_uri) { "https://accounts.google.com" }
-  let(:www_googleapis_com_base_uri)  { "https://www.googleapis.com" }
-
-  let(:id)                           { "1000000000000-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" }
-  let(:client_id)                    { id + ".apps.googleusercontent.com" }
-  let(:auth_uri)                     { accounts_google_com_base_uri + "/o/oauth2/auth" }
-  let(:token_uri)                    { accounts_google_com_base_uri + "/o/oauth2/token" }
-  let(:client_email)                 { id + "@" + client_email_domain }
-  let(:auth_provider_x509_cert_url)  { www_googleapis_com_base_uri + "/oauth2/v1/certs" }
-  let(:client_x509_cert_url)         { www_googleapis_com_base_uri + "/robot/v1/metadata/x509" + client_email }
-  let(:scope)                        { www_googleapis_com_base_uri + "/auth/calendar" }
-
-
-  describe '::CLIENT_ID_SUFFIX' do
-    subject { Google::ServiceAccount::CLIENT_ID_SUFFIX }
-    it { is_expected.to eq client_id_suffix }
-  end
-
-  describe '::CLIENT_EMAIL_DOMAIN' do
-    subject { Google::ServiceAccount::CLIENT_EMAIL_DOMAIN }
-    it { is_expected.to eq client_email_domain }
-  end
-
-  describe '::ACCOUNTS_GOOGLE_COM_BASE_URI' do
-    subject { Google::ServiceAccount::ACCOUNTS_GOOGLE_COM_BASE_URI }
-    it { is_expected.to eq accounts_google_com_base_uri }
-  end
-
-  describe '::WWW_GOOGLEAPIS_COM_BASE_URI' do
-    subject { Google::ServiceAccount::WWW_GOOGLEAPIS_COM_BASE_URI }
-    it { is_expected.to eq www_googleapis_com_base_uri }
-  end
+  before { allow(File).to receive(:read) { secret.to_json } }
+  let(:client_secret_path) { "./testpath" }
+  let(:client_email)       { "test@example.com" }
+  let(:secret) {
+    {
+      installed: {
+        client_id:                   "100000000000000000000",
+        project_id:                  "test-project-000001",
+        auth_uri:                    "https://accounts.google.com/o/oauth2/auth",
+        token_uri:                   "https://accounts.google.com/o/oauth2/token",
+        auth_provider_x509_cert_url: "https://www.googleapis.com/oauth2/v1/certs"
+      }
+    }
+  }
 
   describe '#initialize' do
     it 'should be instance of Google::ServiceAccount' do
-     service_account = Google::ServiceAccount.new(client_id)
-     expect(service_account.id).to eq id
-     expect(service_account.auth_uri).to eq auth_uri
-     expect(service_account.token_uri).to eq token_uri
-     expect(service_account.client_id).to eq client_id
-     expect(service_account.client_email).to eq client_email
-     expect(service_account.auth_provider_x509_cert_url).to eq auth_provider_x509_cert_url
-     expect(service_account.client_x509_cert_url).to eq client_x509_cert_url
-     expect(service_account.scope).to eq scope
+      service_account = Google::ServiceAccount.new(client_secret_path, client_email)
+      secret[:installed].each do |k, v|
+        expect(service_account.send(k)).to eq v
+      end
+      expect(service_account.client_email).to eq client_email
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gcevent
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ogawatti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A wrapper of Google Calendar Event API.