nickel 0.0.3 → 0.0.4

data/test/nlp_tests_helper.rb

@@ -0,0 +1,55 @@
+require File.join(File.dirname(__FILE__), 'compare.rb')
+require 'pp'
+
+module NLPTestsHelper
+  
+  # Removing pretty print and pretty_inspect dramatically improves test time.
+  PRETTY = false
+
+  def assert_nlp(nlpobj, occ_array)
+    nlp_occ_array = nlpobj.parse
+    inspect_method = PRETTY ? :pretty_inspect : :inspect
+    compare = Compare::ArrayofObjects.new(nlp_occ_array, occ_array)
+    err_msg = "\n\n\e[44mExpected\e[0m\n " + occ_array.send(inspect_method) + 
+              "\n\n\e[44mGot\e[0m\n " + nlp_occ_array.send(inspect_method) + 
+              "\n\n" + nlpobj.debug_str(inspect_method)
+    assert_block(err_msg){ compare.same? }
+  end
+
+  def assert_message(nlpobj, expected_message)
+    nlpobj.parse
+    message = nlpobj.message
+    err_msg = "\n\nQuery:\n" + nlpobj.query +
+              "\n\n\e[44mExpected Message\e[0m\n" + expected_message.inspect + 
+              "\n\n\e[44mGot\e[0m\n" + message.inspect
+    assert_block(err_msg){ message == expected_message }
+  end
+end
+
+
+
+# Could use this instead of test/unit 
+# class Testis
+#   def initialize
+#     #find all methods with test_ and run them
+#     methods_to_run = self.methods.select {|mname| mname =~ /^test_/}
+#     methods_to_run.each do |meth|
+#       eval(meth)
+#     end
+#   end
+# 
+#   def assert_nlp(nlpobj, occ_array)
+#     nlp_occ_array = nlpobj.parse
+#     compare = Compare::ArrayofObjects.new(nlp_occ_array.dup, occ_array.dup)
+#     cval = compare.same?
+#     puts cval
+#     if !cval
+#       puts nlp_occ_array.inspect
+#       puts "\n\n\n"
+#       puts occ_array.inspect
+#     end
+#   end
+# end
+
+
+

data/test/zdate_test.rb

@@ -0,0 +1,43 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'nickel', 'ruby_ext', 'to_s2.rb')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'nickel', 'zdate.rb')
+
+include Nickel
+
+class ZDateTest < Test::Unit::TestCase
+
+  def test_get_next_date_from_date_of_month
+    d1 = ZDate.new('20090927')
+    assert_equal ZDate.new('20090928'), d1.get_next_date_from_date_of_month(28)
+    assert_equal ZDate.new('20091005'), d1.get_next_date_from_date_of_month(5)
+    assert_equal nil, d1.get_next_date_from_date_of_month(31)
+  end
+  
+  # def test_get_date_from_day_and_week_of_month
+  #   d1 = ZDate.new('20090927')
+  #   assert_equal ZDate.new('20090930'), d1.get_date_from_day_and_week_of_month(Z::WED, -1)
+  #   assert_equal ZDate.new('20090930'), d1.get_date_from_day_and_week_of_month(Z::WED, 5)
+  #   # there is no 5th thursday this sept
+  #   assert_equal nil, d1.get_date_from_day_and_week_of_month(Z::THU, 5)
+  # end
+  
+  def test_diff_in_days_to_this
+    d1 = ZDate.new('20090927')
+    assert_equal 0, d1.diff_in_days_to_this(ZDate::SUN)
+    assert_equal 1, d1.diff_in_days_to_this(ZDate::MON)
+    assert_equal 2, d1.diff_in_days_to_this(ZDate::TUE)
+    assert_equal 3, d1.diff_in_days_to_this(ZDate::WED)
+    assert_equal 4, d1.diff_in_days_to_this(ZDate::THU)
+    assert_equal 5, d1.diff_in_days_to_this(ZDate::FRI)
+    assert_equal 6, d1.diff_in_days_to_this(ZDate::SAT)
+
+    d2 = ZDate.new('20090930')
+    assert_equal 0, d2.diff_in_days_to_this(ZDate::WED)
+    assert_equal 1, d2.diff_in_days_to_this(ZDate::THU)
+    assert_equal 2, d2.diff_in_days_to_this(ZDate::FRI)
+    assert_equal 3, d2.diff_in_days_to_this(ZDate::SAT)
+    assert_equal 4, d2.diff_in_days_to_this(ZDate::SUN)
+    assert_equal 5, d2.diff_in_days_to_this(ZDate::MON)
+    assert_equal 6, d2.diff_in_days_to_this(ZDate::TUE)
+  end
+end

data/test/ztime_test.rb

@@ -0,0 +1,428 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'nickel', 'ruby_ext', 'to_s2.rb')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'nickel', 'ztime.rb')
+
+include Nickel
+
+class ZTimeTest < Test::Unit::TestCase
+
+  def test_12_to_12am
+    t1 = ZTime.new("1200")
+    t2 = ZTime.new("1200", :am)
+    t1_after_modify = t1.dup    # t1 should not change
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_12pm_to_12
+    t1 = ZTime.new("1200", :pm)
+    t2 = ZTime.new("1200")
+    t2_after_modify = ZTime.new("1200", :am)
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_12_to_12pm
+    t1 = ZTime.new("1200")
+    t2 = ZTime.new("1200", :pm)
+    t1_after_modify = ZTime.new("12", :am)
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_12am_to_12
+    t1 = ZTime.new("1200", :am)
+    t2 = ZTime.new("1200")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+  
+  def test_1_to_2am
+    t1 = ZTime.new("1")
+    t2 = ZTime.new("2", :am)
+    t1_after_modify = t1.dup    # t1 should not change
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_1am_to_2
+    t1 = ZTime.new("1", :am)
+    t2 = ZTime.new("2")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+  
+  def test_10_to_11pm
+    t1 = ZTime.new("10")
+    t2 = ZTime.new("11", :pm)
+    t1_after_modify = ZTime.new("10", :pm)    # should really be 10pm
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_10pm_to_11
+    t1 = ZTime.new("10", :pm)
+    t2 = ZTime.new("11")
+    t2_after_modify = ZTime.new("11", :pm)
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_8_to_12pm
+    t1 = ZTime.new("8")
+    t2 = ZTime.new("12", :pm)
+    t1_after_modify = t1.dup
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_8am_to_12
+    t1 = ZTime.new("8", :am)
+    t2 = ZTime.new("12")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_830_to_835am
+    t1 = ZTime.new("0830")
+    t2 = ZTime.new("0835", :am)
+    t1_after_modify = t1.dup
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_830am_to_835
+    t1 = ZTime.new("0830", :am)
+    t2 = ZTime.new("0835")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_830_to_835pm
+    t1 = ZTime.new("0830")
+    t2 = ZTime.new("0835", :pm)
+    t1_after_modify = ZTime.new("0830", :pm)
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_830pm_to_835
+    t1 = ZTime.new("0830", :pm)
+    t2 = ZTime.new("0835")
+    t2_after_modify = ZTime.new("0835", :pm)
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_835_to_835pm
+    t1 = ZTime.new("0835")
+    t2 = ZTime.new("0835", :pm)
+    t1_after_modify = t1.dup
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_835am_to_835
+    t1 = ZTime.new("0835", :am)
+    t2 = ZTime.new("0835")
+    t2_after_modify = ZTime.new("0835", :pm)
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_835pm_to_835
+    t1 = ZTime.new("0835", :pm)
+    t2 = ZTime.new("0835")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+  
+  def test_1021_to_1223am
+    t1 = ZTime.new("1021")
+    t2 = ZTime.new("1223", :am)
+    t1_after_modify = ZTime.new("1021", :pm)
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_1021pm_to_1223
+    t1 = ZTime.new("1021", :pm)
+    t2 = ZTime.new("1223")
+    t2_after_modify = ZTime.new("1223", :am)
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_12_to_2am
+    t1 = ZTime.new("12")
+    t2 = ZTime.new("2", :am)
+    t1_after_modify = ZTime.new("12", :am)
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_12am_to_2
+    t1 = ZTime.new("12", :am)
+    t2 = ZTime.new("2")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_1220_to_2am
+    t1 = ZTime.new("1220")
+    t2 = ZTime.new("2", :am)
+    t1_after_modify = ZTime.new("1220", :am)
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_1220am_to_2
+    t1 = ZTime.new("1220", :am)
+    t2 = ZTime.new("2")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+  
+  def test_1220_to_12am
+    t1 = ZTime.new("1220")
+    t2 = ZTime.new("12", :am)
+    t1_after_modify = t1.dup
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_1220am_to_12
+    t1 = ZTime.new("1220", :am)
+    t2 = ZTime.new("12")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_1220_to_1220am
+    t1 = ZTime.new("1220")
+    t2 = ZTime.new("1220", :am)
+    t1_after_modify = t1.dup
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_1220pm_to_1220
+    t1 = ZTime.new("1220", :pm)
+    t2 = ZTime.new("1220")
+    t2_after_modify = ZTime.new("1220", :am)
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_930_to_5pm
+    t1 = ZTime.new("0930")
+    t2 = ZTime.new("5", :pm)
+    t1_after_modify = t1.dup
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_930am_to_5
+    t1 = ZTime.new("0930", :am)
+    t2 = ZTime.new("5")
+    t2_after_modify = ZTime.new("5", :pm)
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_930_to_5am
+    t1 = ZTime.new("0930")
+    t2 = ZTime.new("5", :am)
+    t1_after_modify = ZTime.new("0930", :pm)
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_930pm_to_5
+    t1 = ZTime.new("0930", :pm)
+    t2 = ZTime.new("5")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+  
+  def test_1100_to_425pm
+    t1 = ZTime.new("1100")
+    t2 = ZTime.new("0425", :pm)
+    t1_after_modify = t1.dup
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_1100am_to_425
+    t1 = ZTime.new("1100", :am)
+    t2 = ZTime.new("0425")
+    t2_after_modify = ZTime.new("0425", :pm)
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+  
+  def test_1100_to_425am
+    t1 = ZTime.new("1100")
+    t2 = ZTime.new("0425", :am)
+    t1_after_modify = ZTime.new("1100", :pm)
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_1100pm_to_425
+    t1 = ZTime.new("1100", :pm)
+    t2 = ZTime.new("0425")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+  
+  def test_0115_to_0120am
+    t1 = ZTime.new("0115")
+    t2 = ZTime.new("0120", :am)
+    t1_after_modify = t1.dup
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_0115am_to_0120
+    t1 = ZTime.new("0115", :am)
+    t2 = ZTime.new("0120")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_0115_to_0120pm
+    t1 = ZTime.new("0115")
+    t2 = ZTime.new("0120", :pm)
+    t1_after_modify = ZTime.new("0115", :pm)
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_0115pm_to_0120
+    t1 = ZTime.new("0115", :pm)
+    t2 = ZTime.new("0120")
+    t2_after_modify = ZTime.new("0120", :pm)
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+  
+  def test_1020_to_1015am
+    t1 = ZTime.new("1020")
+    t2 = ZTime.new("1015", :am)
+    t1_after_modify = ZTime.new("1020", :pm)
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_1020pm_to_1015
+    t1 = ZTime.new("1020", :pm)
+    t2 = ZTime.new("1015")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+  
+  def test_1020_to_1015pm
+    t1 = ZTime.new("1020")
+    t2 = ZTime.new("1015", :pm)
+    t1_after_modify = t1.dup
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_1020am_to_1015
+    t1 = ZTime.new("1020", :am)
+    t2 = ZTime.new("1015")
+    t2_after_modify = ZTime.new("1015", :pm)
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+
+  def test_1015_to_1020am
+    t1 = ZTime.new("1015")
+    t2 = ZTime.new("1020", :am)
+    t1_after_modify = t1.dup
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_1015pm_to_1020
+    t1 = ZTime.new("1015", :pm)
+    t2 = ZTime.new("1020")
+    t2_after_modify = ZTime.new("1020", :pm)
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+  
+  def test_1015_to_1020pm
+    t1 = ZTime.new("1015")
+    t2 = ZTime.new("1020", :pm)
+    t1_after_modify = ZTime.new("1015", :pm)
+    t1.modify_such_that_is_before(t2)
+    assert_equal(t1_after_modify, t1)
+  end
+
+  def test_1015am_to_1020
+    t1 = ZTime.new("1015", :am)
+    t2 = ZTime.new("1020")
+    t2_after_modify = t2.dup
+    t2.modify_such_that_is_after(t1)
+    assert_equal(t2_after_modify, t2)
+  end
+  
+  def test_am_pm_modifier1
+    t1 = ZTime.new("7", :pm)
+    t1d = t1.dup
+    ZTime.am_pm_modifier(t1)
+    assert_equal(t1d, t1)
+  end
+
+  def test_am_pm_modifier2
+    t1 = ZTime.new("7", :pm)
+    t2 = ZTime.new("8")
+    t1d = t1.dup
+    ZTime.am_pm_modifier(t1,t2)
+    assert_equal(t1d, t1)
+    assert_equal(ZTime.new("8", :pm), t2)
+  end
+  
+  def test_am_pm_modifier3
+    t1 = ZTime.new("7")
+    t2 = ZTime.new("8", :pm)
+    t2d = t2.dup
+    t3 = ZTime.new("9")
+
+    ZTime.am_pm_modifier(t1,t2,t3)
+    assert_equal(ZTime.new("7", :pm), t1)
+    assert_equal(t2d, t2)
+    assert_equal(ZTime.new("9", :pm), t3)    
+  end
+
+  def test_am_pm_modifier4
+    t1 = ZTime.new("7")
+    t2 = ZTime.new("8", :am)
+    t3 = ZTime.new("9")
+    t4 = ZTime.new("4", :pm)
+    t5 = ZTime.new("7")
+    
+    ZTime.am_pm_modifier(t1,t2,t3,t4,t5)
+    assert_equal(ZTime.new("7", :am), t1)
+    assert_equal(ZTime.new("8", :am), t2)
+    assert_equal(ZTime.new("9", :am), t3)
+    assert_equal(ZTime.new("4", :pm), t4)
+    assert_equal(ZTime.new("7", :pm), t5)    
+  end
+end
+

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nickel
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Lou Zell
@@ -14,22 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 -04:00
+date: 2011-03-14 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mapricot
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-description: A client for naturalinputs.com.  Extracts date, time, and message information from naturally worded text.
+dependencies: []
+
+description: Extracts date, time, and message information from naturally worded text.
 email: lzell11@gmail.com
 executables: []
 
@@ -38,12 +28,30 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- README.rdoc
 - History.txt
 - License.txt
+- README.rdoc
+- Rakefile
 - nickel.gemspec
-- test/nickel_spec.rb
 - lib/nickel.rb
+- lib/nickel/construct.rb
+- lib/nickel/construct_finder.rb
+- lib/nickel/construct_interpreter.rb
+- lib/nickel/instance_from_hash.rb
+- lib/nickel/nlp.rb
+- lib/nickel/occurrence.rb
+- lib/nickel/query.rb
+- lib/nickel/query_constants.rb
+- lib/nickel/zdate.rb
+- lib/nickel/ztime.rb
+- lib/nickel/ruby_ext/calling_method.rb
+- lib/nickel/ruby_ext/to_s2.rb
+- test/compare.rb
+- test/nlp_test.rb
+- test/nlp_tests_helper.rb
+- test/zdate_test.rb
+- test/ztime_test.rb
+- spec/nickel_spec.rb
 has_rdoc: true
 homepage: http://github.com/lzell/nickel
 licenses: []
@@ -57,25 +65,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Natural language date and time parsing
+summary: Natural language date, time, and message parsing.
 test_files: []