vcard 0.2.12 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2e912a9dfe65f2058669088fcb34f1be53147564
-  data.tar.gz: 3aad9b7c03a9f32a2173d3386985d075bb264fe6
+SHA256:
+  metadata.gz: a1a9b1a2c5e533fee3acd4659c5baa7234b36eea86da7082f372fd6415d83e31
+  data.tar.gz: 245a9b44434e2fdfbb6c69e32edb81aa43864a7f7f74a4504bac53a1c8148fda
 SHA512:
-  metadata.gz: dbfb602829bfe1c2de00a99950c8783dd930fcd3de4099b84ab2089dda1b96f80ff2af39646e12f044ef235b248257290a07eafc6b5b042ba7d61129b98186bd
-  data.tar.gz: 33afb5ec28ca3e61b8077bec041a5b42e0cc850253fbf82238d68a044606cadf5dc3a50dc930dadc2585cddd9949256b3d8dcdcf1d3975ee42a432a04ff5dd8a
+  metadata.gz: 56df5e3fbce3b326c4daebd7ab9a8dfc7580fe5bd436c0207cd081dc6aa1f0c37df183dd4289651d49fc15f1d1ef0d7ff8b06b01374a55c8a5d1ea8a83f7ecad
+  data.tar.gz: f0fde0a4f77ec00a5eedd124de538c7d0fecd6b9bbcc5d05f96ab1545c9a1de83f8f5c2a9bfa4f9f0475e2e901f395f3868b68b7f715251c8a7ff1ad56d9ea40

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p195
+ruby-2.6.5

data/.travis.yml

@@ -1,16 +1,9 @@
 language: ruby
 script: bundle exec rake
+before_install:
+  - gem install bundler
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  # - ruby-head
-  # - ree
-  # - rbx-18mode
-  # - rbx-19mode
-  # - jruby-18mode
-  # - jruby-19mode
-  # - jruby-head
-matrix:
-  allow_failures:
-    - rvm: 1.8.7
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6

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/Gemfile

@@ -2,5 +2,5 @@ source "https://rubygems.org"
 
 gemspec
 
-
 gem "rake"
+gem 'test-unit'

data/README.md

@@ -1,4 +1,4 @@
-# Vcard
+# Vcard [![Build Status](https://travis-ci.org/qoobaa/vcard.svg?branch=master)](https://travis-ci.org/qoobaa/vcard)
 
 Vcard gem extracts Vcard support from Vpim gem.
 
@@ -15,3 +15,31 @@ And then execute:
 Or install it yourself as:
 
     $ gem install vcard
+
+## Configuration
+
+You can configure how to deal with invalid lines. The gem supports three behaviours:
+
+1. `raise_on_invalid_line = true`
+
+ Vcard::InvalidEncodingError will be raised if any invalid line is found.
+
+2. `raise_on_invalid_line = false, ignore_invalid_vcards = true`
+
+ If the vcard source has an invalid line, this vcard object will be ignored.
+ If you have only one vcard object in your source string, an empty array will be returned from `Vcard.decode`.
+
+3. `raise_on_invalid_line = false, ignore_invalid_vcards = false`
+
+ If the vcard is marked as invalid, invalid fields will be ignored, but the vcard will be present in the results of `Vcard#decode`.
+
+```
+Vcard.configure do |config|
+  config.raise_on_invalid_line = false # default true
+  config.ignore_invalid_vcards = false # default true
+end
+```
+
+## Upgrade Notes
+
+We are no longer testing against Ruby 1.8.7.

data/lib/vcard.rb

@@ -7,6 +7,7 @@ require "date"
 require "open-uri"
 require "stringio"
 
+require "vcard/configuration"
 require "vcard/attachment"
 require "vcard/bnf"
 require "vcard/dirinfo"
@@ -26,7 +27,7 @@ module Vcard
       unfolded = []
 
       prior_line = nil
-      card.lines do |line|
+      card.each_line do |line|
         line.chomp!
         # If it's a continuation line, add it to the last.
         # If it's an empty line, drop it from the input.
@@ -285,4 +286,13 @@ module Vcard
     end
     return outer, inner
   end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield configuration
+  end
+
 end

data/lib/vcard/configuration.rb

@@ -0,0 +1,26 @@
+module Vcard
+  class Configuration
+
+    attr_accessor :raise_on_invalid_line
+    alias_method :raise_on_invalid_line?, :raise_on_invalid_line
+
+    attr_accessor :ignore_invalid_vcards
+    alias_method :ignore_invalid_vcards?, :ignore_invalid_vcards
+
+    def initialize
+      set_default_values
+    end
+
+    def reset
+      set_default_values
+    end
+
+    private
+
+    def set_default_values
+      @raise_on_invalid_line = true
+      @ignore_invalid_vcards = true
+    end
+
+  end
+end

data/lib/vcard/dirinfo.rb

@@ -31,16 +31,27 @@ module Vcard
     # Initialize a DirectoryInfo object from +fields+. If +profile+ is
     # specified, check the BEGIN/END fields.
     def initialize(fields, profile = nil) #:nodoc:
-      if fields.detect { |f| ! f.kind_of? DirectoryInfo::Field }
-        raise ArgumentError, "fields must be an array of DirectoryInfo::Field objects"
+      @valid = true
+      @fields = []
+
+      fields.each do |f|
+        raise ArgumentError, "fields must be an array of DirectoryInfo::Field objects" unless f.kind_of? DirectoryInfo::Field
+        if f.valid?
+          @fields << f
+        else
+          @valid = false
+        end
       end
 
       @string = nil # this is used as a flag to indicate that recoding will be necessary
-      @fields = fields
 
       check_begin_end(profile) if profile
     end
 
+    def valid?
+      @valid
+    end
+
     # Decode +card+ into a DirectoryInfo object.
     #
     # +card+ may either be a something that is convertible to a string using
@@ -81,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)
@@ -181,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
@@ -230,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
@@ -249,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

@@ -101,10 +101,12 @@ module Vcard
         line
       end
 
+
       # Decode a field.
       def Field.decode0(atline) # :nodoc:
         if !(atline =~ Bnf::LINE)
-          raise ::Vcard::InvalidEncodingError, atline
+          raise(::Vcard::InvalidEncodingError, atline) if ::Vcard.configuration.raise_on_invalid_line?
+          return false
         end
 
         atgroup = $1.upcase
@@ -165,19 +167,27 @@ module Vcard
           end
         end
 
-        [ atgroup, atname, atparams, atvalue ]
+        [ true, atgroup, atname, atparams, atvalue ]
       end
 
       def initialize(line) # :nodoc:
         @line = line.to_str
-        @group, @name, @params, @value = Field.decode0(@line)
+        @valid, @group, @name, @params, @value = Field.decode0(@line)
 
-        @params.each do |pname,pvalues|
-          pvalues.freeze
+        if valid?
+          @params.each do |pname,pvalues|
+            pvalues.freeze
+          end
+        else
+          @group = @name = ''
         end
         self
       end
 
+      def valid?
+        @valid
+      end
+
       # Create a field by decoding +line+, a String which must already be
       # unfolded. Decoded fields are frozen, but see #copy().
       def Field.decode(line)
@@ -218,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
@@ -229,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
@@ -323,7 +343,7 @@ module Vcard
 
       # Is the #name of this Field +name+? Names are case insensitive.
       def name?(name)
-        @name.casecmp(name) == 0
+        @name.to_s.casecmp(name) == 0
       end
 
       # Is the #group of this field +group+? Group names are case insensitive.
@@ -590,7 +610,7 @@ module Vcard
       # new fields, not old fields.
       def mutate(g, n, p, v) #:nodoc:
         line = Field.encode0(g, n, p, v)
-        @group, @name, @params, @value = Field.decode0(line)
+        @valid, @group, @name, @params, @value = Field.decode0(line)
         @line = line
         self
       rescue ::Vcard::InvalidEncodingError => e

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.
@@ -659,7 +658,8 @@ module Vcard
       vcards = []
 
       for e in entities
-        vcards.push(new(e.flatten, "VCARD"))
+        vcard  = new(e.flatten, "VCARD")
+        vcards.push(vcard) if vcard.valid? || !::Vcard.configuration.ignore_invalid_vcards?
       end
 
       vcards

data/lib/vcard/version.rb

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

data/test/configuration_test.rb

@@ -0,0 +1,23 @@
+require "test_helper"
+
+class ConfigurationTest < Test::Unit::TestCase
+  def test_should_be_an_instance_of_configuration
+    assert Vcard.configuration.is_a?(::Vcard::Configuration)
+  end
+
+  def test_have_default_values
+    Vcard.configuration.reset
+    assert_equal(Vcard.configuration.raise_on_invalid_line, true)
+    assert_equal(Vcard.configuration.ignore_invalid_vcards, true)
+  end
+
+  def test_allow_configuration_with_block
+    Vcard.configuration.reset
+    Vcard.configure do |config|
+      config.raise_on_invalid_line = false
+      config.ignore_invalid_vcards = false
+    end
+    assert_equal(Vcard.configuration.raise_on_invalid_line, false)
+    assert_equal(Vcard.configuration.ignore_invalid_vcards, false)
+  end
+end

data/test/field_test.rb

@@ -21,31 +21,31 @@ class FieldTest < Test::Unit::TestCase
   def test_field4
     line = "t;e=a,b: 4 "
     part = Field.decode0(line)
-    assert_equal("4", part[ 3 ])
+    assert_equal("4", part[ 4 ])
   end
 
   def test_field3
     line = "t;e=a,b:4"
     part = Field.decode0(line)
-    assert_equal("4", part[ 3 ])
-    assert_equal( {"E" => [ "a","b" ] }, part[ 2 ])
+    assert_equal("4", part[ 4 ])
+    assert_equal( {"E" => [ "a","b" ] }, part[ 3 ])
   end
 
   def test_field2
     line = "tel;type=work,voice,msg:+1 313 747-4454"
     part = Field.decode0(line)
-    assert_equal("+1 313 747-4454", part[ 3 ])
-    assert_equal( {"TYPE" => [ "work","voice","msg" ] }, part[ 2 ])
+    assert_equal("+1 313 747-4454", part[ 4 ])
+    assert_equal( {"TYPE" => [ "work","voice","msg" ] }, part[ 3 ])
   end
 
   def test_field1
     line = 'ORGANIZER;CN="xxxx, xxxx [SC100:370:EXCH]":MAILTO:xxxx@americasm01.nt.com'
     parts = Field.decode0(line)
 
-    assert_equal(nil, parts[0])
-    assert_equal("ORGANIZER", parts[1])
-    assert_equal({ "CN" => [ "xxxx, xxxx [SC100:370:EXCH]" ] }, parts[2])
-    assert_equal("MAILTO:xxxx@americasm01.nt.com", parts[3])
+    assert_equal(nil, parts[1])
+    assert_equal("ORGANIZER", parts[2])
+    assert_equal({ "CN" => [ "xxxx, xxxx [SC100:370:EXCH]" ] }, parts[3])
+    assert_equal("MAILTO:xxxx@americasm01.nt.com", parts[4])
   end
 
 =begin this can not be done :-(
@@ -67,20 +67,21 @@ class FieldTest < Test::Unit::TestCase
 
   def test_field0
     assert_equal("name:", line = Field.encode0(nil, "name"))
-    assert_equal([ nil, "NAME", {}, ""], Field.decode0(line))
+    assert_equal([ true, nil, "NAME", {}, ""], Field.decode0(line))
 
     assert_equal("name:value", line = Field.encode0(nil, "name", {}, "value"))
-    assert_equal([ nil, "NAME", {}, "value"], Field.decode0(line))
+    assert_equal([ true, nil, "NAME", {}, "value"], Field.decode0(line))
 
     assert_equal("name;encoding=B:dmFsdWU=", line = Field.encode0(nil, "name", { "encoding"=>:b64 }, "value"))
-    assert_equal([ nil, "NAME", { "ENCODING"=>["B"]}, ["value"].pack("m").chomp ], Field.decode0(line))
+    assert_equal([ true, nil, "NAME", { "ENCODING"=>["B"]}, ["value"].pack("m").chomp ], Field.decode0(line))
 
     line = Field.encode0("group", "name", {}, "value")
     assert_equal "group.name:value", line
-    assert_equal [ "GROUP", "NAME", {}, "value"], Field.decode0(line)
+    assert_equal [ true, "GROUP", "NAME", {}, "value"], Field.decode0(line)
   end
 
-  def test_invalid_fields
+  def test_invalid_fields_wih_raise_error
+    Vcard::configuration.raise_on_invalid_line = true
     [
       "g.:",
       ":v",
@@ -89,6 +90,16 @@ class FieldTest < Test::Unit::TestCase
     end
   end
 
+  def test_invalid_fields_wihout_raise_error
+    Vcard.configuration.raise_on_invalid_line = false
+    [
+        "g.:",
+        ":v",
+    ].each do |line|
+      assert_nothing_raised { Field.decode0(line) }
+    end
+  end
+
   def test_date_encode
     assert_equal("DTSTART:20040101\n", Field.create("DTSTART",  Date.new(2004, 1, 1) ).to_s)
     assert_equal("DTSTART:20040101\n", Field.create("DTSTART", [Date.new(2004, 1, 1)]).to_s)
@@ -97,6 +108,7 @@ class FieldTest < Test::Unit::TestCase
   def test_field_modify
     f = Field.create("name")
 
+
     assert_equal("", f.value)
     f.value = ""
     assert_equal("", f.value)
@@ -150,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)
@@ -169,17 +183,61 @@ EOF
   end
 
   def test_bad
-    # FIXME: this should THROW, it's badly encoded!
+    Vcard::configuration.raise_on_invalid_line = true
     assert_raises(::Vcard::InvalidEncodingError) do
       Vcard::Vcard.decode("BEGIN:VCARD\nVERSION:3.0\nKEYencoding=b:this could be \nmy certificate\n\nEND:VCARD\n")
     end
   end
 
+  def test_not_raise_error_if_configured_to_ignore
+    Vcard::configuration.raise_on_invalid_line = false
+    Vcard::configuration.ignore_invalid_vcards = false
+    assert_nothing_raised do
+      Vcard::Vcard.decode("BEGIN:VCARD\nVERSION:3.0\nKEYencoding=b:this could be \nmy certificate\n\nEND:VCARD\n")
+    end
+  end
+
+  def test_ignore_vcards_with_invalid_fields
+    Vcard::configuration.raise_on_invalid_line = false
+    Vcard::configuration.ignore_invalid_vcards = true
+    src = <<'EOF'
+BEGIN:VCARD
+VERSION:3.0
+KEYencoding=b:this could be
+my certificate
+EMAIL:valid@field.value
+END:VCARD
+BEGIN:VCARD
+VERSION:3.0
+EMAIL:valid@field.value
+END:VCARD
+EOF
+
+    cards = Vcard::Vcard.decode(src)
+    assert_equal 1, cards.size
+  end
+
+  def test_ignore_only_invalid_fields
+    Vcard::configuration.raise_on_invalid_line = false
+    Vcard::configuration.ignore_invalid_vcards = false
+    email = 'test@example.com'
+    cards = Vcard::Vcard.decode("BEGIN:VCARD\nVERSION:3.0\nKEYencoding=b:this could be \nmy certificate\nEMAIL:#{email}\n\nEND:VCARD\n")
+    assert_equal email, cards.first.email
+    # [BEGIN, VERSION, EMAIL, END].size == 4
+    assert_equal 4, cards.first.fields.size
+  end
+
   def test_create
     card = Vcard::Vcard.create
     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
@@ -318,7 +376,7 @@ EOF
     assert_equal('', card.name.given)
     assert_equal('', card.name.fullname)
 
-    assert_raises(TypeError, RuntimeError) do
+    assert_raises do
       card.name.given = 'given'
     end
 
@@ -466,7 +524,7 @@ EOF
       m.add_role "Office Manager\r\n;Something Else"
     end
     assert_equal "Office Manager\n;Something Else", card.role
-    assert_match /Office Manager\\n\\;Something Else/, card.to_s
+    assert_match(/Office Manager\\n\\;Something Else/, card.to_s)
     card = Vcard::Vcard.decode(card.encode).first
     assert_equal "Office Manager\n;Something Else", card.role
   end
@@ -477,10 +535,10 @@ EOF
         n.given = "John"
         n.family = "Woe"
       end
-      m.add_note note = "line1\r\n;line2"
+      m.add_note "line1\r\n;line2"
     end
     assert_equal "line1\n;line2", card.note
-    assert_match /line1\\n\\;line2/, card.to_s
+    assert_match(/line1\\n\\;line2/, card.to_s)
     card = Vcard::Vcard.decode(card.encode).first
     assert_equal "line1\n;line2", card.note
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcard
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.0
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies: []
 description: Vcard extracted from Vpim
 email:
@@ -17,10 +17,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -28,12 +29,14 @@ files:
 - lib/vcard.rb
 - lib/vcard/attachment.rb
 - lib/vcard/bnf.rb
+- lib/vcard/configuration.rb
 - lib/vcard/dirinfo.rb
 - lib/vcard/enumerator.rb
 - lib/vcard/errors.rb
 - lib/vcard/field.rb
 - lib/vcard/vcard.rb
 - lib/vcard/version.rb
+- test/configuration_test.rb
 - test/field_test.rb
 - test/fixtures/bday_decode.vcard
 - test/fixtures/bday_decode_2.vcard
@@ -74,21 +77,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Vcard extracted from Vpim
 test_files:
+- test/configuration_test.rb
 - test/field_test.rb
 - test/fixtures/bday_decode.vcard
 - test/fixtures/bday_decode_2.vcard