bio-fastqc 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f11168085a96f6fffffc8cab997f32b0a65a4766
-  data.tar.gz: 48ee8e555f36db25b5b2833d72593dbfabdab9ef
+  metadata.gz: eadb40fda6d28b9a545f14241ba2faec3b3a6125
+  data.tar.gz: 22920fae6a3f69315e7ef1d497816b00efb2518f
 SHA512:
-  metadata.gz: 697892a5e9d6596bd5009a8d650dc302f7f4074ec96ab502351e1a0fa61872045d200568a009d78f0af84fff148255425dad98dca7a3bc6d6e44190e841b224b
-  data.tar.gz: 1dc9fbb1c6f61cd03ab649bb053dacbb0f9d0f0a4f4738aaa5c37eedee77aa80348542c96f755da2929df30a8765a6fd5c0fd129644ed0d52ed603dab5607721
+  metadata.gz: 37fb1d7b6e7124ff9c3678ca01402d9cb68422b5630bb55fd15df4e57c3697acac118e53e5d7b4a753487be693fcfd53c67e62f9d5442a2a0b350ddf1719a670
+  data.tar.gz: 71ecd9ac350ef2aecdd8048de2f76faeb5371b0c468f781eb71f934ae5a2cd1bbecb8a4a66db8a24c0d1a022bcc74aa06291c5795f651ba6b179b0dc6fda8d7c

data/.rspec

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

data/Gemfile

@@ -3,16 +3,21 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem 'rubyzip', ">= 1.1.0"
-gem 'thor', ">= 0.19.1"
+gem 'rubyzip', '~> 1.1', '>= 1.1.0'
+gem 'thor', "~> 0.19.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "simplecov", ">= 0"
-  gem "jeweler"
-  gem "bundler", ">= 1.0.21"
-  gem "bio", ">= 1.4.2"
+  gem 'bundler', '~> 1.10'
+  gem 'rake', '~> 10.0'
+  gem 'rspec', '~> 3.3'
+  gem 'jeweler', '~> 2.0'
+  gem 'rdoc', '~> 3.12'
+
+  gem 'shoulda', '~> 3.5'
+  gem 'simplecov', '~> 0.10'
+
+  gem 'pry', '~> 0.10'
+  gem 'bio-fastqc'
 end

data/README.md

@@ -2,9 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/inutano/bioruby-fastqc.png)](http://travis-ci.org/inutano/bioruby-fastqc)
 
-Full description goes here
-
-Note: this software is under active development!
+A ruby parser for [FastQC](http://www.bioinformatics.babraham.ac.uk/projects/fastqc/) data.
 
 ## Installation
 
@@ -16,11 +14,20 @@ gem install bio-fastqc
 
 ```ruby
 require 'bio-fastqc'
+
+# extract data from zipfile
+zip_file = "/path/to/data_fastqc.zip"
+data = Bio::FastQC::Data.read(zip_file)
+parser = Bio::FastQC::Parser.new(data)
+parser.summary
+```
+
+Parse FastQC data as json format by command line tool:
+
+```sh
+$ fastqc-util parse /path/to/data_fastqc.zip
 ```
 
-The API doc is online. For more code examples see the test files in
-the source tree.
-        
 ## Project home page
 
 Information on the source tree, documentation, examples, issues and
@@ -33,7 +40,7 @@ The BioRuby community is on IRC server: irc.freenode.org, channel: #bioruby.
 ## Cite
 
 If you use this software, please cite one of
-  
+
 * [BioRuby: bioinformatics software for the Ruby programming language](http://dx.doi.org/10.1093/bioinformatics/btq475)
 * [Biogem: an effective tool-based approach for scaling up open source software development in bioinformatics](http://dx.doi.org/10.1093/bioinformatics/bts080)
 
@@ -44,4 +51,3 @@ This Biogem is published at (http://biogems.info/index.html#bio-fastqc)
 ## Copyright
 
 Copyright (c) 2015 Tazro Inutano Ohta. See LICENSE.txt for further details.
-

data/Rakefile

@@ -2,6 +2,11 @@
 
 require 'rubygems'
 require 'bundler'
+require 'rake'
+require 'jeweler'
+require 'rspec/core/rake_task'
+require 'rdoc/task'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -9,9 +14,7 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
-require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = "bio-fastqc"
@@ -25,12 +28,8 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
 
 desc "Code coverage detail"
 task :simplecov do
@@ -38,9 +37,6 @@ task :simplecov do
   Rake::Task['test'].execute
 end
 
-task :default => :test
-
-require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/bin/fastqc-util

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'bio-fastqc'
+Bio::FastQC::CLI.start

data/lib/bio-fastqc.rb

@@ -2,11 +2,13 @@
 # bioruby directory tree.
 #
 # For example, say you have a plugin named bio-plugin, the only uncommented
-# line in this file would be 
+# line in this file would be
 #
 #   require 'bio/bio-plugin/plugin'
 #
 # In this file only require other files. Avoid other source code.
 
-require 'bio-fastqc/fastqc.rb'
-
+require 'bio/fastqc/data'
+require 'bio/fastqc/cli'
+require 'bio/fastqc/parser'
+require 'bio/fastqc'

data/lib/bio/fastqc.rb

@@ -0,0 +1,4 @@
+module Bio
+  module FastQC
+  end
+end

data/lib/bio/fastqc/cli.rb

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+require 'thor'
+require 'json'
+
+module Bio
+  module FastQC
+    class CLI < Thor
+      desc "parse [filename]...", "parse fastqc data in fastqc directory or zipfile, output in json format"
+      def parse(*files)
+        files.each do |file|
+          puts JSON.dump(Parser.new(Data.read(file)).summary)
+        end
+      rescue
+        puts "Wrong input file type: specify fastqc result data, directory or zipfile"
+      end
+    end
+  end
+end

data/lib/bio/fastqc/data.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+require 'zip'
+
+module Bio
+  module FastQC
+	  class Data
+			class << self
+				def read(file)
+					read_zipfile(file)
+				rescue Zip::Error
+					read_flatfile(file)
+        rescue Errno::EISDIR
+          read_dir(file)
+				end
+
+				def read_zipfile(file)
+					Zip::File.open(file) do |zipfile|
+						zipfile.glob('*/fastqc_data.txt').first.get_input_stream.read
+					end
+				end
+
+				def read_flatfile(file)
+					open(file).read
+				end
+
+				def read_dir(file)
+					open(File.join(file, "fastqc_data.txt")).read
+				rescue Errno::ENOENT
+					puts "FastQC data file fastqc_data.txt not found"
+					exit
+				end
+  		end
+		end
+	end
+end

data/lib/bio/fastqc/parser.rb

@@ -0,0 +1,232 @@
+# -*- coding: utf-8 -*-
+
+module Bio
+  module FastQC
+	  class Parser
+	    def initialize(fastqc_data_txt)
+	      @data = fastqc_data_txt
+	      @object = parse(@data)
+	      @base = self.basic_statistics
+	    end
+
+	    def parse(data)
+	      modules = data.split(">>END_MODULE\n")
+	      modules.map do |node|
+	        lines = node.split("\n")
+	        rm_header = lines.map do |line|
+	          if line !~ /^\#/ || line =~ /^#Total Duplicate Percentage/
+	            line.split("\t")
+	          end
+	        end
+	        rm_header.compact
+	      end
+	    end
+
+	    def basic_statistics
+	      Hash[*@object.select{|a| a.first.first == ">>Basic Statistics" }.flatten]
+	    end
+
+	    def filename
+	      @base["Filename"]
+	    end
+
+	    def file_type
+	      @base["File type"]
+	    end
+
+	    def encoding
+	      @base["Encoding"]
+	    end
+
+	    def total_sequences
+	      @base["Total Sequences"].to_i
+	    end
+
+	    def filtered_sequences
+	      @base["Filtered Sequences"].to_i
+	    end
+
+	    def sequence_length
+	      @base["Sequence length"]
+	    end
+
+	    def min_length
+	      l = @base["Sequence length"]
+	      if l =~ /\d-\d/
+	        l.sub(/-\d+$/,"").to_i
+	      else
+	        l.to_i
+	      end
+	    end
+
+	    def max_length
+	      l = @base["Sequence length"]
+	      if l =~ /\d-\d/
+	        l.sub(/^\d+-/,"").to_i
+	      else
+	        l.to_i
+	      end
+	    end
+
+	    def percent_gc
+	      @base["%GC"].to_i
+	    end
+
+	    def per_base_sequence_quality
+	      node = @object.select{|a| a.first.first == ">>Per base sequence quality" }
+	      node.first.select{|n| n.first != ">>Per base sequence quality" }
+	    end
+
+	    ## Custom module: overall mean base call quality indicator
+	    def overall_mean_quality_score
+	      per_base = self.per_base_sequence_quality
+	      v = per_base.map{|c| (10**(c[1].to_f/-10)).to_f }
+	      -10 * Math.log10(v.reduce(:+) / v.size)
+	    end
+
+      ## Custom module: overall median base call quality indicator
+	    def overall_median_quality_score
+	      per_base = self.per_base_sequence_quality
+        v = per_base.map{|c| (10**(c[2].to_f/-10)).to_f }
+	      -10 * Math.log10(v.reduce(:+) / v.size)
+	    end
+
+      def per_tile_sequence_quality
+        node = @object.select{|a| a.first.first == ">>Per tile sequence quality" }
+        node.first.select{|n| n.first != ">>Per tile sequence quality" }
+      rescue
+        []
+      end
+
+	    def per_sequence_quality_scores
+	      node = @object.select{|a| a.first.first == ">>Per sequence quality scores" }
+	      node.first.select{|n| n.first != ">>Per sequence quality scores" }
+	    end
+
+	    def per_base_sequence_content
+	      node = @object.select{|a| a.first.first == ">>Per base sequence content" }
+	      node.first.select{|n| n.first != ">>Per base sequence content" }
+	    end
+
+	    def per_sequence_gc_content
+	      node = @object.select{|a| a.first.first == ">>Per sequence GC content" }
+	      node.first.select{|n| n.first != ">>Per sequence GC content" }
+	    end
+
+	    def per_sequence_gc_content
+	      node = @object.select{|a| a.first.first == ">>Per sequence GC content" }
+	      node.first.select{|n| n.first != ">>Per sequence GC content" }
+	    end
+
+	    def per_base_n_content
+	      node = @object.select{|a| a.first.first == ">>Per base N content" }
+	      node.first.select{|n| n.first != ">>Per base N content" }
+	    end
+
+	    ## Custom module: overall N content
+	    def overall_n_content
+	      per_base = self.per_base_n_content
+	      v = per_base.map{|c| c[1].to_f }
+	      v.reduce(:+) / v.size
+	    end
+
+	    def sequence_length_distribution
+	      node = @object.select{|a| a.first.first == ">>Sequence Length Distribution" }
+	      node.first.select{|n| n.first != ">>Sequence Length Distribution" }
+	    end
+
+	    ## Custom module: mean sequence length calculated from distribution
+	    def mean_sequence_length
+	      distribution = self.sequence_length_distribution
+	      sum = distribution.map do |length_count|
+	        length = length_count[0]
+	        count = length_count[1].to_f
+	        if length =~ /\d-\d/
+	          f = length.sub(/-\d+$/,"").to_i
+	          b = length.sub(/^\d+-/,"").to_i
+	          mean = (f + b) / 2
+	          mean * count
+	        else
+	          length.to_i * count
+	        end
+	      end
+	      sum.reduce(:+) / self.total_sequences
+	    end
+
+	    ## Custom module: median sequence length calculated from distribution
+	    def median_sequence_length
+	      distribution = self.sequence_length_distribution
+	      array = distribution.map do |length_count|
+	        length = length_count[0]
+	        count = length_count[1].to_i
+	        if length =~ /\d-\d/
+	          f = length.sub(/-\d+$/,"").to_i
+	          b = length.sub(/^\d+-/,"").to_i
+	          mean = (f + b) / 2
+	          [mean] * count
+	        else
+	          [length.to_i] * count
+	        end
+	      end
+	      sorted = array.flatten.sort
+	      quot = sorted.size / 2
+	      if !sorted.size.even?
+	        sorted[quot]
+	      else
+	        f = sorted[quot]
+	        b = sorted[quot - 1]
+	        (f + b) / 2
+	      end
+	    end
+
+	    def sequence_duplication_levels
+	      node = @object.select{|a| a.first.first == ">>Sequence Duplication Levels" }
+	      node.first.select{|n| n.first != ">>Sequence Duplication Levels" && n.first != "\#Total Duplicate Percentage" }
+	    end
+
+	    def total_duplicate_percentage
+	      node = @object.select{|a| a.first.first == ">>Sequence Duplication Levels" }
+	      node.first.select{|n| n.first == "\#Total Duplicate Percentage" }.flatten[1].to_f
+	    end
+
+	    def overrepresented_sequences
+	      node = @object.select{|a| a.first.first == ">>Overrepresented sequences" }
+	      node.first.select{|n| n.first != ">>Overrepresented sequences" }
+	    end
+
+	    def kmer_content
+	      node = @object.select{|a| a.first.first == ">>Kmer Content" }
+	      node.first.select{|n| n.first != ">>Kmer Content" }
+	    end
+
+	    def summary
+	      {
+          filename: self.filename,
+	        file_type: self.file_type,
+	        encoding: self.encoding,
+	        total_sequences: self.total_sequences,
+	        filtered_sequences: self.filtered_sequences,
+	        sequence_length: self.sequence_length,
+	        percent_gc: self.percent_gc,
+	        per_base_sequence_quality: self.per_base_sequence_quality,
+          per_tile_sequence_quality: self.per_tile_sequence_quality,
+	        per_sequnce_quality_scores: self.per_sequence_quality_scores,
+	        per_base_sequence_content: self.per_base_sequence_content,
+	        per_sequence_gc_content: self.per_sequence_gc_content,
+	        per_base_n_content: self.per_base_n_content,
+	        sequence_length_distribution: self.sequence_length_distribution,
+	        total_duplicate_percentage: self.total_duplicate_percentage,	        sequence_duplication_levels: self.sequence_duplication_levels,
+	        overrepresented_sequences: self.overrepresented_sequences,
+	        kmer_content: self.kmer_content,
+	        min_length: self.min_length,
+	        max_length: self.max_length,
+	        overall_mean_quality_score: self.overall_mean_quality_score,
+	        overall_median_quality_score: self.overall_median_quality_score,
+	        overall_n_content: self.overall_n_content,
+	        mean_sequence_length: self.mean_sequence_length,
+	        median_sequence_length: self.median_sequence_length,
+        }
+	    end
+	  end
+	end
+end

data/spec/bio-fastqc_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Bio::FastQC do
+  context "with an example data" do
+    before do
+      zipfile = File.join(__dir__, "example_fastqc.zip")
+      @data = Bio::FastQC::Data.read(zipfile)
+    end
+    
+    it 'extracts data from zip file' do
+      expect(@data).not_to be_empty
+    end
+    
+    it 'parses a fastqc data and returns json' do
+      p = Bio::FastQC::Parser.new(@data)
+      expect(p.summary).not_to be_empty
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'bio-fastqc'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bio-fastqc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tazro Inutano Ohta
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,34 +27,79 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -67,65 +115,66 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.21
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.21
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: bio
+  name: bio-fastqc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '0'
 description: ruby parser for FastQC, a quality control software for high-throughput
   sequencing data.
 email: inutano@gmail.com
-executables: []
+executables:
+- fastqc-util
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -133,6 +182,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ".document"
+- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -140,10 +190,15 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/fastqc-util
 - lib/bio-fastqc.rb
-- lib/bio-fastqc/fastqc.rb
-- test/helper.rb
-- test/test_bio-fastqc.rb
+- lib/bio/fastqc.rb
+- lib/bio/fastqc/cli.rb
+- lib/bio/fastqc/data.rb
+- lib/bio/fastqc/parser.rb
+- spec/bio-fastqc_spec.rb
+- spec/example_fastqc.zip
+- spec/spec_helper.rb
 homepage: http://github.com/inutano/bioruby-fastqc
 licenses:
 - MIT

data/lib/bio-fastqc/fastqc.rb

@@ -1,3 +0,0 @@
-
-module BioFastqc
-end

data/test/helper.rb

@@ -1,34 +0,0 @@
-require 'simplecov'
-
-module SimpleCov::Configuration
-  def clean_filters
-    @filters = []
-  end
-end
-
-SimpleCov.configure do
-  clean_filters
-  load_adapter 'test_frameworks'
-end
-
-ENV["COVERAGE"] && SimpleCov.start do
-  add_filter "/.rvm/"
-end
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'bio-fastqc'
-
-class Test::Unit::TestCase
-end

data/test/test_bio-fastqc.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestBioFastqc < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end