aptible-auth 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05b6f13b708d4d05d8f553239c5ed83f6a41c2d2
-  data.tar.gz: fcf947d45817171ba9f2475eb02e7e2427d25d9f
+  metadata.gz: 2fba294330104e596ef5313e4adaf0d4dbd72565
+  data.tar.gz: 233fd28c3182778fd16f82cf0f7ecef63aa185aa
 SHA512:
-  metadata.gz: eb8ed96ad97b48e2d9f3187ad25cf1958e07ebc76ca40a2b02ddc5c48138eacbf27cb2fdf948f4e3ea5d01e9dd517edd8ad3999a2d64189261c6dc1045173efb
-  data.tar.gz: c4915d38cc80121139bd52502f37d668dae10e7777bc0e33264fc5c447670bc57c6833851873c5a3d709b994a3e95887e75c27d04c49e7991e9ad9af2bf73ffb
+  metadata.gz: b5bb3c60cb4e2efd1e50f059087c690609f46d4c5365d6daebfd59b3ba93b77b4c54fa61165eb7e3e5e2edbeed060180edfc60c7682699aa47bc83171c6d8cec
+  data.tar.gz: b8d0210d77d9495d7a7a078251fbc9184605a59069dbe6da979c331e6b7ade6104229a8a09876b3e7dcb7daba7e9e2240a2734d20d7437367e5f5d0159a8e6c8

data/Gemfile

@@ -1,7 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'oauth2', github: 'fancyremarker/oauth2', branch: 'aptible'
-gem 'hyperresource', github: 'fancyremarker/hyperresource', branch: 'aptible'
-
 # Specify your gem's dependencies in aptible-auth.gemspec
 gemspec

data/README.md

@@ -8,18 +8,18 @@ Ruby client for [auth.aptible.com](https://auth.aptible.com/). Aptible's authori
 
 ## Installation
 
-Add the following lines to your application's Gemfile.
+Add the following line to your application's Gemfile.
 
     gem 'aptible-auth'
-    gem 'oauth2', github: 'fancyremarker/oauth2', branch: 'aptible'
-    gem 'hyperresource', github: 'fancyremarker/hyperresource', branch: 'aptible'
+
+And then run `bundle install`.
+
+The gem depends on forked releases of the `oauth2` and `hyperresource` gems.
 
 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#22](https://github.com/gamache/hyperresource/pull/22) and [gamache/hyperresource#23](https://github.com/gamache/hyperresource/pull/23) are merged.
 
-And then run `bundle install`.
-
 ## Usage
 
 First, get a token:

data/aptible-auth.gemspec

@@ -6,7 +6,7 @@ require 'English'
 
 Gem::Specification.new do |spec|
   spec.name          = 'aptible-auth'
-  spec.version       = '0.2.1'
+  spec.version       = '0.3.0'
   spec.authors       = ['Frank Macreery']
   spec.email         = ['frank@macreery.com']
   spec.description   = 'Ruby client for auth.aptible.com'
@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'gem_config'
-  spec.add_dependency 'oauth2'
-  spec.add_dependency 'hyperresource'
+  spec.add_dependency 'oauth2-aptible'
+  spec.add_dependency 'hyperresource-aptible'
   spec.add_dependency 'fridge'
+  spec.add_dependency 'activesupport'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'aptible-tasks', '>= 0.2.0'
-  spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 2.0'
   spec.add_development_dependency 'pry'

data/lib/aptible/auth/organization.rb

@@ -1,4 +1,12 @@
 module Aptible
   class Auth::Organization < Auth::Resource
+    has_many :roles
+
+    def accounts
+      api = Aptible::Api.new(token: token, headers: headers)
+      api.get unless api.loaded
+      accounts = api.accounts.entries
+      accounts.select { |account| account.organization.href == href }
+    end
   end
 end

data/lib/aptible/auth/resource.rb

@@ -1,9 +1,36 @@
+require 'active_support/inflector'
+
 module Aptible
   class Auth::Resource < Auth
+    def self.collection_url
+      basename = name.split('::').last
+      config = Aptible::Auth.configuration
+      config.root_url.chomp('/') + "/#{basename.downcase.pluralize}"
+    end
+
+    def self.find(id)
+      find_by_url("#{collection_url}/#{id}")
+    end
+
     def self.find_by_url(url)
       # REVIEW: Should exception be raised if return type mismatch?
       new.find_by_url(url)
+    rescue
+      nil
+    end
+
+    # rubocop:disable PredicateName
+    def self.has_many(relation)
+      define_method relation do
+        get unless loaded
+        if (memoized = instance_variable_get("@#{relation}"))
+          memoized
+        elsif links[relation]
+          instance_variable_set("@#{relation}", links[relation].entries)
+        end
+      end
     end
+    # rubocop:enable PredicateName
   end
 end
 

data/lib/aptible/auth/user.rb

@@ -1,5 +1,7 @@
 module Aptible
   class Auth::User < Auth::Resource
+    has_many :roles
+
     def verified?
       !!attributes['verified']
     end
@@ -8,6 +10,11 @@ module Aptible
       roles.map(&:organization)
     end
 
+    def operations
+      # TODO: Implement query params for /operations
+      []
+    end
+
     def privileged_organizations
       privileged_roles.map(&:organization)
     end

data/spec/aptible/auth/resource_spec.rb

@@ -1,4 +1,18 @@
 require 'spec_helper'
 
-# describe Aptible::Auth::Resource do
-# end
+describe Aptible::Auth::Resource do
+  describe '.collection_url' do
+    it 'should use the pluralized resource name' do
+      url = Aptible::Auth::Role.collection_url
+      expect(url).to eq 'https://auth.aptible.com/roles'
+    end
+  end
+
+  describe '.find' do
+    it 'should call find_by_url' do
+      url = 'https://auth.aptible.com/roles/42'
+      expect(Aptible::Auth::Role).to receive(:find_by_url).with url
+      Aptible::Auth::Role.find(42)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-auth
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oauth2
+  name: oauth2-aptible
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hyperresource
+  name: hyperresource-aptible
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,47 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: aptible-tasks
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: aptible-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement