fbo 0.0.1

data/lib/fbo/parser/presolicitation_handler.rb

@@ -0,0 +1,57 @@
+module FBO::Parser::PresolicitationHandler
+  TAGS = %w( PRESOL DATE YEAR CBAC PASSWORD ZIP CLASSCOD NAICS OFFADD ) +
+    %w( AGENCY OFFICE LOCATION SUBJECT SOLNBR RESPDATE ARCHDATE CONTACT DESC ) +
+    %w( LINK URL EMAIL ADDRESS SETASIDE POPADDRESS POPZIP POPCOUNTRY \/PRESOL )
+
+  ANY_PRESOL_TAG           = TAGS.join("|")
+  PRESOLICITATION_PATTERN  = /^<PRESOL>/
+
+
+  def is_presolicitation?(text)
+    text =~ PRESOLICITATION_PATTERN
+  end
+
+  def parse(text)
+    params = {
+      date: date(text),
+      year: year(text),
+      zip:  zip(text),
+      class_code: classification_code(text),
+      naics_code: naics_code(text),
+      agency: agency(text),
+      office: office(text),
+      location: location(text),
+      office_address: office_address(text),
+      subject: subject(text),
+      solicitation_number: solicitation_number(text),
+      response_date: response_date(text),
+      archive_date: archive_date(text),
+      contact_info: contact(text),
+      description: description(text),
+      link_url: link_url(text),
+      link_description: link_description(text),
+      email_address: email_address(text),
+      email_description: email_description(text),
+      setaside: set_aside(text),
+      pop_address: pop_address(text),
+      pop_zip: pop_zip_code(text),
+      pop_country: pop_country(text)
+    }
+    FBO::Notices::Presolicitation.new(params)
+  end
+
+
+  protected
+
+  # Returns a concatenated list of all tags for the notice
+  #
+  # @return [String]
+  def any_notice_tag
+    ANY_PRESOL_TAG
+  end
+
+
+  extend FBO::Parser::NoticeHandler
+  extend FBO::Parser::ParserHelper
+  extend self
+end

data/lib/fbo/parser/sources_sought_handler.rb

@@ -0,0 +1,57 @@
+module FBO::Parser::SourcesSoughtHandler
+  TAGS = %w( SRCSGT DATE YEAR CBAC PASSWORD ZIP CLASSCOD NAICS OFFADD ) +
+    %w( AGENCY OFFICE LOCATION SUBJECT SOLNBR RESPDATE ARCHDATE CONTACT DESC ) +
+    %w( LINK URL EMAIL ADDRESS SETASIDE POPADDRESS POPZIP POPCOUNTRY \/SRCSGT )
+
+  ANY_SRCSGT_TAG           = TAGS.join("|")
+  SOURCES_SOUGHT_PATTERN  = /^<SRCSGT>/
+
+
+  def is_sources_sought?(text)
+    text =~ SOURCES_SOUGHT_PATTERN
+  end
+
+  def parse(text)
+    params = {
+      date: date(text),
+      year: year(text),
+      zip:  zip(text),
+      class_code: classification_code(text),
+      naics_code: naics_code(text),
+      agency: agency(text),
+      office: office(text),
+      location: location(text),
+      office_address: office_address(text),
+      subject: subject(text),
+      solicitation_number: solicitation_number(text),
+      response_date: response_date(text),
+      archive_date: archive_date(text),
+      contact_info: contact(text),
+      description: description(text),
+      link_url: link_url(text),
+      link_description: link_description(text),
+      email_address: email_address(text),
+      email_description: email_description(text),
+      setaside: set_aside(text),
+      pop_address: pop_address(text),
+      pop_zip: pop_zip_code(text),
+      pop_country: pop_country(text)
+    }
+    FBO::Notices::SourcesSought.new(params)
+  end
+
+
+  protected
+
+  # Returns a concatenated list of all tags for the notice
+  #
+  # @return [String]
+  def any_notice_tag
+    ANY_SRCSGT_TAG
+  end
+
+
+  extend FBO::Parser::NoticeHandler
+  extend FBO::Parser::ParserHelper
+  extend self
+end

data/lib/fbo/parser/unknown_handler.rb

@@ -0,0 +1,20 @@
+module FBO::Parser::UnknownHandler
+
+  def parse(text)
+    params = {
+      type: type(text),
+      text: text
+   }
+    FBO::Notices::Unknown.new(params)
+  end
+
+
+  protected
+
+  def type(text)
+    text =~ /^<([^>]*)>/
+    $1
+  end
+
+  extend self
+end

data/lib/fbo/remote_file.rb

@@ -0,0 +1,39 @@
+require "date"
+require "net/ftp"
+
+module FBO
+  class RemoteFile < File
+    FTP_SERVER = "ftp.fbo.gov"
+    TMP_DIR    = "/tmp/fbo"
+
+    class << self
+      def for_date(date, options = {})
+        filename = filename_for_date(date)
+        FBO::RemoteFile.new(filename, options)
+      end
+
+      def filename_for_date(date)
+        raise ArgumentError, "No date given for file" unless date
+        "FBOFeed#{ date.strftime("%Y%m%d") }"
+      end
+    end
+
+    def initialize(filename, options = {})
+      @filename = filename
+      @tmp_dir = options[:tmp_dir] || TMP_DIR
+      @file = fetch_file(filename)
+    end
+
+    protected
+
+    def fetch_file(filename)
+      Dir.mkdir(@tmp_dir) unless Dir.exists?(@tmp_dir)
+      tmp_filename = ::File.join(@tmp_dir, filename)
+      ftp = Net::FTP.new(FTP_SERVER)
+      ftp.login
+      ftp.getbinaryfile(filename, tmp_filename)
+      ftp.close
+      ::File.new(tmp_filename)
+    end
+  end
+end

data/lib/fbo/version.rb

@@ -0,0 +1,3 @@
+module FBO
+  VERSION = "0.0.1"
+end

data/spec/fbo/file_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe FBO::File do
+  context "existing file" do
+    let(:filename)   { File.join(File.dirname(__FILE__), "..", "fixtures", "FBOFeed20130331") }
+    subject          { FBO::File.new(filename) }
+
+    it "should be possible to open the file and read its contents" do
+      subject.readline.should_not be_nil
+    end
+  end
+
+  context "non-existent file" do
+    subject          { FBO::File.new("foobar.bat") }
+
+    it "should raise an exception when trying open the file and read its contents" do
+      expect { subject.readline }.to raise_error
+    end
+  end
+end

data/spec/fbo/parser/amendment_handler_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe FBO::Parser::AmendmentHandler do
+  let(:filename)   { File.join(File.dirname(__FILE__), "..", "..", "fixtures", "notices", "amdcss") }
+  let(:file)       { File.new(filename) }
+  let(:contents)   { file.read }
+
+  subject          { FBO::Parser::AmendmentHandler }
+
+  it "should recognize amendment content" do
+    subject.is_amendment?(contents).should be_true
+  end
+
+  it "should parse all fields correctly" do
+    combine = subject.parse(contents)
+    combine.date.strftime("%Y-%m-%d").should eq Date.parse("2013-03-26").strftime("%Y-%m-%d")
+    combine.year.should eq 2013
+    combine.agency.should eq "Department of the Air Force"
+    combine.office.should eq "Air Force Materiel Command"
+    combine.location.should eq "Tinker AFB - OC-ALC/PKO"
+    combine.zip.should eq "73145-9106"
+    combine.class_code.should eq "R"
+    combine.naics_code.should eq "541611"
+    combine.office_address.should eq "7858 5th Street Ste 1 Tinker AFB OK 73145-9106"
+    combine.subject.should eq "ISO 9001:2008 AS9100/9110 Registration/Surveillance/Reassessment Audit"
+    combine.solicitation_number.should eq "FA8101-13-Q-0014"
+    combine.response_date.strftime("%Y-%m-%d").should eq "2013-03-27"
+    combine.archive_date.strftime("%Y-%m-%d").should eq "2013-04-26"
+    combine.contact_info.should eq "Matthew Kinney, Contract Specialist, Phone 4057393745, Email matthew.kinney@tinker.af.mil - Kimberly L DeLong, Contracting Officer, Phone (405) 739-3514, Fax (405) 739-7957, Email kimberly.delong2@tinker.af.mil"
+    combine.description.should eq "<p>***All quotes need to be based&nbsp;off of&nbsp;the scope and&nbsp;figures in the&nbsp;PWS and&nbsp;not OASIS<br />***IAW PWS para 1.1(e) the audit will be scheduled in May&nbsp;and must&nbsp;be&nbsp;completed in one week<br />***Organizations&nbsp;OIN 6115237940</p>"
+    combine.link_url.should eq "https://www.fbo.gov/spg/USAF/AFMC/OCALCBC/FA8101-13-Q-0014/listing.html"
+    combine.link_description.should eq "Link To Document"
+    combine.setaside.should eq "Total Small Business"
+    combine.pop_country.should eq "US"
+    combine.pop_zip.should eq "73145"
+    combine.pop_address.should eq "Tinker AFB\nTinker AFB, OK"
+  end
+
+  context "when not a sources sought" do
+    let(:filename)   { File.join(File.dirname(__FILE__), "..", "..", "fixtures", "notices", "presol") }
+
+    it "should not recognize other notice content" do
+      subject.is_amendment?(contents).should_not be_true
+    end
+  end
+end

data/spec/fbo/parser/award_handler_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe FBO::Parser::AwardHandler do
+  let(:filename)   { File.join(File.dirname(__FILE__), "..", "..", "fixtures", "notices", "award") }
+  let(:file)       { File.new(filename) }
+  let(:contents)   { file.read }
+
+  subject          { FBO::Parser::AwardHandler }
+
+  it "should recognize award content" do
+    subject.is_award?(contents).should be_true
+  end
+
+  it "should parse all fields correctly" do
+    award = subject.parse(contents)
+    award.date.strftime("%Y-%m-%d").should eq Date.parse("2013-03-27").strftime("%Y-%m-%d")
+    award.year.should eq 2013
+    award.agency.should eq "Department of the Army"
+    award.office.should eq "Army Contracting Command, MICC"
+    award.location.should eq "MICC - Fort Leonard Wood"
+    award.zip.should eq "65473"
+    award.class_code.should eq "Z"
+    award.naics_code.should eq "238320"
+    award.office_address.should eq "MICC - Fort Leonard Wood, Directorate of Contracting, P.O. Box 140, Fort Leonard Wood, MO  65473-0140"
+    award.subject.should eq "Z--Painting and General Repairs Requirements for Fort Leonard Wood Military Installation and Lake of the Ozarks Recreation Area, Missouri."
+    award.solicitation_number.should eq "W911S713B0002"
+    award.notice_type.should eq "PRESOL"
+    award.archive_date.strftime("%Y-%m-%d").should eq "2013-04-26"
+    award.contact_info.should eq "Christine Wilson, 5735960251\n\n<a href=\"mailto:christine.l.wilson2.civ@mail.mil\">MICC - Fort Leonard Wood</a>"
+    award.description.should eq "Painting and General Repairs Requirements for Fort Leonard Wood Military Installation and Lake of the Ozarks Recreation Area, Missouri."
+    award.award_number.should eq "W911S713D0003"
+    award.award_amount.should eq 10_848_912.50
+    award.line_number.should eq "0001"
+    award.awardee.should eq "HOWELL & HOWELL CONTRACTORS, INC. (601721483)  <br>  2603 GRASSLAND DR <br>  LOUISVILLE, KY 40299-2523"
+    award.awardee_duns.should eq "1234567890123"
+    award.link_url.should eq "https://www.fbo.gov/notices/4f878388ec8ed40badf141d1c0281dae"
+    award.link_description.should eq "Link To Document"
+    award.email_address.should eq "christine.l.wilson2.civ@mail.mil"
+    award.email_description.should eq "MICC - Fort Leonard Wood"
+    award.setaside.should be_nil
+    award.correction.should be_false
+  end
+
+  context "when not an award" do
+    let(:filename)   { File.join(File.dirname(__FILE__), "..", "..", "fixtures", "notices", "presol") }
+
+    it "should not recognize other notice content" do
+      subject.is_award?(contents).should_not be_true
+    end
+  end
+end

data/spec/fbo/parser/combined_solicitation_handler_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe FBO::Parser::CombinedSolicitationHandler do
+  let(:filename)   { File.join(File.dirname(__FILE__), "..", "..", "fixtures", "notices", "combine") }
+  let(:file)       { File.new(filename) }
+  let(:contents)   { file.read }
+
+  subject          { FBO::Parser::CombinedSolicitationHandler }
+
+  it "should recognize combined solicitation content" do
+    subject.is_combined_solicitation?(contents).should be_true
+  end
+
+  it "should parse all fields correctly" do
+    combine = subject.parse(contents)
+    combine.date.strftime("%Y-%m-%d").should eq Date.parse("2013-04-07").strftime("%Y-%m-%d")
+    combine.year.should eq 2013
+    combine.agency.should eq "Defense Logistics Agency"
+    combine.office.should eq "DLA Acquisition Locations"
+    combine.location.should eq "DLA Aviation - BSM"
+    combine.zip.should eq "23297"
+    combine.class_code.should eq "61"
+    combine.naics_code.should eq "335931"
+    combine.office_address.should eq "DLA AVIATION; 8000 JEFFERSON DAVIS HIGHWAY; RICHMOND VA 23297"
+    combine.subject.should eq "61--CABLE ASSEMBLY,SPECIAL"
+    combine.solicitation_number.should eq "SPE4A613TBW31"
+    combine.response_date.strftime("%Y-%m-%d").should eq "2013-04-15"
+    combine.archive_date.strftime("%Y-%m-%d").should eq "2013-05-15"
+    combine.contact_info.should eq "Questions regarding this solicitation should be emailed to dibbsBSM@dla.mil"
+    combine.description.should eq "Proposed procurement for NSN 6150012666487 CABLE ASSEMBLY,SPECIAL:\nLine 0001 Qty 40.00  UI EA  Deliver To: W1BG DLA DISTRIBUTION By: 0189 DAYS ADOApproved sources are 56540 75A756180-9AUK; 76301 75A756180-9AUK.\nThe solicitation is an RFQ and will be available at the link provided in this notice.  Hard copies of this solicitation are not available. Specifications, plans, or drawings are not available.\nAll responsible sources may submit a quote which, if timely received, shall be considered.\nQuotes must be submitted electronically."
+    combine.link_url.should eq "https://www.fbo.gov/spg/DLA/J3/DSCR-BSM/SPE4A613TBW31/listing.html"
+    combine.link_description.should eq "Link To Document"
+    combine.setaside.should eq "Total Small Business"
+    combine.pop_country.should eq "US"
+    combine.pop_zip.should eq "20005-4026"
+    combine.pop_address.should eq "Washington, DC 20005"
+
+  end
+
+  context "when not a combined solicitation" do
+    let(:filename)   { File.join(File.dirname(__FILE__), "..", "..", "fixtures", "notices", "presol") }
+
+    it "should not recognize other notice content" do
+      subject.is_combined_solicitation?(contents).should_not be_true
+    end
+  end
+end

data/spec/fbo/parser/modification_handler_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe FBO::Parser::ModificationHandler do
+  let(:filename)   { File.join(File.dirname(__FILE__), "..", "..", "fixtures", "notices", "mod") }
+  let(:file)       { File.new(filename) }
+  let(:contents)   { file.read }
+
+  subject          { FBO::Parser::ModificationHandler }
+
+  it "should recognize modification content" do
+    subject.is_modification?(contents).should be_true
+  end
+
+  it "should parse all fields correctly" do
+    mod = subject.parse(contents)
+    mod.date.strftime("%Y-%m-%d").should eq Date.parse("2013-03-27").strftime("%Y-%m-%d")
+    mod.year.should eq 2013
+    mod.agency.should eq "Department of Agriculture"
+    mod.office.should eq "Agricultural Research Service"
+    mod.location.should eq "ARS EBSC APB DM"
+    mod.zip.should eq "20705"
+    mod.class_code.should eq "66"
+    mod.naics_code.should eq "811219"
+    mod.office_address.should eq "5601 Sunnyside Avenue Beltsville MD 20705"
+    mod.subject.should eq "Maintenance/Service contract (Plus 2 Option years) for a \"ELAN DRC E  Inductively Coupled Spectrometer\""
+    mod.solicitation_number.should eq "625715"
+    mod.notice_type.should eq "SNOTE"
+    mod.response_date.strftime("%Y-%m-%d").should eq "2013-04-01"
+    mod.archive_date.should be_nil
+    mod.contact_info.should eq "John C. Wilkinson, Purchasing Agent, Phone 301-504-1731, Email john.wilkinson@ars.usda.gov - Rene D. Edwards, Contract Specialist, Phone 301 504-1744, Email rene.edwards@ars.usda.gov"
+    mod.description.should eq "&nbsp;\n<p><span style=\"COLOR: #1f497d\">___________________________________________________________________________________________________________________</span></p>\n<p>&nbsp;THIS IS AN AMENDMENT TO ADD THE ADDITIONAL VERBIAGE&nbsp;AS&nbsp;A&nbsp; CRITICAL MINIMUM&nbsp;REQUIREMENT&nbsp;FOR&nbsp;&nbsp;THE FOLLOWING SERVICE CONTRACT REQUIREMENT: &nbsp;\"GUARANTEE\" OF&nbsp;A CERTIFIED ENGINEER'S PHONE RESPONSE TO U.S. DEPARTMENT OF AGRICULTURE (USDA'S)&nbsp;REQUEST&nbsp;&nbsp;WITHIN 24 HOURS OF A &nbsp;USDA CUSTOMER PLACING A SERVICE CALL.&nbsp;PLEASE ALSO NOTE THE CORRECTED TIME FRAME OF THE ANTICIPATED AWARD DATE BEING APRIL 3, 2013 AND THE QUOTES DUE NO LATER TO ME: JOHN WILKINSON&nbsp; AT USDA BY CLOSE OF BUSINESS APRIL 1, 2013 TO <a href=\"mailto:JOHN.WILKINSON@ARS.USDA.GOV\">JOHN.WILKINSON@ARS.USDA.GOV</a> AT PHONE # 301-504-1731.</p>\n<p>U.S. Department of Agriculture, Agriculture Research Service in Beltsville, Maryland intends to award a <span style=\"COLOR: #1f497d\">(yearly maintenance plus 2 option years) </span>contract<span style=\"COLOR: #1f497d\"> as a sole source award &nbsp;for the following instrument: &nbsp;\"ICP-MS Elan DRC E\" instrument, Serial Number: AH00430510 located in Beltsville, Maryland, &nbsp;that is manufactured by Perkin Elmer Health Sciences, Inc.</span> , located in <span style=\"COLOR: #1f497d\">Shelton, Connecticut.&nbsp;&nbsp; &nbsp;The following are the requirements of this service contract:&nbsp;&nbsp; Personnel that performs service on the above instrument, must be able to demonstrate that they are trained,&nbsp; in testing, service and software support, for this instrument, and can replace internal parts of this equipment.&nbsp; The repair coverage for the above instrument will include: Parts, Components, &nbsp;labor, travel, and phone support.&nbsp;&nbsp; Perkin Elmer Health Sciences, Inc. is the sole source provider for factory new or factory re-manufactured parts, local service representation and factory trained/certified engineers to provide service and installation for all instrumentation &nbsp;manufactured and sold by Perkin Elmer, Inc.&nbsp;&nbsp; Perkin Elmer does not certify third party technical service nor does Perkin Elmer have any dealers or distributors selling parts.&nbsp; &nbsp;&nbsp;The base year of this maintenance contract will run from April 3, 2013&nbsp; to March 26, 2014, then option year I would run from March 27, 2014 to March 26, 2015 and Option Year II would run from March 27, 2015 to March 26, 2016</span></p>"
+    mod.link_url.should eq "https://www.fbo.gov/notices/9189b266ca1710152c807950c8b13cbe"
+    mod.link_description.should eq "Link To Document"
+    mod.setaside.should eq "N/A"
+    mod.pop_country.should eq "US"
+    mod.pop_zip.should be_nil
+    mod.pop_address.should eq "USDA, ARS, EMBUL, BARC\n10300 BALTIMORE AVE.\nBeltsville, MD"
+  end
+
+  context "when not a modification" do
+    let(:filename)   { File.join(File.dirname(__FILE__), "..", "..", "fixtures", "notices", "presol") }
+
+    it "should not recognize other notice content" do
+      subject.is_modification?(contents).should_not be_true
+    end
+  end
+end

data/spec/fbo/parser/presolicitation_handler_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe FBO::Parser::PresolicitationHandler do
+  let(:filename)   { File.join(File.dirname(__FILE__), "..", "..", "fixtures", "notices", "presol") }
+  let(:file)       { File.new(filename) }
+  let(:contents)   { file.read }
+
+  subject          { FBO::Parser::PresolicitationHandler }
+
+  it "should recognize presolication content" do
+    subject.is_presolicitation?(contents).should be_true
+  end
+
+  it "should parse all fields correctly" do
+    presol = subject.parse(contents)
+    presol.date.strftime("%Y-%m-%d").should eq Date.parse("2013-03-31").strftime("%Y-%m-%d")
+    presol.year.should eq 2013
+    presol.agency.should eq "Defense Logistics Agency"
+    presol.office.should eq "DLA Acquisition Locations"
+    presol.location.should eq "DLA Aviation - BSM"
+    presol.zip.should eq "23297-5000"
+    presol.class_code.should eq "15"
+    presol.naics_code.should eq "336412"
+    presol.office_address.should eq "8000 Jefferson Davis Highway Richmond VA 23297-5000"
+    presol.subject.should eq "Seal, AFT; F108-CF100"
+    presol.solicitation_number.should eq "SPE4A713R0795"
+    presol.response_date.strftime("%Y-%m-%d").should eq "2013-05-15"
+    presol.contact_info.should eq "Heidi LaCosse, Acquisition Specialist, Phone 8042793395, Fax 8042792314, Email heidi.lacosse@dla.mil - Amanda M Parker, Acquisition Supervisor, Phone (804)279-2326, Fax (804)279-4722, Email amanda.parker@dla.mil"
+    presol.description.should eq "&nbsp;\n<p>PR# 49250123; NSN 2840-01-183-1908; Firm Fixed Price; Definite Quantity Contract; Unrestricted Acquisition; Other Than Full and Open Competition; The only approved manufacturing sources are Jet Avion, Cage 14236 and CFM International, Cage 58828;<span style=\"mso-spacerun: yes\">&nbsp; </span>Seal, Aft; Critical Application Item; Configuration Control Applies; Government FAT; Quantity of 3929 units; Inspection/Acceptance at Origin; FOB at Origin; Requested delivery is 450 days after receipt of order; Electronic Offers are not acceptable; Progress Payments are not offered as the conditions at FAR 32.5 have not been met; Any manufacturer, other than the approved source, wishing to submit a proposal on this item must submit a complete source approval package and a complete solicitation package; A copy of the solicitation will be available via DIBBS at <a href=\"https://www.dibbs.bsm.dla.mil/RFP\"><span style=\"mso-ansi-font-size: 12.0pt\">https://www.dibbs.bsm.dla.mil/RFP</span></a> on the issue date cited in this synopsis.<span style=\"mso-spacerun: yes\">&nbsp; </span>RFP's are in portable document format (PDF).<span style=\"mso-spacerun: yes\">&nbsp; </span>To download and view these documents you will need the latest version of Adobe Acrobat.<span style=\"mso-spacerun: yes\">&nbsp; </span>This software is available free at http://www.adobe.com.<span style=\"mso-spacerun: yes\">&nbsp; </span>A paper copy of this solicitation will be available to requesters.<span style=\"mso-spacerun: yes\">&nbsp; </span>The solicitation issue date is April 15, 2013.</p>"
+    presol.link_url.should eq "https://www.fbo.gov/spg/DLA/J3/DSCR-BSM/SPE4A713R0795/listing.html"
+    presol.link_description.should eq "Link To Document"
+    presol.setaside.should eq "N/A"
+    presol.pop_country.should eq "US"
+    presol.pop_zip.should eq "23297"
+    presol.pop_address.should eq "8000 Jefferson Davis Highway\nRichmonda, VA"
+
+  end
+
+  context "when not a presolication" do
+    let(:filename)   { File.join(File.dirname(__FILE__), "..", "..", "fixtures", "notices", "combine") }
+
+    it "should not recognize other notice content" do
+      subject.is_presolicitation?(contents).should_not be_true
+    end
+  end
+end