droplet_kit 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 84d6ad636a505caf049b0c9bcf8c38ff0aedda28
-  data.tar.gz: a447e68783fce91d0eeaa1ecbefaf1ce1752ed57
+SHA256:
+  metadata.gz: 2ec217312a19e55394c76f6f02a4e59b59525f0767405ea2e42fd5f24f5e09b8
+  data.tar.gz: 7c0d074571a6531486ae81dd7fc8f30a020bf60bc824a266a8f2701813f4539c
 SHA512:
-  metadata.gz: d592ec69dd61e597c02a7ab9e737b42b58fa62189024ee745f27fa77d22e8fb99de448d7c09eae4d98325d813b7e5d2671ff669ef8b1b4721fb00b65f746afed
-  data.tar.gz: 7ab6c9ae7ea96cabdc6b03be3abae4e4f559039bba48f4062dbce3f9763c153f9953b5dd77ce36a96783314622585c0fa3cae38e8514de2c8764609f1a2b46b6
+  metadata.gz: 1e7c4295594d705170819ced2305c2f92e20c2d497db5782c9aad227a055d2b72f910da9c84993f911dc02547a39115406a59aa359dfae489d7f1b2cc156b6e9
+  data.tar.gz: 9148f78a78f2dbef212fd71166feaa97d5a33fe4c46678529cd70593d1130f7810e00d650a5d860c1fbc31dec4dac050221bb735e9bed95f6db0e750273db7eb

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### Version 2.5.0
+* Added ability to tag images and retrieving new fields for tagged resources.
+
 ### Version 2.4.0
 * Added CDN resource.
 

data/README.md

@@ -359,8 +359,8 @@ Actions supported:
 * `client.tags.find(name: 'name')`
 * `client.tags.create(DropletKit::Tag.new(name: 'name'))`
 * `client.tags.delete(name: 'name')`
-* `client.tags.tag_resources(name: 'name', resources: [{ resource_id => 'droplet_id', resource_type: 'droplet' }])`
-* `client.tags.untag_resources(name 'name', resources: [{ resource_id => 'droplet_id', resource_type: 'droplet' }])`
+* `client.tags.tag_resources(name: 'name', resources: [{ resource_id => 'droplet_id', resource_type: 'droplet' },{ resource_id => 'image_id', resource_type: 'image' }])`
+* `client.tags.untag_resources(name 'name', resources: [{ resource_id => 'droplet_id', resource_type: 'droplet' },{ resource_id => 'image_id', resource_type: 'image' }])`
 
 ## Account resource
 

data/lib/droplet_kit.rb

@@ -27,6 +27,7 @@ module DropletKit
   autoload :Tag, 'droplet_kit/models/tag'
   autoload :TaggedResources, 'droplet_kit/models/tagged_resources'
   autoload :TaggedDropletsResources, 'droplet_kit/models/tagged_droplets_resources'
+  autoload :TaggedImagesResources, 'droplet_kit/models/tagged_images_resources'
   autoload :Volume, 'droplet_kit/models/volume'
   autoload :LoadBalancer, 'droplet_kit/models/load_balancer'
   autoload :StickySession, 'droplet_kit/models/sticky_session'
@@ -85,6 +86,7 @@ module DropletKit
   autoload :TagMapping, 'droplet_kit/mappings/tag_mapping'
   autoload :TaggedResourcesMapping, 'droplet_kit/mappings/tagged_resources_mapping'
   autoload :TaggedDropletsResourcesMapping, 'droplet_kit/mappings/tagged_droplets_resources_mapping'
+  autoload :TaggedImagesResourcesMapping, 'droplet_kit/mappings/tagged_images_resources_mapping'
   autoload :VolumeMapping, 'droplet_kit/mappings/volume_mapping'
   autoload :LoadBalancerMapping, 'droplet_kit/mappings/load_balancer_mapping'
   autoload :StickySessionMapping, 'droplet_kit/mappings/sticky_session_mapping'

data/lib/droplet_kit/mappings/tagged_droplets_resources_mapping.rb

@@ -5,10 +5,11 @@ module DropletKit
     kartograph do
       mapping TaggedDropletsResources
 
-      root_key plural: 'droplets', singular: 'tag', scopes: [:read]
+      root_key plural: 'droplets', singular: 'droplet', scopes: [:read]
 
       scoped :read do
         property :count
+        property :last_tagged_uri
         property :last_tagged, include: DropletMapping
       end
     end

data/lib/droplet_kit/mappings/tagged_images_resources_mapping.rb

@@ -0,0 +1,16 @@
+module DropletKit
+  class TaggedImagesResourcesMapping
+    include Kartograph::DSL
+
+    kartograph do
+      mapping TaggedImagesResources
+
+      root_key plural: 'images', singular: 'image', scopes: [:read]
+
+      scoped :read do
+        property :count
+        property :last_tagged_uri
+      end
+    end
+  end
+end

data/lib/droplet_kit/mappings/tagged_resources_mapping.rb

@@ -8,7 +8,10 @@ module DropletKit
       root_key plural: 'resources', singular: 'resource', scopes: [:read]
 
       scoped :read do
+        property :count
+        property :last_tagged_uri
         property :droplets, include: TaggedDropletsResourcesMapping
+        property :images, include: TaggedImagesResourcesMapping
       end
     end
   end

data/lib/droplet_kit/models/tagged_droplets_resources.rb

@@ -2,5 +2,6 @@ module DropletKit
   class TaggedDropletsResources < BaseModel
     attribute :count
     attribute :last_tagged
+    attribute :last_tagged_uri
   end
 end

data/lib/droplet_kit/models/tagged_images_resources.rb

@@ -0,0 +1,6 @@
+module DropletKit
+  class TaggedImagesResources < BaseModel
+    attribute :count
+    attribute :last_tagged_uri
+  end
+end

data/lib/droplet_kit/models/tagged_resources.rb

@@ -1,5 +1,8 @@
 module DropletKit
   class TaggedResources < BaseModel
+    attribute :count
+    attribute :last_tagged_uri
     attribute :droplets
+    attribute :images
   end
 end

data/lib/droplet_kit/version.rb

@@ -1,3 +1,3 @@
 module DropletKit
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/spec/fixtures/tags/all.json

@@ -3,18 +3,26 @@
     {
       "name": "testing-1",
       "resources": {
+        "count": 0,
         "droplets": {
           "count": 0,
           "last_tagged": null
+        },
+        "images": {
+          "count": 0
         }
       }
     },
     {
       "name": "testing-2",
       "resources": {
+        "count": 0,
         "droplets": {
           "count": 0,
           "last_tagged": null
+        },
+        "images": {
+          "count": 0
         }
       }
     }

data/spec/fixtures/tags/create.json

@@ -2,9 +2,13 @@
   "tag": {
     "name": "testing-1",
     "resources": {
+      "count": 0,
       "droplets": {
         "count": 0,
         "last_tagged": null
+      },
+      "images": {
+        "count": 0
       }
     }
   }

data/spec/fixtures/tags/find.json

@@ -2,8 +2,11 @@
   "tag": {
     "name": "testing-1",
     "resources": {
+      "count": 2,
+      "last_tagged_uri": "https://api.digitalocean.com/v2/droplets/1",
       "droplets": {
         "count": 1,
+        "last_tagged_uri": "https://api.digitalocean.com/v2/droplets/1",
         "last_tagged": {
           "id": 1,
           "name": "test.example.com",
@@ -82,10 +85,14 @@
 
           ],
           "tags": [
-            "tag-1",
-            "tag-2"
+            "testing-1",
+            "testing-2"
           ]
         }
+      },
+      "images": {
+        "count": 1,
+        "last_tagged_uri": "https://api.digitalocean.com/v2/images/146"
       }
     }
   }

data/spec/lib/droplet_kit/resources/tag_resource_spec.rb

@@ -47,9 +47,15 @@ describe DropletKit::TagResource do
 
       expect(tag).to be_kind_of(DropletKit::Tag)
       expect(tag).to match_tag_fixture
+      expect(tag.resources.count).to eq(2)
       expect(tag.resources.droplets.count).to eq(1)
       expect(tag.resources.droplets.last_tagged).to be_kind_of(DropletKit::Droplet)
       expect(tag.resources.droplets.last_tagged.id).to eq(1)
+      expect(tag.resources.droplets.last_tagged_uri).to eq('https://api.digitalocean.com/v2/droplets/1')
+
+      expect(tag.resources.images.count).to eq(1)
+      expect(tag.resources.images.attributes).to_not include(:last_tagged)
+      expect(tag.resources.images.last_tagged_uri).to eq('https://api.digitalocean.com/v2/images/146')
     end
   end
 
@@ -84,6 +90,10 @@ describe DropletKit::TagResource do
           {
             resource_id: '1',
             resource_type: "droplet"
+          },
+          {
+            resource_id: '146',
+            resource_type: "images"
           }
         ]
       }
@@ -105,6 +115,10 @@ describe DropletKit::TagResource do
           {
             resource_id: '1',
             resource_type: "droplet"
+          },
+          {
+            resource_id: '146',
+            resource_type: "images"
           }
         ]
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droplet_kit
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -232,6 +232,7 @@ files:
 - lib/droplet_kit/mappings/sticky_session_mapping.rb
 - lib/droplet_kit/mappings/tag_mapping.rb
 - lib/droplet_kit/mappings/tagged_droplets_resources_mapping.rb
+- lib/droplet_kit/mappings/tagged_images_resources_mapping.rb
 - lib/droplet_kit/mappings/tagged_resources_mapping.rb
 - lib/droplet_kit/mappings/volume_mapping.rb
 - lib/droplet_kit/models/account.rb
@@ -265,6 +266,7 @@ files:
 - lib/droplet_kit/models/sticky_session.rb
 - lib/droplet_kit/models/tag.rb
 - lib/droplet_kit/models/tagged_droplets_resources.rb
+- lib/droplet_kit/models/tagged_images_resources.rb
 - lib/droplet_kit/models/tagged_resources.rb
 - lib/droplet_kit/models/volume.rb
 - lib/droplet_kit/paginated_resource.rb
@@ -433,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Droplet Kit is the official Ruby library for DigitalOcean's API