aviator 0.0.6 → 0.0.7

data/lib/aviator/openstack/volume/v1/public/list_volumes.rb

@@ -1,21 +1,22 @@
 module Aviator
 
-  define_request :list_volumes, inherit: [:openstack, :common, :v2, :public, :base] do
+  define_request :list_volumes, :inherit => [:openstack, :common, :v2, :public, :base] do
 
     meta :service,        :volume
     meta :api_version,    :v1
 
     link 'documentation', 'http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/GET_getVolumesSimple_v1__tenant_id__volumes_v1__tenant_id__volumes.html'
 
-    param :details,             required: false
-    param :status,              required: false
-    param :availability_zone,   required: false
-    param :bootable,            required: false
-    param :display_name,        required: false
-    param :display_description, required: false
-    param :volume_type,         required: false
-    param :snapshot_id,         required: false
-    param :size,                required: false
+    param :all_tenants,         :required => false
+    param :details,             :required => false
+    param :status,              :required => false
+    param :availability_zone,   :required => false
+    param :bootable,            :required => false
+    param :display_name,        :required => false
+    param :display_description, :required => false
+    param :volume_type,         :required => false
+    param :snapshot_id,         :required => false
+    param :size,                :required => false
 
 
     def headers
@@ -29,7 +30,17 @@ module Aviator
     def url
       str  = "#{ base_url }/volumes"
       str += "/detail" if params[:details]
-      str += params_to_querystring(optional_params + required_params - [:details])
+
+      filters = []
+
+      (optional_params + required_params - [:details]).each do |param_name|
+        value = param_name == :all_tenants && params[param_name] ? 1 : params[param_name]
+        filters << "#{ param_name }=#{ value }" if value
+      end
+
+      str += "?#{ filters.join('&') }" unless filters.empty?
+
+      str
     end
 
   end

data/lib/aviator/openstack/volume/v1/public/root.rb

@@ -1,6 +1,6 @@
 module Aviator
 
-  define_request :root, inherit: [:openstack, :common, :v2, :public, :base] do
+  define_request :root, :inherit => [:openstack, :common, :v2, :public, :base] do
 
     meta :service,     :volume
     meta :api_version, :v1

data/lib/aviator/openstack/volume/v1/public/update_volume.rb

@@ -1,19 +1,19 @@
 module Aviator
 
-  define_request :update_volume, inherit: [:openstack, :common, :v2, :public, :base] do
+  define_request :update_volume, :inherit => [:openstack, :common, :v2, :public, :base] do
 
     meta :service,       :volume
     meta :api_version,   :v1
 
     link 'documentation', 'http://docs.rackspace.com/cbs/api/v1.0/cbs-devguide/content/PUT_renameVolume_v1__tenant_id__volumes__volume_id__v1__tenant_id__volumes.html'
 
-    param :id,                  required: true
-    param :display_name,        required: false
-    param :display_description, required: false
+    param :id,                  :required => true
+    param :display_name,        :required => false
+    param :display_description, :required => false
 
 
     def body
-      p = { volume: {} }
+      p = { :volume => {} }
 
       [:display_name, :display_description].each do |key|
         p[:volume][key] = params[key] if params[key]

data/lib/aviator/version.rb

@@ -1,3 +1,3 @@
 module Aviator
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/aviator.rb

@@ -1 +1,6 @@
+# Add the parent dir to the load path. This is for when
+# Aviator is not installed as a gem
+lib_path = File.dirname(__FILE__)
+$LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include? lib_path
+
 require 'aviator/core'

data/test/aviator/core/cli/describer_test.rb

@@ -32,7 +32,7 @@ class Aviator::Test
 
       inherit = [provider_name.to_sym, service_name.to_sym, base_ver, base_ept, base_name]
 
-      Aviator.define_request request_name, inherit: inherit, &block
+      Aviator.define_request request_name, :inherit => inherit, &block
     end
 
 
@@ -110,7 +110,7 @@ class Aviator::Test
         request_class = build_request(provider, service, request_name)
 
         expected = <<-EOF
-Request: #{ request_name }
+:Request => #{ request_name }
 
 Sample Code:
   session.#{ service }_service.request(:#{ request_name })
@@ -134,20 +134,20 @@ EOF
         request_name = 'sample_request2'
 
         request_class = build_request(provider, service, request_name) do
-                          param :theParam, required: true
-                          param :another, required: false
+                          param :theParam, :required => true
+                          param :another, :required => false
                         end
 
         expected = <<-EOF
-Request: #{ request_name }
+:Request => #{ request_name }
 
 Parameters:
- +----------+----------+
- | NAME     | REQUIRED |
- +----------+----------+
- | another  |    N     |
- | theParam |    Y     |
- +----------+----------+
+ +----------+-----------+
+ | NAME     | REQUIRED? |
+ +----------+-----------+
+ | another  |     N     |
+ | theParam |     Y     |
+ +----------+-----------+
 
 Sample Code:
   session.#{ service }_service.request(:#{ request_name }) do |params|
@@ -174,20 +174,20 @@ EOF
         request_name = 'sample_request3'
 
         request_class = build_request(provider, service, request_name) do
-                          param :theParam, required: true, alias: :the_param
-                          param :anotherParam, required: false, alias: :another_param
+                          param :theParam, :required => true, :alias => :the_param
+                          param :anotherParam, :required => false, :alias => :another_param
                         end
 
         expected = <<-EOF
-Request: #{ request_name }
+:Request => #{ request_name }
 
 Parameters:
- +--------------+----------+---------------+
- | NAME         | REQUIRED | ALIAS         |
- +--------------+----------+---------------+
- | anotherParam |    N     | another_param |
- | theParam     |    Y     | the_param     |
- +--------------+----------+---------------+
+ +--------------+-----------+---------------+
+ | NAME         | REQUIRED? | ALIAS         |
+ +--------------+-----------+---------------+
+ | anotherParam |     N     | another_param |
+ | theParam     |     Y     | the_param     |
+ +--------------+-----------+---------------+
 
 Sample Code:
   session.#{ service }_service.request(:#{ request_name }) do |params|
@@ -214,22 +214,22 @@ EOF
         request_name = 'sample_request4'
 
         request_class = build_request(provider, service, request_name) do
-                          param :theParam, required: true, alias: :the_param
-                          param :anotherParam, required: false, alias: :another_param
+                          param :theParam, :required => true, :alias => :the_param
+                          param :anotherParam, :required => false, :alias => :another_param
 
                           link 'link1', 'http://www.link.com'
                         end
 
         expected = <<-EOF
-Request: #{ request_name }
+:Request => #{ request_name }
 
 Parameters:
- +--------------+----------+---------------+
- | NAME         | REQUIRED | ALIAS         |
- +--------------+----------+---------------+
- | anotherParam |    N     | another_param |
- | theParam     |    Y     | the_param     |
- +--------------+----------+---------------+
+ +--------------+-----------+---------------+
+ | NAME         | REQUIRED? | ALIAS         |
+ +--------------+-----------+---------------+
+ | anotherParam |     N     | another_param |
+ | theParam     |     Y     | the_param     |
+ +--------------+-----------+---------------+
 
 Sample Code:
   session.#{ service }_service.request(:#{ request_name }) do |params|

data/test/aviator/core/request_builder_test.rb

@@ -62,11 +62,11 @@ class Aviator::Test
 
       it 'understands request inheritance' do
         base = {
-          provider: :another_provider,
-          service:  :base_service,
-          api_ver:  :base_api_ver,
-          ep_type:  :base_ep_type,
-          name:     :base_name
+          :provider => :another_provider,
+          :service  => :base_service,
+          :api_ver  => :base_api_ver,
+          :ep_type  => :base_ep_type,
+          :name     => :base_name
         }
 
         builder.define_request base[:name] do
@@ -84,7 +84,7 @@ class Aviator::Test
           base[:name]
         ]
 
-        builder.define_request :child_request, inherit: base_request do; end
+        builder.define_request :child_request, :inherit => base_request do; end
 
         child_req_hierarchy = [
           base[:provider],
@@ -110,7 +110,7 @@ class Aviator::Test
         non_existent_base = [:none, :existent, :base]
 
         the_method = lambda do
-          builder.define_request :child, inherit: non_existent_base do; end
+          builder.define_request :child, :inherit => non_existent_base do; end
         end
 
         the_method.must_raise Aviator::BaseRequestNotFoundError
@@ -125,11 +125,11 @@ class Aviator::Test
 
       it 'raises a RequestAlreadyDefinedError if the request is already defined' do
         request = {
-          provider: :existing_provider,
-          service:  :base_service,
-          api_ver:  :base_api_ver,
-          ep_type:  :base_ep_type,
-          name:     :base_name
+          :provider => :existing_provider,
+          :service  => :base_service,
+          :api_ver  => :base_api_ver,
+          :ep_type  => :base_ep_type,
+          :name     => :base_name
         }
 
         builder.define_request request[:name] do
@@ -161,7 +161,7 @@ class Aviator::Test
         base_arr  = [:openstack, :identity, :v2, :public, :root]
         child_arr = base_arr.first(base_arr.length - 1) + [:child]
 
-        builder.define_request child_arr.last, inherit: base_arr do; end
+        builder.define_request child_arr.last, :inherit => base_arr do; end
 
         base_klass = base_arr.inject(builder) do |namespace, sym|
           namespace.const_get(sym.to_s.camelize, false)

data/test/aviator/core/request_test.rb

@@ -8,7 +8,7 @@ class Aviator::Test
 
       it 'raises an error when a required param is not provided' do
         klass = Class.new(Aviator::Request) do
-                  param :someparamname, required: true
+                  param :someparamname, :required => true
                 end
 
         the_method = lambda { klass.new }
@@ -23,7 +23,7 @@ class Aviator::Test
 
       it 'does not raise any error when the required param is provided' do
         klass = Class.new(Aviator::Request) do
-                  param :someparamname, required: true
+                  param :someparamname, :required => true
                 end
       
         obj = klass.new do |params|
@@ -190,7 +190,7 @@ class Aviator::Test
                 end
     
         expected = [
-          { rel: rel, href: href }
+          { :rel => rel, :href => href }
         ]
         
         klass.links.must_equal expected
@@ -215,7 +215,7 @@ class Aviator::Test
       
       it 'accepts an alias for a given parameter' do
         klass = Class.new(Aviator::Request) do
-                  param :the_param, required: true, alias: :the_alias
+                  param :the_param, :required => true, :alias => :the_alias
                 end
         
         param_val = 999
@@ -231,7 +231,7 @@ class Aviator::Test
       
       it 'makes the param alias assignable' do
         klass = Class.new(Aviator::Request) do
-                  param :the_param, required: true, alias: :the_alias
+                  param :the_param, :required => true, :alias => :the_alias
                 end
         
         param_val = 999
@@ -247,7 +247,7 @@ class Aviator::Test
       
       it 'allows aliases to be accessible as symbols' do
         klass = Class.new(Aviator::Request) do
-                  param :the_param, required: true, alias: :the_alias
+                  param :the_param, :required => true, :alias => :the_alias
                 end
         
         param_val = 999
@@ -263,7 +263,7 @@ class Aviator::Test
 
       it 'allows aliases to be accessible as strings' do
         klass = Class.new(Aviator::Request) do
-                  param :the_param, required: true, alias: :the_alias
+                  param :the_param, :required => true, :alias => :the_alias
                 end
         
         param_val = 999
@@ -283,7 +283,7 @@ class Aviator::Test
     
       it 'returns an array' do
         klass = Class.new(Aviator::Request) do
-                  param :whatever, required: false
+                  param :whatever, :required => false
                 end
     
         klass.optional_params.must_equal [:whatever]
@@ -296,7 +296,7 @@ class Aviator::Test
     
       it 'returns an array' do
         klass = Class.new(Aviator::Request) do
-                  param :whatever, required: false
+                  param :whatever, :required => false
                 end
     
         klass.new.optional_params.must_equal [:whatever]
@@ -309,7 +309,7 @@ class Aviator::Test
     
       it 'returns an array' do
         klass = Class.new(Aviator::Request) do
-                  param :whatever, required: true
+                  param :whatever, :required => true
                 end
     
         klass.required_params.must_equal [:whatever]
@@ -322,7 +322,7 @@ class Aviator::Test
     
       it 'returns an array' do
         klass = Class.new(Aviator::Request) do
-                  param :whatever, required: true
+                  param :whatever, :required => true
                 end
     
         request = klass.new do |params|

data/test/aviator/core/service_test.rb

@@ -13,10 +13,10 @@ class Aviator::Test
       request_name = config[:auth_service][:request].to_sym
 
       bootstrap = {
-        auth_service: config[:auth_service]
+        :auth_service => config[:auth_service]
       }
 
-      service.request request_name, session_data: bootstrap do |params|
+      service.request request_name, :session_data => bootstrap do |params|
         config[:auth_credentials].each do |k,v|
           params[k] = v
         end
@@ -31,8 +31,8 @@ class Aviator::Test
 
     def service(default_session_data=nil)
       options = {
-        provider: config[:provider],
-        service:  config[:auth_service][:name]
+        :provider => config[:provider],
+        :service  => config[:auth_service][:name]
       }
 
       options[:default_session_data] = default_session_data unless default_session_data.nil?
@@ -55,14 +55,14 @@ class Aviator::Test
         request_name = config[:auth_service][:request].to_sym
 
         bootstrap = {
-          auth_service: {
-            name:        'identity',
-            host_uri:    'http://devstack:5000/v2.0',
-            request:     'create_token'
+          :auth_service => {
+            :name        => 'identity',
+            :host_uri    => 'http://devstack:5000/v2.0',
+            :request     => 'create_token'
           }
         }
 
-        response = service.request request_name, session_data: bootstrap do |params|
+        response = service.request request_name, :session_data => bootstrap do |params|
           config[:auth_credentials].each do |k,v|
             params[k] = v
           end
@@ -77,25 +77,25 @@ class Aviator::Test
       it 'raises an error if session data does not have the endpoint information' do
         request_name = config[:auth_service][:request].to_sym
 
-        bootstrap = JSON.parse('{"access": {"token": {"issued_at": "2013-09-25T20:21:55.453783",
+        bootstrap = Hashish.new(JSON.parse('{"access": {"token": {"issued_at": "2013-09-25T20:21:55.453783",
           "expires": "2013-09-26T02:21:55Z", "id": "2f6bdec6cd0f49b4a60ede0cd4bf2c0d"},
           "serviceCatalog": [], "user": {"username": "bogus",
           "roles_links": [], "id": "447527294dae4a1788d36beb0db99c00", "roles": [],
           "name": "bogus"}, "metadata": {"is_admin": 0, "roles":
-          []}}}').with_indifferent_access
-          
+          []}}}'))
+
         s = service(bootstrap)
 
         the_method = lambda { s.request request_name }
 
         the_method.must_raise Aviator::Service::MissingServiceEndpointError
       end
-            
+
 
       it 'can find the correct request based on non-bootstrapped session data' do
         session_data = do_auth_request.body
 
-        response = service.request :list_tenants, session_data: session_data
+        response = service.request :list_tenants, :session_data => session_data
 
         response.status.must_equal 200
       end
@@ -126,35 +126,35 @@ class Aviator::Test
         default_session_data = do_auth_request.body
         s = service(default_session_data)
 
-        response1 = s.request :list_tenants, endpoint_type: 'admin'
-        response2 = s.request :list_tenants, endpoint_type: 'public'
+        response1 = s.request :list_tenants, :endpoint_type => 'admin'
+        response2 = s.request :list_tenants, :endpoint_type => 'public'
 
         response1.request.url.wont_equal response2.request.url
       end
 
     end
-    
-    
+
+
     describe '#request_classes' do
-      
+
       it 'returns an array of the request classes' do
         provider_name = config[:provider]
         service_name  = config[:auth_service][:name]
         service_path  = Pathname.new(__FILE__).join(
                           '..', '..', '..', '..', 'lib', 'aviator', provider_name, service_name
                         ).expand_path
-                       
-        request_files = Pathname.glob(service_path.join('**', '*.rb'))
-                          .map{|rf| rf.to_s.match(/#{provider_name}\/#{service_name}\/([\w\/]+)\.rb$/) }
+
+        request_files = Pathname.glob(service_path.join('**', '*.rb')) \
+                          .map{|rf| rf.to_s.match(/#{provider_name}\/#{service_name}\/([\w\/]+)\.rb$/) } \
                           .map{|rf| rf[1].split('/').map{|c| c.camelize }.join('::') }
-        
-        classes = request_files.map do |rf| 
+
+        classes = request_files.map do |rf|
           "Aviator::#{provider_name.camelize}::#{service_name.camelize}::#{rf}".constantize
         end
-        
+
         service.request_classes.must_equal classes
       end
-      
+
     end
 
 
@@ -162,10 +162,10 @@ class Aviator::Test
 
       it 'sets the service\'s default session data' do
         bootstrap = {
-          auth_service: {
-            name:     'identity',
-            host_uri: 'http://devstack:5000/v2.0',
-            request:  'create_token'
+          :auth_service => {
+            :name     => 'identity',
+            :host_uri => 'http://devstack:5000/v2.0',
+            :request  => 'create_token'
           }
         }
 
@@ -184,4 +184,4 @@ class Aviator::Test
 
   end
 
-end
+end