vobject 1.0.2 → 1.1.0

data/lib/vobject/vcalendar/typegrammars.rb

@@ -19,66 +19,66 @@ module Vobject::Vcalendar
           /WEEKLY/i.r | /MONTHLY/i.r | /YEARLY/i.r
         enddate = C::DATE_TIME | C::DATE
         seconds = /[0-9]{1,2}/.r
-        byseclist = seq(seconds << ",".r, lazy { byseclist }) do |s, l|
+        byseclist = seq(seconds << ",".r, lazy { byseclist }) do |(s, l)|
           [s, l].flatten
         end | seconds.map { |s| [s] }
         minutes = /[0-9]{1,2}/.r
-        byminlist = seq(minutes << ",".r, lazy { byminlist }) do |m, l|
+        byminlist = seq(minutes << ",".r, lazy { byminlist }) do |(m, l)|
           [m, l].flatten
         end | minutes.map { |m| [m] }
         hours = /[0-9]{1,2}/.r
-        byhrlist = seq(hours << ",".r, lazy { byhrlist }) do |h, l|
+        byhrlist = seq(hours << ",".r, lazy { byhrlist }) do |(h, l)|
           [h, l].flatten
         end | hours.map { |h| [h] }
         ordwk = /[0-9]{1,2}/.r
         weekday = /SU/i.r | /MO/i.r | /TU/i.r | /WE/i.r | /TH/i.r | /FR/i.r | /SA/i.r
-        weekdaynum1 = seq(C::SIGN._?, ordwk) do |s, o|
+        weekdaynum1 = seq(C::SIGN._?, ordwk) do |(s, o)|
           h = { ordwk: o }
           h[:sign] = s[0] unless s.empty?
           h
         end
-        weekdaynum = seq(weekdaynum1._?, weekday) do |a, b|
+        weekdaynum = seq(weekdaynum1._?, weekday) do |(a, b)|
           h = { weekday: b }
           h = h.merge a[0] unless a.empty?
           h
         end
-        bywdaylist = seq(weekdaynum << ",".r, lazy { bywdaylist }) do |w, l|
+        bywdaylist = seq(weekdaynum << ",".r, lazy { bywdaylist }) do |(w, l)|
           [w, l].flatten
         end | weekdaynum.map { |w| [w] }
         ordmoday = /[0-9]{1,2}/.r
-        monthdaynum = seq(C::SIGN._?, ordmoday) do |s, o|
+        monthdaynum = seq(C::SIGN._?, ordmoday) do |(s, o)|
           h = { ordmoday: o }
           h[:sign] = s[0] unless s.empty?
           h
         end
-        bymodaylist = seq(monthdaynum << ",".r, lazy { bymodaylist }) do |m, l|
+        bymodaylist = seq(monthdaynum << ",".r, lazy { bymodaylist }) do |(m, l)|
           [m, l].flatten
         end | monthdaynum.map { |m| [m] }
         ordyrday = /[0-9]{1,3}/.r
-        yeardaynum = seq(C::SIGN._?, ordyrday) do |s, o|
+        yeardaynum = seq(C::SIGN._?, ordyrday) do |(s, o)|
           h = { ordyrday: o }
           h[:sign] = s[0] unless s.empty?
           h
         end
-        byyrdaylist = seq(yeardaynum << ",".r, lazy { byyrdaylist }) do |y, l|
+        byyrdaylist = seq(yeardaynum << ",".r, lazy { byyrdaylist }) do |(y, l)|
           [y, l].flatten
         end | yeardaynum.map { |y| [y] }
-        weeknum = seq(C::SIGN._?, ordwk) do |s, o|
+        weeknum = seq(C::SIGN._?, ordwk) do |(s, o)|
           h = { ordwk: o }
           h[:sign] = s[0] unless s.empty?
           h
         end
-        bywknolist = seq(weeknum << ",".r, lazy { bywknolist }) do |w, l|
+        bywknolist = seq(weeknum << ",".r, lazy { bywknolist }) do |(w, l)|
           [w, l].flatten
         end | weeknum.map { |w| [w] }
         # monthnum = /[0-9]{1,2}/.r
         # RFC 7529 add leap month indicator
         monthnum = /[0-9]{1,2}L?/i.r
-        bymolist = seq(monthnum << ",".r, lazy { bymolist }) do |m, l|
+        bymolist = seq(monthnum << ",".r, lazy { bymolist }) do |(m, l)|
           [m, l].flatten
         end | monthnum.map { |m| [m] }
         setposday = yeardaynum
-        bysplist = seq(setposday << ",".r, lazy { bysplist }) do |s, l|
+        bysplist = seq(setposday << ",".r, lazy { bysplist }) do |(s, l)|
           [s, l].flatten
         end | setposday.map { |s| [s] }
         # http://www.unicode.org/repos/cldr/tags/latest/common/bcp47/calendar.xml
@@ -89,24 +89,24 @@ module Vobject::Vcalendar
           /islamic-rgsa/i.r | /iso8601/i.r | /japanese/i.r | /persian/i.r |
           /roc/i.r | /islamicc/i.r | /gregorian/i.r
         skip = /OMIT/i.r | /BACKWARD/i.r | /FORWARD/i.r
-        recur_rule_part = 	seq(/FREQ/i.r << "=".r, freq) { |_k, v| { freq: v } } |
-          seq(/UNTIL/i.r << "=".r, enddate) { |_k, v| { until: v } } |
-          seq(/COUNT/i.r << "=".r, /[0-9]+/i.r) { |_k, v| { count: v } } |
-          seq(/INTERVAL/i.r << "=".r, /[0-9]+/i.r) { |_k, v| { interval: v } } |
-          seq(/BYSECOND/i.r << "=".r, byseclist) { |_k, v| { bysecond: v } } |
-          seq(/BYMINUTE/i.r << "=".r, byminlist) { |_k, v| { byminute: v } } |
-          seq(/BYHOUR/i.r << "=".r, byhrlist) { |_k, v| { byhour: v } } |
-          seq(/BYDAY/i.r << "=".r, bywdaylist) { |_k, v| { byday: v } } |
-          seq(/BYMONTHDAY/i.r << "=".r, bymodaylist) { |_k, v| { bymonthday: v } } |
-          seq(/BYYEARDAY/i.r << "=".r, byyrdaylist) { |_k, v| { byyearday: v } } |
-          seq(/BYWEEKNO/i.r << "=".r, bywknolist) { |_k, v| { byweekno: v } } |
-          seq(/BYMONTH/i.r << "=".r, bymolist) { |_k, v| { bymonth: v } } |
-          seq(/BYSETPOS/i.r << "=".r, bysplist) { |_k, v| { bysetpos: v } } |
-          seq(/WKST/i.r << "=".r, weekday) { |_k, v| { wkst: v } } |
+        recur_rule_part = 	seq(/FREQ/i.r << "=".r, freq) { |(_k, v)| { freq: v } } |
+          seq(/UNTIL/i.r << "=".r, enddate) { |(_k, v)| { until: v } } |
+          seq(/COUNT/i.r << "=".r, /[0-9]+/i.r) { |(_k, v)| { count: v } } |
+          seq(/INTERVAL/i.r << "=".r, /[0-9]+/i.r) { |(_k, v)| { interval: v } } |
+          seq(/BYSECOND/i.r << "=".r, byseclist) { |(_k, v)| { bysecond: v } } |
+          seq(/BYMINUTE/i.r << "=".r, byminlist) { |(_k, v)| { byminute: v } } |
+          seq(/BYHOUR/i.r << "=".r, byhrlist) { |(_k, v)| { byhour: v } } |
+          seq(/BYDAY/i.r << "=".r, bywdaylist) { |(_k, v)| { byday: v } } |
+          seq(/BYMONTHDAY/i.r << "=".r, bymodaylist) { |(_k, v)| { bymonthday: v } } |
+          seq(/BYYEARDAY/i.r << "=".r, byyrdaylist) { |(_k, v)| { byyearday: v } } |
+          seq(/BYWEEKNO/i.r << "=".r, bywknolist) { |(_k, v)| { byweekno: v } } |
+          seq(/BYMONTH/i.r << "=".r, bymolist) { |(_k, v)| { bymonth: v } } |
+          seq(/BYSETPOS/i.r << "=".r, bysplist) { |(_k, v)| { bysetpos: v } } |
+          seq(/WKST/i.r << "=".r, weekday) { |(_k, v)| { wkst: v } } |
           # RFC 7529
-          seq(/RSCALE/i.r << "=".r, rscale) { |_k, v| { rscale: v } } |
-          seq(/SKIP/i.r << "=".r, skip) { |_k, v| { skip: v } }
-        recur1 = seq(recur_rule_part, ";", lazy { recur1 }) { |h, _, r| h.merge r } |
+          seq(/RSCALE/i.r << "=".r, rscale) { |(_k, v)| { rscale: v } } |
+          seq(/SKIP/i.r << "=".r, skip) { |(_k, v)| { skip: v } }
+        recur1 = seq(recur_rule_part, ";", lazy { recur1 }) { |(h, _, r)| h.merge r } |
           recur_rule_part
         recur = recur1.map { |r| PropertyValue::Recur.new r }
         recur.eof
@@ -151,7 +151,7 @@ module Vobject::Vcalendar
 
       def geovalue
         float = prim(:double)
-        geovalue = seq(float << ";".r, float) do |a, b|
+        geovalue = seq(float << ";".r, float) do |(a, b)|
           if a <= 180.0 && a >= -180.0 && b <= 180 && b > -180
             PropertyValue::Geovalue.new(lat: a, long: b)
           else
@@ -173,7 +173,7 @@ module Vobject::Vcalendar
 
       def versionvalue
         versionvalue = seq(prim(:double) << ";".r,
-                           prim(:double)) do |x, y|
+                           prim(:double)) do |(x, y)|
           PropertyValue::Version.new [x, y]
         end | "2.0".r.map do
           PropertyValue::Version.new ["2.0"]
@@ -184,7 +184,7 @@ module Vobject::Vcalendar
       end
 
       def binary
-        binary = seq(/[a-zA-Z0-9+\/]*/.r, /={0,2}/.r) do |b, q|
+        binary = seq(/[a-zA-Z0-9+\/]*/.r, /={0,2}/.r) do |(b, q)|
           if (b.length + q.length) % 4 == 0
             PropertyValue::Binary.new(b + q)
           else
@@ -212,7 +212,7 @@ module Vobject::Vcalendar
 
       def textlist
         textlist1 =
-          seq(C::TEXT << ",".r, lazy { textlist1 }) { |a, b| [unescape(a), b].flatten } |
+          seq(C::TEXT << ",".r, lazy { textlist1 }) { |(a, b)| [unescape(a), b].flatten } |
           C::TEXT.map { |t| [unescape(t)] }
         textlist = textlist1.map { |m| PropertyValue::Textlist.new m }
         textlist.eof
@@ -220,8 +220,8 @@ module Vobject::Vcalendar
 
       def request_statusvalue
         @req_status = Set.new %w{2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 4.0 5.0 5.1 5.2 5.3}
-        extdata = seq(";".r, C::TEXT) { |_, t| t }
-        request_statusvalue = seq(/[0-9](\.[0-9]){1,2}/.r << ";".r, C::TEXT, extdata._?) do |n, t1, t2|
+        extdata = seq(";".r, C::TEXT) { |(_, t)| t }
+        request_statusvalue = seq(/[0-9](\.[0-9]){1,2}/.r << ";".r, C::TEXT, extdata._?) do |(n, t1, t2)|
           return { error: "Invalid request status #{n}" } unless @req_status.include?(n) # RFC 5546
           hash = { statcode: n, statdesc: t1 }
           hash[:extdata] = t2[0] unless t2.empty?
@@ -264,7 +264,7 @@ module Vobject::Vcalendar
       end
 
       def datelist
-        datelist1 = seq(C::DATE << ",".r, lazy { datelist1 }) do |d, l|
+        datelist1 = seq(C::DATE << ",".r, lazy { datelist1 }) do |(d, l)|
           [d, l].flatten
         end | C::DATE.map { |d| [d] }
         datelist = datelist1.map { |m| PropertyValue::Datelist.new m }
@@ -277,7 +277,7 @@ module Vobject::Vcalendar
 
       def date_timelist
         date_timelist1 = seq(C::DATE_TIME << ",".r,
-                             lazy { date_timelist1 }) do |d, l|
+                             lazy { date_timelist1 }) do |(d, l)|
           [d, l].flatten
         end | C::DATE_TIME.map { |d| [d] }
         date_timelist = date_timelist1.map do |m|
@@ -292,7 +292,7 @@ module Vobject::Vcalendar
       end
 
       def date_time_utclist
-        date_time_utclist1 = seq(C::DATE_TIME_UTC << ",".r, lazy { date_time_utclist1 }) do |d, l|
+        date_time_utclist1 = seq(C::DATE_TIME_UTC << ",".r, lazy { date_time_utclist1 }) do |(d, l)|
           [d, l].flatten
         end | C::DATE_TIME_UTC.map { |d| [d] }
         date_time_utclist = date_time_utclist1.map do |m|
@@ -307,14 +307,14 @@ module Vobject::Vcalendar
       end
 
       def periodlist
-        period_explicit = seq(C::DATE_TIME << "/".r, C::DATE_TIME) do |s, e|
+        period_explicit = seq(C::DATE_TIME << "/".r, C::DATE_TIME) do |(s, e)|
           { start: s, end: e }
         end
-        period_start = seq(C::DATE_TIME << "/".r, C::DURATION) do |s, d|
+        period_start = seq(C::DATE_TIME << "/".r, C::DURATION) do |(s, d)|
           { start: s, duration: PropertyValue::Duration.new(d) }
         end
         period = period_explicit | period_start
-        periodlist1 = seq(period << ",".r, lazy { periodlist1 }) do |p, l|
+        periodlist1 = seq(period << ",".r, lazy { periodlist1 }) do |(p, l)|
           [p, l].flatten
         end | period.map { |p| [p] }
         periodlist = periodlist1.map { |m| PropertyValue::Periodlist.new m }
@@ -330,7 +330,7 @@ module Vobject::Vcalendar
 
       def utc_offset
         utc_offset = seq(C::SIGN, /[0-9]{2}/.r, /[0-9]{2}/.r,
-                         /[0-9]{2}/.r._?) do |sign, h, m, sec|
+                         /[0-9]{2}/.r._?) do |(sign, h, m, sec)|
           hash = { sign: sign, hr: h, min: m }
           hash[:sec] = sec[0] unless sec.empty?
           PropertyValue::Utcoffset.new hash

data/lib/vobject/vcard/v3_0/grammar.rb

@@ -32,66 +32,66 @@ module Vcard::V3_0
       # parameters && parameter types
       paramname = /ENCODING/i.r | /LANGUAGE/i.r | /CONTEXT/i.r | /TYPE/i.r | /VALUE/i.r | /PREF/i.r
       otherparamname = C::NAME_VCARD ^ paramname
-      paramvalue = C::QUOTEDSTRING_VCARD.map { |s| s } | C::PTEXT_VCARD.map(&:upcase)
+      paramvalue = C::QUOTEDSTRING_VCARD.map { |s| s } | C::PTEXT_VCARD.map { |x, _| x.upcase }
 
       # prefvalue = /[0-9]{1,2}/i.r | "100".r
       valuetype = /URI/i.r | /DATE/i.r | /DATE-TIME/i.r | /BINARY/i.r | /PTEXT/i.r
       # mediaattr = /[!\"#$%&'*+.^A-Z0-9a-z_`i{}|~-]+/.r
       # mediavalue1 =	mediaattr | C::QUOTEDSTRING_VCARD
-      # mediatail = seq(";".r >> mediaattr, "=".r << mediavalue1).map do |a, v|
+      # mediatail = seq(";".r >> mediaattr, "=".r << mediavalue1).map do |(a, v)|
       #  ";#{a}=#{v}"
       # end
       # rfc4288regname = /[A-Za-z0-9!#$&.+^+-]{1,127}/.r
       # rfc4288typename = rfc4288regname
       # rfc4288subtypename = rfc4288regname
-      # mediavalue = seq(rfc4288typename << "/".r, rfc4288subtypename, # mediatail.star).map do |t, s, tail|
+      # mediavalue = seq(rfc4288typename << "/".r, rfc4288subtypename, # mediatail.star).map do |(t, s, tail)|
       #  ret = "#{t}/#{s}"
       #  ret = ret . tail[0] unless tail.empty?
       #  ret
       # end
-      pvalue_list = (seq(paramvalue << ",".r, lazy { pvalue_list }) & /[;:]/.r).map do |e, list|
+      pvalue_list = (seq(paramvalue << ",".r, lazy { pvalue_list }) & /[;:]/.r).map do |(e, list)|
         [e.sub(Regexp.new("^\"(.+)\"$"), '\1').gsub(/\\n/, "\n"), list].flatten
       end | (paramvalue & /[;:]/.r).map do |e|
         [e.sub(Regexp.new("^\"(.+)\"$"), '\1').gsub(/\\n/, "\n")]
       end
-      typevaluelist = seq(C::IANATOKEN, ",".r >> lazy { typevaluelist }).map do |t, l|
+      typevaluelist = seq(C::IANATOKEN, ",".r >> lazy { typevaluelist }).map do |(t, l)|
         [t.upcase, l].flatten
       end | C::IANATOKEN.map { |t| [t.upcase] }
-      quoted_string_list = (seq(C::QUOTEDSTRING_VCARD << ",".r, lazy { quoted_string_list }) & /[;:]/.r).map do |e, list|
+      quoted_string_list = (seq(C::QUOTEDSTRING_VCARD << ",".r, lazy { quoted_string_list }) & /[;:]/.r).map do |(e, list)|
         [e.sub(Regexp.new("^\"(.+)\"$"), '\1').gsub(/\\n/, "\n"), list].flatten
       end | (C::QUOTEDSTRING_VCARD & /[;:]/.r).map do |e|
         [e.sub(Regexp.new("^\"(.+)\"$"), '\1').gsub(/\\n/, "\n")]
       end
 
-      # fmttypevalue = seq(rfc4288typename, "/", rfc4288subtypename).map(&:join)
+      # fmttypevalue = seq(rfc4288typename, "/", rfc4288subtypename).map {|x, _| x.join }
       rfc1766primarytag = /[A-Za-z]{1,8}/.r
-      rfc1766subtag = seq("-", /[A-Za-z]{1,8}/.r) { |a, b| a + b }
-      rfc1766language = seq(rfc1766primarytag, rfc1766subtag.star) do |a, b|
+      rfc1766subtag = seq("-", /[A-Za-z]{1,8}/.r) { |(a, b)| a + b }
+      rfc1766language = seq(rfc1766primarytag, rfc1766subtag.star) do |(a, b)|
         a += b[0] unless b.empty?
         a
       end
 
-      param = seq(/ENCODING/i.r, "=", /b/.r) do |name, _, val|
+      param = seq(/ENCODING/i.r, "=", /b/.r) do |(name, _, val)|
         { name.upcase.tr("-", "_").to_sym => val }
-      end | seq(/LANGUAGE/i.r, "=", rfc1766language) do |name, _, val|
+      end | seq(/LANGUAGE/i.r, "=", rfc1766language) do |(name, _, val)|
         { name.upcase.tr("-", "_").to_sym => val.upcase }
-      end | seq(/CONTEXT/i.r, "=", /word/.r) do |name, _, val|
+      end | seq(/CONTEXT/i.r, "=", /word/.r) do |(name, _, val)|
         { name.upcase.tr("-", "_").to_sym => val.upcase }
-      end | seq(/TYPE/i.r, "=", typevaluelist) do |name, _, val|
+      end | seq(/TYPE/i.r, "=", typevaluelist) do |(name, _, val)|
         { name.upcase.tr("-", "_").to_sym => val }
-      end | seq(/VALUE/i.r, "=", valuetype) do |name, _, val|
+      end | seq(/VALUE/i.r, "=", valuetype) do |(name, _, val)|
         { name.upcase.tr("-", "_").to_sym => val }
       end | /PREF/i.r.map do |_name|
         # this is likely erroneous use of VCARD 2.1 convention in RFC2739; converting to canonical TYPE=PREF
         { TYPE: ["PREF"] }
-      end | seq(otherparamname, "=", pvalue_list) do |name, _, val|
+      end | seq(otherparamname, "=", pvalue_list) do |(name, _, val)|
         val = val[0] if val.length == 1
         { name.upcase.tr("-", "_").to_sym => val }
-      end | seq(paramname, "=", pvalue_list) do |name, _, val|
+      end | seq(paramname, "=", pvalue_list) do |(name, _, val)|
         parse_err("Violated format of parameter value #{name} = #{val}")
       end
 
-      params = seq(";".r >> param & ";", lazy { params }) do |p, ps|
+      params = seq(";".r >> param & ";", lazy { params }) do |(p, ps)|
         p.merge(ps) do |key, old, new|
           if @cardinality1[:PARAM].include?(key)
             parse_err("Violated cardinality of parameter #{key}")
@@ -102,7 +102,7 @@ module Vcard::V3_0
       end |  seq(";".r >> param).map { |e| e[0] }
 
       contentline = seq(linegroup._?, C::NAME_VCARD, params._? << ":".r,
-                        C::VALUE, /(\r|\n|\r\n)/) do |g, name, p, value, _|
+                        C::VALUE, /(\r|\n|\r\n)/) do |(g, name, p, value, _)|
         key =  name.upcase.tr("-", "_").to_sym
         hash = { key => {} }
         hash[key][:value], errors1 = Typegrammars.typematch(strict, key, p[0], :GENERIC, value, @ctx)
@@ -112,7 +112,7 @@ module Vcard::V3_0
         hash[key][:params] = p[0] unless p.empty?
         hash
       end
-      props = seq(contentline, lazy { props }) do |c, rest|
+      props = seq(contentline, lazy { props }) do |(c, rest)|
         c.merge(rest) do |key, old, new|
           if @cardinality1[:PROP].include?(key.upcase)
             parse_err("Violated cardinality of property #{key}")
@@ -123,7 +123,7 @@ module Vcard::V3_0
       end | ("".r & beginend).map { {} }
 
       calpropname = /VERSION/i.r
-      calprop = seq(linegroup._?, calpropname << ":".r, C::VALUE, /[\r\n]/) do |g, key, value, _|
+      calprop = seq(linegroup._?, calpropname << ":".r, C::VALUE, /[\r\n]/) do |(g, key, value, _)|
         key = key.upcase.tr("-", "_").to_sym
         hash = { key => {} }
         hash[key][:value], errors1 = Typegrammars.typematch(strict, key, nil, :VCARD, value, @ctx)

data/lib/vobject/vcard/v3_0/typegrammars.rb

@@ -12,7 +12,7 @@ module Vcard::V3_0
       # property value types, each defining their own parser
 
       def binary
-        binary = seq(/[a-zA-Z0-9+\/]*/.r, /={0,2}/.r) do |b, q|
+        binary = seq(/[a-zA-Z0-9+\/]*/.r, /={0,2}/.r) do |(b, q)|
           if (b.length + q.length) % 4 == 0
             PropertyValue::Binary.new(b + q)
           else
@@ -31,7 +31,7 @@ module Vcard::V3_0
 
       def geovalue
         float = prim(:double)
-        geovalue = seq(float << ";".r, float) do |a, b|
+        geovalue = seq(float << ";".r, float) do |(a, b)|
           if a <= 180.0 && a >= -180.0 && b <= 180 && b > -180
             PropertyValue::Geovalue.new(lat: a, long: b)
           else
@@ -43,7 +43,7 @@ module Vcard::V3_0
 
       def classvalue
         iana_token = /[a-zA-Z\d\-]+/.r
-        xname = seq(/[xX]-/, /[a-zA-Z0-9-]+/.r).map(&:join)
+        xname = seq(/[xX]-/, /[a-zA-Z0-9-]+/.r).map {|x, _| x.join }
         classvalue = (/PUBLIC/i.r | /PRIVATE/i.r | /CONFIDENTIAL/i.r | iana_token | xname).map do |m|
           PropertyValue::ClassValue.new m
         end
@@ -94,7 +94,7 @@ module Vcard::V3_0
       def textlist
         text = C::TEXT3
         textlist1 =
-          seq(text << ",".r, lazy { textlist1 }) { |a, b| [unescape(a), b].flatten } |
+          seq(text << ",".r, lazy { textlist1 }) { |(a, b)| [unescape(a), b].flatten } |
           text.map { |t| [unescape(t)] }
         textlist = textlist1.map { |m| PropertyValue::Textlist.new m }
         textlist.eof
@@ -103,21 +103,21 @@ module Vcard::V3_0
       def org
         text = C::TEXT3
         org1 =
-          seq(text << ";".r, lazy { org1 }) { |a, b| [unescape(a), b].flatten } |
+          seq(text << ";".r, lazy { org1 }) { |(a, b)| [unescape(a), b].flatten } |
           text.map { |t| [unescape(t)] }
         org	 = org1.map { |o| PropertyValue::Org.new o }
         org.eof
       end
 
       def date_t
-        date_t = seq(/[0-9]{4}/.r, /-/.r._? >> /[0-9]{2}/.r, /-/.r._? >> /[0-9]{2}/.r) do |yy, mm, dd|
+        date_t = seq(/[0-9]{4}/.r, /-/.r._? >> /[0-9]{2}/.r, /-/.r._? >> /[0-9]{2}/.r) do |(yy, mm, dd)|
           PropertyValue::Date.new(year: yy, month: mm, day: dd)
         end
         date_t.eof
       end
 
       def time_t
-        utc_offset = seq(C::SIGN, /[0-9]{2}/.r << /:/.r._?, /[0-9]{2}/.r) do |s, h, m|
+        utc_offset = seq(C::SIGN, /[0-9]{2}/.r << /:/.r._?, /[0-9]{2}/.r) do |(s, h, m)|
           { sign: s, hour: h, min: m }
         end
         zone = utc_offset.map { |u| u } |
@@ -126,7 +126,7 @@ module Vcard::V3_0
         minute = /[0-9]{2}/.r
         second = /[0-9]{2}/.r
         secfrac = seq(",".r >> /[0-9]+/)
-        time_t = seq(hour << /:/._?, minute << /:/._?, second, secfrac._?, zone._?) do |h, m, s, f, z|
+        time_t = seq(hour << /:/._?, minute << /:/._?, second, secfrac._?, zone._?) do |(h, m, s, f, z)|
           h = { hour: h, min: m, sec: s }
           h[:zone] = z[0] unless z.empty?
           h[:secfrac] = f[0] unless f.empty?
@@ -136,7 +136,7 @@ module Vcard::V3_0
       end
 
       def date_time
-        utc_offset = seq(C::SIGN, /[0-9]{2}/.r << /:/.r._?, /[0-9]{2}/.r) do |s, h, m|
+        utc_offset = seq(C::SIGN, /[0-9]{2}/.r << /:/.r._?, /[0-9]{2}/.r) do |(s, h, m)|
           { sign: s, hour: h, min: m }
         end
         zone = utc_offset.map { |u| u } |
@@ -145,10 +145,10 @@ module Vcard::V3_0
         minute = /[0-9]{2}/.r
         second = /[0-9]{2}/.r
         secfrac = seq(",".r >> /[0-9]+/)
-        date = seq(/[0-9]{4}/.r, /-/.r._?, /[0-9]{2}/.r, /-/.r._?, /[0-9]{2}/.r) do |yy, _, mm, _, dd|
+        date = seq(/[0-9]{4}/.r, /-/.r._?, /[0-9]{2}/.r, /-/.r._?, /[0-9]{2}/.r) do |(yy, _, mm, _, dd)|
           { year: yy, month: mm, day: dd }
         end
-        time = seq(hour << /:/.r._?, minute << /:/.r._?, second, secfrac._?, zone._?) do |h, m, s, f, z|
+        time = seq(hour << /:/.r._?, minute << /:/.r._?, second, secfrac._?, zone._?) do |(h, m, s, f, z)|
           h = { hour: h, min: m, sec: s }
           h[:zone] = if z.empty?
                        ""
@@ -158,14 +158,14 @@ module Vcard::V3_0
           h[:secfrac] = f[0] unless f.empty?
           h
         end
-        date_time = seq(date << "T".r, time) do |d, t|
+        date_time = seq(date << "T".r, time) do |(d, t)|
           PropertyValue::DateTimeLocal.new(d.merge(t))
         end
         date_time.eof
       end
 
       def date_or_date_time
-        utc_offset = seq(C::SIGN, /[0-9]{2}/.r << /:/.r._?, /[0-9]{2}/.r) do |s, h, m|
+        utc_offset = seq(C::SIGN, /[0-9]{2}/.r << /:/.r._?, /[0-9]{2}/.r) do |(s, h, m)|
           { sign: s, hour: h, min: m }
         end
         zone = utc_offset.map { |u| u } |
@@ -174,23 +174,23 @@ module Vcard::V3_0
         minute = /[0-9]{2}/.r
         second = /[0-9]{2}/.r
         secfrac = seq(",".r >> /[0-9]+/)
-        date = seq(/[0-9]{4}/.r << /-/.r._?, /[0-9]{2}/.r << /-/.r._?, /[0-9]{2}/.r) do |yy, mm, dd|
+        date = seq(/[0-9]{4}/.r << /-/.r._?, /[0-9]{2}/.r << /-/.r._?, /[0-9]{2}/.r) do |(yy, mm, dd)|
           { year: yy, month: mm, day: dd }
         end
-        time = seq(hour << /:/.r._?, minute << /:/.r._?, second, secfrac._?, zone._?) do |h, m, s, f, z|
+        time = seq(hour << /:/.r._?, minute << /:/.r._?, second, secfrac._?, zone._?) do |(h, m, s, f, z)|
           h = { hour: h, min: m, sec: s }
           h[:zone] = z[0] unless z.empty?
           h[:secfrac] = f[0] unless f.empty?
           h
         end
-        date_or_date_time = seq(date << "T".r, time) do |d, t|
+        date_or_date_time = seq(date << "T".r, time) do |(d, t)|
           PropertyValue::DateTimeLocal.new(d.merge(t))
         end | date.map { |d| PropertyValue::Date.new(d) }
         date_or_date_time.eof
       end
 
       def utc_offset
-        utc_offset = seq(C::SIGN, /[0-9]{2}/.r, /:/.r._?, /[0-9]{2}/.r) do |s, h, _, m|
+        utc_offset = seq(C::SIGN, /[0-9]{2}/.r, /:/.r._?, /[0-9]{2}/.r) do |(s, h, _, m)|
           PropertyValue::Utcoffset.new(sign: s, hour: h, min: m)
         end
         utc_offset.eof
@@ -198,7 +198,7 @@ module Vcard::V3_0
 
       def kindvalue
         iana_token = /[a-zA-Z\d\-]+/.r
-        xname = seq(/[xX]-/, /[a-zA-Z0-9-]+/.r).map(&:join)
+        xname = seq(/[xX]-/, /[a-zA-Z0-9-]+/.r).map {|x, _| x.join }
         kindvalue = (/individual/i.r | /group/i.r | /org/i.r | /location/i.r |
                      iana_token | xname).map do |k|
           PropertyValue::Kindvalue.new(k)
@@ -208,29 +208,29 @@ module Vcard::V3_0
 
       def fivepartname
         text = C::TEXT3
-        component = seq(text << ",".r, lazy { component }) do |a, b|
+        component = seq(text << ",".r, lazy { component }) do |(a, b)|
           [unescape(a), b].flatten
         end | text.map { |t| [unescape(t)] }
         fivepartname1 = seq(component << ";".r, component << ";".r, component << ";".r,
-                            component << ";".r, component) do |a, b, c, d, e|
+                            component << ";".r, component) do |(a, b, c, d, e)|
           a = a[0] if a.length == 1
           b = b[0] if b.length == 1
           c = c[0] if c.length == 1
           d = d[0] if d.length == 1
           e = e[0] if e.length == 1
           { surname: a, givenname: b, middlename: c, honprefix: d, honsuffix: e }
-        end | seq(component << ";".r, component << ";".r, component << ";".r, component) do |a, b, c, d|
+        end | seq(component << ";".r, component << ";".r, component << ";".r, component) do |(a, b, c, d)|
           a = a[0] if a.length == 1
           b = b[0] if b.length == 1
           c = c[0] if c.length == 1
           d = d[0] if d.length == 1
           { surname: a, givenname: b, middlename: c, honprefix: d, honsuffix: "" }
-        end | seq(component << ";".r, component << ";".r, component) do |a, b, c|
+        end | seq(component << ";".r, component << ";".r, component) do |(a, b, c)|
           a = a[0] if a.length == 1
           b = b[0] if b.length == 1
           c = c[0] if c.length == 1
           { surname: a, givenname: b, middlename: c, honprefix: "", honsuffix: "" }
-        end | seq(component << ";".r, component) do |a, b|
+        end | seq(component << ";".r, component) do |(a, b)|
           a = a[0] if a.length == 1
           b = b[0] if b.length == 1
           { surname: a, givenname: b, middlename: "", honprefix: "", honsuffix: "" }
@@ -244,11 +244,11 @@ module Vcard::V3_0
 
       def address
         text = C::TEXT3
-        component = seq(text << ",".r, lazy { component }) do |a, b|
+        component = seq(text << ",".r, lazy { component }) do |(a, b)|
           [unescape(a), b].flatten
         end | text.map { |t| [unescape(t)] }
         address1 = seq(component << ";".r, component << ";".r, component << ";".r, component << ";".r,
-                       component << ";".r, component << ";".r, component) do |a, b, c, d, e, f, g|
+                       component << ";".r, component << ";".r, component) do |(a, b, c, d, e, f, g)|
           a = a[0] if a.length == 1
           b = b[0] if b.length == 1
           c = c[0] if c.length == 1
@@ -259,7 +259,7 @@ module Vcard::V3_0
           { pobox: a, ext: b, street: c,
             locality: d, region: e, code: f, country: g }
         end | seq(component << ";".r, component << ";".r, component << ";".r, component << ";".r,
-                  component << ";".r, component) do |a, b, c, d, e, f|
+                  component << ";".r, component) do |(a, b, c, d, e, f)|
           a = a[0] if a.length == 1
           b = b[0] if b.length == 1
           c = c[0] if c.length == 1
@@ -269,7 +269,7 @@ module Vcard::V3_0
           { pobox: a, ext: b, street: c,
             locality: d, region: e, code: f, country: "" }
         end | seq(component << ";".r, component << ";".r, component << ";".r,
-                  component << ";".r, component) do |a, b, c, d, e|
+                  component << ";".r, component) do |(a, b, c, d, e)|
           a = a[0] if a.length == 1
           b = b[0] if b.length == 1
           c = c[0] if c.length == 1
@@ -277,20 +277,20 @@ module Vcard::V3_0
           e = e[0] if e.length == 1
           { pobox: a, ext: b, street: c,
             locality: d, region: e, code: "", country: "" }
-        end | seq(component << ";".r, component << ";".r, component << ";".r, component) do |a, b, c, d|
+        end | seq(component << ";".r, component << ";".r, component << ";".r, component) do |(a, b, c, d)|
           a = a[0] if a.length == 1
           b = b[0] if b.length == 1
           c = c[0] if c.length == 1
           d = d[0] if d.length == 1
           { pobox: a, ext: b, street: c,
             locality: d, region: "", code: "", country: "" }
-        end | seq(component << ";".r, component << ";".r, component) do |a, b, c|
+        end | seq(component << ";".r, component << ";".r, component) do |(a, b, c)|
           a = a[0] if a.length == 1
           b = b[0] if b.length == 1
           c = c[0] if c.length == 1
           { pobox: a, ext: b, street: c,
             locality: "", region: "", code: "", country: "" }
-        end | seq(component << ";".r, component) do |a, b|
+        end | seq(component << ";".r, component) do |(a, b)|
           a = a[0] if a.length == 1
           b = b[0] if b.length == 1
           { pobox: a, ext: b, street: "",