light_resizer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b714088c4264d928eb641b3606d016cea6aef7f
-  data.tar.gz: b6d370e74c2d727093afacb90c83cf1c0d10ba53
+  metadata.gz: c5e96f10cbc75a2c4f51fe257b25a9b33285d79a
+  data.tar.gz: 5bcdb15b74a9af11c1b3f7ef8df6dff97ec7c177
 SHA512:
-  metadata.gz: 17ee6e40bdd572258ab8b8874697b96787ce44a09e2ddd988922f2c7aec9f9363d2aae7180836b3ce5d6af78a85ba858f0c29694cb2d8fd74a805fd0efbcde3d
-  data.tar.gz: d81e8d8a9a19099124ad5ac07ad5e45327e60987c5ac2508ffbd9e67a9e83767e31bed160da0ea75ef9d4386929d442597e3926a1ff8eb361dbcf7b3eee3727a
+  metadata.gz: 6e0565d872d65fe21da6fbaab44208d9b5c347f64c58250acdc8a6a70fa264d1bd00606da62dac1fb763c9010be3b181e4c75f816bea22e5e4c6c9c21b267876
+  data.tar.gz: 22bf31bc915d97b05fde9db94fa5d903860fbba7b95b2e931190be791d74787d9fd96e5f400a7f50c680b869892241f3621bcbaaea72df8007972daf8c8556dc

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/.idea/

data/.travis.yml

@@ -0,0 +1,10 @@
+bundler_args: --without dev
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+
+branches:
+  only:
+    - master
+script: xvfb-run rspec

data/Gemfile

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

data/README.md

@@ -1,4 +1,7 @@
 light-resizer
 =============
 
+[![Build Status](https://travis-ci.org/Rademade/light_resizer.svg?branch=master)](https://travis-ci.org/Rademade/light_resizer)
+
 Rack middleware for image resizer. Can be integrated with CarrierWave.
+

data/lib/light_resizer/carrierwave_resize.rb

@@ -1,7 +1,12 @@
 module LightResizer
   module CarrierWaveResize
     def resize(width, height)
-      start = "/image/#{width}x#{height}"
+      start = "/resize_image/#{width}x#{height}"
+      File.join(start, url)
+    end
+
+    def resize_crop(width, height)
+      start = "/resize_image_crop/#{width}x#{height}"
       File.join(start, url)
     end
   end

data/lib/light_resizer/image_loader/original_image.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+module LightResizer
+  class ImageLoader
+    class OriginalImage
+
+      attr_accessor :relative_path
+
+      def initialize(root_dir)
+        @root_dir = root_dir
+      end
+
+      # Full original image path /{root}/some_dir/image.png
+      def full_path
+        File.join(@root_dir, relative_path)
+      end
+
+      # Absolute store /{root}/some_dir
+      def dir_path
+        File.dirname( full_path ).to_s
+      end
+
+      # Requested filename /image.png
+      def filename
+        File.basename( full_path ).to_s
+      end
+
+      # Relative file store dir /some_dir/
+      def relative_dir
+        dir_path.gsub(@root_dir, '')
+      end
+
+      # {Bool} original image exist
+      def image_exist?
+        File.exist? full_path
+      end
+
+    end
+  end
+end

data/lib/light_resizer/image_loader/resize_image.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+module LightResizer
+  class ImageLoader
+    class ResizeImage
+
+      STORE_RESIZE_DIR = 'resize' #todo move to config option
+
+      attr_accessor :original_filename, :original_relative_dir, :resize_prefix
+
+      def initialize(root_dir)
+        @root_dir = root_dir
+      end
+
+      def resize_prefix_dir
+        STORE_RESIZE_DIR
+      end
+
+      # Resized file name '150x150_image.png'
+      def filename
+        resize_prefix + '_' + original_filename
+      end
+
+      # Relative resize image path '/some_dir/resize/150x150_image.png'
+      def relative_path
+        File.join(original_relative_dir, STORE_RESIZE_DIR, filename)
+      end
+
+      # Absolute image path
+      def full_path
+        File.join(@root_dir, relative_path)
+      end
+
+      # Absolute resize path {root}/some_dir/resize
+      def dir_path
+        File.dirname full_path
+      end
+
+      # {Bool} returns true if resize dir exist?
+      def dir_exist?
+        Dir.exist? dir_path
+      end
+
+      # {Bool} returns true if resize image exist?
+      def image_exist?
+        File.exist? full_path
+      end
+
+    end
+  end
+end

data/lib/light_resizer/image_loader.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+require 'light_resizer/image_loader/original_image'
+require 'light_resizer/image_loader/resize_image'
+
+module LightResizer
+  class ImageLoader
+
+    attr_reader :original, :resized
+
+    def initialize(root_dir)
+      @original = ImageLoader::OriginalImage.new(root_dir)
+      @resized = ImageLoader::ResizeImage.new(root_dir)
+    end
+
+    def original_image_path=(path)
+      #todo refresh @original image
+      @original.relative_path = path
+    end
+
+    def resize_prefix=(prefix)
+      #todo clear resize prefix
+      @resized.original_filename = @original.filename
+      @resized.original_relative_dir = @original.relative_dir
+      @resized.resize_prefix = prefix
+    end
+
+    def original_path
+      @original.full_path
+    end
+
+    def original_image_exist?
+      @original.image_exist?
+    end
+
+    def resize_path
+      @resized.full_path
+    end
+
+    def resized_image_relative_path
+      @resized.relative_path
+    end
+
+    def resized_image_exist?
+      @resized.image_exist?
+    end
+
+  end
+end

data/lib/light_resizer/middleware/path.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+module LightResizer
+  class Middleware
+    class Path
+
+      attr_reader :request_path
+
+      def request_path=(path)
+        @request_path = path
+        @segments = nil
+      end
+
+      # {Bool} returns true if request path begins with 'image'
+      def image_path?
+        segments[1].start_with?('resize_image')
+      end
+
+
+      # {Bool} returns true if image should be croped on resize
+      def crop_path?
+        segments[1].end_with?('crop')
+      end
+
+      # {String} last part of request – relative path
+      def image_path
+        '/' + segments[3..-1].join('/')
+      end
+
+      # {Array} returns required dimensions of image. Like a 200x200
+      def dimensions
+        #todo validate params!
+        segments[2]
+      end
+
+      # {String} returns prefix of resized image name
+      # image.png => 200x200_crop_image.png
+      def prefix
+        crop_prefix = crop_path? ? '_crop' : ''
+
+        dimensions + crop_prefix
+      end
+
+      def segments
+        @segments ||= request_path.split('/')
+      end
+
+    end
+  end
+end

data/lib/light_resizer/middleware/resizer.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+module LightResizer
+  class Middleware
+    class Resizer
+
+      def resize(dimensions, original_path, resize_path, crop)
+        check_resized_dir(resize_path)
+        store_image(dimensions, original_path, resize_path, crop)
+      end
+
+      private
+      def check_resized_dir(resize_path)
+        dir_name = File.dirname resize_path
+        Dir.mkdir dir_name unless Dir.exist? dir_name
+        #todo permissions?
+      end
+
+      def store_image(dimensions, original_path, resize_path, crop)
+        @image = MiniMagick::Image.open original_path
+
+        crop ? set_crop_options(dimensions) : set_options(dimensions)
+
+        @image.write resize_path
+      end
+
+      def set_options(dimensions)
+        @image.combine_options do |c|
+          c.resize dimensions
+          c.unsharp '0x1'
+          c.add_command 'extent', dimensions
+          c.gravity 'center'
+        end
+      end
+
+      def set_crop_options(dimensions)
+        @image.combine_options do |c|
+          c.resize dimensions+'^'
+          c.unsharp '0x1'
+          c.add_command 'extent', dimensions
+          c.gravity 'center'
+        end
+      end
+
+    end
+  end
+end

data/lib/light_resizer/middleware.rb

@@ -1,98 +1,41 @@
+# encoding: utf-8
+require 'light_resizer/image_loader'
+require 'light_resizer/middleware/path'
+require 'light_resizer/middleware/resizer'
+
 module LightResizer
   class Middleware
+
     def initialize(app, root, folder='public')
-      @app_root      = root
-      @public_folder = folder
       @app           = app
+      @image_loader  = LightResizer::ImageLoader.new File.join(root, folder)
+      @path          = LightResizer::Middleware::Path.new
+      @resizer       = LightResizer::Middleware::Resizer.new
     end
 
     def call(env)
-      @path = nil
-      @splited_path = nil
-      @env = env
-      handle
-
-      status, headers, response = @app.call(@env)
-
-      [status, headers, response]
-    end
-
-    private
-
-    # Handle request.
-    # resizes images and
-    # modificates env
-    def handle
-      if is_image_path?
-        resize! unless image_exist
-
-        modify_path!
-      end
-    end
-
-    # creates new resized verion of requested image
-    def resize!
-      image = MiniMagick::Image.open(original_path)
-      image.combine_options do |c|
-        c.resize dimensions+'^'
-        c.unsharp '0x1'
-        c.add_command('extent', dimensions)
-        c.gravity 'center'
-      end
-      image.write resized_image_filepath
-    end
+      @path.request_path = env['PATH_INFO']
 
-    # {Bool} returns true if image exist
-    def image_exist
-      File.exist?(resized_image_filepath)
-    end
+      env['PATH_INFO'] = resize_image_path if @path.image_path? and resize_request?
 
-    # Modifies path to resized image
-    def modify_path!
-      @env['PATH_INFO'] = resized_image_path
+      @app.call( env )
     end
 
-    # {String} returns site path to resized image
-    # /image/200x200/.../image.png => /.../200x200_image.png
-    def resized_image_path
-      dir      = File.dirname(File.join(splited_path[3..-1]))
-      filename = File.basename(File.join(splited_path[3..-1]))
-
-      dir = '/' if dir == '.'
-      filename = dimensions + '_' + filename
-
-      File.join(dir, filename)
-    end
-
-    # {String} returns full path to resized image
-    # /image/200x200/.../image.png => {APP_ROOT}/{@public_folder}/.../200x200_image.png
-    def resized_image_filepath
-      File.join(@app_root, @public_folder, resized_image_path)
-    end
+    def resize_request?
+        @image_loader.original_image_path = @path.image_path
+        @image_loader.resize_prefix = @path.prefix
 
-    # {String} returns full path of image that will be resized
-    def original_path
-      File.join(@app_root, @public_folder, splited_path[3..-1])
+        @image_loader.original_image_exist?
     end
 
-    # {String} requested path
-    def path
-      @path ||= @env['PATH_INFO']
-    end
-
-    # {Bool} returns true if request path begins with 'image'
-    def is_image_path?
-      splited_path[1] == 'image'
-    end
+    private
 
-    # {Array} returns required dimensions of image
-    # '/image/200x200/...'' => '200x200'
-    def dimensions
-      splited_path[2]
+    def resize_image_path
+      unless @image_loader.resized_image_exist?
+        @resizer.resize(@path.dimensions, @image_loader.original_path, @image_loader.resize_path, @path.crop_path?)
+      end
+      @image_loader.resized_image_relative_path
     end
 
-    def splited_path
-      @splited_path ||= path.split('/')
-    end
   end
 end

data/lib/light_resizer/version.rb

@@ -1,3 +1,3 @@
 module LightResizer
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/light_resizer.rb

@@ -1,4 +1,4 @@
-require "light_resizer/version"
+require 'light_resizer/version'
 require 'light_resizer/middleware'
 require 'light_resizer/carrierwave_resize'
 require 'mini_magick'

data/light_resizer.gemspec

@@ -6,8 +6,8 @@ require 'light_resizer/version'
 Gem::Specification.new do |spec|
   spec.name          = "light_resizer"
   spec.version       = LightResizer::VERSION
-  spec.authors       = ["Denis Sergienko"]
-  spec.email         = ["olol.toor@gmail.com"]
+  spec.authors       = ["Denis Sergienko", "Vladislav Melanitskiy"]
+  spec.email         = ["olol.toor@gmail.com", "co@rademade.com"]
   spec.summary       = %q{Tiny rack middleware for image resizing.}
   spec.description   = %q{}
   spec.homepage      = "http://github.com/Rademade/light_resizer"
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "coveralls"
 end

data/spec/integration/middleware_spec.rb

@@ -3,22 +3,25 @@ require 'spec_helper'
 describe LightResizer::Middleware do
   let(:app) { AppEmulator.new }
   let(:resizer) { described_class.new(app, ROOT, 'fixtures') }
-  let(:env) { { 'PATH_INFO' => '/image/20x20/avatar.png' } }
-  let(:path) { File.join(ROOT, 'fixtures', '20x20_avatar.png') }
+  let(:env) { { 'PATH_INFO' => '/resize_image/100x160/avatar.png' } }
+
+  let(:resize_relative_path) { '/resize/100x160_avatar.png' } #todo depends for many constant
+  let(:resize_full_path) { File.join(ROOT, 'fixtures', resize_relative_path) }
 
   after do
-    File.delete(path)
+    File.delete resize_full_path
   end
 
   it 'should create resized image' do
     resizer.call(env)
 
-    expect(File.exist?(path)).to eq(true)
+    expect(resizer.resize_request?).to eq(true)
   end
 
   it 'should return right path' do
     resizer.call(env)
 
-    expect(app.env['PATH_INFO']).to eq('/20x20_avatar.png')
+    expect(app.env['PATH_INFO']).to eq( resize_relative_path )
   end
+
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'light_resizer'
 ROOT = File.dirname(__FILE__)
 

data/spec/unit/image_loader_original_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe LightResizer::ImageLoader::OriginalImage do
+
+  let(:root_dir) { File.join(ROOT, 'fixtures') }
+  let(:store_dir) { '/some/dir' }
+  let(:filename) { 'image.png' }
+  let(:image_full_path) { File.join(root_dir, store_dir, filename) }
+  let(:original_image) { described_class.new root_dir }
+
+  before(:each) do
+    original_image.relative_path = File.join(store_dir, filename)
+  end
+
+  context 'path methods' do
+
+    it { expect(original_image.send(:full_path)).to eq(image_full_path) }
+
+    it { expect(original_image.send(:dir_path)).to eq( File.join(root_dir, store_dir) ) }
+
+    it { expect(original_image.send(:filename)).to eq( filename ) }
+
+    it { expect(original_image.send(:relative_dir)).to eq(store_dir) }
+
+    it { expect(original_image.send(:image_exist?)).to eq(false) }
+
+  end
+
+end

data/spec/unit/image_loader_resized_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe LightResizer::ImageLoader::ResizeImage do
+
+  let(:root_dir) { File.join(ROOT, 'fixtures') }
+  let(:store_dir) { '/some/dir' }
+  let(:original_filename) { 'image.png' }
+  let(:resized_prefix) { '20x20' }
+  let(:resized_image) { described_class.new root_dir }
+
+  before(:each) do
+    resized_image.original_filename = original_filename
+    resized_image.original_relative_dir = store_dir
+    resized_image.resize_prefix = resized_prefix
+  end
+
+  context 'path methods' do
+
+    it {
+      expected_filename = [resized_prefix, '_', original_filename].join('')
+      expect(resized_image.send(:filename)).to eq( expected_filename )
+    }
+
+    it {
+      expected_path = File.join(store_dir, resized_image.resize_prefix_dir, resized_image.filename)
+      expect(resized_image.send(:relative_path)).to eq( expected_path )
+    }
+
+    it {
+      expected_path = File.join(root_dir, resized_image.relative_path )
+      expect(resized_image.send(:full_path)).to eq( expected_path )
+    }
+
+    it {
+      expected_path = File.join(root_dir, store_dir, resized_image.resize_prefix_dir )
+      expect(resized_image.send(:dir_path)).to eq( expected_path )
+    }
+
+    it { expect(resized_image.send(:dir_exist?)).to eq(false) }
+
+    it { expect(resized_image.send(:image_exist?)).to eq(false) }
+
+  end
+
+end

data/spec/unit/image_loader_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe LightResizer::ImageLoader do
+
+  let(:root_dir) { File.join(ROOT, 'fixtures') }
+  let(:image_loader) { described_class.new root_dir }
+
+  before(:each) do
+    image_loader.original_image_path = '/some/dir/image.png'
+    image_loader.resize_prefix = '20x20'
+  end
+
+  context 'image loader methods' do
+
+    it { expect(image_loader.send(:original_image_exist?)).to eq(false) }
+
+    it { expect(image_loader.send(:resized_image_relative_path)).to eq('/some/dir/resize/20x20_image.png') }
+
+    it { expect(image_loader.send(:resized_image_exist?)).to eq(false) }
+
+  end
+
+end

data/spec/unit/middleware_path_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe LightResizer::Middleware::Path do
+
+  let(:path) { described_class.new }
+
+  context 'valid path methods' do
+
+    before(:each) do
+      path.request_path = '/resize_image/150x150/some_dir/image.png'
+    end
+
+    it { expect(path.image_path?).to eq(true) }
+
+    it { expect(path.image_path).to eq('/some_dir/image.png') }
+
+    it { expect(path.dimensions).to eq('150x150') }
+
+    it { expect(path.prefix).to eq('150x150') }
+
+  end
+
+  context 'resize with crop' do
+    before(:each) do
+      path.request_path = '/resize_image_crop/150x150/some_dir/image.png'
+    end
+
+    it { expect(path.crop_path?).to be_true }
+
+    it { expect(path.dimensions).to eq('150x150') }
+
+    it { expect(path.prefix).to eq('150x150_crop') }
+  end
+
+  context 'wrong path methods' do
+
+    before(:each) do
+      path.request_path = '/asdada/123acad/some_dir/imdage.png'
+    end
+
+    it { expect(path.image_path?).to eq(false) }
+
+  end
+
+end

data/spec/unit/middleware_resizer_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe LightResizer::Middleware::Resizer do
+
+  let(:resizer) { described_class.new }
+  let(:image_path) { File.join(ROOT, 'fixtures', 'avatar.png') }
+  let(:resize_image_path) { File.join(ROOT, 'fixtures', 'resize', image_name) }
+
+  context 'resize' do
+
+    after do
+      File.delete( resize_image_path )
+    end
+
+    context 'without crop' do
+      let(:image_name) { '50x50_avatar.png' }
+
+      it 'should create resized image file' do
+        resizer.resize('50x50', image_path, resize_image_path, false)
+        expect(File.exist?(resize_image_path)).to eq(true)
+      end
+    end
+
+    context 'with crop' do
+      let(:image_name) { '50x50_crop_avatar.png' }
+      
+      it 'should create resized image file' do
+        resizer.resize('50x50', image_path, resize_image_path, true)
+        expect(File.exist?(resize_image_path)).to eq(true)
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: light_resizer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Denis Sergienko
+- Vladislav Melanitskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -80,28 +81,54 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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'
 description: ''
 email:
 - olol.toor@gmail.com
+- co@rademade.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/light_resizer.rb
 - lib/light_resizer/carrierwave_resize.rb
+- lib/light_resizer/image_loader.rb
+- lib/light_resizer/image_loader/original_image.rb
+- lib/light_resizer/image_loader/resize_image.rb
 - lib/light_resizer/middleware.rb
+- lib/light_resizer/middleware/path.rb
+- lib/light_resizer/middleware/resizer.rb
 - lib/light_resizer/version.rb
 - light_resizer.gemspec
 - spec/fixtures/avatar.png
 - spec/integration/middleware_spec.rb
 - spec/spec_helper.rb
-- spec/unit/middleware_spec.rb
+- spec/unit/image_loader_original_spec.rb
+- spec/unit/image_loader_resized_spec.rb
+- spec/unit/image_loader_spec.rb
+- spec/unit/middleware_path_spec.rb
+- spec/unit/middleware_resizer_spec.rb
 homepage: http://github.com/Rademade/light_resizer
 licenses:
 - MIT
@@ -130,5 +157,9 @@ test_files:
 - spec/fixtures/avatar.png
 - spec/integration/middleware_spec.rb
 - spec/spec_helper.rb
-- spec/unit/middleware_spec.rb
+- spec/unit/image_loader_original_spec.rb
+- spec/unit/image_loader_resized_spec.rb
+- spec/unit/image_loader_spec.rb
+- spec/unit/middleware_path_spec.rb
+- spec/unit/middleware_resizer_spec.rb
 has_rdoc: 

data/spec/unit/middleware_spec.rb

@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-describe LightResizer::Middleware do
-  let(:app) { AppEmulator.new }
-  let(:resizer) { described_class.new(app, ROOT, 'fixtures') }
-  let(:path) { File.join(ROOT, 'fixtures', '20x20_avatar.png') }
-
-  before(:each) do
-    resizer.call(env)
-  end
-
-  context 'path methods' do
-    after do
-      File.delete(path)
-    end
-
-    let(:env) { { 'PATH_INFO' => '/image/20x20/avatar.png' } }
-
-    it { expect(resizer.send(:splited_path)).to eq(['', 'image', '20x20', 'avatar.png']) }
-
-    it { expect(resizer.send(:dimensions)).to eq('20x20') }
-
-    it { expect(resizer.send(:is_image_path?)).to eq(true) }
-
-    it { expect(resizer.send(:path)).to eq('/image/20x20/avatar.png') }
-
-    it { expect(resizer.send(:original_path)).to eq(File.join(ROOT, 'fixtures', 'avatar.png')) }
-
-    it { expect(resizer.send(:resized_image_filepath)).to eq(path) }
-
-    it { expect(resizer.send(:resized_image_path)).to eq('/20x20_avatar.png') }
-
-    it { expect(resizer.send(:image_exist)).to eq(true) }
-  end
-
-  context 'with non image path' do
-
-    let(:env) { { 'PATH_INFO' => '/lalala/20x20/avatar.png' } }
-
-    it { expect(resizer.send(:is_image_path?)).to eq(false) }
-  end
-end