aviator 0.0.2 → 0.0.3

data/test/aviator/core/request_test.rb

@@ -8,13 +8,13 @@ class Aviator::Test
 
       it 'raises an error when a required param is not provided' do
         klass = Class.new(Aviator::Request) do
-                  required_param :someparamname
+                  param :someparamname, required: true
                 end
 
-        initializer = lambda { klass.new }
-        initializer.must_raise ArgumentError
+        the_method = lambda { klass.new }
+        the_method.must_raise ArgumentError
 
-        error = initializer.call rescue $!
+        error = the_method.call rescue $!
 
         error.message.wont_be_nil
         error.message.must_include "someparamname"
@@ -23,11 +23,9 @@ class Aviator::Test
 
       it 'does not raise any error when the required param is provided' do
         klass = Class.new(Aviator::Request) do
-                  required_param :someparamname
+                  param :someparamname, required: true
                 end
-
-        # obj = klass.new({ someparamname: 'someparamvalue' })
-
+      
         obj = klass.new do |params|
           params.someparamname = 'something'
         end
@@ -37,173 +35,160 @@ class Aviator::Test
 
 
     describe '::anonymous?' do
-
+    
       it 'is false by default' do
         klass = Class.new(Aviator::Request)
-
+    
         klass.anonymous?.must_equal false
       end
-
-
+    
+    
       it 'returns true if specified as such' do
         klass = Class.new(Aviator::Request) do
-                  anonymous
+                  meta :anonymous, true
                 end
-
+          
         klass.anonymous?.must_equal true
       end
-
+    
     end
-
-
+    
+    
     describe '#anonymous?' do
-
+    
       it 'is false by default' do
         klass = Class.new(Aviator::Request)
-
+    
         klass.new.anonymous?.must_equal false
       end
-
-
+    
+    
       it 'returns true if specified as such' do
         klass = Class.new(Aviator::Request) do
-                  anonymous
+                  meta :anonymous, true
                 end
-
+    
         klass.new.anonymous?.must_equal true
       end
-
+    
     end
-
-
+    
+    
     describe '::api_version' do
-
+    
       it 'returns the api version' do
         klass = Class.new(Aviator::Request) do
-          api_version :v2
+          meta :api_version, :v2
         end
-
+    
         klass.api_version.must_equal :v2
       end
-
+    
     end
-
-
+    
+    
     describe '#api_version' do
-
+    
       it 'returns the api version' do
         klass = Class.new(Aviator::Request) do
-          api_version :v2
+          meta :api_version, :v2
         end
-
+    
         klass.new.api_version.must_equal :v2
       end
-
+    
     end
-
-
+    
+    
     describe '::body?' do
-
+    
       it 'returns false if the body method is not defined' do
         klass = Class.new(Aviator::Request)
-
+    
         klass.body?.must_equal false
       end
-
-
+    
+    
       it 'returns true if the body method is defined' do
         klass = Class.new(Aviator::Request) do
           def body; end
         end
-
+    
         klass.body?.must_equal true
       end
-
+    
     end
-
-
+    
+    
     describe '#body?' do
-
+    
       it 'returns false if the body method is not defined' do
         klass = Class.new(Aviator::Request)
-
+    
         klass.new.body?.must_equal false
       end
-
-
+    
+    
       it 'returns true if the body method is defined' do
         klass = Class.new(Aviator::Request) do
           def body; end
         end
-
+          
         klass.new.body?.must_equal true
       end
-
+    
     end
-
-
+    
+    
     describe '::endpoint_type' do
-
+    
       it 'returns the endpoint type' do
         klass = Class.new(Aviator::Request) do
-          endpoint_type :public
+          meta :endpoint_type, :public
         end
-
+    
         klass.endpoint_type.must_equal :public
       end
-
+    
     end
-
-
+    
+    
     describe '#endpoint_type' do
-
+    
       it 'returns the endpoint type' do
         klass = Class.new(Aviator::Request) do
-          endpoint_type :public
+          meta :endpoint_type, :whatever
         end
-
-        klass.new.endpoint_type.must_equal :public
-      end
-
-    end
-
-
-    describe '::http_method' do
-
-      it 'returns the http method if it is defined' do
-        klass = Class.new(Aviator::Request) do
-                  http_method :post
-                end
-
-        klass.http_method.must_equal :post
+    
+        klass.new.endpoint_type.must_equal :whatever
       end
-
+    
     end
-
-
+        
+    
     describe '#http_method' do
-
+    
       it 'returns the http method if it is defined' do
         klass = Class.new(Aviator::Request) do
-                  http_method :post
+                  def http_method; :post; end
                 end
-
+    
         klass.new.http_method.must_equal :post
       end
-
+    
     end
-
-
-    describe '::link_to' do
-
+    
+    
+    describe '::link' do
+    
       it 'adds a link to Request::links' do
         rel  = 'documentation'
         href = 'http://x.y.z'
         
         klass = Class.new(Aviator::Request) do
-                  link_to rel, href
+                  link rel, href
                 end
-
+    
         expected = [
           { rel: rel, href: href }
         ]
@@ -211,129 +196,119 @@ class Aviator::Test
         klass.links.must_equal expected
         klass.new.links.must_equal expected
       end
-
+    
     end
     
-
-    describe '::optional_param' do
-
+    
+    describe '::param' do
+    
       it 'is a private class method' do
-        private_method = lambda { Aviator::Request.optional_param }
+        private_method = lambda { Aviator::Request.param }
         private_method.must_raise NoMethodError
-
+    
         error = private_method.call rescue $!
-
+    
         error.message.wont_be_nil
         error.message.must_include "private method"
       end
-
+    
     end
     
-
+    
     describe '::optional_params' do
-
+    
       it 'returns an array' do
         klass = Class.new(Aviator::Request) do
-                  optional_param :whatever
+                  param :whatever, required: false
                 end
-
+    
         klass.optional_params.must_equal [:whatever]
       end
-
+    
     end
-
-
+    
+    
     describe '#optional_params' do
-
+    
       it 'returns an array' do
         klass = Class.new(Aviator::Request) do
-                  optional_param :whatever
+                  param :whatever, required: false
                 end
-
+    
         klass.new.optional_params.must_equal [:whatever]
       end
-
-    end
-
-
-    describe '::required_param' do
-
-      it 'is a private class method' do
-        private_method = lambda { Aviator::Request.required_param }
-        private_method.must_raise NoMethodError
-
-        error = private_method.call rescue $!
-
-        error.message.wont_be_nil
-        error.message.must_include "private method"
-      end
-
+    
     end
-
-
+    
+    
     describe '::required_params' do
-
+    
       it 'returns an array' do
         klass = Class.new(Aviator::Request) do
-                  required_param :whatever
+                  param :whatever, required: true
                 end
-
+    
         klass.required_params.must_equal [:whatever]
       end
-
+    
     end
-
-
+    
+    
     describe '#required_params' do
-
+    
       it 'returns an array' do
         klass = Class.new(Aviator::Request) do
-                  required_param :whatever
+                  param :whatever, required: true
                 end
-
-        klass.required_params.must_equal [:whatever]
+    
+        request = klass.new do |params|
+                    params[:whatever] = 'something'
+                  end
+          
+          
+        request.required_params.must_equal [:whatever]
       end
-
+    
     end
     
-
+    
     describe '::url?' do
-
-      it 'returns false if the path method is not defined' do
+    
+      it 'returns false if the url method is not defined' do
         klass = Class.new(Aviator::Request)
-
+    
         klass.url?.must_equal false
       end
-
-
-      it 'returns true if the path method is defined' do
+    
+    
+      it 'returns true if the url method is defined' do
         klass = Class.new(Aviator::Request) do
           def url; end
         end
-
+          
         klass.url?.must_equal true
       end
-
+    
     end
-
-
-    describe '#path?' do
-
-      it 'returns false if the path method is not defined' do
+    
+    
+    describe '#url?' do
+    
+      it 'returns false if the url method is not defined' do
         klass = Class.new(Aviator::Request)
-
+    
         klass.new.url?.must_equal false
       end
-
-
-      it 'returns true if the path method is defined' do
+    
+    
+      it 'returns true if the url method is defined' do
         klass = Class.new(Aviator::Request) do
           def url; end
         end
-
+    
         klass.new.url?.must_equal true
       end
-
+    
     end
 
 

data/test/aviator/core/service_test.rb

@@ -22,21 +22,21 @@ class Aviator::Test
         end
       end
     end
-        
-    
+
+
     def klass
       Aviator::Service
     end
-    
+
 
     def service(default_session_data=nil)
       options = {
         provider: config[:provider],
         service:  config[:auth_service][:name]
       }
-      
+
       options[:default_session_data] = default_session_data unless default_session_data.nil?
-      
+
       klass.new(options)
     end
 
@@ -45,7 +45,7 @@ class Aviator::Test
 
       it 'can find the correct request based on bootstrapped session data' do
         response = do_auth_request
-      
+
         response.must_be_instance_of Aviator::Response
         response.request.api_version.must_equal config[:auth_service][:api_version].to_sym
       end
@@ -67,26 +67,26 @@ class Aviator::Test
             params[k] = v
           end
         end
-      
+
         response.must_be_instance_of Aviator::Response
         response.request.api_version.must_equal :v2
         response.status.must_equal 200
       end
-      
-      
+
+
       it 'can find the correct request based on non-bootstrapped session data' do
         session_data = do_auth_request.body
-        
+
         response = service.request :create_tenant, session_data: session_data do |params|
           params.name        = 'Test Project'
           params.description = 'This is a test'
           params.enabled     =  true
         end
-        
+
         response.status.must_equal 200
       end
-      
-      
+
+
       it 'uses the default session data if session data is not provided' do
         default_session_data = do_auth_request.body
         s = service(default_session_data)
@@ -96,11 +96,11 @@ class Aviator::Test
           params.description = 'This is a test'
           params.enabled     =  true
         end
-        
+
         response.status.must_equal 200
       end
-      
-      
+
+
       it 'raises a SessionDataNotProvidedError if there is no session data' do
         the_method = lambda do
           service.request :create_tenant do |params|
@@ -109,28 +109,51 @@ class Aviator::Test
             params.enabled     =  true
           end
         end
-        
+
         the_method.must_raise Aviator::Service::SessionDataNotProvidedError
         error = the_method.call rescue $!
         error.message.wont_be_nil
       end
-      
-      
+
+
       it 'accepts an endpoint type option for selecting a specific request' do
         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.request.url.wont_equal response2.request.url
       end
 
     end
     
     
-    describe '#default_session_data=' do
+    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$/) }
+                          .map{|rf| rf[1].split('/').map{|c| c.camelize }.join('::') }
+        
+        classes = request_files.map do |rf| 
+          "Aviator::#{provider_name.camelize}::#{service_name.camelize}::#{rf}".constantize
+        end
+        
+        service.request_classes.must_equal classes
+      end
       
+    end
+
+
+    describe '#default_session_data=' do
+
       it 'sets the service\'s default session data' do
         bootstrap = {
           auth_service: {
@@ -139,18 +162,18 @@ class Aviator::Test
             request:  'create_token'
           }
         }
-        
+
         svc = service(bootstrap)
 
         session_data_1 = svc.default_session_data
         session_data_2 = do_auth_request.body
-        
+
         svc.default_session_data = session_data_2
-        
+
         svc.default_session_data.wont_equal session_data_1
         svc.default_session_data.must_equal session_data_2
       end
-      
+
     end
 
   end

data/test/aviator/core/session_test.rb

@@ -99,6 +99,35 @@ class Aviator::Test
       end
       
     end
+
+
+    describe '#load' do
+      
+      it 'returns itself' do
+        session = new_session
+        session.authenticate
+        
+        str = session.dump
+        session.load(str).must_equal session
+      end
+
+      
+      it 'updates the session data of its service objects' do
+        session1 = new_session
+        session1.authenticate
+        keystone1 = session1.identity_service
+
+        session2 = new_session
+        session2.authenticate
+        keystone2 = session2.identity_service
+
+        session1.load(session2.dump)
+
+        keystone1.wont_equal keystone2
+        keystone1.default_session_data.must_equal keystone2.default_session_data
+      end
+
+    end # describe '#load'
     
     
     describe '::load' do