aptible-auth 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 101f4e5eba0e9ddacf579ed8758ebbbdfba30d84
-  data.tar.gz: b2daa6d3703e05bfcba62c36d7469890430a7463
+  metadata.gz: 34caa61e053fc96d4a43bd90c73db5a00776c634
+  data.tar.gz: fef45746c7c7ab4d42be4bf720f0b42c0f192edf
 SHA512:
-  metadata.gz: 535418028b5197789fb200a8608133df28e5f2c6622d7a9d614c259409850139231209988a633a592fc6ef45e6808ecd8012ba1bea42223220b55e99df4280c8
-  data.tar.gz: c784ba5e1f430fd0ee88de2dc06a13214d7b0f4aab0c5ef57055fcd447dc4c56a69e02312f1293ff17612b179894c6b53ad8e734bd4a5c099d1a31fc9eae6c42
+  metadata.gz: 9f2d7eb28d29eddd7cf8e5473a3d143fc01ff67c3605f5471a8e34190c3256ddcd22784967001841a95a357d86eff03e144886f32772821536f2fb5b6aa4304e
+  data.tar.gz: 06e82bb7831bbf3b3dfeda977dd3b655a5977986e7de8223567b3b693ea84ad719e84db86697c7e049cf2d82ae2ae9da1668b3178189ec2a096180825f8b71c2

data/README.md

@@ -12,9 +12,12 @@ Add the following lines to your application's Gemfile.
 
     gem 'aptible-auth'
     gem 'oauth2', github: 'fancyremarker/oauth2', branch: 'aptible'
+    gem 'hyperresource', github: 'fancyremarker/hyperresource', branch: 'aptible'
 
 The forked version of the OAuth2 gem is necessary until [intridea/oauth2#165](https://github.com/intridea/oauth2/pull/165) and [intridea/oauth2#166](https://github.com/intridea/oauth2/pull/166) are merged.
 
+The forked version of the HyperResource gem is necessary until [gamache/hyperresource#19](https://github.com/gamache/hyperresource/pull/19) is merged.
+
 And then run `bundle install`.
 
 ## Usage
@@ -33,12 +36,11 @@ auth = Aptible::Auth::Client.new(token: token)
 From here, you can interact with the Authorization API however you wish:
 
 ```ruby
-auth.get
-auth.clients.count
+auth.get.clients.count
 # => 4
-auth.clients.first.name
+auth.get.clients.first.name
 # => "Client 0"
-client = auth.clients.create(name: 'Dogeclient')
+client = auth.get.clients.create(name: 'Dogeclient')
 client.href
 # => "http://localhost:4000/clients/60765b69-ffd8-4762-b9d2-96354ddb16f9"
 ```

data/lib/aptible/auth/client.rb

@@ -9,17 +9,26 @@ module Aptible
         unless options.is_a?(Hash)
           fail ArgumentError, 'Call Aptible::Auth::Client.new with a Hash'
         end
-        @token = options[:token]
+        self.token = options[:token]
 
         options[:root] ||= config.root_url
         options[:headers] ||= { 'Content-Type' => 'application/json' }
         options[:headers].merge!(
-          'Authorization' => "Bearer #{options[:token].access_token}"
+          'Authorization' => "Bearer #{bearer_token}"
         ) if options[:token]
 
         super(options)
       end
 
+      def bearer_token
+        # REVIEW: Should we really allow any token type here?
+        case token
+        when Aptible::Auth::Token then token.access_token
+        when Fridge::AccessToken then token.to_s
+        when String then token
+        end
+      end
+
       def config
         @config ||= Aptible::Auth.configuration
       end

data/lib/aptible/auth/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Auth
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-auth
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config