droplet_kit 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8d31231e3af2be10b1a55dfe123b5e2e8b72517
-  data.tar.gz: 26c342ab6ba83c993dab33c0fddc383eea4c5e70
+  metadata.gz: 9a7043fefd42f5297c3f91fa3033c30a47ff86fd
+  data.tar.gz: 2dfc49f1230133e864b1b9373a6caee0c7b9c5e3
 SHA512:
-  metadata.gz: f86c214072f2b056efbd9eac7bf0a0d026a3aba1df7d7bc381fcfdf21a49a9c7938345624071e57ac2e5aa8fe2b70b75edd9123ebbbbaf127a6b526a48575630
-  data.tar.gz: 9ca7632532e88953369de900f8be54489c02688684694a5ff0035bd26cd740bdcf230342c8b401e277d67ac1607d15520cc9a9ae0dba021f78e153b9019aab57
+  metadata.gz: da1218af357c9a2c1ef5cd2650d583cd2899b4895760747438054e8d353de5c1479a186427ef3711c2f541333d189a19d6c5fc7aff193cd0b08393018514f004
+  data.tar.gz: f37b970dd2c05bad03039fbaadd98736c70e4c889014f9e01a5ddcdf11d3b5150196ba7a6da908f028b104c7232b8089d4b2d3cf3e2b32f0500a8b9032300364

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### Version 1.1.2
+
+* Add `public_ip` and `private_ip` to easily get the IP address on `DropletKit::Droplet` objects returned.
+
+### Version 1.1.1
+
+* Use size_slug instead of size object in droplet mappings.
+
 ### Version 1.1.0
 
 * Changing kernels is now `client.droplet_actions.change_kernel(kernel: 'name', droplet_id: 123)` instead of `droplet_actions.kernel()`.

data/lib/droplet_kit/models/droplet.rb

@@ -13,6 +13,29 @@ module DropletKit
     attribute :ipv6
     attribute :user_data
     attribute :private_networking
+
+    def public_ip
+      network = network_for(:v4, 'public')
+      network && network.ip_address
+    end
+
+    def private_ip
+      network = network_for(:v4, 'private')
+      network && network.ip_address
+    end
+
+    private
+
+    def network_for(type, publicity)
+      networks = case type
+                 when :v4 then self.networks.v4
+                 when :v6 then self.networks.v6
+                 end
+
+      networks.find do |network|
+        network.type == publicity
+      end
+    end
   end
 end
 

data/lib/droplet_kit/version.rb

@@ -1,3 +1,3 @@
 module DropletKit
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/lib/droplet_kit/models/droplet_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+RSpec.describe DropletKit::Droplet do
+  let(:droplet_fixture) { api_fixture('droplets/find') }
+  let(:droplet) { DropletKit::DropletMapping.extract_single(droplet_fixture, :read) }
+
+  describe '#public_ip' do
+    it 'returns the public IP for ipv4' do
+      expect(droplet.public_ip).to eq('127.0.0.19')
+    end
+
+    context 'when the droplet does not have an IP yet' do
+      it 'returns nil' do
+        droplet.networks.v4.clear
+        expect(droplet.public_ip).to be_nil
+      end
+    end
+  end
+
+  describe '#private_ip' do
+    it 'returns the public IP for ipv4' do
+      expect(droplet.private_ip).to eq('10.0.0.19')
+    end
+
+    context 'when the droplet does not have private networking enabled' do
+      it 'returns nil' do
+        droplet.networks.v4.clear
+        expect(droplet.private_ip).to be_nil
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droplet_kit
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -244,6 +244,7 @@ files:
 - spec/fixtures/ssh_keys/find.json
 - spec/fixtures/ssh_keys/update.json
 - spec/lib/droplet_kit/client_spec.rb
+- spec/lib/droplet_kit/models/droplet_spec.rb
 - spec/lib/droplet_kit/paginated_resource_spec.rb
 - spec/lib/droplet_kit/resources/account_resource_spec.rb
 - spec/lib/droplet_kit/resources/action_resource_spec.rb
@@ -314,6 +315,7 @@ test_files:
 - spec/fixtures/ssh_keys/find.json
 - spec/fixtures/ssh_keys/update.json
 - spec/lib/droplet_kit/client_spec.rb
+- spec/lib/droplet_kit/models/droplet_spec.rb
 - spec/lib/droplet_kit/paginated_resource_spec.rb
 - spec/lib/droplet_kit/resources/account_resource_spec.rb
 - spec/lib/droplet_kit/resources/action_resource_spec.rb