Flattened an extra directory from aws-sdk-resource lib path.

Also moved unit tests to matching locations.
amazon-archives · Sep 19, 2014 · ef9ae46 · ef9ae46
1 parent 2785686
commit ef9ae46
Show file tree

Hide file tree

Showing 45 changed files with 159 additions and 154 deletions.
diff --git a/aws-sdk-resources/lib/aws-sdk-resources.rb b/aws-sdk-resources/lib/aws-sdk-resources.rb
@@ -1,32 +1,33 @@
 require 'aws-sdk-core'
 
 module Aws
+  module Resources
+
+    autoload :Batch, 'aws-sdk-resources/batch'
+    autoload :Builder, 'aws-sdk-resources/builder'
+    autoload :BuilderSources, 'aws-sdk-resources/builder_sources'
+    autoload :Collection, 'aws-sdk-resources/collection'
+    autoload :Definition, 'aws-sdk-resources/definition'
+    autoload :Documenter, 'aws-sdk-resources/documenter'
+    autoload :Errors, 'aws-sdk-resources/errors'
+    autoload :Operations, 'aws-sdk-resources/operations'
+    autoload :OperationMethods, 'aws-sdk-resources/operation_methods'
+    autoload :Options, 'aws-sdk-resources/options'
+    autoload :Request, 'aws-sdk-resources/request'
+    autoload :RequestParams, 'aws-sdk-resources/request_params'
+    autoload :Resource, 'aws-sdk-resources/resource'
+    autoload :Source, 'aws-sdk-resources/source'
+    autoload :Validator, 'aws-sdk-resources/validator'
 
-  module Resource
-    autoload :Base, 'aws-sdk-resources/resource/base'
-    autoload :Batch, 'aws-sdk-resources/resource/batch'
-    autoload :Builder, 'aws-sdk-resources/resource/builder'
-    autoload :BuilderSources, 'aws-sdk-resources/resource/builder_sources'
-    autoload :Collection, 'aws-sdk-resources/resource/collection'
-    autoload :Definition, 'aws-sdk-resources/resource/definition'
-    autoload :Documenter, 'aws-sdk-resources/resource/documenter'
-    autoload :Errors, 'aws-sdk-resources/resource/errors'
-    autoload :Operations, 'aws-sdk-resources/resource/operations'
-    autoload :OperationMethods, 'aws-sdk-resources/resource/operation_methods'
-    autoload :Options, 'aws-sdk-resources/resource/options'
-    autoload :Request, 'aws-sdk-resources/resource/request'
-    autoload :RequestParams, 'aws-sdk-resources/resource/request_params'
-    autoload :Source, 'aws-sdk-resources/resource/source'
-    autoload :Validator, 'aws-sdk-resources/resource/validator'
   end
 
   service_added do |_, svc_module, options|
     definition = options[:resources]
     definition = case definition
-      when nil then Resource::Definition.new({})
-      when Resource::Definition then definition
-      when Hash then Resource::Definition.new(definition)
-      when String then Resource::Definition.new(Aws.load_json(definition), source_path: definition)
+      when nil then Resources::Definition.new({})
+      when Resources::Definition then definition
+      when Hash then Resources::Definition.new(definition)
+      when String then Resources::Definition.new(Aws.load_json(definition), source_path: definition)
       else raise ArgumentError, "invalid resource definition #{definition}"
     end
     definition.apply(svc_module)

diff --git a/...s/lib/aws-sdk-resources/resource/batch.rb → ...-resources/lib/aws-sdk-resources/batch.rb b/...s/lib/aws-sdk-resources/resource/batch.rb → ...-resources/lib/aws-sdk-resources/batch.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
 
     # A batch provides array like access to a list of resources. Batches
     # also provide the ability to invoke certain operations against

diff --git a/...lib/aws-sdk-resources/resource/builder.rb → ...esources/lib/aws-sdk-resources/builder.rb b/...lib/aws-sdk-resources/resource/builder.rb → ...esources/lib/aws-sdk-resources/builder.rb
@@ -1,7 +1,7 @@
 require 'jamespath'
 
 module Aws
-  module Resource
+  module Resources
 
     # A {Builder} construct resource objects.  It extracts resource identifiers
     # for the objects it builds from another resource object and/or an

diff --git a/...sdk-resources/resource/builder_sources.rb → .../lib/aws-sdk-resources/builder_sources.rb b/...sdk-resources/resource/builder_sources.rb → .../lib/aws-sdk-resources/builder_sources.rb
@@ -1,7 +1,7 @@
 require 'jamespath'
 
 module Aws
-  module Resource
+  module Resources
     module BuilderSources
 
       # Used by a {Builder} to extract resource identifiers from an AWS

diff --git a/.../aws-sdk-resources/resource/collection.rb → ...urces/lib/aws-sdk-resources/collection.rb b/.../aws-sdk-resources/resource/collection.rb → ...urces/lib/aws-sdk-resources/collection.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     class Collection
 
       include Enumerable
@@ -13,7 +13,7 @@ def initialize(operation, options)
         reject_limit_param(options)
       end
 
-      # @return [Enumerator<Resource::Base>]
+      # @return [Enumerator<Resource>]
       def each(&block)
         if block_given?
           batches.each { |batch| batch.each(&block) }
@@ -73,7 +73,7 @@ def batch_size(size)
       #     resources = collection.first(10)
       #     resources.delete
       #
-      # @return [Resource::Base, Resource::Batch]
+      # @return [Resource, Batch]
       def first(count = 1)
         if count == 1
           limit(1).to_a.first

diff --git a/.../aws-sdk-resources/resource/definition.rb → ...urces/lib/aws-sdk-resources/definition.rb b/.../aws-sdk-resources/resource/definition.rb → ...urces/lib/aws-sdk-resources/definition.rb
@@ -1,7 +1,7 @@
 require 'set'
 
 module Aws
-  module Resource
+  module Resources
 
     # Given a resource definition document, a {Definition} can build a set
     # of related resource classes.
@@ -36,15 +36,15 @@ def apply(namespace)
 
       def build_resource_classes(namespace)
         each_definition do |name, definition|
-          resource_class = Class.new(Base)
+          resource_class = Class.new(Resource)
           resource_class.client_class = namespace::Client
           resource_class.resource_name = name
           (definition['identifiers'] || []).each do |identifier|
             resource_class.add_identifier(underscore(identifier['name']))
           end
           namespace.const_set(name, resource_class)
           unless name == 'Resource'
-            resource_class.const_set(:Batch, Class.new(Resource::Batch))
+            resource_class.const_set(:Batch, Class.new(Batch))
           end
         end
       end
@@ -278,7 +278,7 @@ def define_reference(namespace, resource, name, definition)
       end
 
       def define_builder(namespace, definition)
-        builder = Resource::Builder.new(
+        builder = Builder.new(
           resource_class: namespace.const_get(definition['type']),
           sources: builder_sources(definition['identifiers'] || [])
         )

diff --git a/aws-sdk-resources/lib/aws-sdk-resources/documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/documenter.rb
@@ -0,0 +1,18 @@
+require 'json'
+
+module Aws
+  module Resources
+    class Documenter
+
+      autoload :BaseOperationDocumenter, 'aws-sdk-resources/documenter/base_operation_documenter'
+      autoload :DataOperationDocumenter, 'aws-sdk-resources/documenter/data_operation_documenter'
+      autoload :EnumerateDataOperationDocumenter, 'aws-sdk-resources/documenter/enumerate_data_operation_documenter'
+      autoload :EnumerateResourceOperationDocumenter, 'aws-sdk-resources/documenter/enumerate_resource_operation_documenter'
+      autoload :OperationDocumenter, 'aws-sdk-resources/documenter/operation_documenter'
+      autoload :ReferenceOperationDocumenter, 'aws-sdk-resources/documenter/reference_operation_documenter'
+      autoload :ResourceOperationDocumenter, 'aws-sdk-resources/documenter/resource_operation_documenter'
+      autoload :WaiterOperationDocumenter, 'aws-sdk-resources/documenter/waiter_operation_documenter'
+
+    end
+  end
+end
diff --git a/...e/documenter/base_operation_documenter.rb → ...s/documenter/base_operation_documenter.rb b/...e/documenter/base_operation_documenter.rb → ...s/documenter/base_operation_documenter.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     class Documenter
       class BaseOperationDocumenter
 
@@ -27,7 +27,7 @@ def initialize(yard_class, resource_class, operation_name, operation)
         # @return [YARD::CodeObject::ClassObject]
         attr_reader :yard_class
 
-        # @return [Class<Resource::Base>] Returns the resource class this
+        # @return [Class<Resource>] Returns the resource class this
         #   operation belongs to.
         attr_reader :resource_class
 
@@ -42,7 +42,7 @@ def initialize(yard_class, resource_class, operation_name, operation)
         #
         attr_reader :resource_class_name
 
-        # @return [Class<Resource::Base>,nil] Returns the class of the resource
+        # @return [Class<Resource>,nil] Returns the class of the resource
         #   returned by invoking this operation. Returns `nil` if this operation
         #   does not return any resource objects.
         attr_reader :target_resource_class
@@ -72,12 +72,12 @@ def initialize(yard_class, resource_class, operation_name, operation)
         #   This is useful for generating `@see` tags and `{links}`.
         attr_reader :called_operation
 
-        # @return [Resource::Builder,nil] Returns the resource builder for
+        # @return [Builder,nil] Returns the resource builder for
         #   this operation. Returns `nil` if this operation does not build
         #   and return resource objects.
         attr_reader :builder
 
-        # @return [Resource::Source]
+        # @return [Source]
         attr_reader :source
 
         # Constructs and returns a new YARD method object for this operation.

diff --git a/...e/documenter/data_operation_documenter.rb → ...s/documenter/data_operation_documenter.rb b/...e/documenter/data_operation_documenter.rb → ...s/documenter/data_operation_documenter.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     class Documenter
       class DataOperationDocumenter < BaseOperationDocumenter
 

diff --git a/...er/enumerate_data_operation_documenter.rb → ...er/enumerate_data_operation_documenter.rb b/...er/enumerate_data_operation_documenter.rb → ...er/enumerate_data_operation_documenter.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     class Documenter
       class EnumerateDataOperationDocumenter < BaseOperationDocumenter
 

diff --git a/...numerate_resource_operation_documenter.rb → ...numerate_resource_operation_documenter.rb b/...numerate_resource_operation_documenter.rb → ...numerate_resource_operation_documenter.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     class Documenter
       class EnumerateResourceOperationDocumenter < BaseOperationDocumenter
 

diff --git a/...source/documenter/operation_documenter.rb → ...ources/documenter/operation_documenter.rb b/...source/documenter/operation_documenter.rb → ...ources/documenter/operation_documenter.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     class Documenter
       class OperationDocumenter < BaseOperationDocumenter
 

diff --git a/...umenter/reference_operation_documenter.rb → ...umenter/reference_operation_documenter.rb b/...umenter/reference_operation_documenter.rb → ...umenter/reference_operation_documenter.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     class Documenter
       class ReferenceOperationDocumenter < BaseOperationDocumenter
 

diff --git a/...cumenter/resource_operation_documenter.rb → ...cumenter/resource_operation_documenter.rb b/...cumenter/resource_operation_documenter.rb → ...cumenter/resource_operation_documenter.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     class Documenter
       class ResourceOperationDocumenter < BaseOperationDocumenter
 

diff --git a/...documenter/waiter_operation_documenter.rb → ...documenter/waiter_operation_documenter.rb b/...documenter/waiter_operation_documenter.rb → ...documenter/waiter_operation_documenter.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     class Documenter
       class WaiterOperationDocumenter < BaseOperationDocumenter
 

diff --git a/.../lib/aws-sdk-resources/resource/errors.rb → ...resources/lib/aws-sdk-resources/errors.rb b/.../lib/aws-sdk-resources/resource/errors.rb → ...resources/lib/aws-sdk-resources/errors.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     module Errors
 
       class UnknownOperationError < ArgumentError

diff --git a/...k-resources/resource/operation_methods.rb → ...ib/aws-sdk-resources/operation_methods.rb b/...k-resources/resource/operation_methods.rb → ...ib/aws-sdk-resources/operation_methods.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     module OperationMethods
 
       # @param [Symbol] name

diff --git a/.../aws-sdk-resources/resource/operations.rb → ...urces/lib/aws-sdk-resources/operations.rb b/.../aws-sdk-resources/resource/operations.rb → ...urces/lib/aws-sdk-resources/operations.rb
@@ -1,7 +1,7 @@
 require 'jamespath'
 
 module Aws
-  module Resource
+  module Resources
     module Operations
 
       # Base class for operations. An operation is any object that responds
@@ -22,7 +22,7 @@ def initialize(options = {})
         # @return [Source, nil]
         attr_reader :source
 
-        # @option options[required,Resource::Base] :resource
+        # @option options[required,Resource] :resource
         # @option options[required,Array<Mixed>] :args
         # @option options[Proc] :block
         # @return [Mixed]
@@ -258,7 +258,7 @@ def initialize(options = {})
         # @return [String<JMESPathExpression>, nil]
         attr_reader :path
 
-        # @option options [required,Resource::Base] :resource
+        # @option options [required,Resource] :resource
         # @option options [required,Array<Mixed>] :args
         def call(options, &block)
 

diff --git a/...lib/aws-sdk-resources/resource/options.rb → ...esources/lib/aws-sdk-resources/options.rb b/...lib/aws-sdk-resources/resource/options.rb → ...esources/lib/aws-sdk-resources/options.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     module Options
 
       private

diff --git a/...lib/aws-sdk-resources/resource/request.rb → ...esources/lib/aws-sdk-resources/request.rb b/...lib/aws-sdk-resources/resource/request.rb → ...esources/lib/aws-sdk-resources/request.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     class Request
 
       # @option opitons [requried, String] :method_name
@@ -17,7 +17,7 @@ def initialize(options = {})
       # @return [Array<RequestParams::Param>]
       attr_reader :params
 
-      # @option options [required,Resource::Base] :resource
+      # @option options [required,Resource] :resource
       # @option options [Array<Mixed>] :args
       # @return [Seahorse::Client::Response]
       def call(options)

diff --git a/...-sdk-resources/resource/request_params.rb → ...s/lib/aws-sdk-resources/request_params.rb b/...-sdk-resources/resource/request_params.rb → ...s/lib/aws-sdk-resources/request_params.rb
@@ -1,5 +1,5 @@
 module Aws
-  module Resource
+  module Resources
     module RequestParams
 
       # @api private
@@ -10,7 +10,7 @@ def initialize(params)
           @params = params
         end
 
-        # @option options [required,Resource::Base] :resource
+        # @option options [required,Resource] :resource
         # @option options [required,Array<Mixed>] :args
         # @return [Hash]
         def build(options = {})

diff --git a/...es/lib/aws-sdk-resources/resource/base.rb → ...sources/lib/aws-sdk-resources/resource.rb b/...es/lib/aws-sdk-resources/resource/base.rb → ...sources/lib/aws-sdk-resources/resource.rb
@@ -1,12 +1,12 @@
 module Aws
-  module Resource
-    class Base
+  module Resources
+    class Resource
 
       extend OperationMethods
 
       # @overload initialize(options = {})
       # @overload initialize(*identifiers, options = {})
-      # @option options [Seahorse::Client::Base] :client
+      # @option options [Client] :client
       def initialize(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         @identifiers = extract_identifiers(args, options)
@@ -15,7 +15,7 @@ def initialize(*args)
       end
 
       # Marked private to prevent double documentation
-      # @return [Seahorse::Client::Base]
+      # @return [Client]
       attr_reader :client
 
       # Marked private to prevent double documentation
@@ -87,7 +87,7 @@ class << self
         # @return [String, nil] The resource name.
         attr_accessor :resource_name
 
-        # @return [Class<Seahorse::Client::Base>, nil] When constructing
+        # @return [Class<Client>, nil] When constructing
         #   a resource, the client will default to an instance of the
         #   this class.
         attr_accessor :client_class

diff --git a/aws-sdk-resources/lib/aws-sdk-resources/resource/documenter.rb b/aws-sdk-resources/lib/aws-sdk-resources/resource/documenter.rb
diff --git a/.../lib/aws-sdk-resources/resource/source.rb → ...resources/lib/aws-sdk-resources/source.rb b/.../lib/aws-sdk-resources/resource/source.rb → ...resources/lib/aws-sdk-resources/source.rb
@@ -1,7 +1,7 @@
 require 'json'
 
 module Aws
-  module Resource
+  module Resources
     class Source
 
       def initialize(definition, file = nil)