aptible-api 0.4.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab1bcb0612ddbf2b9e2ea12406797703a4c4e7c
-  data.tar.gz: f3e98b601229d8fc44ccdc469d2cf46fab5e0688
+  metadata.gz: 7f7914574135166984620bac823d42f06164c7ba
+  data.tar.gz: bff0ea8cf8843b10f9e9571b81d3e147758457bb
 SHA512:
-  metadata.gz: 0021904bd30563932be95c34e0e6f3dd4ae181239605124dcc8bbe9281b35a64ed0bec033287ac01c49f64fd598166a9ad2b1bdfc643ab1ca247733b932e2eb2
-  data.tar.gz: 5b31fcbf867dd06c1dbf8b6367392e2f2dddc48e1c0f9c9f87d1c3b542460d88c14e5773ac694cb41f872c83270802f384d587210f3700d0d84aefabc467f2c1
+  metadata.gz: 7dbbb0798a405ddeca24b0fd2ca31d7a2271f6b2121c2a1f267cee5cf6647265795af60e15a48248489301c002f1ba62396089e9bb4443a5e2c091db761912c4
+  data.tar.gz: e5c4250d1572130d052d9a3d7e71e79ab51f8b21a57035aa76eeb8d83827a1dd06a9a2a9bc37f3e5bba1261a4ad2e6bf8c662323affc6865ee9dd963994668cb

data/aptible-api.gemspec

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

data/lib/aptible/api.rb

@@ -1,69 +1,16 @@
-require 'aptible/auth'
 require 'gem_config'
-require 'hyperresource'
-require 'fridge'
 
 module Aptible
-  class Api < HyperResource
+  module Api
     include GemConfig::Base
 
-    attr_accessor :token, :config
-
     with_configuration do
       has :root_url,
           classes: [String],
           default: ENV['APTIBLE_API_ROOT_URL'] || 'https://api.aptible.com'
     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::Api::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::Api'
-        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::Api.configuration
-    end
   end
 end
 
-require 'aptible/api/adapter'
 require 'aptible/api/resource'
+require 'aptible/api/agent'

data/lib/aptible/api/account.rb

@@ -1,23 +1,26 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Account < Api::Resource
-    has_many :apps
-    has_many :databases
-    has_many :disks
-    has_many :services
+  module Api
+    class Account < Resource
+      has_many :apps
+      has_many :databases
+      has_many :disks
+      has_many :services
 
-    def production?
-      type == 'production'
-    end
+      def production?
+        type == 'production'
+      end
 
-    def operations
-      # TODO: Implement /accounts/:id/operations
-      []
-    end
+      def operations
+        # TODO: Implement /accounts/:id/operations
+        []
+      end
+
+      def organization
+        require 'aptible/auth'
 
-    def organization
-      auth = Aptible::Auth::Resource.new(token: token, headers: headers)
-      auth.find_by_url(links['organization'].href)
+        auth = Aptible::Auth::Organization.new(token: token, headers: headers)
+        auth.find_by_url(links['organization'].href)
+      end
     end
   end
 end

data/lib/aptible/api/agent.rb

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

data/lib/aptible/api/app.rb

@@ -1,13 +1,14 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::App < Api::Resource
-    belongs_to :account
-    belongs_to :current_configuration
-    belongs_to :current_image
-    has_many :configurations
-    has_many :images
-    has_many :operations
-    has_many :permissions
-    has_many :services
+  module Api
+    class App < Resource
+      belongs_to :account
+      belongs_to :current_configuration
+      belongs_to :current_image
+      has_many :configurations
+      has_many :images
+      has_many :operations
+      has_many :permissions
+      has_many :services
+    end
   end
 end

data/lib/aptible/api/configuration.rb

@@ -1,6 +1,7 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Configuration < Api::Resource
-    belongs_to :resource
+  module Api
+    class Configuration < Resource
+      belongs_to :resource
+    end
   end
 end

data/lib/aptible/api/container.rb

@@ -1,6 +1,7 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Container < Api::Resource
-    belongs_to :release
+  module Api
+    class Container < Resource
+      belongs_to :release
+    end
   end
 end

data/lib/aptible/api/database.rb

@@ -1,10 +1,11 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Database < Api::Resource
-    belongs_to :account
-    has_one :disk
-    has_one :service
-    has_many :operations
-    has_many :permissions
+  module Api
+    class Database < Resource
+      belongs_to :account
+      has_one :disk
+      has_one :service
+      has_many :operations
+      has_many :permissions
+    end
   end
 end

data/lib/aptible/api/disk.rb

@@ -1,9 +1,10 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Disk < Api::Resource
-    belongs_to :account
-    belongs_to :database
-    has_many :operations
-    has_many :permissions
+  module Api
+    class Disk < Resource
+      belongs_to :account
+      belongs_to :database
+      has_many :operations
+      has_many :permissions
+    end
   end
 end

data/lib/aptible/api/image.rb

@@ -1,6 +1,7 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Image < Api::Resource
-    belongs_to :app
+  module Api
+    class Image < Resource
+      belongs_to :app
+    end
   end
 end

data/lib/aptible/api/operation.rb

@@ -1,11 +1,14 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Operation < Api::Resource
-    belongs_to :resource
+  module Api
+    class Operation < Resource
+      belongs_to :resource
 
-    def user
-      auth = Aptible::Auth::User.new(token: token, headers: headers)
-      auth.find_by_url(links['user'].href)
+      def user
+        require 'aptible/auth'
+
+        auth = Aptible::Auth::User.new(token: token, headers: headers)
+        auth.find_by_url(links['user'].href)
+      end
     end
   end
 end

data/lib/aptible/api/permission.rb

@@ -1,6 +1,7 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Permission < Api::Resource
-    belongs_to :resource
+  module Api
+    class Permission < Resource
+      belongs_to :resource
+    end
   end
 end

data/lib/aptible/api/release.rb

@@ -1,7 +1,8 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Release < Api::Resource
-    belongs_to :service
-    has_many :containers
+  module Api
+    class Release < Resource
+      belongs_to :service
+      has_many :containers
+    end
   end
 end

data/lib/aptible/api/resource.rb

@@ -1,110 +1,16 @@
-require 'active_support/inflector'
+require 'aptible/resource'
 
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Resource < Api
-    def delete
-      # HyperResource/Faraday choke on empty response bodies
-      super
-    rescue HyperResource::ResponseError
-      nil
-    end
-    alias_method :destroy, :delete
-
-    def self.basename
-      name.split('::').last.downcase.pluralize
-    end
-
-    def self.collection_url
-      config = Aptible::Api.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 = Api.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
-        elsif links[relation]
-          instance_variable_set("@#{relation}", links[relation].get)
-        end
-      end
-    end
-
-    # rubocop:disable PredicateName
-    def self.has_one(relation)
-      # Better than class << self + alias_method?
-      belongs_to(relation)
-    end
-    # rubocop:enable PredicateName
-
-    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
+  module Api
+    class Resource < Aptible::Resource::Base
+      def namespace
+        'Aptible::Api'
       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::Api.configuration.root_url
       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
   end
 end
 

data/lib/aptible/api/service.rb

@@ -1,13 +1,14 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Service < Api::Resource
-    belongs_to :account
-    belongs_to :app
-    belongs_to :database
-    belongs_to :current_release
-    has_many :vhosts
-    has_many :operations
-    has_many :permissions
-    has_many :releases
+  module Api
+    class Service < Resource
+      belongs_to :account
+      belongs_to :app
+      belongs_to :database
+      belongs_to :current_release
+      has_many :vhosts
+      has_many :operations
+      has_many :permissions
+      has_many :releases
+    end
   end
 end

data/lib/aptible/api/version.rb

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

data/lib/aptible/api/vhost.rb

@@ -1,11 +1,12 @@
-# rubocop:disable ClassAndModuleChildren
 module Aptible
-  class Api::Vhost < Api::Resource
-    belongs_to :service
-    has_many :operations
+  module Api
+    class Vhost < Resource
+      belongs_to :service
+      has_many :operations
 
-    def provisioned?
-      provisioned
+      def provisioned?
+        provisioned
+      end
     end
   end
 end

data/spec/aptible/api/agent_spec.rb

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

data/spec/aptible/api/resource_spec.rb

@@ -1,52 +1,6 @@
 require 'spec_helper'
 
 describe Aptible::Api::Resource do
-  describe '.collection_url' do
-    it 'should use the pluralized resource name' do
-      url = Aptible::Api::Disk.collection_url
-      expect(url).to eq 'https://api.aptible.com/disks'
-    end
-  end
-
-  describe '.find' do
-    it 'should call find_by_url' do
-      url = 'https://api.aptible.com/disks/42'
-      expect(Aptible::Api::Disk).to receive(:find_by_url).with url, {}
-      Aptible::Api::Disk.find(42)
-    end
-  end
-
-  describe '.all' do
-    let(:app) { double Aptible::Api::App }
-    let(:collection) { double Aptible::Api }
-
-    before do
-      collection.stub(:apps) { [app] }
-      Aptible::Api::App.any_instance.stub(:find_by_url) { collection }
-    end
-
-    it 'should be an array' do
-      expect(Aptible::Api::App.all).to be_a Array
-    end
-
-    it 'should return the root collection' do
-      expect(Aptible::Api::App.all).to eq [app]
-    end
-
-    it 'should pass options to the HyperResource initializer' do
-      klass = Aptible::Api::App
-      options = { token: 'token' }
-      expect(klass).to receive(:new).with(options).and_return klass.new
-      Aptible::Api::App.all(options)
-    end
-  end
-
-  describe '.create' do
-    it 'should create a new top-level resource' do
-      apps = double Aptible::Api
-      Aptible::Api.stub_chain(:new, :apps) { apps }
-      expect(apps).to receive(:create).with(foo: 'bar')
-      Aptible::Api::App.create(foo: 'bar')
-    end
-  end
+  its(:namespace) { should eq 'Aptible::Api' }
+  its(:root_url) { should eq 'https://api.aptible.com' }
 end

data/spec/aptible/api_spec.rb

@@ -1,32 +1,7 @@
 require 'spec_helper'
 
 describe Aptible::Api do
-  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
-  end
+  subject { Aptible::Api::App.new }
 
   it 'should have a configurable root_url' do
     config = described_class.configuration

metadata

@@ -1,45 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: aptible-api
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 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: 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: aptible-auth
+  name: aptible-resource
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fridge
+  name: gem_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -182,7 +154,7 @@ files:
 - aptible-api.gemspec
 - lib/aptible/api.rb
 - lib/aptible/api/account.rb
-- lib/aptible/api/adapter.rb
+- lib/aptible/api/agent.rb
 - lib/aptible/api/app.rb
 - lib/aptible/api/configuration.rb
 - lib/aptible/api/container.rb
@@ -194,7 +166,9 @@ files:
 - lib/aptible/api/release.rb
 - lib/aptible/api/resource.rb
 - lib/aptible/api/service.rb
+- lib/aptible/api/version.rb
 - lib/aptible/api/vhost.rb
+- spec/aptible/api/agent_spec.rb
 - spec/aptible/api/resource_spec.rb
 - spec/aptible/api_spec.rb
 - spec/shared/set_env.rb
@@ -224,6 +198,7 @@ signing_key:
 specification_version: 4
 summary: Ruby client for api.aptible.com
 test_files:
+- spec/aptible/api/agent_spec.rb
 - spec/aptible/api/resource_spec.rb
 - spec/aptible/api_spec.rb
 - spec/shared/set_env.rb

data/lib/aptible/api/adapter.rb

@@ -1,22 +0,0 @@
-# rubocop:disable ClassAndModuleChildren
-module Aptible
-  class Api::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