cronofy 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 326fa8f77f51139784236c0a9e2f73cdc53edecc
-  data.tar.gz: 3b314897d498fcf530953ac9bd44bcfd7b21f533
+  metadata.gz: e337b294d628d5677d58763c49dd46441d66edcf
+  data.tar.gz: 7ad6ea54a3fd5cba4b43f7f2533368574fa1639e
 SHA512:
-  metadata.gz: b36221de26d3abf310b4be4ce4ea29a7c02bf0858ea36f9924488559fd9db24dea773b07c0a8d47863f940bb0484b4349a1b6796538c437c25b6d9dd1325591c
-  data.tar.gz: d78d17162887646dbfc909290ceabc2fb2bd080253597a54c0aa3be452504d01112dd1b1b91c323734b023bdae071b211a419a2994e0a5b7d7c60194544209c9
+  metadata.gz: ae50423467418330fbe878fbf70fbb2e8547c69e17b94858b0d66e1c9e700d0e54d1c827fbdb2abb16f7aa796f5ad5c8d81d3878d742266858051918c508dd76
+  data.tar.gz: 747e9ef78b0da42569496a3ff48ebdce4213be8848dc1a8332cd1c4d507e419fd23c5c8c057f49b08b6a055cae017a22d31ee7f7407422abefea714edb3d8dca

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "rack", "~> 1.0"

data/lib/cronofy/auth.rb

@@ -11,7 +11,7 @@ module Cronofy
       @auth_client = OAuth2::Client.new(client_id, client_secret, site: ::Cronofy.app_url, connection_opts: { headers: { "User-Agent" => "Cronofy Ruby #{::Cronofy::VERSION}" } })
       @api_client = OAuth2::Client.new(client_id, client_secret, site: ::Cronofy.api_url, connection_opts: { headers: { "User-Agent" => "Cronofy Ruby #{::Cronofy::VERSION}" } })
 
-      set_access_token(token, refresh_token) if token
+      set_access_token(token, refresh_token) if token || refresh_token
     end
 
     # Internal: generate a URL for authorizing the application with Cronofy
@@ -52,8 +52,15 @@ module Cronofy
     end
 
     # Internal: Refreshes the access token
-    # Returns Hash of token elements to allow client to update in local store for user
+    #
+    # Returns Hash of token elements to allow client to update in local store
+    # for user
+    #
+    # Raises Cronofy::CredentialsMissingError if no credentials available.
     def refresh!
+      raise CredentialsMissingError.new("No credentials to refresh") unless access_token
+      raise CredentialsMissingError.new("No refresh_token provided") unless access_token.refresh_token
+
       do_request do
         @access_token = access_token.refresh!
         Credentials.new(@access_token)
@@ -71,12 +78,16 @@ module Cronofy
     # Internal: Revokes the refresh token and corresponding access tokens.
     #
     # Returns nothing.
+    #
+    # Raises Cronofy::CredentialsMissingError if no credentials available.
     def revoke!
+      raise CredentialsMissingError.new("No credentials to revoke") unless access_token
+
       do_request do
         body = {
           client_id: @api_client.id,
           client_secret: @api_client.secret,
-          token: access_token.refresh_token,
+          token: access_token.refresh_token || access_token.token,
         }
 
         @api_client.request(:post, "/oauth/token/revoke", body: body)

data/lib/cronofy/client.rb

@@ -455,6 +455,7 @@ module Cronofy
     # been revoked.
     # Raises Cronofy::AuthenticationFailureError if the client ID and secret are
     # not valid.
+    # Raises Cronofy::CredentialsMissingError if no credentials available.
     def refresh_access_token
       @auth.refresh!
     end
@@ -471,6 +472,7 @@ module Cronofy
     #
     # Raises Cronofy::AuthenticationFailureError if the client ID and secret are
     # not valid.
+    # Raises Cronofy::CredentialsMissingError if no credentials available.
     def revoke_authorization
       @auth.revoke!
     end

data/lib/cronofy/version.rb

@@ -1,3 +1,3 @@
 module Cronofy
-  VERSION = "0.9.0".freeze
+  VERSION = "0.10.0".freeze
 end

data/spec/lib/cronofy/auth_spec.rb

@@ -243,46 +243,114 @@ describe Cronofy::Auth do
   end
 
   describe '#refresh!' do
-    subject do
-      Cronofy::Auth.new(client_id, client_secret, access_token, refresh_token).refresh!
+    context "access_token and refresh_token present" do
+      subject do
+        Cronofy::Auth.new(client_id, client_secret, access_token, refresh_token).refresh!
+      end
+
+      it_behaves_like 'an authorization request'
     end
 
-    it_behaves_like 'an authorization request'
+    context "no refresh_token" do
+      subject do
+        Cronofy::Auth.new(client_id, client_secret, access_token, nil).refresh!
+      end
+
+      it "raises a credentials missing error" do
+        expect { subject }.to raise_error(Cronofy::CredentialsMissingError)
+      end
+    end
+
+    context "no access_token or refresh_token" do
+      subject do
+        Cronofy::Auth.new(client_id, client_secret, nil, nil).refresh!
+      end
+
+      it "raises a credentials missing error" do
+        expect { subject }.to raise_error(Cronofy::CredentialsMissingError)
+      end
+    end
+
+    context "only refresh_token" do
+      subject do
+        Cronofy::Auth.new(client_id, client_secret, nil, refresh_token).refresh!
+      end
+
+      it_behaves_like 'an authorization request'
+    end
   end
 
   describe "#revoke!" do
-    let(:auth) do
-      Cronofy::Auth.new(client_id, client_secret, access_token, refresh_token)
+    shared_examples 'successful revocation' do
+      let!(:revocation_request) do
+        stub_request(:post, "https://api.cronofy.com/oauth/token/revoke")
+          .with(
+            body: {
+              client_id: client_id,
+              client_secret: client_secret,
+              token: revoke_token,
+            },
+            headers: {
+              'Content-Type' => 'application/x-www-form-urlencoded',
+              'User-Agent' => "Cronofy Ruby #{Cronofy::VERSION}",
+            }
+          )
+          .to_return(
+            status: response_status,
+          )
+      end
+
+      before do
+        auth.revoke!
+      end
+
+      it "unsets the access token" do
+        expect(auth.access_token).to be_nil
+      end
+
+      it "makes the revocation request" do
+        expect(revocation_request).to have_been_requested
+      end
     end
 
-    let!(:revocation_request) do
-      stub_request(:post, "https://api.cronofy.com/oauth/token/revoke")
-        .with(
-          body: {
-            client_id: client_id,
-            client_secret: client_secret,
-            token: refresh_token,
-          },
-          headers: {
-            'Content-Type' => 'application/x-www-form-urlencoded',
-            'User-Agent' => "Cronofy Ruby #{Cronofy::VERSION}",
-          }
-        )
-        .to_return(
-          status: response_status,
-        )
+    context "access_token and refresh_token present" do
+      let(:auth) do
+        Cronofy::Auth.new(client_id, client_secret, access_token, refresh_token)
+      end
+
+      let(:revoke_token) { refresh_token }
+
+      it_behaves_like 'successful revocation'
     end
 
-    before do
-      auth.revoke!
+    context "only refresh_token" do
+      let(:auth) do
+        Cronofy::Auth.new(client_id, client_secret, nil, refresh_token)
+      end
+
+      let(:revoke_token) { refresh_token }
+
+      it_behaves_like 'successful revocation'
     end
 
-    it "unsets the access token" do
-      expect(auth.access_token).to be_nil
+    context "only access_token" do
+      let(:auth) do
+        Cronofy::Auth.new(client_id, client_secret, access_token, nil)
+      end
+
+      let(:revoke_token) { access_token }
+
+      it_behaves_like 'successful revocation'
     end
 
-    it "makes the revocation request" do
-      expect(revocation_request).to have_been_requested
+    context "no access_token or refresh_token" do
+      let(:auth) do
+        Cronofy::Auth.new(client_id, client_secret, nil, nil)
+      end
+
+      it "raises a credentials missing error" do
+        expect { auth.revoke! }.to raise_error(Cronofy::CredentialsMissingError)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cronofy
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Sergii Paryzhskyi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2