niftycloud-restful-read-api 0.0.3 → 0.0.4

data/README.md

@@ -61,6 +61,8 @@ config.ru から require して使うこともできます。
 
 * /computing/regions
   * リージョン一覧を取得できます
+* /computing/availability_zones
+  * 利用可能ゾーン一覧を取得できます
 * /computing/instances
   * サーバー一覧を取得できます
 * /computing/volumes

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/niftycloud-restful-read-api.rb

@@ -31,18 +31,34 @@ class NiftycloudRestfulReadApi < Sinatra::Base
           :path => '/api'
         )
       end
-  
-      def regions
-        response = @api.send(:response_generator, 'Action' => 'DescribeRegions')
-        response.regionInfo.item.to_a rescue []
+
+      def items(options)
+        response = @api.send(:response_generator, 'Action' => options[:action])
+        response[options[:key]].item.to_a rescue []
+      end
+
+      {
+        :regions => {:action => 'DescribeRegions', :key => 'regionInfo'},
+        :availability_zones => {:action => 'DescribeAvailabilityZones', :key => 'availabilityZoneInfo'},
+        :volumes => {:action => 'DescribeVolumes', :key => 'volumeSet'}, 
+        :key_pairs => {:action => 'DescribeKeyPairs', :key => 'keySet'},
+        :images => {:action => 'DescribeImages', :key => 'imagesSet'},
+        :security_groups => {:action => 'DescribeSecurityGroups', :key => 'securityGroupInfo'},
+        :ssl_certificates => {:action => 'DescribeSSLCertificates', :key => 'certsSet'},
+        :addresses => {:action => 'DescribeAddresses', :key => 'addressesSet'}
+      }.each do |method, options|
+        define_method method do
+          items(:action => options[:action], :key => options[:key])
+        end
+      end
+
+      def load_balancers
+        response = @api.describe_load_balancers
+        response.DescribeLoadBalancersResult.LoadBalancerDescriptions.member.to_a rescue []
       end
-      
-      def instances
-        response = @api.describe_instances
-  
-        return [] if response.reservationSet.nil?
   
-        items = response.reservationSet.item
+      def instances
+        items = items(:action => 'DescribeInstances', :key => 'reservationSet')
         instances = items.map do |item|
           security_groups = item.groupSet.item.flatten.map {|item| item.groupId }
           instances = item.instancesSet.item.to_a
@@ -53,41 +69,6 @@ class NiftycloudRestfulReadApi < Sinatra::Base
         end
         instances.flatten
       end
-      
-      def volumes
-        response = @api.describe_volumes
-        response.volumeSet.item.to_a rescue []
-      end
-      
-      def key_pairs
-        response = @api.describe_key_pairs
-        response.keySet.item.to_a rescue []
-      end
-      
-      def images
-        response = @api.describe_images
-        response.imagesSet.item.to_a rescue []
-      end
-      
-      def load_balancers
-        response = @api.describe_load_balancers
-        response.DescribeLoadBalancersResult.LoadBalancerDescriptions.member.to_a rescue []
-      end
-      
-      def security_groups
-        response = @api.describe_security_groups
-        response.securityGroupInfo.item.to_a rescue []
-      end
-      
-      def ssl_certificates
-        response = @api.describe_ssl_certificates
-        response.certsSet.item.to_a rescue []
-      end
-  
-      def addresses
-        response = @api.send(:response_generator, 'Action' => 'DescribeAddresses')
-        response.addressesSet.item.to_a rescue []
-      end
     end
 
     class Rdb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: niftycloud-restful-read-api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &144182160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *144182160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nifty-cloud-sdk
-  requirement: &144181320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *144181320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &144180180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *144180180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &144178260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *144178260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &144177380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *144177380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: NIFTYCloud の情報取得系 API を RESTful に利用できるようにする Sinatra アプリ
 email: tily05@gmail.com
 executables:
@@ -101,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3637886189179613779
+      hash: -3245465240281679413
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: NIFTYCloud の情報取得系 API を RESTful に利用できるようにする Sinatra アプリ