droplet_kit 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce63bc5aac34db2dc7a39b5c7fef9f5fb02654a1
-  data.tar.gz: 6d22b740f138522b5e765965ac2557965e79abbb
+  metadata.gz: 4573b2ad1d55aa0ad804badf5bce1b2614800b34
+  data.tar.gz: 02c8d03d60f9f1ef07aeddaf8a39005c58b1206e
 SHA512:
-  metadata.gz: 1656f66b808a250ff08508204571c8ff0b6ceeff50c7ba3678585db457e3a9b2f1cd6faadc5982b0edc7950b553b52c8a9782e3de2c16877c7c2d4f61a96941c
-  data.tar.gz: aa6b612faceeb0428448d583833f8bc4345666e6a2b891fc3a6d6558b8f310375f91dcd67b51951953b283584bc526841edcffd0b7ab3de15cf7c4f927e37def
+  metadata.gz: b5b1a994c2dbe57857d9ae95bdc61aba6704d3f6be89cf091cfe5ec0652e1e9eaf75796822bb527c85c901a5e44e59fe3f903174bd4d1de6bbf6c215c40522d8
+  data.tar.gz: ef0228046db08ff59a8d21053efb37ca0460a073304057efe83be3d9aac6684525b61f345068e68407815a9dc2a075129e5dc885540213013e11ff24c3172728

data/droplet_kit.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "droplet_kit"
   spec.version       = DropletKit::VERSION
   spec.authors       = ["Robert Ross"]
-  spec.email         = ["engineering@digitalocean.com", "rross@digitalocean.com"]
+  spec.email         = ["rross@digitalocean.com"]
   spec.summary       = %q{Droplet Kit is the official Ruby library for DigitalOcean's API}
   spec.description   = %q{Droplet Kit is the official Ruby library for DigitalOcean's API}
   spec.homepage      = ""
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'virtus', '~> 1.0.3'
   spec.add_dependency "resource_kit", '~> 0.1.1'
-  spec.add_dependency "kartograph", '~> 0.2.0'
+  spec.add_dependency "kartograph", '~> 0.2.1'
   spec.add_dependency "activesupport", '~> 4.1.6'
   spec.add_dependency "faraday", '~> 0.9.1'
 

data/lib/droplet_kit/mappings/action_mapping.rb

@@ -13,7 +13,7 @@ module DropletKit
       property :completed_at, scopes: [:read]
       property :resource_id, scopes: [:read]
       property :resource_type, scopes: [:read]
-      property :region, scopes: [:read]
+      property :region, scopes: [:read], include: RegionMapping
       property :region_slug, scopes: [:read]
     end
   end

data/lib/droplet_kit/mappings/image_action_mapping.rb

@@ -13,7 +13,7 @@ module DropletKit
       property :completed_at, scopes: [:read]
       property :resource_id, scopes: [:read]
       property :resource_type, scopes: [:read]
-      property :region, scopes: [:read]
+      property :region, scopes: [:read], include: RegionMapping
       property :region_slug, scopes: [:read]
     end
   end

data/lib/droplet_kit/mappings/ssh_key_mapping.rb

@@ -14,4 +14,4 @@ module DropletKit
       property :name, scopes: [:update]
     end
   end
-end
+end

data/lib/droplet_kit/models/region.rb

@@ -6,4 +6,4 @@ module DropletKit
     attribute :available
     attribute :features
   end
-end
+end

data/lib/droplet_kit/version.rb

@@ -1,3 +1,3 @@
 module DropletKit
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/fixtures/actions/all.json

@@ -8,8 +8,14 @@
       "completed_at": null,
       "resource_id": null,
       "resource_type": "backend",
-      "region": "nyc1",
-      "region_slug": "nyc1"
+      "region_slug": "nyc1",
+      "region": {
+        "name": "New York",
+        "slug": "nyc1",
+        "available": true,
+        "sizes": ["512mb"],
+        "features": ["virtio", "private_networking", "backups", "ipv6", "metadata"]
+      }
     }
   ],
   "meta": {

data/spec/fixtures/actions/find.json

@@ -7,7 +7,13 @@
     "completed_at": null,
     "resource_id": null,
     "resource_type": "backend",
-    "region": "nyc1",
-    "region_slug": "nyc1"
+    "region_slug": "nyc1",
+    "region": {
+      "name": "New York",
+      "slug": "nyc1",
+      "available": true,
+      "sizes": ["512mb"],
+      "features": ["virtio", "private_networking", "backups", "ipv6", "metadata"]
+    }
   }
 }

data/spec/fixtures/droplets/list_actions.json

@@ -8,8 +8,14 @@
       "completed_at": null,
       "resource_id": 24,
       "resource_type": "droplet",
-      "region": "nyc1",
-      "region_slug": "nyc1"
+      "region_slug": "nyc1",
+      "region": {
+        "name": "New York",
+        "slug": "nyc1",
+        "available": true,
+        "sizes": ["512mb"],
+        "features": ["virtio", "private_networking", "backups", "ipv6", "metadata"]
+      }
     }
   ],
   "meta": {

data/spec/fixtures/image_actions/all.json

@@ -19,7 +19,13 @@
             "completed_at": "2014-10-28T17:12:04Z",
             "resource_id": 45646587,
             "resource_type": "image",
-            "region": "nyc2",
+            "region": {
+                "name": "New York",
+                "slug": "nyc2",
+                "available": true,
+                "sizes": ["512mb"],
+                "features": ["virtio", "private_networking", "backups", "ipv6", "metadata"]
+            },
             "region_slug": "nyc2"
         }
     ],

data/spec/fixtures/image_actions/create.json

@@ -7,7 +7,13 @@
     "completed_at": null,
     "resource_id": 449676391,
     "resource_type": "image",
-    "region": "nyc1",
-    "region_slug": "nyc1"
+    "region_slug": "nyc1",
+    "region": {
+      "name": "New York",
+      "slug": "nyc1",
+      "available": true,
+      "sizes": ["512mb"],
+      "features": ["virtio", "private_networking", "backups", "ipv6", "metadata"]
+    }
   }
 }

data/spec/fixtures/image_actions/find.json

@@ -7,7 +7,13 @@
     "completed_at": null,
     "resource_id": 449676391,
     "resource_type": "image",
-    "region": "nyc1",
-    "region_slug": "nyc1"
+    "region_slug": "nyc1",
+    "region": {
+      "name": "New York",
+      "slug": "nyc1",
+      "available": true,
+      "sizes": ["512mb"],
+      "features": ["virtio", "private_networking", "backups", "ipv6", "metadata"]
+    }
   }
 }

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

@@ -26,8 +26,13 @@ RSpec.describe DropletKit::ActionResource do
       expect(actions.first.completed_at).to eq(nil)
       expect(actions.first.resource_id).to eq(nil)
       expect(actions.first.resource_type).to eq("backend")
-      expect(actions.first.region).to eq("nyc1")
-      expect(actions.first.region_slug).to eq("nyc1")
+
+      expect(actions.first.region).to be_kind_of(DropletKit::Region)
+      expect(actions.first.region.slug).to eq('nyc1')
+      expect(actions.first.region.name).to eq('New York')
+      expect(actions.first.region.sizes).to include('512mb')
+      expect(actions.first.region.available).to be(true)
+      expect(actions.first.region.features).to include("virtio", "private_networking", "backups", "ipv6", "metadata")
     end
   end
 
@@ -53,8 +58,14 @@ RSpec.describe DropletKit::ActionResource do
       expect(action.completed_at).to eq(nil)
       expect(action.resource_id).to eq(nil)
       expect(action.resource_type).to eq("backend")
-      expect(action.region).to eq("nyc1")
       expect(action.region_slug).to eq("nyc1")
+
+      expect(action.region).to be_kind_of(DropletKit::Region)
+      expect(action.region.slug).to eq('nyc1')
+      expect(action.region.name).to eq('New York')
+      expect(action.region.sizes).to include('512mb')
+      expect(action.region.available).to be(true)
+      expect(action.region.features).to include("virtio", "private_networking", "backups", "ipv6", "metadata")
     end
   end
 end

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

@@ -13,8 +13,14 @@ RSpec.describe DropletKit::DropletActionResource do
         "completed_at" => nil,
         "resource_id" => 12,
         "resource_type" => "droplet",
-        "region" => "nyc1",
-        "region_slug" => "nyc1"
+        "region_slug" => "nyc1",
+        "region" => {
+          "name" => "New York",
+          "slug" => "nyc1",
+          "available" => true,
+          "sizes" => ["512mb"],
+          "features" => ["virtio", "private_networking", "backups", "ipv6", "metadata"]
+        }
       }
     }.to_json
   end
@@ -161,8 +167,14 @@ RSpec.describe DropletKit::DropletActionResource do
       expect(returned_action.completed_at).to eq(nil)
       expect(returned_action.resource_id).to eq(nil)
       expect(returned_action.resource_type).to eq("backend")
-      expect(returned_action.region).to eq("nyc1")
-      expect(returned_action.region_slug).to eq("nyc1")
+      expect(returned_action.region_slug).to eq('nyc1')
+
+      expect(returned_action.region).to be_kind_of(DropletKit::Region)
+      expect(returned_action.region.slug).to eq('nyc1')
+      expect(returned_action.region.name).to eq('New York')
+      expect(returned_action.region.sizes).to include('512mb')
+      expect(returned_action.region.available).to be(true)
+      expect(returned_action.region.features).to include("virtio", "private_networking", "backups", "ipv6", "metadata")
     end
   end
 end

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

@@ -191,7 +191,12 @@ RSpec.describe DropletKit::DropletResource do
       expect(actions[0].completed_at).to eq(nil)
       expect(actions[0].resource_id).to eq(24)
       expect(actions[0].resource_type).to eq("droplet")
-      expect(actions[0].region).to eq("nyc1")
+      expect(actions[0].region).to be_kind_of(DropletKit::Region)
+      expect(actions[0].region.slug).to eq('nyc1')
+      expect(actions[0].region.name).to eq('New York')
+      expect(actions[0].region.sizes).to include('512mb')
+      expect(actions[0].region.available).to be(true)
+      expect(actions[0].region.features).to include("virtio", "private_networking", "backups", "ipv6", "metadata")
     end
   end
 

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

@@ -22,8 +22,14 @@ RSpec.describe DropletKit::ImageActionResource do
       expect(action.completed_at).to eq(nil)
       expect(action.resource_id).to eq(449676391)
       expect(action.resource_type).to eq("image")
-      expect(action.region).to eq("nyc1")
       expect(action.region_slug).to eq("nyc1")
+
+      expect(action.region).to be_kind_of(DropletKit::Region)
+      expect(action.region.slug).to eq('nyc1')
+      expect(action.region.name).to eq('New York')
+      expect(action.region.sizes).to include('512mb')
+      expect(action.region.available).to be(true)
+      expect(action.region.features).to include("virtio", "private_networking", "backups", "ipv6", "metadata")
     end
   end
 
@@ -67,8 +73,14 @@ RSpec.describe DropletKit::ImageActionResource do
       expect(action.completed_at).to eq(nil)
       expect(action.resource_id).to eq(449676391)
       expect(action.resource_type).to eq("image")
-      expect(action.region).to eq("nyc1")
       expect(action.region_slug).to eq("nyc1")
+
+      expect(action.region).to be_kind_of(DropletKit::Region)
+      expect(action.region.slug).to eq('nyc1')
+      expect(action.region.name).to eq('New York')
+      expect(action.region.sizes).to include('512mb')
+      expect(action.region.available).to be(true)
+      expect(action.region.features).to include("virtio", "private_networking", "backups", "ipv6", "metadata")
     end
   end
 end

metadata

@@ -1,180 +1,179 @@
 --- !ruby/object:Gem::Specification
 name: droplet_kit
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: resource_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: kartograph
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.1.6
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.18'
 description: Droplet Kit is the official Ruby library for DigitalOcean's API
 email:
-- engineering@digitalocean.com
 - rross@digitalocean.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -290,12 +289,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []