vcard 0.2.16 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb41c0907ad9041c65948878f1f4b873209698604c9436010191d0ca1489bf1
-  data.tar.gz: 28680dd09a300f12e132ffc8edc40b4f8f47ea92d6caf746a1fc7dd8f581e990
+  metadata.gz: a1a9b1a2c5e533fee3acd4659c5baa7234b36eea86da7082f372fd6415d83e31
+  data.tar.gz: 245a9b44434e2fdfbb6c69e32edb81aa43864a7f7f74a4504bac53a1c8148fda
 SHA512:
-  metadata.gz: 64a863c62c87930f6d5bd3002ebc4f7b462ba60ed230e0ada8ff58c8f6c3e8be37c2b3e00a77ce6d6b27e51bd0ba8628269f7a32a07a6dfaac98671ead5aefa1
-  data.tar.gz: c200b2482df4b22e4da2926b7310f05627b067a7db37efaa1674c97fdd60da274a3e01ffceccdef1a89679be32199d2a436262b3a18dd74650672121da280f0c
+  metadata.gz: 56df5e3fbce3b326c4daebd7ab9a8dfc7580fe5bd436c0207cd081dc6aa1f0c37df183dd4289651d49fc15f1d1ef0d7ff8b06b01374a55c8a5d1ea8a83f7ecad
+  data.tar.gz: f0fde0a4f77ec00a5eedd124de538c7d0fecd6b9bbcc5d05f96ab1545c9a1de83f8f5c2a9bfa4f9f0475e2e901f395f3868b68b7f715251c8a7ff1ad56d9ea40

data/CHANGELOG.md

@@ -0,0 +1,184 @@
+# Changelog
+
+## [Unreleased](https://github.com/qoobaa/vcard/tree/HEAD)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.3.0...HEAD)
+
+## [v0.3.0](https://github.com/qoobaa/vcard/tree/v0.3.0) (2020-11-20)
+
+**Closed issues:**
+
+- New release with ruby25 and ruby26 support [\#30](https://github.com/qoobaa/vcard/issues/30)
+
+**Merged pull requests:**
+
+- Add an `nl` option to encode\(\) and remove caching [\#35](https://github.com/qoobaa/vcard/pull/35) ([knu](https://github.com/knu))
+- Use the default argument in encode\(\) [\#34](https://github.com/qoobaa/vcard/pull/34) ([knu](https://github.com/knu))
+- Do not modify the fields argument in Vcard::Vcard.create\(\) [\#33](https://github.com/qoobaa/vcard/pull/33) ([knu](https://github.com/knu))
+- Wrap lines exactly by a given width \(75 by default\) [\#32](https://github.com/qoobaa/vcard/pull/32) ([knu](https://github.com/knu))
+
+## [v0.2.16](https://github.com/qoobaa/vcard/tree/v0.2.16) (2019-12-01)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.15...v0.2.16)
+
+**Merged pull requests:**
+
+- Update supported ruby versions [\#31](https://github.com/qoobaa/vcard/pull/31) ([senzpo](https://github.com/senzpo))
+
+## [v0.2.15](https://github.com/qoobaa/vcard/tree/v0.2.15) (2016-12-01)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.14...v0.2.15)
+
+**Merged pull requests:**
+
+- Fix incorrect scope of Vcard.configure and Vcard.configuration methods [\#29](https://github.com/qoobaa/vcard/pull/29) ([solenko](https://github.com/solenko))
+
+## [v0.2.14](https://github.com/qoobaa/vcard/tree/v0.2.14) (2016-11-22)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.13...v0.2.14)
+
+**Closed issues:**
+
+- Method for releasing a new gem version [\#27](https://github.com/qoobaa/vcard/issues/27)
+
+**Merged pull requests:**
+
+- Allow to ignore invalid fields [\#28](https://github.com/qoobaa/vcard/pull/28) ([solenko](https://github.com/solenko))
+
+## [v0.2.13](https://github.com/qoobaa/vcard/tree/v0.2.13) (2016-09-23)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.12...v0.2.13)
+
+**Closed issues:**
+
+- vCard v2.1 ADR fields with quoted-printable encoding not decoded [\#22](https://github.com/qoobaa/vcard/issues/22)
+- License missing from gemspec [\#17](https://github.com/qoobaa/vcard/issues/17)
+
+**Merged pull requests:**
+
+- Fix tests [\#26](https://github.com/qoobaa/vcard/pull/26) ([brendon](https://github.com/brendon))
+- Fix 2.2 2.3 & Remove 1.9.2 [\#25](https://github.com/qoobaa/vcard/pull/25) ([brendon](https://github.com/brendon))
+- Fix travis bundler [\#24](https://github.com/qoobaa/vcard/pull/24) ([brendon](https://github.com/brendon))
+- Add Ruby 2.x for testing [\#23](https://github.com/qoobaa/vcard/pull/23) ([brendon](https://github.com/brendon))
+
+## [v0.2.12](https://github.com/qoobaa/vcard/tree/v0.2.12) (2013-10-30)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.11...v0.2.12)
+
+**Merged pull requests:**
+
+- Add work-around for JRuby Regexp issue [\#20](https://github.com/qoobaa/vcard/pull/20) ([dgolombek](https://github.com/dgolombek))
+- Change field's to accept symbols as values [\#19](https://github.com/qoobaa/vcard/pull/19) ([dgolombek](https://github.com/dgolombek))
+
+## [v0.2.11](https://github.com/qoobaa/vcard/tree/v0.2.11) (2013-10-02)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.10...v0.2.11)
+
+## [v0.2.10](https://github.com/qoobaa/vcard/tree/v0.2.10) (2013-10-01)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.9...v0.2.10)
+
+## [v0.2.9](https://github.com/qoobaa/vcard/tree/v0.2.9) (2013-09-27)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.8...v0.2.9)
+
+**Closed issues:**
+
+- Failing Tests [\#11](https://github.com/qoobaa/vcard/issues/11)
+
+**Merged pull requests:**
+
+- Fix decoding of multi-line quoted-printable fields [\#16](https://github.com/qoobaa/vcard/pull/16) ([dgolombek](https://github.com/dgolombek))
+
+## [v0.2.8](https://github.com/qoobaa/vcard/tree/v0.2.8) (2013-06-20)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.7...v0.2.8)
+
+## [v0.2.7](https://github.com/qoobaa/vcard/tree/v0.2.7) (2013-06-20)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.6...v0.2.7)
+
+**Closed issues:**
+
+- Encoding line breaks for things like Address and Notes [\#9](https://github.com/qoobaa/vcard/issues/9)
+
+**Merged pull requests:**
+
+- Add back support for multiple ROLEs [\#15](https://github.com/qoobaa/vcard/pull/15) ([brendon](https://github.com/brendon))
+
+## [v0.2.6](https://github.com/qoobaa/vcard/tree/v0.2.6) (2013-06-19)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.5...v0.2.6)
+
+**Merged pull requests:**
+
+- Eliminate carriage returns when encoding text [\#14](https://github.com/qoobaa/vcard/pull/14) ([m1foley](https://github.com/m1foley))
+
+## [v0.2.5](https://github.com/qoobaa/vcard/tree/v0.2.5) (2013-06-19)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.4...v0.2.5)
+
+**Closed issues:**
+
+- Role is missing [\#8](https://github.com/qoobaa/vcard/issues/8)
+
+**Merged pull requests:**
+
+- Newlines bug [\#13](https://github.com/qoobaa/vcard/pull/13) ([brendon](https://github.com/brendon))
+- ROLE can occur multiple times [\#12](https://github.com/qoobaa/vcard/pull/12) ([brendon](https://github.com/brendon))
+
+## [v0.2.4](https://github.com/qoobaa/vcard/tree/v0.2.4) (2013-06-18)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.3...v0.2.4)
+
+**Closed issues:**
+
+- Using Ruby 2.0 there is  invalid multibyte escape error [\#6](https://github.com/qoobaa/vcard/issues/6)
+
+**Merged pull requests:**
+
+- Added native support for ROLE with escaping [\#10](https://github.com/qoobaa/vcard/pull/10) ([brendon](https://github.com/brendon))
+
+## [v0.2.3](https://github.com/qoobaa/vcard/tree/v0.2.3) (2013-01-31)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.2...v0.2.3)
+
+**Closed issues:**
+
+- Birthday decoding broken in 0.2.0 [\#4](https://github.com/qoobaa/vcard/issues/4)
+
+**Merged pull requests:**
+
+- Code patch to correct invalid multibyte escape  [\#7](https://github.com/qoobaa/vcard/pull/7) ([seth-macpherson](https://github.com/seth-macpherson))
+
+## [v0.2.2](https://github.com/qoobaa/vcard/tree/v0.2.2) (2012-12-17)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.1...v0.2.2)
+
+**Merged pull requests:**
+
+- Regex refactor, includes date parsing fix [\#5](https://github.com/qoobaa/vcard/pull/5) ([m1foley](https://github.com/m1foley))
+
+## [v0.2.1](https://github.com/qoobaa/vcard/tree/v0.2.1) (2012-12-16)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/v0.2.0...v0.2.1)
+
+**Merged pull requests:**
+
+- Fix wrong scope, add Travis [\#3](https://github.com/qoobaa/vcard/pull/3) ([rngtng](https://github.com/rngtng))
+
+## [v0.2.0](https://github.com/qoobaa/vcard/tree/v0.2.0) (2012-11-26)
+
+[Full Changelog](https://github.com/qoobaa/vcard/compare/46a2517b0f9bd073b00f233eeae6f106069ddce5...v0.2.0)
+
+**Closed issues:**
+
+- incompatible encoding regexp match \(ASCII-8BIT regexp with UTF-8 string\) [\#1](https://github.com/qoobaa/vcard/issues/1)
+
+**Merged pull requests:**
+
+- remove superfluous encoding detection, which errors with ruby-1.9 [\#2](https://github.com/qoobaa/vcard/pull/2) ([hannesm](https://github.com/hannesm))
+
+
+
+<!-- This Changelog was originally generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator) -->

data/lib/vcard/dirinfo.rb

@@ -92,10 +92,11 @@ module Vcard
 
       if profile
         p = profile.to_str
-        f = [ Field.create("BEGIN", p) ]
-        f.concat fields
-        f.push Field.create("END", p)
-        fields = f
+        fields = [
+          Field.create("BEGIN", p),
+          *fields,
+          Field.create("END", p)
+        ]
       end
 
       new(fields, profile)
@@ -192,9 +193,8 @@ module Vcard
       Enumerator.new(self, cond )
     end
 
-    # Force card to be reencoded from the fields.
+    # Obsoleted; force card to be reencoded from the fields.
     def dirty #:nodoc:
-      #string = nil
     end
 
     # Append +field+ to the fields. Note that it won't be literally appended
@@ -241,13 +241,12 @@ module Vcard
       self
     end
 
+    LF= "\n"
+
     # The string encoding of the DirectoryInfo. See Field#encode for information
-    # about the width parameter.
-    def encode(width=nil)
-      unless @string
-        @string = @fields.collect { |f| f.encode(width) } . join ""
-      end
-      @string
+    # about the parameters.
+    def encode(width = 75, nl: LF)
+      @fields.collect { |f| f.encode(width, nl: nl) }.join
     end
 
     alias to_s encode
@@ -260,10 +259,10 @@ module Vcard
         raise "No fields to check"
       end
       unless @fields.first.name? "BEGIN"
-        raise "Needs BEGIN, found: #{@fields.first.encode nil}"
+        raise "Needs BEGIN, found: #{@fields.first.encode}"
       end
       unless @fields.last.name? "END"
-        raise "Needs END, found: #{@fields.last.encode nil}"
+        raise "Needs END, found: #{@fields.last.encode}"
       end
       unless @fields.last.value? @fields.first.value
         raise "BEGIN/END mismatch: (#{@fields.first.value} != #{@fields.last.value}"

data/lib/vcard/field.rb

@@ -228,9 +228,18 @@ module Vcard
         Marshal.load(Marshal.dump(self))
       end
 
-      # The String encoding of the Field. The String will be wrapped to a
-      # maximum line width of +width+, where +0+ means no wrapping, and nil is
-      # to accept the default wrapping (75, recommended by RFC2425).
+      LF = "\n"
+
+      # The String encoding of the Field. The String will be wrapped
+      # to a maximum line width of +width+, where +0+ means no
+      # wrapping, and omitting it is to accept the default wrapping
+      # (75, recommended by RFC2425).
+      #
+      # The +nl+ parameter specifies the line delimiter, which is
+      # defaulted to LF ("\n") for historical reasons.  Relevant RFC's
+      # all say it should be CRLF, so it is highly recommended that
+      # you specify "\r\n" if you care about maximizing
+      # interoperability and interchangeability.
       #
       # Note: AddressBook.app 3.0.3 neither understands to unwrap lines when it
       # imports vCards (it treats them as raw new-line characters), nor wraps
@@ -239,15 +248,16 @@ module Vcard
       #
       # FIXME - breaks round-trip encoding, need to change this to not wrap
       # fields that are already wrapped.
-      def encode(width=nil)
-        width = 75 unless width
-        l = @line
-        # Wrap to width, unless width is zero.
-        if width > 0
-          l = l.gsub(/.{#{width},#{width}}/) { |m| m + "\n " }
+      def encode(width = 75, nl: LF)
+        l = @line.rstrip
+        if width.zero?
+          l + nl
+        elsif width <= 1
+          raise ArgumentError, "#{width} is too narrow"
+        else
+          # Wrap to width
+          l.scan(/\A.{,#{width}}|.{1,#{width - 1}}/).join("#{nl} ") + nl
         end
-        # Make sure it's terminated with no more than a single NL.
-        l.gsub(/\s*\z/, "") + "\n"
       end
 
       alias to_s encode

data/lib/vcard/vcard.rb

@@ -608,9 +608,8 @@ module Vcard
 
     # Create a vCard 3.0 object with the minimum required fields, plus any
     # +fields+ you want in the card (they can also be added later).
-    def self.create(fields = [] )
-      fields.unshift Field.create("VERSION", "3.0")
-      super(fields, "VCARD")
+    def self.create(fields = [])
+      super([Field.create("VERSION", "3.0"), *fields], "VCARD")
     end
 
     # Decode a collection of vCards into an array of Vcard objects.

data/lib/vcard/version.rb

@@ -1,3 +1,3 @@
 module Vcard
-  VERSION = "0.2.16"
+  VERSION = "0.3.0"
 end

data/test/field_test.rb

@@ -162,8 +162,14 @@ class FieldTest < Test::Unit::TestCase
     assert_equal("0:xx\n",            Vcard::DirectoryInfo::Field.create("0", "x" * 2).encode(4))
     assert_equal("0:xx\n x\n",        Vcard::DirectoryInfo::Field.create("0", "x" * 3).encode(4))
     assert_equal("0:xx\n xx\n",       Vcard::DirectoryInfo::Field.create("0", "x" * 4).encode(4))
-    assert_equal("0:xx\n xxxx\n",     Vcard::DirectoryInfo::Field.create("0", "x" * 6).encode(4))
-    assert_equal("0:xx\n xxxx\n x\n", Vcard::DirectoryInfo::Field.create("0", "x" * 7).encode(4))
+    assert_equal("0:xx\n xxx\n x\n",  Vcard::DirectoryInfo::Field.create("0", "x" * 6).encode(4))
+    assert_equal("0:xx\n xxx\n xx\n", Vcard::DirectoryInfo::Field.create("0", "x" * 7).encode(4))
+    assert_equal("0:xxxxxxx\n",       Vcard::DirectoryInfo::Field.create("0", "x" * 7).encode(0))
+    assert_equal("0:xxxxxxx\n",       Vcard::DirectoryInfo::Field.create("0", "x" * 7).encode())
+    assert_equal("0:#{"x" * 73}\n #{"x" * 74}\n #{"x" * 53}\n", Vcard::DirectoryInfo::Field.create("0", "x" * 200).encode())
   end
-end
 
+  def test_nl
+    assert_equal("test:#{"value" * 14}\r\n #{"value" * 6}\r\n", Vcard::DirectoryInfo::Field.create("test", "value" * 20).encode(nl: "\r\n"))
+  end
+end

data/test/vcard_test.rb

@@ -97,6 +97,20 @@ class VcardTest < Test::Unit::TestCase
     assert_equal("CATEGORIES: Amis/Famille", card[ "note" ])
   end
 
+  def test_nl
+    lf_card = crlf_card = nil
+    assert_nothing_thrown {
+      lf_card = Vcard::Vcard.decode(vcard(:ex3)).first
+      crlf_encoded = lf_card.encode(nl: "\r\n")
+      lf_encoded = lf_card.encode
+      assert_equal(crlf_encoded.split(/\r\n/), lf_encoded.split(/\n/))
+      crlf_card = Vcard::Vcard.decode(crlf_encoded).first
+    }
+
+    assert_equal(lf_card["note"], crlf_card["note"])
+    assert_equal(lf_card["home.label"], crlf_card["home.label"])
+  end
+
   def test_nickname
     assert_equal(nil,          Vcard::Vcard.decode(vcard(:nickname0)).first.nickname)
     assert_equal(nil,          Vcard::Vcard.decode(vcard(:nickname1)).first.nickname)
@@ -218,6 +232,12 @@ EOF
     key = Vcard::DirectoryInfo.decode("key;type=x509;encoding=B:dGhpcyBjb3VsZCBiZSAKbXkgY2VydGlmaWNhdGUK\n")['key']
     card << Vcard::DirectoryInfo::Field.create('key', key, 'encoding' => :b64)
     assert_equal(key, card['key'])
+
+    field = Vcard::DirectoryInfo::Field.create('key', 'value')
+    card = assert_nothing_raised {
+      Vcard::Vcard.create([field].freeze)
+    }
+    assert_equal('value', card['key'])
   end
 
   def test_decode_date

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcard
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.3.0
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies: []
 description: Vcard extracted from Vpim
 email:
@@ -21,6 +21,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md