@@ -168,12 +168,29 @@ To add a parser to a parser type: t = Time.now {:civil=>[t.year, t.mon, t.day]} end + DateTime.add_parser(:mine, /\Anow\z/i) do |m| t = Time.now {:civil=>[t.year, t.mon, t.day], :parts=>[t.hour, t.min, t.sec, t.usec] \ :offset=>t.utc_offset} end +If you add a DateTime parser that may guess at certain values instead of +parsing them out of the string, you should include a :not_parsed entry which +is an array of symbols indicating items that were not parsed directly out +of the string. This is only necessary if you are using the compatibility +mode and want better compatibility for Date._parse (which ruby's Time.parse +method uses internally): + + DateTime.add_parser(:mine, /\A(\d\d)_(\d\d)_(\d{4})\z/i) do |m| + {:civil=>[m[3].to_i, m[2].to_i, m[1].to_i], :parts=>[0,0,0,0], :offset=>0, \ + :not_parsed=>[:hour, :min, :sec, :sec_fraction, :offset, :zone]} + end + +The entries in :not_parsed should match keys that can be returned by +Date._parse, so in addition to the ones listed above, you can also use +:year, :mon, and :mday. + Adding a parser to a parser type adds it to the front of the array of parsers for that type, so it will be tried before other parsers for that type. It is an error to add a parser to a parser type that doesn't exist. README @@ -42,7 +42,7 @@ module ThirdBase # * :zone : time zone offset as string def _parse(str, comp=false) d = DateTime.parse(str) - {:mon=>d.mon, :zone=>d.zone, :sec=>d.sec, :year=>d.year, :hour=>d.hour, :offset=>d.offset, :mday=>d.day, :min=>d.min, :sec_fraction=>d.usec/1000000.0} + {:mon=>d.mon, :zone=>d.zone, :sec=>d.sec, :year=>d.year, :hour=>d.hour, :offset=>d.offset, :mday=>d.day, :min=>d.min, :sec_fraction=>d.usec/1000000.0}.reject{|k, v| d.not_parsed.include?(k)} end # Converts an Astronomical Julian Date to an Astronomical Modified Julian Date (substracts an integer from ajd) lib/third_base/compat.rb @@ -12,13 +12,13 @@ module ThirdBase DEFAULT_PARSERS[:time] = [[%r{\A#{TIME_RE_STRING}\z}io, proc do |m| unless m[0] == '' t = Time.now - add_parsed_time_parts(m, {:civil=>[t.year, t.mon, t.day]}, 1) + add_parsed_time_parts(m, {:civil=>[t.year, t.mon, t.day], :not_parsed=>[:year, :mon, :mday]}, 1) end end]] DEFAULT_PARSERS[:iso] = [[%r{\A(-?\d{4})[-./ ](\d\d)[-./ ](\d\d)#{TIME_RE_STRING}\z}io, proc{|m| add_parsed_time_parts(m, :civil=>[m[1].to_i, m[2].to_i, m[3].to_i])}]] DEFAULT_PARSERS[:us] = [[%r{\A(\d\d?)[-./ ](\d\d?)[-./ ](\d\d(?:\d\d)?)#{TIME_RE_STRING}\z}io, proc{|m| add_parsed_time_parts(m, :civil=>[two_digit_year(m[3]), m[1].to_i, m[2].to_i])}], - [%r{\A(\d\d?)/(\d?\d)#{TIME_RE_STRING}\z}o, proc{|m| add_parsed_time_parts(m, {:civil=>[Time.now.year, m[1].to_i, m[2].to_i]}, 3)}], - [%r{\A#{MONTHNAME_RE_PATTERN}[-./ ](\d\d?)(?:st|nd|rd|th)?,?(?:[-./ ](-?(?:\d\d(?:\d\d)?)))?#{TIME_RE_STRING}\z}io, proc{|m| add_parsed_time_parts(m, :civil=>[m[3] ? two_digit_year(m[3]) : Time.now.year, MONTH_NUM_MAP[m[1].downcase], m[2].to_i])}], + [%r{\A(\d\d?)/(\d?\d)#{TIME_RE_STRING}\z}o, proc{|m| add_parsed_time_parts(m, {:civil=>[Time.now.year, m[1].to_i, m[2].to_i], :not_parsed=>:year}, 3)}], + [%r{\A#{MONTHNAME_RE_PATTERN}[-./ ](\d\d?)(?:st|nd|rd|th)?,?(?:[-./ ](-?(?:\d\d(?:\d\d)?)))?#{TIME_RE_STRING}\z}io, proc{|m| add_parsed_time_parts(m, :civil=>[m[3] ? two_digit_year(m[3]) : Time.now.year, MONTH_NUM_MAP[m[1].downcase], m[2].to_i], :not_parsed=>m[3] ? [] : [:year])}], [%r{\A(\d\d?)(?:st|nd|rd|th)?[-./ ]#{MONTHNAME_RE_PATTERN}[-./ ](-?\d{4})#{TIME_RE_STRING}\z}io, proc{|m| add_parsed_time_parts(m, :civil=>[m[3].to_i, MONTH_NUM_MAP[m[2].downcase], m[1].to_i])}], [%r{\A(-?\d{4})[-./ ]#{MONTHNAME_RE_PATTERN}[-./ ](\d\d?)(?:st|nd|rd|th)?#{TIME_RE_STRING}\z}io, proc{|m| add_parsed_time_parts(m, :civil=>[m[1].to_i, MONTH_NUM_MAP[m[2].downcase], m[3].to_i])}], [%r{\A#{MONTHNAME_RE_PATTERN}[-./ ](-?\d{4})#{TIME_RE_STRING}\z}io, proc{|m| add_parsed_time_parts(m, {:civil=>[m[2].to_i, MONTH_NUM_MAP[m[1].downcase], 1]}, 3)}]] @@ -30,11 +30,11 @@ module ThirdBase case m.length when 2 t = Time.now - {:civil=>[t.year, t.mon, m.to_i]} + {:civil=>[t.year, t.mon, m.to_i], :not_parsed=>[:year, :mon, :mday]} when 3 - {:ordinal=>[Time.now.year, m.to_i]} + {:ordinal=>[Time.now.year, m.to_i], :not_parsed=>[:year, :mon, :mday]} when 4 - {:civil=>[Time.now.year, m[0..1].to_i, m[2..3].to_i]} + {:civil=>[Time.now.year, m[0..1].to_i, m[2..3].to_i], :not_parsed=>[:year]} when 5 {:ordinal=>[two_digit_year(m[0..1]), m[2..4].to_i]} when 6 @@ -128,16 +128,25 @@ module ThirdBase # * i + 4 : meridian indicator # * i + 5 : time zone def self.add_parsed_time_parts(m, h, i=4) + not_parsed = h[:not_parsed] || [] hour = m[i].to_i meridian = m[i+4] hour = hour_with_meridian(hour, /a/io.match(meridian) ? :am : :pm) if meridian - offset = if m[i+5] - x = m[i+5].gsub(':','') - x == 'Z' ? 0 : x[0..2].to_i*3600 + x[3..4].to_i*60 + offset = if of = m[i+5] + x = of.gsub(':','') + offset = x == 'Z' ? 0 : x[0..2].to_i*3600 + x[3..4].to_i*60 else + not_parsed.concat([:zone, :offset]) Time.now.utc_offset end - h.merge!(:parts=>[hour, m[i+1].to_i, m[i+2].to_i, (m[i+3].to_f/0.000001).to_i], :offset=>offset) + min = m[i+1].to_i + sec = m[i+2].to_i + sec_fraction = m[i+3].to_f + not_parsed << :hour unless m[i] + not_parsed << :min unless m[i+1] + not_parsed << :sec unless m[i+2] + not_parsed << :sec_fraction unless m[i+3] + h.merge!(:parts=>[hour, min, sec, (sec_fraction/0.000001).to_i], :offset=>offset, :not_parsed=>not_parsed) h end @@ -212,6 +221,9 @@ module ThirdBase attr_reader :offset alias utc_offset offset + # Which parts of this datetime were guessed instead of being parsed from the input. + attr_reader :not_parsed + # Called by DateTime.new!, should be a hash with the following possible keys: # # * :civil, :commericial, :jd, :ordinal : See ThirdBase::Date#initialize @@ -221,6 +233,7 @@ module ThirdBase # # Raises an ArgumentError if an invalid date is used. DateTime objects are immutable once created. def initialize(opts) + @not_parsed = opts[:not_parsed] || [] @offset = opts[:offset] raise(ArgumentError, 'invalid datetime') unless @offset.is_a?(Integer) and @offset <= 43200 and @offset >= -43200 if opts[:parts] lib/third_base/datetime.rb @@ -22,8 +22,13 @@ describe ThirdBase::CompatClassMethods do end it "#_parse should parse the date string and return a hash" do - Date._parse('2008-10-20 11:12:13-08:00').should == {:mon=>10, :zone=>'-08:00', :sec=>13, :sec_fraction=>0.0, :year=>2008, :hour=>11, :offset=>-28800, :mday=>20, :min=>12} - Date._parse('2008-10-20 11:12:13-08:00', true).should == {:mon=>10, :zone=>'-08:00', :sec=>13, :sec_fraction=>0.0, :year=>2008, :hour=>11, :offset=>-28800, :mday=>20, :min=>12} + Date._parse('2008-10-20 11:12:13.0-08:00').should == {:mon=>10, :zone=>'-08:00', :sec=>13, :sec_fraction=>0.0, :year=>2008, :hour=>11, :offset=>-28800, :mday=>20, :min=>12} + Date._parse('2008-10-20 11:12:13.0-08:00', true).should == {:mon=>10, :zone=>'-08:00', :sec=>13, :sec_fraction=>0.0, :year=>2008, :hour=>11, :offset=>-28800, :mday=>20, :min=>12} + end + + it "#_parse should not contain fields in the hash that were guessed" do + Date._parse('2008-10-20').should == {:year=>2008, :mday=>20, :mon=>10} + Date._parse('11:12:13').should == {:sec=>13, :hour=>11, :min=>12} end it "#ajd_to_amjd should convert a astronomical julian date to a astronomical modified julian date" do spec/compat/compat_class_methods_spec.rb @@ -33,4 +33,4 @@ describe "DateTime#+" do lambda { DateTime.civil(2007,2,27) + Object.new }.should raise_error(TypeError) end -end \ No newline at end of file +end spec/datetime/add_spec.rb @@ -1,6 +1,6 @@ spec = Gem::Specification.new do |s| s.name = "third_base" - s.version = "1.0.1" + s.version = "1.1.0" s.author = "Jeremy Evans" s.email = "code@jeremyevans.net" s.homepage = "http://third-base.rubyforge.org" third_base.gemspec b31b918a8ba7ef82aa5f5e0039c37996cc30e659 Jeremy Evans code@jeremyevans.net http://github.com/jeremyevans/third_base/commit/32db77410ff0fa5b879db2770bed8a2d21f68b39 32db77410ff0fa5b879db2770bed8a2d21f68b39 2009-06-01T10:15:23-07:00 2009-06-01T10:15:23-07:00 Fix Time.parse/Date._parse when using third_base; bump version to 1.1.0 ruby's Time.parse relies on Date._parse, and before third_base's Date._parse operated differently than the standard Date._parse. ruby's Date._parse returns a hash that only has keys where the values were parsed out of the string. third_base's Date._parse used to include all possible values, instead of just those that were parsed out of the string. For example, for a string like "06/01/2009", the standard Date._parse would return {:year=>2009, :mday=>1, :mon=>6}. third_base's Date._parse would return :hour, :min, :sec, :sec_fraction, :zone, and :offset keys in the hash. This caused problems with Time.parse because it used those values to build a time object, and it could yield the wrong time, due to issues with the offset. Time.parse when using third_base's Date._parse could give a time like 09:00:00-07:00 instead of 08:00:00-08:00. This commit fixes that issue by making the hash returned by Date._parse only include the keys parsed out of the string, and not include parts guessed by using the current time. This change unfortunately requires changing the DateTime parsers to include a :not_parsed entry for values that were not_parsed out of the string. Since third_base allows custom parsers, those custom parsers should change as well, though this should be backwards compatible. Because this change requires changes to external parsers to be fully compatible, the version is getting bumped to 1.1.0 instead of 1.0.2. If you aren't using third_base's compatibility mode, there should be no change by this commit, since it only affects Date._parse. See the README section added if you are using a custom external DateTime parser and want to see how to support the new :not_parsed setting. 24d408292ae125b82962da940621c7f0da8e2315 Jeremy Evans code@jeremyevans.net