chronic 0.1.5 → 0.6.5

data/test/test_Chronic.rb

@@ -1,50 +1,148 @@
-require 'chronic'
-require 'test/unit'
+require 'helper'
 
 class TestChronic < Test::Unit::TestCase
-  
+
   def setup
     # Wed Aug 16 14:00:00 UTC 2006
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
-  
+
+  def test_pre_normalize_numerized_string
+    string = 'two and a half years'
+    assert_equal Chronic::Numerizer.numerize(string), Chronic.pre_normalize(string)
+  end
+
   def test_post_normalize_am_pm_aliases
     # affect wanted patterns
-    
+
     tokens = [Chronic::Token.new("5:00"), Chronic::Token.new("morning")]
     tokens[0].tag(Chronic::RepeaterTime.new("5:00"))
     tokens[1].tag(Chronic::RepeaterDayPortion.new(:morning))
-    
+
     assert_equal :morning, tokens[1].tags[0].type
-    
-    tokens = Chronic.dealias_and_disambiguate_times(tokens, {})
-    
+
+    tokens = Chronic::Handlers.dealias_and_disambiguate_times(tokens, {})
+
     assert_equal :am, tokens[1].tags[0].type
     assert_equal 2, tokens.size
-    
+
     # don't affect unwanted patterns
-    
+
     tokens = [Chronic::Token.new("friday"), Chronic::Token.new("morning")]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
     tokens[1].tag(Chronic::RepeaterDayPortion.new(:morning))
-    
+
     assert_equal :morning, tokens[1].tags[0].type
-    
-    tokens = Chronic.dealias_and_disambiguate_times(tokens, {})
-    
+
+    tokens = Chronic::Handlers.dealias_and_disambiguate_times(tokens, {})
+
     assert_equal :morning, tokens[1].tags[0].type
     assert_equal 2, tokens.size
   end
-  
+
   def test_guess
     span = Chronic::Span.new(Time.local(2006, 8, 16, 0), Time.local(2006, 8, 17, 0))
     assert_equal Time.local(2006, 8, 16, 12), Chronic.guess(span)
-    
+
     span = Chronic::Span.new(Time.local(2006, 8, 16, 0), Time.local(2006, 8, 17, 0, 0, 1))
     assert_equal Time.local(2006, 8, 16, 12), Chronic.guess(span)
-    
+
     span = Chronic::Span.new(Time.local(2006, 11), Time.local(2006, 12))
     assert_equal Time.local(2006, 11, 16), Chronic.guess(span)
   end
-  
-end
+
+  def test_now
+    Chronic.parse('now', :now => Time.local(2006, 01))
+    assert_equal Time.local(2006, 01), Chronic.now
+
+    Chronic.parse('now', :now => Time.local(2007, 01))
+    assert_equal Time.local(2007, 01), Chronic.now
+  end
+
+  def test_endian_definitions
+    # middle, little
+    endians = [
+      Chronic::Handler.new([:scalar_month, :separator_slash_or_dash, :scalar_day, :separator_slash_or_dash, :scalar_year, :separator_at?, 'time?'], :handle_sm_sd_sy),
+      Chronic::Handler.new([:scalar_day, :separator_slash_or_dash, :scalar_month, :separator_slash_or_dash, :scalar_year, :separator_at?, 'time?'], :handle_sd_sm_sy)
+    ]
+
+    assert_equal endians, Chronic.definitions[:endian]
+
+    defs = Chronic.definitions(:endian_precedence => :little)
+    assert_equal endians.reverse, defs[:endian]
+
+    defs = Chronic.definitions(:endian_precedence => [:little, :middle])
+    assert_equal endians.reverse, defs[:endian]
+
+    assert_raises(ArgumentError) do
+      Chronic.definitions(:endian_precedence => :invalid)
+    end
+  end
+
+  def test_passing_options
+    assert_raises(ArgumentError) do
+      Chronic.parse('now', :invalid => :option)
+    end
+
+    assert_raises(ArgumentError) do
+      Chronic.parse('now', :context => :invalid_context)
+    end
+  end
+
+  def test_debug
+    require 'stringio'
+    $stdout = StringIO.new
+    Chronic.debug = true
+
+    Chronic.parse 'now'
+    assert $stdout.string.include?('this(grabber-this)')
+  ensure
+    $stdout = STDOUT
+    Chronic.debug = false
+  end
+
+  # Chronic.construct
+
+  def test_normal
+    assert_equal Time.local(2006, 1, 2, 0, 0, 0), Chronic.construct(2006, 1, 2, 0, 0, 0)
+    assert_equal Time.local(2006, 1, 2, 3, 0, 0), Chronic.construct(2006, 1, 2, 3, 0, 0)
+    assert_equal Time.local(2006, 1, 2, 3, 4, 0), Chronic.construct(2006, 1, 2, 3, 4, 0)
+    assert_equal Time.local(2006, 1, 2, 3, 4, 5), Chronic.construct(2006, 1, 2, 3, 4, 5)
+  end
+
+  def test_second_overflow
+    assert_equal Time.local(2006, 1, 1, 0, 1, 30), Chronic.construct(2006, 1, 1, 0, 0, 90)
+    assert_equal Time.local(2006, 1, 1, 0, 5, 0), Chronic.construct(2006, 1, 1, 0, 0, 300)
+  end
+
+  def test_minute_overflow
+    assert_equal Time.local(2006, 1, 1, 1, 30), Chronic.construct(2006, 1, 1, 0, 90)
+    assert_equal Time.local(2006, 1, 1, 5), Chronic.construct(2006, 1, 1, 0, 300)
+  end
+
+  def test_hour_overflow
+    assert_equal Time.local(2006, 1, 2, 12), Chronic.construct(2006, 1, 1, 36)
+    assert_equal Time.local(2006, 1, 7), Chronic.construct(2006, 1, 1, 144)
+  end
+
+  def test_day_overflow
+    assert_equal Time.local(2006, 2, 1), Chronic.construct(2006, 1, 32)
+    assert_equal Time.local(2006, 3, 5), Chronic.construct(2006, 2, 33)
+    assert_equal Time.local(2004, 3, 4), Chronic.construct(2004, 2, 33)
+    assert_equal Time.local(2000, 3, 4), Chronic.construct(2000, 2, 33)
+
+    assert_nothing_raised do
+      Chronic.construct(2006, 1, 56)
+    end
+
+    assert_raise(RuntimeError) do
+      Chronic.construct(2006, 1, 57)
+    end
+  end
+
+  def test_month_overflow
+    assert_equal Time.local(2006, 1), Chronic.construct(2005, 13)
+    assert_equal Time.local(2005, 12), Chronic.construct(2000, 72)
+  end
+
+end

data/test/test_DaylightSavings.rb

@@ -0,0 +1,118 @@
+require 'helper'
+
+class TestDaylightSavings < Test::Unit::TestCase
+
+  def setup
+    @begin_daylight_savings = Time.local(2008, 3, 9, 5, 0, 0, 0)
+    @end_daylight_savings = Time.local(2008, 11, 2, 5, 0, 0, 0)
+  end
+
+  def test_begin_past
+    # ambiguous - resolve to last night
+    t = Chronic::RepeaterTime.new('900')
+    t.start = @begin_daylight_savings
+    assert_equal Time.local(2008, 3, 8, 21), t.next(:past).begin
+
+    # ambiguous - resolve to this afternoon
+    t = Chronic::RepeaterTime.new('900')
+    t.start = Time.local(2008, 3, 9, 22, 0, 0, 0)
+    assert_equal Time.local(2008, 3, 9, 21), t.next(:past).begin
+
+    # ambiguous - resolve to this morning
+    t = Chronic::RepeaterTime.new('400')
+    t.start = @begin_daylight_savings
+    assert_equal Time.local(2008, 3, 9, 4), t.next(:past).begin
+
+    # unambiguous - resolve to today
+    t = Chronic::RepeaterTime.new('0400')
+    t.start = @begin_daylight_savings
+    assert_equal Time.local(2008, 3, 9, 4), t.next(:past).begin
+
+    # unambiguous - resolve to yesterday
+    t = Chronic::RepeaterTime.new('1300')
+    t.start = @begin_daylight_savings
+    assert_equal Time.local(2008, 3, 8, 13), t.next(:past).begin
+  end
+
+  def test_begin_future
+    # ambiguous - resolve to this morning
+    t = Chronic::RepeaterTime.new('900')
+    t.start = @begin_daylight_savings
+    assert_equal Time.local(2008, 3, 9, 9), t.next(:future).begin
+
+    # ambiguous - resolve to this afternoon
+    t = Chronic::RepeaterTime.new('900')
+    t.start = Time.local(2008, 3, 9, 13, 0, 0, 0)
+    assert_equal Time.local(2008, 3, 9, 21), t.next(:future).begin
+
+    # ambiguous - resolve to tomorrow
+    t = Chronic::RepeaterTime.new('900')
+    t.start = Time.local(2008, 3, 9, 22, 0, 0, 0)
+    assert_equal Time.local(2008, 3, 10, 9), t.next(:future).begin
+
+    # unambiguous - resolve to today
+    t = Chronic::RepeaterTime.new('0900')
+    t.start = @begin_daylight_savings
+    assert_equal Time.local(2008, 3, 9, 9), t.next(:future).begin
+
+    # unambiguous - resolve to tomorrow
+    t = Chronic::RepeaterTime.new('0400')
+    t.start = @begin_daylight_savings
+    assert_equal Time.local(2008, 3, 10, 4), t.next(:future).begin
+  end
+
+  def test_end_past
+    # ambiguous - resolve to last night
+    t = Chronic::RepeaterTime.new('900')
+    t.start = @end_daylight_savings
+    assert_equal Time.local(2008, 11, 1, 21), t.next(:past).begin
+
+    # ambiguous - resolve to this afternoon
+    t = Chronic::RepeaterTime.new('900')
+    t.start = Time.local(2008, 11, 2, 22, 0, 0, 0)
+    assert_equal Time.local(2008, 11, 2, 21), t.next(:past).begin
+
+    # ambiguous - resolve to this morning
+    t = Chronic::RepeaterTime.new('400')
+    t.start = @end_daylight_savings
+    assert_equal Time.local(2008, 11, 2, 4), t.next(:past).begin
+
+    # unambiguous - resolve to today
+    t = Chronic::RepeaterTime.new('0400')
+    t.start = @end_daylight_savings
+    assert_equal Time.local(2008, 11, 2, 4), t.next(:past).begin
+
+    # unambiguous - resolve to yesterday
+    t = Chronic::RepeaterTime.new('1300')
+    t.start = @end_daylight_savings
+    assert_equal Time.local(2008, 11, 1, 13), t.next(:past).begin
+  end
+
+  def test_end_future
+    # ambiguous - resolve to this morning
+    t = Chronic::RepeaterTime.new('900')
+    t.start = @end_daylight_savings
+    assert_equal Time.local(2008, 11, 2, 9), t.next(:future).begin
+
+    # ambiguous - resolve to this afternoon
+    t = Chronic::RepeaterTime.new('900')
+    t.start = Time.local(2008, 11, 2, 13, 0, 0, 0)
+    assert_equal Time.local(2008, 11, 2, 21), t.next(:future).begin
+
+    # ambiguous - resolve to tomorrow
+    t = Chronic::RepeaterTime.new('900')
+    t.start = Time.local(2008, 11, 2, 22, 0, 0, 0)
+    assert_equal Time.local(2008, 11, 3, 9), t.next(:future).begin
+
+    # unambiguous - resolve to today
+    t = Chronic::RepeaterTime.new('0900')
+    t.start = @end_daylight_savings
+    assert_equal Time.local(2008, 11, 2, 9), t.next(:future).begin
+
+    # unambiguous - resolve to tomorrow
+    t = Chronic::RepeaterTime.new('0400')
+    t.start = @end_daylight_savings
+    assert_equal Time.local(2008, 11, 3, 4), t.next(:future).begin
+  end
+
+end

data/test/test_Handler.rb

@@ -1,8 +1,7 @@
-require 'chronic'
-require 'test/unit'
+require 'helper'
 
 class TestHandler < Test::Unit::TestCase
-  
+
   def setup
     # Wed Aug 16 14:00:00 UTC 2006
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
@@ -10,101 +9,96 @@ class TestHandler < Test::Unit::TestCase
 
   def test_handler_class_1
     handler = Chronic::Handler.new([:repeater], :handler)
-    
+
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('afternoon')
     tokens[1].tag(Chronic::RepeaterDayPortion.new(:afternoon))
-    
+
     assert !handler.match(tokens, Chronic.definitions)
   end
-  
+
   def test_handler_class_2
     handler = Chronic::Handler.new([:repeater, :repeater?], :handler)
-    
+
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('afternoon')
     tokens[1].tag(Chronic::RepeaterDayPortion.new(:afternoon))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('afternoon')
     tokens[2].tag(Chronic::RepeaterDayPortion.new(:afternoon))
-    
+
     assert !handler.match(tokens, Chronic.definitions)
   end
-  
+
   def test_handler_class_3
     handler = Chronic::Handler.new([:repeater, 'time?'], :handler)
-    
+
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('afternoon')
     tokens[1].tag(Chronic::RepeaterDayPortion.new(:afternoon))
-    
+
     assert !handler.match(tokens, Chronic.definitions)
   end
-  
+
   def test_handler_class_4
     handler = Chronic::Handler.new([:repeater_month_name, :scalar_day, 'time?'], :handler)
-    
+
     tokens = [Chronic::Token.new('may')]
     tokens[0].tag(Chronic::RepeaterMonthName.new(:may))
-    
+
     assert !handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('27')
     tokens[1].tag(Chronic::ScalarDay.new(27))
-    
+
     assert handler.match(tokens, Chronic.definitions)
   end
-  
+
   def test_handler_class_5
     handler = Chronic::Handler.new([:repeater, 'time?'], :handler)
-    
+
     tokens = [Chronic::Token.new('friday')]
     tokens[0].tag(Chronic::RepeaterDayName.new(:friday))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('5:00')
     tokens[1].tag(Chronic::RepeaterTime.new('5:00'))
-    
+
     assert handler.match(tokens, Chronic.definitions)
-    
+
     tokens << Chronic::Token.new('pm')
     tokens[2].tag(Chronic::RepeaterDayPortion.new(:pm))
-    
+
     assert handler.match(tokens, Chronic.definitions)
   end
-  
+
   def test_handler_class_6
     handler = Chronic::Handler.new([:scalar, :repeater, :pointer], :handler)
-    
+
     tokens = [Chronic::Token.new('3'),
               Chronic::Token.new('years'),
               Chronic::Token.new('past')]
-              
+
     tokens[0].tag(Chronic::Scalar.new(3))
     tokens[1].tag(Chronic::RepeaterYear.new(:year))
     tokens[2].tag(Chronic::Pointer.new(:past))
-    
+
     assert handler.match(tokens, Chronic.definitions)
   end
-  
-  def test_constantize
-    handler = Chronic::Handler.new([], :handler)
-    assert_equal Chronic::RepeaterTime, handler.constantize(:repeater_time)
-  end
-  
-end
+
+end

data/test/test_MiniDate.rb

@@ -0,0 +1,32 @@
+require 'helper'
+
+class TestMiniDate < Test::Unit::TestCase
+  def test_valid_month
+    assert_raise(ArgumentError){ Chronic::MiniDate.new(0,12) }
+    assert_raise(ArgumentError){ Chronic::MiniDate.new(13,1) }
+  end
+  
+  def test_is_between
+    m=Chronic::MiniDate.new(3,2)
+    assert m.is_between?(Chronic::MiniDate.new(2,4), Chronic::MiniDate.new(4,7))
+    assert !m.is_between?(Chronic::MiniDate.new(1,5), Chronic::MiniDate.new(2,7))    
+    
+    #There was a hang if date tested is in december and outside the testing range
+    m=Chronic::MiniDate.new(12,24)
+    assert !m.is_between?(Chronic::MiniDate.new(10,1), Chronic::MiniDate.new(12,21))
+  end
+  
+  def test_is_between_short_range
+    m=Chronic::MiniDate.new(5,10)
+    assert m.is_between?(Chronic::MiniDate.new(5,3), Chronic::MiniDate.new(5,12))
+    assert !m.is_between?(Chronic::MiniDate.new(5,11), Chronic::MiniDate.new(5,15))
+  end
+  
+  def test_is_between_wrapping_range
+    m=Chronic::MiniDate.new(1,1)
+    assert m.is_between?(Chronic::MiniDate.new(11,11), Chronic::MiniDate.new(2,2))
+    m=Chronic::MiniDate.new(12,12)
+    assert m.is_between?(Chronic::MiniDate.new(11,11), Chronic::MiniDate.new(1,5))
+  end
+  
+end

data/test/test_Numerizer.rb

@@ -0,0 +1,72 @@
+require 'helper'
+
+class ParseNumbersTest < Test::Unit::TestCase
+
+  def test_straight_parsing
+    strings = {
+      'one' => 1,
+      'five' => 5,
+      'ten' => 10,
+      'eleven' => 11,
+      'twelve' => 12,
+      'thirteen' => 13,
+      'fourteen' => 14,
+      'fifteen' => 15,
+      'sixteen' => 16,
+      'seventeen' => 17,
+      'eighteen' => 18,
+      'nineteen' => 19,
+      'twenty' => 20,
+      'twenty seven' => 27,
+      'thirty-one' => 31,
+      'thirty-seven' => 37,
+      'thirty seven' => 37,
+      'fifty nine' => 59,
+      'forty two' => 42,
+      'fourty two' => 42,
+      # 'a hundred' => 100,
+      'one hundred' => 100,
+      'one hundred and fifty' => 150,
+      # 'one fifty' => 150,
+      'two-hundred' => 200,
+      '5 hundred' => 500,
+      'nine hundred and ninety nine' => 999,
+      'one thousand' => 1000,
+      'twelve hundred' => 1200,
+      'one thousand two hundred' => 1_200,
+      'seventeen thousand' => 17_000,
+      'twentyone-thousand-four-hundred-and-seventy-three' => 21_473,
+      'seventy four thousand and two' => 74_002,
+      'ninety nine thousand nine hundred ninety nine' => 99_999,
+      '100 thousand' => 100_000,
+      'two hundred fifty thousand' => 250_000,
+      'one million' => 1_000_000,
+      'one million two hundred fifty thousand and seven' => 1_250_007,
+      'one billion' => 1_000_000_000,
+      'one billion and one' => 1_000_000_001}
+
+    strings.each do |key, val|
+      assert_equal val, Chronic::Numerizer.numerize(key).to_i
+    end
+  end
+
+  def test_ordinal_strings
+    {
+      'first' => '1st',
+      'second' => 'second',
+      'second day' => '2nd day',
+      'second of may' => '2nd of may',
+      'fifth' => '5th',
+      'twenty third' => '23rd',
+      'first day month two' => '1st day month 2'
+    }.each do |key, val|
+      # Use pre_normalize here instead of Numerizer directly because
+      # pre_normalize deals with parsing 'second' appropriately
+      assert_equal val, Chronic.pre_normalize(key)
+    end
+  end
+
+  def test_edges
+    assert_equal "27 Oct 2006 7:30am", Chronic::Numerizer.numerize("27 Oct 2006 7:30am")
+  end
+end

data/test/test_RepeaterDayName.rb

@@ -1,18 +1,17 @@
-require 'chronic'
-require 'test/unit'
+require 'helper'
 
 class TestRepeaterDayName < Test::Unit::TestCase
-  
+
   def setup
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
-  
+
   def test_match
     token = Chronic::Token.new('saturday')
     repeater = Chronic::Repeater.scan_for_day_names(token)
     assert_equal Chronic::RepeaterDayName, repeater.class
     assert_equal :saturday, repeater.type
-    
+
     token = Chronic::Token.new('sunday')
     repeater = Chronic::Repeater.scan_for_day_names(token)
     assert_equal Chronic::RepeaterDayName, repeater.class
@@ -22,31 +21,31 @@ class TestRepeaterDayName < Test::Unit::TestCase
   def test_next_future
     mondays = Chronic::RepeaterDayName.new(:monday)
     mondays.start = @now
-    
+
     span = mondays.next(:future)
-    
+
     assert_equal Time.local(2006, 8, 21), span.begin
-    assert_equal Time.local(2006, 8, 22), span.end 
+    assert_equal Time.local(2006, 8, 22), span.end
 
     span = mondays.next(:future)
-    
+
     assert_equal Time.local(2006, 8, 28), span.begin
     assert_equal Time.local(2006, 8, 29), span.end
   end
-  
+
   def test_next_past
     mondays = Chronic::RepeaterDayName.new(:monday)
     mondays.start = @now
-    
+
     span = mondays.next(:past)
-    
+
     assert_equal Time.local(2006, 8, 14), span.begin
-    assert_equal Time.local(2006, 8, 15), span.end 
+    assert_equal Time.local(2006, 8, 15), span.end
 
     span = mondays.next(:past)
-    
+
     assert_equal Time.local(2006, 8, 7), span.begin
     assert_equal Time.local(2006, 8, 8), span.end
   end
-  
-end
+
+end

data/test/test_RepeaterFortnight.rb

@@ -1,8 +1,7 @@
-require 'chronic'
-require 'test/unit'
+require 'helper'
 
 class TestRepeaterFortnight < Test::Unit::TestCase
-  
+
   def setup
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
@@ -10,54 +9,54 @@ class TestRepeaterFortnight < Test::Unit::TestCase
   def test_next_future
     fortnights = Chronic::RepeaterFortnight.new(:fortnight)
     fortnights.start = @now
-    
+
     next_fortnight = fortnights.next(:future)
     assert_equal Time.local(2006, 8, 20), next_fortnight.begin
     assert_equal Time.local(2006, 9, 3), next_fortnight.end
-    
+
     next_next_fortnight = fortnights.next(:future)
     assert_equal Time.local(2006, 9, 3), next_next_fortnight.begin
     assert_equal Time.local(2006, 9, 17), next_next_fortnight.end
   end
-  
+
   def test_next_past
     fortnights = Chronic::RepeaterFortnight.new(:fortnight)
     fortnights.start = @now
-    
+
     last_fortnight = fortnights.next(:past)
     assert_equal Time.local(2006, 7, 30), last_fortnight.begin
     assert_equal Time.local(2006, 8, 13), last_fortnight.end
-    
+
     last_last_fortnight = fortnights.next(:past)
     assert_equal Time.local(2006, 7, 16), last_last_fortnight.begin
     assert_equal Time.local(2006, 7, 30), last_last_fortnight.end
   end
-  
+
   def test_this_future
     fortnights = Chronic::RepeaterFortnight.new(:fortnight)
     fortnights.start = @now
-    
+
     this_fortnight = fortnights.this(:future)
     assert_equal Time.local(2006, 8, 16, 15), this_fortnight.begin
     assert_equal Time.local(2006, 8, 27), this_fortnight.end
   end
-  
+
   def test_this_past
     fortnights = Chronic::RepeaterFortnight.new(:fortnight)
     fortnights.start = @now
-    
+
     this_fortnight = fortnights.this(:past)
     assert_equal Time.local(2006, 8, 13, 0), this_fortnight.begin
     assert_equal Time.local(2006, 8, 16, 14), this_fortnight.end
   end
-  
+
   def test_offset
     span = Chronic::Span.new(@now, @now + 1)
-    
+
     offset_span = Chronic::RepeaterWeek.new(:week).offset(span, 3, :future)
-    
+
     assert_equal Time.local(2006, 9, 6, 14), offset_span.begin
     assert_equal Time.local(2006, 9, 6, 14, 0, 1), offset_span.end
   end
-  
-end
+
+end