aptible-api 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d2457b7c3accb03805735dfaaa760880eee3588
-  data.tar.gz: 30e94d083309a23e8ef0da7e2f7a19ab284f949a
+  metadata.gz: 9ae1f234749249ba10c4e830f31cc403b78de9c8
+  data.tar.gz: a984b4d81ba494532f92a52090e067ff7aa5154d
 SHA512:
-  metadata.gz: cab3f8b2378c7cdba2abfb5ee9c5fee35cd2d66032fcc544da03f85f7da212bb44e7a2039b26a09d6412456cf99810c00917bba7244f031e3cf909f8fd65bcb5
-  data.tar.gz: dd7e70a80f2ce6b4197c21a55b16e078436c1ba2020b3bd37a756b166c69e1211c3e3d329c72bedb62964e618fb8d76efb4c046e4c5e7d770d18e299eb572b50
+  metadata.gz: e66e1bafd9405e86e9bbfda05b92ea533b726dab6c7dfe8b15f0c28774053ea3f04abaadbe836401f070dbabf3df2e9a45de9579ac5fb17282a02373f939255f
+  data.tar.gz: b39e936172ff7a45d2e24994f44f2caeff0519b0f970693876ea1e647b2ea952f4f921ac1d367cc41628fc18a0a7c60f494252c38f6070c9a1961bb8542a20b8

data/aptible-api.gemspec

@@ -6,7 +6,7 @@ require 'English'
 
 Gem::Specification.new do |spec|
   spec.name          = 'aptible-api'
-  spec.version       = '0.2.2'
+  spec.version       = '0.3.0'
   spec.authors       = ['Frank Macreery']
   spec.email         = ['frank@macreery.com']
   spec.description   = %q{Ruby client for api.aptible.com}

data/lib/aptible/api/app.rb

@@ -1,5 +1,6 @@
 module Aptible
   class Api::App < Api::Resource
+    belongs_to :account
     has_many :configurations
     has_many :images
     has_many :operations

data/lib/aptible/api/attachment.rb

@@ -1,4 +1,5 @@
 module Aptible
   class Api::Attachment < Api::Resource
+    belongs_to :disk
   end
 end

data/lib/aptible/api/configuration.rb

@@ -1,4 +1,5 @@
 module Aptible
   class Api::Configuration < Api::Resource
+    belongs_to :resource
   end
 end

data/lib/aptible/api/container.rb

@@ -1,4 +1,5 @@
 module Aptible
   class Api::Container < Api::Resource
+    belongs_to :release
   end
 end

data/lib/aptible/api/disk.rb

@@ -1,5 +1,6 @@
 module Aptible
   class Api::Disk < Api::Resource
+    belongs_to :account
     has_many :operations
     has_many :permissions
   end

data/lib/aptible/api/image.rb

@@ -1,4 +1,5 @@
 module Aptible
   class Api::Image < Api::Resource
+    belongs_to :app
   end
 end

data/lib/aptible/api/operation.rb

@@ -1,4 +1,10 @@
 module Aptible
   class Api::Operation < Api::Resource
+    belongs_to :resource
+
+    def user
+      auth = Aptible::Auth::User.new(token: token, headers: headers)
+      auth.find_by_url(links['user'].href)
+    end
   end
 end

data/lib/aptible/api/permission.rb

@@ -1,4 +1,5 @@
 module Aptible
   class Api::Permission < Api::Resource
+    belongs_to :resource
   end
 end

data/lib/aptible/api/proxy.rb

@@ -1,4 +1,5 @@
 module Aptible
   class Api::Proxy < Api::Resource
+    belongs_to :service
   end
 end

data/lib/aptible/api/release.rb

@@ -1,5 +1,6 @@
 module Aptible
   class Api::Release < Api::Resource
+    belongs_to :service
     has_many :containers
   end
 end

data/lib/aptible/api/resource.rb

@@ -12,17 +12,17 @@ module Aptible
     end
 
     def self.all(options = {})
-      resource = new(options).find_by_url(collection_url)
+      resource = find_by_url(collection_url, options)
       resource.send(basename).entries
     end
 
-    def self.find(id)
-      find_by_url("#{collection_url}/#{id}")
+    def self.find(id, options = {})
+      find_by_url("#{collection_url}/#{id}", options)
     end
 
-    def self.find_by_url(url)
+    def self.find_by_url(url, options = {})
       # REVIEW: Should exception be raised if return type mismatch?
-      new.find_by_url(url)
+      new(options).find_by_url(url)
     rescue
       nil
     end
@@ -40,6 +40,17 @@ module Aptible
     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
+      end
+    end
+
     private
 
     def self.define_has_many_getter(relation)

data/lib/aptible/api/service.rb

@@ -1,5 +1,6 @@
 module Aptible
   class Api::Service < Api::Resource
+    belongs_to :account
     has_many :vhosts
     has_many :operations
     has_many :permissions

data/lib/aptible/api/vhost.rb

@@ -1,4 +1,5 @@
 module Aptible
   class Api::Vhost < Api::Resource
+    belongs_to :service
   end
 end

data/spec/aptible/api/resource_spec.rb

@@ -11,7 +11,7 @@ describe Aptible::Api::Resource do
   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
+      expect(Aptible::Api::Disk).to receive(:find_by_url).with url, {}
       Aptible::Api::Disk.find(42)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-api
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config