restful_error 0.0.10 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b3fff4f822826b410486c8fd4e0a96d93e68a360
-  data.tar.gz: d5444371ca2ab9bbd33882b9ba23ba70c7daad85
+SHA256:
+  metadata.gz: ed41c4445374dd04c3bc55400525f9e436f7adc503485be8d77faa764251d172
+  data.tar.gz: 8f9c8e4199d621f75ea4983749c728332024b0217aa5a28650b32077f035087f
 SHA512:
-  metadata.gz: 273d0f7b854eeb21a7b0041c21154f3ad71f4a99935f2192263fbde59d44cf64f1136b31fa9e160211f2e6a9d77807beca314f1011de34ff9cdf9b7879f5a816
-  data.tar.gz: 10e0c2bea56bb5e4cc85d60873234a711e409dcee8060af65a38fcca81459536560f7810f25604c677dd4843a5065f57833af5cc535d44bb51444130ac7c96bb
+  metadata.gz: b215a5616379e7efcd84d0945512b72ea757558d1d987725f5097f4c2eb3e1f8df3b5b4191c03ea5653204b6f9e56a9765012015de1e58b81a8db8359daa4c0f
+  data.tar.gz: 0d7ef8d2754453d72759e754634ef452f4f06104f6e3747bc5f7fd9ccbb1744badb98442bab74ac91ececd2021b68f96ccf0639e02364dae4029e2a8661d31f7

data/lib/restful_error/inflector.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RestfulError
+  module Inflector
+    module_function
+
+    def underscore(word_)
+      return word_.underscore if word_.respond_to?(:underscore)
+
+      word = word_.dup
+      word.gsub!("::", "/")
+      word.gsub!(/(?<=[A-Z])(?=[A-Z][a-z])|(?<=[a-z\d])(?=[A-Z])/, "_")
+      word.tr!("-", "_")
+      word.downcase!
+    end
+
+    def camelize(word_)
+      return word_.camelize if word_.respond_to?(:camelize)
+
+      word = word_.dup
+      word.sub!(/^[a-z\d]*/) { ::Regexp.last_match(0).capitalize }
+      word.gsub!(%r{(?:_|(/))([a-z\d]*)}) { "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}" }
+      word.gsub!("/", "::")
+    end
+  end
+end

data/lib/restful_error/railtie.rb

@@ -0,0 +1,31 @@
+require "abstract_controller"
+require "action_controller/metal"
+
+module RestfulError
+  class ExceptionsController < ::ActionController::Metal
+    include AbstractController::Rendering
+    include ActionView::Layouts
+
+    append_view_path File.join(File.dirname(__FILE__), "../../app/views")
+
+    def show
+      @exception = request.env["action_dispatch.exception"]
+      status = Status.new(request.path_info[1..].to_i)
+      @status_code = status.code
+      @reason_phrase = status.reason_phrase
+      @message = @exception.try(:response_message)
+      unless @message
+        class_name = @exception.class.name
+        class_key = RestfulError::Inflector.underscore(class_name)
+        @message = I18n.t class_key, default: [ status.symbol, @reason_phrase ], scope: :restful_error
+      end
+
+      self.status = status.code
+      render "restful_error/show"
+    end
+  end
+
+  def self.exceptions_app
+    ExceptionsController.action(:show)
+  end
+end

data/lib/restful_error/status.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "restful_error/inflector"
+require "rack/utils"
+
+module RestfulError
+  STATUS_CODE_TO_SYMBOL = Rack::Utils::SYMBOL_TO_STATUS_CODE.invert
+  def self.code_from(code_or_sym_or_const_name)
+    case code_or_sym_or_const_name
+    when Integer
+      code_or_sym_or_const_name
+    when Symbol
+      str = code_or_sym_or_const_name.to_s
+      sym = /[A-Z]/.match?(str[0]) ? RestfulError::Inflector.underscore(str).to_sym : code_or_sym_or_const_name
+      begin
+        Rack::Utils.status_code(sym)
+      rescue ArgumentError
+        nil
+      end
+    when /\A\d{3}\z/
+      code_from(code_or_sym_or_const_name.to_i)
+    else
+      raise ArgumentError, "Invalid argument: #{code_or_sym_or_const_name.inspect}"
+    end
+  end
+
+  Status = Data.define(:code, :reason_phrase, :symbol, :const_name) do
+    def initialize(code:)
+      reason_phrase = Rack::Utils::HTTP_STATUS_CODES[code]
+      raise ArgumentError, "Invalid status code: #{code}" unless reason_phrase
+
+      symbol = STATUS_CODE_TO_SYMBOL[code]
+      const_name = Inflector.camelize(symbol.to_s)
+      super(code:, reason_phrase:, symbol:, const_name:)
+    end
+  end
+end

data/lib/restful_error/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RestfulError
-  VERSION = "0.0.10"
+  VERSION = "1.0.1"
 end

data/lib/restful_error.rb

@@ -1,70 +1,54 @@
-require 'webrick/httpstatus'
-require 'webrick/accesslog'
+# frozen_string_literal: true
 
-RestfulError = WEBrick::HTTPStatus
+require "rack/utils"
+require "restful_error/railtie" if defined? ActionController
+require "restful_error/status"
 
-load "restful_error/version.rb"
-require 'restful_error/engine'
-require 'restful_error/wrapper'
-require 'abstract_controller'
-require 'action_controller/metal'
+I18n.load_path += Dir["#{File.expand_path("../config/locales")}/*.yml"] if defined? I18n
 
 module RestfulError
-  CodeToError.each do |_, klass|
-    code = klass::code
-    reason_phrase = klass::reason_phrase
-    klass.class_exec do
-      define_method(:status_code, ->{ code })
-      define_method(:reason_phrase, ->{ reason_phrase })
-    end
-  end
+  class BaseError < StandardError; end
 
   module Helper
     def restful
-      @restful ||= Wrapper.new(self)
+      raise NotImplementedError, "http_status must be implemented by including class" unless respond_to?(:http_status)
+
+      @restful ||= Status.new(RestfulError.code_from(http_status))
     end
   end
 
-  module ActionController
-    def render_exception(ex)
-      @exception     = ex.extend(Helper)
-      ex.restful.set_env(request.env)
-      @status_code   = ex.restful.status_code
-      @reason_phrase = ex.restful.reason_phrase
-      @message       = ex.restful.message
-
-      raise if @status_code == 500 && Rails.configuration.consider_all_requests_local
-
-      respond_to do |format|
-        format.any(:json, :xml, :html){ render 'restful_error/show', status: @status_code }
-      end
+  @cache = {}
+  class << self
+    def [](code_like)
+      code = RestfulError.code_from(code_like)
+      @cache[code] ||= build_error_class_for(code)
     end
-    def self.included(base)
-      base.rescue_from StandardError do |ex|
-        render_exception ex
-      end
-    end
-  end
 
-  class ExceptionsController < ::ActionController::Metal
-    include AbstractController::Rendering
-    include ActionView::Layouts
+    def const_missing(const_name)
+      code = RestfulError.code_from(const_name)
+      return super unless code
 
-    append_view_path File.join(File.dirname(__FILE__), '../app/views')
+      @cache[code] ||= build_error_class_for(code)
+    end
 
-    def show
-      ex = env["action_dispatch.exception"]
-      @exception     = ex.extend(Helper)
-      ex.restful.set_env(env)
-      @status_code   = ex.restful.status_code
-      @reason_phrase = ex.restful.reason_phrase
-      @message       = ex.restful.message
+    private
 
-      self.status = @status_code
-      render 'restful_error/show'
+    def build_error_class_for(code)
+      status = Status.new(code)
+      message = defined?(I18n) ? I18n.t(status.symbol, default: status.reason_phrase, scope: :restful_error) : status.reason_phrase
+      klass = Class.new(BaseError) do
+        define_method(:http_status) { status.code }
+        define_method(:restful) { status }
+        define_method(:message) { message }
+      end
+      const_set(status.const_name, klass)
+      if defined? ActionDispatch::ExceptionWrapper
+        ActionDispatch::ExceptionWrapper.rescue_responses[klass.name] = status.code
+        klass.define_singleton_method(:inherited) do |subclass|
+          ActionDispatch::ExceptionWrapper.rescue_responses[subclass.name] = status.code
+        end
+      end
+      klass
     end
   end
-  def self.exceptions_app
-    ExceptionsController.action(:show)
-  end
 end

data/spec/rack_spec.rb

@@ -1,3 +1,4 @@
+require 'action_controller'
 require 'spec_helper'
 
 describe 'RestfulError' do
@@ -11,7 +12,7 @@ describe 'RestfulError' do
         env "action_dispatch.exception", RestfulError[404].new
       end
       it do
-        get '/hoge'
+        get '/404'
         expect(last_response.status).to eq 404
       end
     end

data/spec/railtie_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "action_controller"
+require "spec_helper"
+
+RSpec.describe "RestfulError.exceptions_app" do
+  let(:app) { RestfulError.exceptions_app }
+  let(:env) { {} }
+  let(:request) { Rack::MockRequest.new(app) }
+
+  it "renders 404" do
+    env["action_dispatch.exception"] = ActionController::RoutingError.new("Not Found")
+    env["PATH_INFO"] = "/404"
+    response = request.get("/404", env)
+    expect(response.status).to eq 404
+    expect(response.body).to include "Not Found"
+  end
+end

data/spec/restful_error_spec.rb

@@ -1,24 +1,47 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 describe RestfulError do
-  it 'has a version number' do
-    expect(RestfulError::VERSION).not_to be nil
+  describe "RestfullError[404]" do
+    subject { described_class[404].new }
+
+    it do
+      expect(subject.http_status).to eq 404
+      expect(subject.restful.reason_phrase).to eq "Not Found"
+    end
   end
 
-  describe 'Wrapper' do
-    require 'active_record/errors'
-    subject { ex.extend(RestfulError::Helper) }
-    context 'with number' do
-      let(:ex){ Class.new(RestfulError[404]).new }
-      it do
-        expect(subject.restful.status_code).to eq 404
-      end
+  describe "RestfullError[:bad_request]" do
+    subject { described_class[:bad_request].new }
+
+    it do
+      expect(subject.http_status).to eq 400
+      expect(subject.restful.reason_phrase).to eq "Bad Request"
+    end
+  end
+
+  describe described_class::Forbidden do
+    subject { described_class.new }
+
+    it do
+      expect(subject.http_status).to eq 403
+      expect(subject.restful.reason_phrase).to eq "Forbidden"
     end
-    context 'with phrase' do
-      let(:ex){ Class.new(RestfulError::NotFound).new }
-      it do
-        expect(subject.restful.status_code).to eq 404
+  end
+
+  describe "custom class" do
+    subject { klass.new }
+
+    let(:klass) do
+      Class.new(StandardError) do
+        include RestfulError::Helper
+        def http_status = 404
       end
     end
+
+    it do
+      expect(subject.restful.symbol).to eq :not_found
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,6 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'restful_error'
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+
+require "debug"
+require "restful_error"

metadata

@@ -1,105 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: restful_error
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 1.0.1
 platform: ruby
 authors:
 - kuboon
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
+date: 2025-01-28 00:00:00.000000000 Z
+dependencies: []
 description: Define status_code method on your error. Views and messages are fully
   customizable on rails way.
 email:
-- ohkubo@magician.jp
+- o@kbn.one
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- app/views/restful_error/show.html.erb
-- app/views/restful_error/show.html.haml
-- app/views/restful_error/show.json.jbuilder
-- app/views/restful_error/show.xml.erb
-- config/locales/en.restful_error.yml
-- config/locales/ja.restful_error.yml
 - lib/restful_error.rb
 - lib/restful_error/engine.rb
+- lib/restful_error/inflector.rb
+- lib/restful_error/railtie.rb
+- lib/restful_error/status.rb
 - lib/restful_error/version.rb
 - lib/restful_error/wrapper.rb
-- restful_error.gemspec
 - spec/rack_spec.rb
+- spec/railtie_spec.rb
 - spec/restful_error_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/kuboon/restful_error
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,20 +42,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Define your error with status code. Raise it and you will get formatted response
   with i18nized message.
-test_files:
-- spec/rack_spec.rb
-- spec/restful_error_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,22 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.2

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in restful_error.gemspec
-gemspec

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Ohkubo KOHEI
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,119 +0,0 @@
-# RestfulError
-
-[![Join the chat at https://gitter.im/kuboon/restful_error](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/kuboon/restful_error?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-Define your error with status code. Raise it and you will get formatted response with i18nized message.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'restful_error'
-
-And then execute:
-
-    $ bundle
-
-Load the module in your controller:
-
-```ruby
-class ApplicationController < ActionController::Base
-
-  include RestfulError::ActionController
-```
-
-## Usage
-
-### Simple
-#### raise me
-```ruby
-class PostsController < ApplicationController
-  before_action do
-    raise RestfulError[401] unless current_user
-    # or
-    raise RestfulError::Unauthorized unless current_user
-  end
-end
-```
-#### Multi format response
-
-```ruby
-get '/posts/new'
-#=> render 'restful_error/show.html' with @status_code and @message
-
-post '/posts.json'
-#=> { status_code: 401, message: "Sign in required"} or write your json at 'restful_error/show.json'
-
-get '/session.xml'
-#=> "<error><status_code type="integer">401</status_code><message>Sign in required</message></error>" or write your xml at 'restful_error/show.xml'
-```
-
-#### I18n
-
-```yaml
-ja:
-  restful_error:
-    unauthorized: ログインしてください #401
-    not_found: ページが存在しません #404
-```
-
-### Advanced
-#### your custom error
-```ruby
-class ::NoSession < RestfulError[404]; end
-# or
-class ::NoSession < RestfulError::NotFound; end
-```
-#### duck typing
-```ruby
-class OAuthController < ApplicationController
-
-  # all you need is status_code
-  class RequireTwitterLogin < StandardError
-    def status_code; 401; end
-  end
-  # or
-  class RequireTwitterLogin < StandardError
-    def status_code; :unauthorized; end
-  end
-end
-```
-
-#### library defined error
-``` ruby
-config.action_dispatch.rescue_responses["CanCan::Unauthorized"] = 401
-# or
-config.action_dispatch.rescue_responses["CanCan::Unauthorized"] = :unauthorized
-```
-#### I18n
-```yaml
-ja:
-  restful_error:
-    no_session: セッションがありません
-    oauth_controller/require_twitter_login: Twitterログインが必要です
-    can_can/unauthorized: 権限がありません
-    active_record/record_not_found: 要求されたリソースが存在しません
-```
-#### custom message
-
-```ruby
-class RequireLogin < StandardError
-  def initialize(provider = 'Unknown')
-    @provider = provider
-  end
-  def status_code
-    :unauthorized
-  end
-  def status_message
-    I18n.t('restful_error.require_login', provider: provider)
-  end
-end
-```
-
-## Contributing
-
-1. Fork it ( https://github.com/kuboon/restful_error/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

data/Rakefile

@@ -1,7 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-

data/app/views/restful_error/show.html.erb

@@ -1,4 +0,0 @@
-<div class="'page_header">
-  <h1><%= @status_code %> <%= @reason_phrase %></h1>
-  <p><%= @message %></p>
-</div>

data/app/views/restful_error/show.html.haml

@@ -1,5 +0,0 @@
-.page_header
-  %h1
-    = @status_code
-    = @reason_phrase
-  %p= @message

data/app/views/restful_error/show.json.jbuilder

@@ -1,3 +0,0 @@
-json.status_code @status_code
-json.reason_phrase @reason_phrase
-json.message @message

data/app/views/restful_error/show.xml.erb

@@ -1,5 +0,0 @@
-<error>
-  <status_code><%= @status_code %></status_code>
-  <reason_phrase><%= @reason_phrase %></reason_phrase>
-  <message><%= @message %></message>
-</error>

data/config/locales/en.restful_error.yml

@@ -1,12 +0,0 @@
-ja:
-  restful_error:
-    active_record/record_not_found: Requested resource is not found
-    can_can/unauthorized: Unauthorized
-    bad_request: Bad request #400
-    unauthorized: Unauthorized #401
-    forbidden: Forbidden #403
-    not_found: Not found #404
-    method_not_allowed: Method not allowd #405
-    gone: Gone #410
-    internal_server_error: Internal server error #500
-    service_unavailable: Service unavailable #503

data/config/locales/ja.restful_error.yml

@@ -1,12 +0,0 @@
-ja:
-  restful_error:
-    active_record/record_not_found: 要求されたリソースが存在しません
-    can_can/unauthorized: 権限がありません
-    bad_request: 不正なリクエストです #400
-    unauthorized: 権限がありません #401
-    forbidden: そのURLへのアクセスは禁止されています #403
-    not_found: そのURLは存在しません #404
-    method_not_allowed: メソッドは使用できません #405
-    gone: 要求されたリソースは消滅しました #410
-    internal_server_error: サーバエラーです #500
-    service_unavailable: サービスが一時的に利用不可能になっています。しばらく時間をおいて、再度ご確認願います。 #503

data/restful_error.gemspec

@@ -1,26 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'restful_error/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "restful_error"
-  spec.version       = RestfulError::VERSION
-  spec.authors       = ["kuboon"]
-  spec.email         = ["ohkubo@magician.jp"]
-  spec.summary       = %q{Define your error with status code. Raise it and you will get formatted response with i18nized message.}
-  spec.description   = %q{Define status_code method on your error. Views and messages are fully customizable on rails way.}
-  spec.homepage      = "https://github.com/kuboon/restful_error"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency 'rails', ">= 4.1" 
-
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake", '~> 0'
-  spec.add_development_dependency "rspec", "~> 3"
-end