apill 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83d6429288497499ef52987e7f8f9a5c8d8c7f6c
-  data.tar.gz: a07b1f22022080022b72665a07b212c58aba56d4
+  metadata.gz: c80e6572755af69fbfa5998dabbf1231921a72c9
+  data.tar.gz: 2727edeb979c451907dbd1e3ef15cc1bf4fb98b5
 SHA512:
-  metadata.gz: 80896fdee5a9fd08bf3ba02449d54d481415ccb6fa82424312fa3aaa329bcaf1492ac14d93f4f7bca224cbe7cc78f2da21210f5e07b9992887dfcce8d6f3bb3d
-  data.tar.gz: 875abc5d8d8999fe9e649f2fde48305c2f822ecdc820ba2aad2c7f8d79aa906eb69b9a135bfb3129d8ff55458be3f294ba20d53dad75727111786c5de8641acf
+  metadata.gz: a92ed1e2312cfca05317328b48c3e5e5b8bd93c2c246aefed7f479775744b9ab1ca31ea24d74d7a4de0c4421ac31848b50838089449f3ce503f80da441963ca1
+  data.tar.gz: 5c6262450fcbd115923654bd86658e0378d566c98bdb46620df70f45129827e40aab6f74f86aba553217c1f8d56eb181a1e70614f4670be050e28c7d0ace3004

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/lib/apill/accept_header.rb

@@ -43,7 +43,7 @@ class   AcceptHeader
   end
 
   def version_format
-    "\\d+(?:\\.\\d+){0,2}(?:beta(?:\\d*))?"
+    '\\d+(?:\\.\\d+){0,2}(?:beta(?:\\d*))?'
   end
 end
 end

data/lib/apill/errors/invalid_api_request_error.rb

@@ -10,7 +10,8 @@ class   InvalidApiRequestError < HumanError::Errors::RequestError
   end
 
   def developer_message
-    'The accept header that you passed in the request cannot be parsed, please refer to the documentation to verify.'
+    'The accept header that you passed in the request cannot be parsed, ' \
+    'please refer to the documentation to verify.'
   end
 
   def developer_details

data/lib/apill/matchers/generic_matcher.rb

@@ -9,7 +9,7 @@ module  GenericMatcher
 
   def initialize(**args)
     args.each do |variable, value|
-      self.send("#{variable}=", value)
+      send("#{variable}=", value)
     end
   end
 

data/lib/apill/middleware/api_request.rb

@@ -1,7 +1,6 @@
-require 'json'
 require 'apill/configuration'
 require 'apill/matchers/subdomain_matcher'
-require 'apill/matchers/invalid_api_request_matcher'
+require 'apill/matchers/accept_header_matcher'
 require 'apill/responses/invalid_api_request_response'
 require 'apill/responses/invalid_subdomain_response'
 

data/lib/apill/mixins/pageable.rb

@@ -0,0 +1,51 @@
+module  Apill
+module  Mixins
+module  Pageable
+  module ClassMethods
+    def paginate(model)
+      define_method(:paginated_model_name) do
+        model
+      end
+    end
+  end
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  private
+
+  def filtered_resource
+    @filtered_resource ||= begin
+      page_number    = params[:page]
+      items_per_page = params[:per_page]
+
+      resource = if defined? super
+                   super
+                 else
+                   send(paginated_model_name)
+                 end
+
+      resource.
+        page(page_number).
+        per(items_per_page)
+    end
+  end
+
+  def filter_data
+    filter_data = defined?(super) ? super : {}
+
+    filter_data.merge(pagination_data)
+  end
+
+  def pagination_data
+    {
+      total_pages:   filtered_resource.total_pages,
+      current_page:  filtered_resource.current_page,
+      previous_page: filtered_resource.prev_page,
+      next_page:     filtered_resource.next_page,
+    }
+  end
+end
+end
+end

data/lib/apill/mixins/queryable.rb

@@ -0,0 +1,54 @@
+module Apill
+module Mixins
+module Queryable
+  module ClassMethods
+    def query(model)
+      define_method(:queryed_model_name) do
+        model
+      end
+    end
+  end
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  private
+
+  def filtered_resource
+    @filtered_resource ||= begin
+      resource = if defined? super
+                   super
+                 else
+                   send(queryed_model_name)
+                 end
+
+      sanitized_query_params.reduce(resource) do |query_resource, query_param|
+        key, value = query_param
+
+        query_resource.public_send(query_method_name_for(key, query_resource), value)
+      end
+    end
+  end
+
+  def query_params
+    @query_params ||= params.fetch(:query_params, {})
+  end
+
+  def sanitized_query_params
+    query_attrs = respond_to?(:queryable_attributes) ? queryable_attributes : {}
+
+    query_params.
+    slice(*query_attrs)
+  end
+
+  def query_method_name_for(query_item, resource)
+    if resource.respond_to? "for_#{query_item}"
+      "for_#{query_item}"
+    elsif resource.respond_to? query_item
+      query_item
+    end
+  end
+end
+end
+end

data/lib/apill/mixins/sortable.rb

@@ -0,0 +1,49 @@
+module  Apill
+module  Mixins
+module  Sortable
+  module ClassMethods
+    def sort(model)
+      define_method(:sorted_model_name) do
+        model
+      end
+    end
+  end
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  private
+
+  def filtered_resource
+    @filtered_resource ||= begin
+      resource = if defined? super
+                   super
+                 else
+                   send(sorted_model_name)
+                 end
+
+      resource.
+        order(sorting_arguments)
+    end
+  end
+
+  def sorting_arguments
+    sorting_data.values.join(' ')
+  end
+
+  def filter_data
+    filter_data = defined?(super) ? super : {}
+
+    filter_data.merge(sorting_data)
+  end
+
+  def sorting_data
+    {
+      sort:      params.fetch(:sort,      'created_at'),
+      direction: params.fetch(:direction, 'DESC'),
+    }
+  end
+end
+end
+end

data/lib/apill/requests/base.rb

@@ -19,8 +19,6 @@ class   Base
     end
   end
 
-  private
-
   def self.rails_request_class
     require 'apill/requests/rails_request'
 

data/lib/apill/requests/rack_request.rb

@@ -5,7 +5,7 @@ require 'apill/accept_header'
 module  Apill
 module  Requests
 class   RackRequest < Base
-  ACCEPT_PARAM_PATTERN = %r{(?:\A|&)accept=(.+?)(?=\z|&)}
+  ACCEPT_PARAM_PATTERN = /(?:\A|&)accept=(.+?)(?=\z|&)/
 
   attr_accessor :request
 

data/lib/apill/responses/invalid_api_request_response.rb

@@ -9,7 +9,7 @@ class   InvalidApiRequestResponse
     [
       error.http_status,  # HTTP Status Code
       {},                 # Response Headers
-      [ error.to_json ],  # Message
+      [error.to_json],  # Message
     ]
   end
 end

data/lib/apill/responses/invalid_subdomain_response.rb

@@ -9,7 +9,7 @@ class   InvalidSubdomainResponse
     [
       error.http_status,  # HTTP Status Code
       {},                 # Response Headers
-      [ error.to_json ],  # Message
+      [error.to_json],  # Message
     ]
   end
 end

data/lib/apill/version.rb

@@ -1,3 +1,3 @@
 module Apill
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/lib/apill.rb

@@ -1,10 +1,14 @@
+require 'kaminari'
+
 require 'apill/version'
 
 require 'apill/configuration'
 require 'apill/matchers/accept_header_matcher'
-require 'apill/matchers/invalid_api_request_matcher'
 require 'apill/matchers/subdomain_matcher'
 require 'apill/matchers/version_matcher'
+require 'apill/mixins/sortable'
+require 'apill/mixins/queryable'
+require 'apill/mixins/pageable'
 
 require 'apill/middleware/api_request'
 

data/spec/apill/accept_header_spec.rb

@@ -4,101 +4,103 @@ require 'apill/accept_header'
 module    Apill
 describe  AcceptHeader do
   it 'can validate an accept header with all the pieces of information' do
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/vnd.matrix+zion;version=1.0.0')
+    header = AcceptHeader.new(application: 'matrix',
+                              header:      'application/vnd.matrix+zion;version=1.0.0')
 
     expect(header).to be_valid
   end
 
   it 'does not validate an accept header without passing an application' do
-    header = AcceptHeader.new(application:  '',
-                              header:       'application/vnd.matrix+zion;version=1.0.0')
+    header = AcceptHeader.new(application: '',
+                              header:      'application/vnd.matrix+zion;version=1.0.0')
 
     expect(header).not_to be_valid
   end
 
   it 'does not validate an accept header if it is not passed in' do
-    header = AcceptHeader.new(application:  '',
-                              header:       '')
+    header = AcceptHeader.new(application: '',
+                              header:      '')
 
     expect(header).not_to be_valid
 
-    header = AcceptHeader.new(application:  '',
-                              header:       nil)
+    header = AcceptHeader.new(application: '',
+                              header:      nil)
 
     expect(header).not_to be_valid
   end
 
   it 'does not validate an accept header without an application in the header' do
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/vnd.+zion;version=1.0.0')
+    header = AcceptHeader.new(application: 'matrix',
+                              header:      'application/vnd.+zion;version=1.0.0')
 
     expect(header).not_to be_valid
 
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/+zion;version=1.0.0')
+    header = AcceptHeader.new(application: 'matrix',
+                              header:      'application/+zion;version=1.0.0')
 
     expect(header).not_to be_valid
 
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/matrix+zion;version=1.0.0')
+    header = AcceptHeader.new(application: 'matrix',
+                              header:      'application/matrix+zion;version=1.0.0')
 
     expect(header).not_to be_valid
   end
 
   it 'does not validate an accept header with an invalid version' do
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/vnd.matrix+zion;version=10..0')
+    header = AcceptHeader.new(application: 'matrix',
+                              header:      'application/vnd.matrix+zion;version=10..0')
 
     expect(header).not_to be_valid
 
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/vnd.matrix+zion;version=neo')
+    header = AcceptHeader.new(application: 'matrix',
+                              header:      'application/vnd.matrix+zion;version=neo')
 
     expect(header).not_to be_valid
 
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/vnd.matrix+zion;version=')
+    header = AcceptHeader.new(application: 'matrix',
+                              header:      'application/vnd.matrix+zion;version=')
 
     expect(header).not_to be_valid
 
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/vnd.matrix+zion;10.0')
+    header = AcceptHeader.new(application: 'matrix',
+                              header:      'application/vnd.matrix+zion;10.0')
 
     expect(header).not_to be_valid
   end
 
   it 'does validate an accept header even with a missing content type' do
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/vnd.matrix;version=10.0')
+    header = AcceptHeader.new(application: 'matrix',
+                              header:      'application/vnd.matrix;version=10.0')
 
     expect(header).to be_valid
   end
 
   it 'does validate an accept header with only the minimal information' do
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/vnd.matrix')
+    header = AcceptHeader.new(application: 'matrix',
+                              header:      'application/vnd.matrix')
 
     expect(header).to be_valid
   end
 
   it 'does validate an accept header with only a content type but no version' do
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/vnd.matrix+zion')
+    header = AcceptHeader.new(application: 'matrix',
+                              header:      'application/vnd.matrix+zion')
 
     expect(header).to be_valid
   end
 
   it 'can extract version information from an accept header' do
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/vnd.matrix+zion;version=10.0.0beta1')
+    header = AcceptHeader.new(
+              application: 'matrix',
+              header:      'application/vnd.matrix+zion;version=10.0.0beta1')
 
     expect(header.version).to eql '10.0.0beta1'
   end
 
   it 'can extract the content type from an accept header' do
-    header = AcceptHeader.new(application:  'matrix',
-                              header:       'application/vnd.matrix+zion;version=10.0.0beta1')
+    header = AcceptHeader.new(
+              application: 'matrix',
+              header:      'application/vnd.matrix+zion;version=10.0.0beta1')
 
     expect(header.content_type).to eql 'zion'
   end

data/spec/apill/errors/invalid_api_request_error_spec.rb

@@ -19,7 +19,9 @@ describe  InvalidApiRequestError do
   end
 
   it 'can output the developer message' do
-    expect(error.developer_message).to eql 'The accept header that you passed in the request cannot be parsed, please refer to the documentation to verify.'
+    expect(error.developer_message).to eql 'The accept header that you passed in the ' \
+                                           'request cannot be parsed, please refer to ' \
+                                           'the documentation to verify.'
   end
 
   it 'can output the developer details' do
@@ -29,7 +31,8 @@ describe  InvalidApiRequestError do
   end
 
   it 'can output the friendly message' do
-    expect(error.friendly_message).to eql "Sorry! We couldn't understand what you were trying to ask us to do."
+    expect(error.friendly_message).to eql "Sorry! We couldn't understand what you were " \
+                                          'trying to ask us to do.'
   end
 end
 end

data/spec/apill/invalid_subdomain_response_spec.rb

@@ -27,17 +27,20 @@ describe  InvalidSubdomainResponse do
               '"developer_documentation_uri":"http://error.com/1010?version=1",' \
               '"customer_support_uri":"http://knowledge.com/1234567890",' \
               '"developer_message_key":"errors.invalid.subdomain.error.developer",' \
-              '"developer_message":"The resource you attempted to access is either not authorized for the authenticated user or does not exist.",' \
+              '"developer_message":"The resource you attempted to access is either not ' \
+                                   'authorized for the authenticated user or does not ' \
+                                   'exist.",' \
               '"developer_details":' \
                 '{' \
                   '"http_host":"api.example.com"' \
                 '},' \
               '"friendly_message_key":"errors.invalid.subdomain.error.friendly",' \
-              '"friendly_message":"Sorry! The resource you tried to access does not exist."' \
+              '"friendly_message":"Sorry! The resource you tried to access does not ' \
+                                  'exist."' \
             '}' \
-          '}'
-        ]
-      ]
+          '}',
+        ],
+      ],
     )
   end
 end

data/spec/apill/matchers/accept_header_matcher_spec.rb

@@ -32,7 +32,8 @@ describe  AcceptHeaderMatcher do
      'secondary parameter' do
 
     request = {
-      'QUERY_STRING'            => 'first=my_param&accept=application/vnd.matrix+zion;version=1.0.0',
+      'QUERY_STRING'            => 'first=my_param&accept=application/vnd.matrix+zion;' \
+                                   'version=1.0.0',
       'HTTP_X_APPLICATION_NAME' => 'matrix',
     }
 

data/spec/apill/middleware/api_request_spec.rb

@@ -4,7 +4,7 @@ require 'apill/middleware/api_request'
 module    Apill
 module    Middleware
 describe  ApiRequest do
-  let(:app) { lambda { |env| [200, {}, 'response'] } }
+  let(:app) { ->(_env) { [200, {}, 'response'] } }
 
   before(:each) do
     HumanError.configure do |config|
@@ -23,9 +23,9 @@ describe  ApiRequest do
     api_request_middleware = ApiRequest.new(app)
 
     request = {
-      'HTTP_HOST'               => 'notvalid.example.com',
-      'HTTP_ACCEPT'             => '',
-      'QUERY_STRING'            => 'first=my_param&accept=application/vnd.silent+zion;version=1.0.0',
+      'HTTP_HOST'    => 'notvalid.example.com',
+      'HTTP_ACCEPT'  => '',
+      'QUERY_STRING' => 'first=my_param&accept=application/vnd.silent+zion;version=1.0.0',
     }
 
     status, headers, response = api_request_middleware.call(request)
@@ -42,16 +42,19 @@ describe  ApiRequest do
             '"developer_documentation_uri":"http://error.com/1010?version=1",' \
             '"customer_support_uri":"http://knowledge.com/1234567890",' \
             '"developer_message_key":"errors.invalid.subdomain.error.developer",' \
-            '"developer_message":"The resource you attempted to access is either not authorized for the authenticated user or does not exist.",' \
+            '"developer_message":"The resource you attempted to access is either not ' \
+                                 'authorized for the authenticated user or does not ' \
+                                 'exist.",' \
             '"developer_details":' \
               '{' \
                 '"http_host":"notvalid.example.com"' \
               '},' \
             '"friendly_message_key":"errors.invalid.subdomain.error.friendly",' \
-            '"friendly_message":"Sorry! The resource you tried to access does not exist."' \
+            '"friendly_message":"Sorry! The resource you tried to access does not ' \
+                                'exist."' \
           '}' \
-        '}'
-      ]
+        '}',
+      ],
     )
   end
 
@@ -61,9 +64,9 @@ describe  ApiRequest do
     api_request_middleware = ApiRequest.new(app)
 
     request = {
-      'HTTP_HOST'               => 'api.example.com',
-      'HTTP_ACCEPT'             => '',
-      'QUERY_STRING'            => 'first=my_param&accept=application/vnd.silent+zion;version=1.0.0',
+      'HTTP_HOST'    => 'api.example.com',
+      'HTTP_ACCEPT'  => '',
+      'QUERY_STRING' => 'first=my_param&accept=application/vnd.silent+zion;version=1.0.0',
     }
 
     status, headers, response = api_request_middleware.call(request)
@@ -80,16 +83,19 @@ describe  ApiRequest do
             '"developer_documentation_uri":"http://error.com/1007?version=1",' \
             '"customer_support_uri":"http://knowledge.com/1234567890",' \
             '"developer_message_key":"errors.invalid.api.request.error.developer",' \
-            '"developer_message":"The accept header that you passed in the request cannot be parsed, please refer to the documentation to verify.",' \
+            '"developer_message":"The accept header that you passed in the request ' \
+                                 'cannot be parsed, please refer to the documentation ' \
+                                 'to verify.",' \
             '"developer_details":' \
               '{' \
                 '"accept_header":""' \
               '},' \
             '"friendly_message_key":"errors.invalid.api.request.error.friendly",' \
-            '"friendly_message":"Sorry! We couldn\'t understand what you were trying to ask us to do."' \
+            '"friendly_message":"Sorry! We couldn\'t understand what you were trying ' \
+                                'to ask us to do."' \
           '}' \
-        '}'
-      ]
+        '}',
+      ],
     )
   end
 
@@ -97,9 +103,9 @@ describe  ApiRequest do
     api_request_middleware = ApiRequest.new(app)
 
     request = {
-      'HTTP_HOST'               => 'api.example.com',
-      'HTTP_ACCEPT'             => 'application/vnd.matrix+zion;version=1.0.0',
-      'QUERY_STRING'            => 'first=my_param&accept=application/vnd.matrix+zion;version=1.0.0',
+      'HTTP_HOST'    => 'api.example.com',
+      'HTTP_ACCEPT'  => 'application/vnd.matrix+zion;version=1.0.0',
+      'QUERY_STRING' => 'first=my_param&accept=application/vnd.matrix+zion;version=1.0.0',
     }
 
     status, headers, response = api_request_middleware.call(request)

data/spec/apill/requests/rack_request_spec.rb

@@ -45,8 +45,8 @@ describe  RackRequest do
     Apill.configuration.application_name = 'zion'
 
     raw_request = {
-      'HTTP_ACCEPT'             => '',
-      'QUERY_STRING'            => 'accept=application/vnd.zion+zion;version=10.0',
+      'HTTP_ACCEPT'  => '',
+      'QUERY_STRING' => 'accept=application/vnd.zion+zion;version=10.0',
     }
     request     = RackRequest.new(raw_request)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apill
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - jfelchner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: human_error
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -82,10 +96,12 @@ files:
 - lib/apill/errors/invalid_subdomain_error.rb
 - lib/apill/matchers/accept_header_matcher.rb
 - lib/apill/matchers/generic_matcher.rb
-- lib/apill/matchers/invalid_api_request_matcher.rb
 - lib/apill/matchers/subdomain_matcher.rb
 - lib/apill/matchers/version_matcher.rb
 - lib/apill/middleware/api_request.rb
+- lib/apill/mixins/pageable.rb
+- lib/apill/mixins/queryable.rb
+- lib/apill/mixins/sortable.rb
 - lib/apill/requests/base.rb
 - lib/apill/requests/rack_request.rb
 - lib/apill/requests/rails_request.rb
@@ -97,7 +113,6 @@ files:
 - spec/apill/errors/invalid_subdomain_error_spec.rb
 - spec/apill/invalid_subdomain_response_spec.rb
 - spec/apill/matchers/accept_header_matcher_spec.rb
-- spec/apill/matchers/invalid_api_request_matcher_spec.rb
 - spec/apill/matchers/subdomain_matcher_spec.rb
 - spec/apill/matchers/version_matcher_spec.rb
 - spec/apill/middleware/api_request_spec.rb
@@ -123,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Common API functionality
@@ -133,7 +148,6 @@ test_files:
 - spec/apill/errors/invalid_subdomain_error_spec.rb
 - spec/apill/invalid_subdomain_response_spec.rb
 - spec/apill/matchers/accept_header_matcher_spec.rb
-- spec/apill/matchers/invalid_api_request_matcher_spec.rb
 - spec/apill/matchers/subdomain_matcher_spec.rb
 - spec/apill/matchers/version_matcher_spec.rb
 - spec/apill/middleware/api_request_spec.rb

data/lib/apill/matchers/invalid_api_request_matcher.rb

@@ -1,11 +0,0 @@
-require 'apill/matchers/accept_header_matcher'
-
-module  Apill
-module  Matchers
-class   InvalidApiRequestMatcher < AcceptHeaderMatcher
-  def matches?(request)
-    !super
-  end
-end
-end
-end

data/spec/apill/matchers/invalid_api_request_matcher_spec.rb

@@ -1,21 +0,0 @@
-require 'ostruct'
-require 'rspectacular'
-require 'apill/matchers/invalid_api_request_matcher'
-
-module    Apill
-module    Matchers
-describe  InvalidApiRequestMatcher do
-  it 'is the inverse of whether the accept header matches' do
-    request = {
-      'HTTP_HOST'               => 'api.example.com',
-      'HTTP_ACCEPT'             => 'application/vnd.matrix+zion;version=1.0.0',
-      'HTTP_X_APPLICATION_NAME' => 'matrix',
-    }
-
-    matcher = InvalidApiRequestMatcher.new
-
-    expect(matcher.matches?(request)).to be_a FalseClass
-  end
-end
-end
-end