diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/date/format.rb | 34 |
2 files changed, 21 insertions, 18 deletions
@@ -1,3 +1,8 @@ +Tue Aug 10 20:56:13 2010 Tadayoshi Funaba <tadf@dotrb.org> + + * lib/date/format.rb (Date::Format::Bag): use Struct. + as an experimental. + Tue Aug 10 20:45:35 2010 Tanaka Akira <akr@fsij.org> * ext/pathname/pathname.c (path_rename): Pathname#rename translated diff --git a/lib/date/format.rb b/lib/date/format.rb index 5aacb2a128..1a420fb398 100644 --- a/lib/date/format.rb +++ b/lib/date/format.rb @@ -1,4 +1,4 @@ -# format.rb: Written by Tadayoshi Funaba 1999-2009 +# format.rb: Written by Tadayoshi Funaba 1999-2010 # $Id: format.rb,v 2.43 2008-01-17 20:16:31+09 tadf Exp $ class Date @@ -109,29 +109,27 @@ class Date x.freeze end - class Bag # :nodoc: - - def initialize - @elem = {} - end - - def method_missing(t, *args, &block) - t = t.to_s - set = t.chomp!('=') - t = t.intern - if set - @elem[t] = args[0] - else - @elem[t] - end - end + class BagStruct < Struct # :nodoc: def to_hash - @elem.reject{|k, v| /\A_/ =~ k.to_s || v.nil?} + h = {} + members.each do |k| + unless /\A_/ =~ k.to_s || self[k].nil? + h[k] = self[k] + end + end + h end end + Bag = BagStruct.new(:year, :mon, :yday, :mday, :wday, + :cwyear, :cweek, :cwday, + :hour, :min, :sec, :sec_fraction, + :wnum0, :wnum1, :seconds, + :zone, :offset, :leftover, + :_cent, :_merid, :_comp) + end def emit(e, f) # :nodoc: |