aptible-auth 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8af4bf9e2e8ac1bb6966eaee5354eec672ca3a8
-  data.tar.gz: 469679f0afb91b09d850ad2a74d120aad664daa5
+  metadata.gz: 1d8c13460cf708f5e18e6eb88460d82e5198de56
+  data.tar.gz: 796d6154994eccc679d26147d16fe8c0e9a31952
 SHA512:
-  metadata.gz: ea85782e75ddace3eb78f66a3abab1f25b3f224c1256ece3a225f35f23bcbd54a824a3d735ac44bc3cb2f079a5d9269549742b4af92f0b33ecb30bccc3ae5259
-  data.tar.gz: b93bac000b8b1234a4beb3930fc9415c165ff72199535afa7679f1c5132ef55b740373fee970950cfc97494e1b9d682eee227866b965273387a61ef14f751b33
+  metadata.gz: 0c6be2c7ec992a4686aa7d790d3d5ec13b3e6169f236181399cd5d2427284f9105bdb0e3d360c0c1594c1668d0a0756b077ab5eb4c014c8e72e98931adcbe60b
+  data.tar.gz: 19391a96c1c2e1fd83e8096dcc13aa6fb3c86ae2c5a9a774d5ae970cde1136574dccc1866aadcce2298f3b75a0f4fe321ac9245ed372505c478a263ab43e601a

data/aptible-auth.gemspec

@@ -3,10 +3,11 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'English'
+require 'aptible/auth/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'aptible-auth'
-  spec.version       = '0.4.3'
+  spec.version       = Aptible::Auth::VERSION
   spec.authors       = ['Frank Macreery']
   spec.email         = ['frank@macreery.com']
   spec.description   = 'Ruby client for auth.aptible.com'
@@ -18,11 +19,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^spec\//)
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'aptible-resource', '>= 0.1.1'
   spec.add_dependency 'gem_config'
   spec.add_dependency 'oauth2-aptible'
-  spec.add_dependency 'hyperresource-aptible', '>= 0.9.0'
-  spec.add_dependency 'fridge'
-  spec.add_dependency 'activesupport'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'aptible-tasks', '>= 0.2.0'

data/lib/aptible/auth.rb

@@ -1,13 +1,9 @@
 require 'gem_config'
-require 'hyperresource'
-require 'fridge'
 
 module Aptible
-  class Auth < HyperResource
+  module Auth
     include GemConfig::Base
 
-    attr_accessor :token, :config
-
     with_configuration do
       has :root_url,
           classes: [String],
@@ -15,58 +11,10 @@ module Aptible
     end
 
     def self.public_key
-      Resource.new.get.public_key
-    end
-
-    def self.get_data_type_from_response(response)
-      return nil unless response && response.body
-      adapter.get_data_type_from_object(adapter.deserialize(response.body))
-    end
-
-    def self.adapter
-      Aptible::Auth::Adapter
-    end
-
-    def adapter
-      self.class.adapter
-    end
-
-    def initialize(options = {})
-      if options.is_a?(Hash)
-        self.token = options[:token]
-
-        options[:root] ||= config.root_url
-        options[:namespace] ||= 'Aptible::Auth'
-        options[:headers] ||= { 'Content-Type' => 'application/json' }
-        options[:headers].merge!(
-          'Authorization' => "Bearer #{bearer_token}"
-        ) if options[:token]
-      end
-
-      super(options)
-    end
-
-    def find_by_url(url)
-      fail "URL must be rooted at #{root}" unless /^#{root}/.match url
-
-      resource = dup
-      resource.href = url.gsub(/^#{root}/, '')
-      resource.get
-    end
-
-    def bearer_token
-      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
+      Agent.new.public_key
     end
   end
 end
 
-require 'aptible/auth/adapter'
 require 'aptible/auth/resource'
+require 'aptible/auth/agent'

data/lib/aptible/auth/agent.rb

@@ -0,0 +1,6 @@
+module Aptible
+  module Auth
+    class Agent < Resource
+    end
+  end
+end

data/lib/aptible/auth/client.rb

@@ -1,6 +1,7 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Auth::Client < Auth::Resource
-    belongs_to :user
+  module Auth
+    class Client < Resource
+      belongs_to :user
+    end
   end
 end

data/lib/aptible/auth/membership.rb

@@ -1,7 +1,8 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Auth::Membership < Auth::Resource
-    belongs_to :role
-    belongs_to :user
+  module Auth
+    class Membership < Resource
+      belongs_to :role
+      belongs_to :user
+    end
   end
 end

data/lib/aptible/auth/organization.rb

@@ -1,21 +1,22 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Auth::Organization < Auth::Resource
-    has_many :roles
+  module Auth
+    class Organization < Resource
+      has_many :roles
 
-    def security_officer
-      # REVIEW: Examine underlying data model for a less arbitrary solution
-      security_officers_role = roles.find do |role|
-        role.name == 'Security Officers'
+      def security_officer
+        # REVIEW: Examine underlying data model for a less arbitrary solution
+        security_officers_role = roles.find do |role|
+          role.name == 'Security Officers'
+        end
+        security_officers_role.users.first if security_officers_role
       end
-      security_officers_role.users.first if security_officers_role
-    end
 
-    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 }
+      def accounts
+        require 'aptible/api'
+
+        accounts = Aptible::Api::Account.all(token: token, headers: headers)
+        accounts.select { |account| account.organization.href == href }
+      end
     end
   end
 end

data/lib/aptible/auth/resource.rb

@@ -1,93 +1,14 @@
-require 'active_support/inflector'
+require 'aptible/resource'
 
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Auth::Resource < Auth
-    def self.basename
-      name.split('::').last.downcase.pluralize
-    end
-
-    def self.collection_url
-      config = Aptible::Auth.configuration
-      config.root_url.chomp('/') + "/#{basename}"
-    end
-
-    def self.all(options = {})
-      resource = find_by_url(collection_url, options)
-      return [] unless resource
-      resource.send(basename).entries
-    end
-
-    def self.find(id, options = {})
-      find_by_url("#{collection_url}/#{id}", options)
-    end
-
-    def self.find_by_url(url, options = {})
-      # REVIEW: Should exception be raised if return type mismatch?
-      new(options).find_by_url(url)
-    rescue HyperResource::ClientError => e
-      if e.response.status == 404
-        return nil
-      else
-        raise e
-      end
-    end
-
-    def self.create(params)
-      token = params.delete(:token)
-      auth = Auth.new(token: token)
-      auth.send(basename).create(normalize_params(params))
-    end
-
-    # rubocop:disable PredicateName
-    def self.has_many(relation)
-      define_has_many_getter(relation)
-      define_has_many_setter(relation)
-    end
-    # rubocop:enable PredicateName
-
-    def self.belongs_to(relation)
-      define_method relation do
-        get unless loaded
-        if (memoized = instance_variable_get("@#{relation}"))
-          memoized
-        else
-          instance_variable_set("@#{relation}", links[relation].get)
-        end
+  module Auth
+    class Resource < Aptible::Resource::Base
+      def namespace
+        'Aptible::Auth'
       end
-    end
-
-    def self.normalize_params(params = {})
-      params_array = params.map do |key, value|
-        value.is_a?(HyperResource) ? [key, value.href] : [key, value]
-      end
-      Hash[params_array]
-    end
-
-    def update(params = {})
-      super(self.class.normalize_params(params))
-    end
-
-    # NOTE: The following does not update the object in-place
-    def reload
-      self.class.find_by_url(href, headers: headers)
-    end
-
-    def self.define_has_many_getter(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
 
-    def self.define_has_many_setter(relation)
-      define_method "create_#{relation.to_s.singularize}" do |params = {}|
-        get unless loaded
-        links[relation].create(self.class.normalize_params(params))
+      def root_url
+        Aptible::Auth.configuration.root_url
       end
     end
   end

data/lib/aptible/auth/role.rb

@@ -1,10 +1,11 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Auth::Role < Auth::Resource
-    belongs_to :organization
+  module Auth
+    class Role < Resource
+      belongs_to :organization
 
-    def privileged?
-      !!attributes['privileged']
+      def privileged?
+        !!attributes['privileged']
+      end
     end
   end
 end

data/lib/aptible/auth/session.rb

@@ -1,6 +1,7 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Auth::Session < Auth::Resource
-    belongs_to :user
+  module Auth
+    class Session < Resource
+      belongs_to :user
+    end
   end
 end

data/lib/aptible/auth/token.rb

@@ -1,79 +1,80 @@
 require 'oauth2'
 
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Auth::Token < Auth::Resource
-    attr_accessor :access_token, :refresh_token, :expires_at
+  module Auth
+    class Token < Resource
+      attr_accessor :access_token, :refresh_token, :expires_at
 
-    def self.create(options)
-      token = new
-      token.process_options(options)
-      token
-    end
+      def self.create(options)
+        token = new
+        token.process_options(options)
+        token
+      end
 
-    def authenticate_user(email, password, options = {})
-      options[:scope] ||= 'manage'
-      response = oauth.password.get_token(email, password, options)
-      parse_oauth_response(response)
-    end
+      def authenticate_user(email, password, options = {})
+        options[:scope] ||= 'manage'
+        response = oauth.password.get_token(email, password, options)
+        parse_oauth_response(response)
+      end
 
-    def authenticate_client(id, secret, subject, options = {})
-      options[:scope] ||= 'manage'
-      response = oauth.assertion.get_token({
-        iss: id,
-        sub: subject
-      }.merge(signing_params_from_secret(secret).merge(options)))
-      parse_oauth_response(response)
-    end
+      def authenticate_client(id, secret, subject, options = {})
+        options[:scope] ||= 'manage'
+        response = oauth.assertion.get_token({
+          iss: id,
+          sub: subject
+        }.merge(signing_params_from_secret(secret).merge(options)))
+        parse_oauth_response(response)
+      end
 
-    def oauth
-      options = { site: config.root_url, token_url: '/tokens' }
-      @oauth ||= OAuth2::Client.new(nil, nil, options)
-    end
+      def oauth
+        options = { site: root_url, token_url: '/tokens' }
+        @oauth ||= OAuth2::Client.new(nil, nil, options)
+      end
 
-    def process_options(options)
-      if (email = options.delete(:email)) &&
-         (password = options.delete(:password))
-        authenticate_user(email, password, options)
-      elsif (client_id = options.delete(:client_id)) &&
-            (client_secret = options.delete(:client_secret)) &&
-            (subject = options.delete(:subject))
-        authenticate_client(client_id, client_secret, subject, options)
+      def process_options(options)
+        if (email = options.delete(:email)) &&
+           (password = options.delete(:password))
+          authenticate_user(email, password, options)
+        elsif (client_id = options.delete(:client_id)) &&
+              (client_secret = options.delete(:client_secret)) &&
+              (subject = options.delete(:subject))
+          authenticate_client(client_id, client_secret, subject, options)
+        end
       end
-    end
 
-    private
+      private
 
-    def parse_oauth_response(response)
-      @access_token = response.token
-      @refresh_token = response.refresh_token
-      @expires_at = Time.at(response.expires_at)
-    end
+      def parse_oauth_response(response)
+        @access_token = response.token
+        @refresh_token = response.refresh_token
+        @expires_at = Time.at(response.expires_at)
+      end
 
-    def signing_params_from_secret(secret)
-      private_key = parse_private_key(secret)
-      {
-        private_key: private_key,
-        algorithm:  "RS#{key_length(private_key) / 2}"
-      }
-    end
+      def signing_params_from_secret(secret)
+        private_key = parse_private_key(secret)
+        {
+          private_key: private_key,
+          algorithm:  "RS#{key_length(private_key) / 2}"
+        }
+      end
 
-    def parse_private_key(string)
-      if string =~ /\A-----/
-        OpenSSL::PKey::RSA.new(string)
-      else
-        formatted_string = <<-PRIVATE_KEY.gsub(/^\s+/, '')
-          -----BEGIN RSA PRIVATE KEY-----
-          #{string.scan(/.{1,64}/).join("\n")}
-          -----END RSA PRIVATE KEY-----
-        PRIVATE_KEY
-        OpenSSL::PKey::RSA.new(formatted_string)
+      def parse_private_key(string)
+        if string =~ /\A-----/
+          OpenSSL::PKey::RSA.new(string)
+        else
+          formatted_string = <<-PRIVATE_KEY.gsub(/^\s+/, '')
+            -----BEGIN RSA PRIVATE KEY-----
+            #{string.scan(/.{1,64}/).join("\n")}
+            -----END RSA PRIVATE KEY-----
+          PRIVATE_KEY
+          OpenSSL::PKey::RSA.new(formatted_string)
+        end
       end
-    end
 
-    def key_length(private_key)
-      # http://stackoverflow.com/questions/13747212
-      private_key.n.num_bytes * 8
+      def key_length(private_key)
+        # http://stackoverflow.com/questions/13747212
+        private_key.n.num_bytes * 8
+      end
     end
   end
 end

data/lib/aptible/auth/user.rb

@@ -1,27 +1,28 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Auth::User < Auth::Resource
-    has_many :roles
+  module Auth
+    class User < Resource
+      has_many :roles
 
-    def verified?
-      !!attributes['verified']
-    end
+      def verified?
+        !!attributes['verified']
+      end
 
-    def organizations
-      roles.map(&:organization)
-    end
+      def organizations
+        roles.map(&:organization)
+      end
 
-    def operations
-      # TODO: Implement query params for /operations
-      []
-    end
+      def operations
+        # TODO: Implement query params for /operations
+        []
+      end
 
-    def privileged_organizations
-      privileged_roles.map(&:organization)
-    end
+      def privileged_organizations
+        privileged_roles.map(&:organization)
+      end
 
-    def privileged_roles
-      @privileged_roles ||= roles.select(&:privileged?)
+      def privileged_roles
+        @privileged_roles ||= roles.select(&:privileged?)
+      end
     end
   end
 end

data/lib/aptible/auth/version.rb

@@ -0,0 +1,5 @@
+module Aptible
+  module Auth
+    VERSION = '0.5.0'
+  end
+end

data/spec/aptible/auth/agent_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Aptible::Auth::Agent do
+  it { should be_a Aptible::Auth::Resource }
+end

data/spec/aptible/auth/resource_spec.rb

@@ -1,52 +1,15 @@
 require 'spec_helper'
 
 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
-
-  describe '.all' do
-    let(:session) { double Aptible::Auth::Session }
-    let(:collection) { double Aptible::Auth }
-
-    before do
-      collection.stub(:sessions) { [session] }
-      Aptible::Auth::Session.any_instance.stub(:find_by_url) { collection }
-    end
-
-    it 'should be an array' do
-      expect(Aptible::Auth::Session.all).to be_a Array
-    end
-
-    it 'should return the root collection' do
-      expect(Aptible::Auth::Session.all).to eq [session]
-    end
-
-    it 'should pass options to the HyperResource initializer' do
-      klass = Aptible::Auth::Session
-      options = { token: 'token' }
-      expect(klass).to receive(:new).with(options).and_return klass.new
-      Aptible::Auth::Session.all(options)
-    end
-  end
-
-  describe '.create' do
-    it 'should create a new top-level resource' do
-      sessions = double Aptible::Auth
-      Aptible::Auth.stub_chain(:new, :sessions) { sessions }
-      expect(sessions).to receive(:create).with(foo: 'bar')
-      Aptible::Auth::Session.create(foo: 'bar')
+  its(:namespace) { should eq 'Aptible::Auth'  }
+  its(:root_url) { should eq 'https://auth.aptible.com' }
+
+  describe '#bearer_token' do
+    it 'should accept an Aptible::Auth::Token' do
+      token = Aptible::Auth::Token.new
+      token.stub(:access_token) { 'aptible_auth_token' }
+      subject.stub(:token) { token }
+      expect(subject.bearer_token).to eq token.access_token
     end
   end
 end

data/spec/aptible/auth_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Aptible::Auth do
+  subject { Aptible::Auth::User.new }
+
   it 'should have a configurable root_url' do
     config = described_class.configuration
     expect(config).to be_a GemConfig::Configuration
@@ -16,36 +18,7 @@ describe Aptible::Auth do
   end
 
   it 'should expose the server public key' do
-    get = double 'get'
-    Aptible::Auth.any_instance.stub(:get) { get }
-    expect(get).to receive :public_key
-    described_class.public_key
-  end
-
-  describe '#initialize' do
-    it 'should be a HyperResource instance' do
-      expect(subject).to be_a HyperResource
-    end
-  end
-
-  describe '#bearer_token' do
-    it 'should accept an Aptible::Auth::Token' do
-      token = Aptible::Auth::Token.new
-      token.stub(:access_token) { 'abtible_auth_token' }
-      subject.stub(:token) { token }
-      expect(subject.bearer_token).to eq token.access_token
-    end
-
-    it 'should accept an Fridge::AccessToken' do
-      token = Fridge::AccessToken.new
-      token.stub(:to_s) { 'fridge_access_token' }
-      subject.stub(:token) { token }
-      expect(subject.bearer_token).to eq token.to_s
-    end
-
-    it 'should accept a String' do
-      subject.stub(:token) { 'token' }
-      expect(subject.bearer_token).to eq 'token'
-    end
+    Aptible::Auth::Agent.any_instance.should_receive :public_key
+    Aptible::Auth.public_key
   end
 end

metadata

@@ -1,59 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: aptible-auth
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gem_config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: oauth2-aptible
+  name: aptible-resource
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: hyperresource-aptible
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: fridge
+  name: gem_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: oauth2-aptible
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -167,7 +139,7 @@ files:
 - Rakefile
 - aptible-auth.gemspec
 - lib/aptible/auth.rb
-- lib/aptible/auth/adapter.rb
+- lib/aptible/auth/agent.rb
 - lib/aptible/auth/client.rb
 - lib/aptible/auth/membership.rb
 - lib/aptible/auth/organization.rb
@@ -176,6 +148,8 @@ files:
 - lib/aptible/auth/session.rb
 - lib/aptible/auth/token.rb
 - lib/aptible/auth/user.rb
+- lib/aptible/auth/version.rb
+- spec/aptible/auth/agent_spec.rb
 - spec/aptible/auth/organization_spec.rb
 - spec/aptible/auth/resource_spec.rb
 - spec/aptible/auth/token_spec.rb
@@ -207,6 +181,7 @@ signing_key:
 specification_version: 4
 summary: Ruby client for auth.aptible.com
 test_files:
+- spec/aptible/auth/agent_spec.rb
 - spec/aptible/auth/organization_spec.rb
 - spec/aptible/auth/resource_spec.rb
 - spec/aptible/auth/token_spec.rb

data/lib/aptible/auth/adapter.rb

@@ -1,22 +0,0 @@
-# rubocop:disable ClassAndModuleChildren
-module Aptible
-  class Auth::Adapter < HyperResource::Adapter::HAL_JSON
-    class << self
-      # rubocop:disable MethodLength
-      def get_data_type_from_object(object)
-        return nil unless object
-
-        if (type = object['type'])
-          if type.respond_to?(:camelize)
-            type.camelize
-          else
-            type[0].upcase + type[1..-1]
-          end
-        else
-          'Resource'
-        end
-      end
-      # rubocop:enable MethodLength
-    end
-  end
-end