vcardigan 0.0.2 → 0.0.3

data/lib/vcardigan/vcard.rb

@@ -2,7 +2,9 @@ module VCardigan
 
   class VCard
 
-    VCARD_PATTERN = /BEGIN:VCARD\s+(.*?)VERSION:(.+?)\s+(.+?)END:VCARD/m;
+    # A quoted-printable encoded string with a trailing '=', indicating that
+    # it's not terminated
+    UNTERMINATED_QUOTED_PRINTABLE = /ENCODING=QUOTED-PRINTABLE:.*=$/
 
     attr_accessor :version
     attr_accessor :chars
@@ -23,18 +25,18 @@ module VCardigan
     end
 
     def parse(data)
-      match = VCARD_PATTERN.match(data)
-      if match
-        # Set version number
-        @version = match[2]
-        lines = "#{match[1].strip}#{match[3].strip}"
-
-        # Add the parsed properties to this vCard
-        lines.each_line do |line|
-          property = VCardigan::Property.parse(self, line)
-          add_prop(property)
+      lines = unfold(data)
+
+      # Add the parsed properties to this vCard
+      lines.each do |line|
+        if line =~ /^VERSION:(.+)/
+          @version = $1
         end
+
+        property = VCardigan::Property.parse(self, line)
+        add_prop(property)
       end
+
       self
     end
 
@@ -57,7 +59,7 @@ module VCardigan
       if @group
         # If there's a group, add it to the name
         name = "#{@group}.#{name}"
-        
+
         # Reset group to nil
         @group = nil
       end
@@ -124,6 +126,39 @@ module VCardigan
     # Private ##########
     private
 
+    # Split on \r\n or \n to get the lines, unfold continued lines (they
+    # start with " " or \t), and return the array of unfolded lines.
+    #
+    # Strip away BEGIN:VCARD and END:VCARD
+    #
+    # This also supports the (invalid) encoding convention of allowing empty
+    # lines to be inserted for readability - it does this by dropping zero-length
+    # lines.
+    # Borrowed from https://github.com/qoobaa/vcard
+    def unfold(card)
+      unfolded = []
+
+      prior_line = nil
+      card.lines 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.
+        if line =~ /^[ \t]/
+          unfolded[-1] << line[1, line.size-1]
+        elsif line =~ /(^BEGIN:VCARD$)|(^END:VCARD$)/
+        elsif prior_line && (prior_line =~ UNTERMINATED_QUOTED_PRINTABLE)
+          # Strip the trailing = off prior line, then append current line
+          unfolded[-1] = prior_line[0, prior_line.length-1] + line
+        elsif line =~ /^$/
+        else
+          unfolded << line
+        end
+        prior_line = unfolded[-1]
+      end
+
+      unfolded
+    end
+
     def build_prop(name, *args)
       VCardigan::Property.create(self, name, *args)
     end
@@ -137,7 +172,7 @@ module VCardigan
       unless @fields.has_key? name
         @fields[name] = []
       end
-      
+
       # Add the property to the field array
       @fields[name].push(property)
 

data/lib/vcardigan/version.rb

@@ -1,5 +1,5 @@
 module VCardigan
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
 end

data/spec/examples/property_spec.rb

@@ -95,6 +95,42 @@ describe VCardigan::Property do
     it 'should return the property vCard formatted' do
       prop.to_s.should == "#{group}.#{name.upcase};TYPE=#{params[:type]}:#{value}"
     end
+
+    context 'with properties that return long strings' do
+      let(:value) { 'qwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwertqwert' }
+      let(:prop) { VCardigan::Property.create(vcard, "#{group}.#{name}", value, params) }
+
+      it 'should line fold at 75 chars' do
+        prop.to_s.split("\n").each do |line|
+          line.length.should <= 75
+        end
+      end
+
+      context 'when chars option is set to 50' do
+        let(:chars) { 50 }
+        let(:vcard) { VCardigan.create(:chars => chars) }
+        let(:prop) { VCardigan::Property.create(vcard, "#{group}.#{name}", value, params) }
+
+        it 'should line fold at 50 chars' do
+          prop.to_s.split("\n").each do |line|
+            line.length.should <= 50
+          end
+        end
+      end
+
+      context 'when chars option is set to 0' do
+        let(:chars) { 0 }
+        let(:vcard) { VCardigan.create(:chars => chars) }
+        let(:prop) { VCardigan::Property.create(vcard, "#{group}.#{name}", value, params) }
+
+        it 'should not line fold' do
+          ret = "#{group}.#{name.upcase};TYPE=#{params[:type]}:#{value}"
+          prop.to_s.split("\n").length.should == 1
+          prop.to_s.length.should == ret.length
+        end
+      end
+    end
+
   end
 
   describe '#parse' do

data/spec/examples/vcard_spec.rb

@@ -245,6 +245,22 @@ describe VCardigan::VCard do
         fields.should have_key('fn')
       end
     end
-  end
 
+    context 'google 3.0 vCard' do
+      let(:data) { File.read(File.dirname(__FILE__) + '/../helpers/google.vcf') }
+      let(:vcard) { VCardigan.parse(data) }
+      let(:fields) { vcard.instance_variable_get(:@fields) }
+
+      it 'should set the version' do
+        vcard.version.should == '3.0'
+      end
+
+      it 'should add the properties to the fields array' do
+        fields.should have_key('n')
+        fields.should have_key('fn')
+        fields.should have_key('photo')
+        fields.should have_key('x-socialprofile')
+      end
+    end
+  end
 end

metadata

@@ -1,74 +1,93 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vcardigan
-version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
-authors:
+authors: 
 - Matt Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-02-07 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: pry
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-description: vCardigan is a ruby library for building and parsing vCards that supports
-  both v3.0 and v4.0.
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: vCardigan is a ruby library for building and parsing vCards that supports both v3.0 and v4.0.
 email: matt@mlmorg.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/vcardigan/errors.rb
 - lib/vcardigan/properties/name_property.rb
 - lib/vcardigan/property.rb
 - lib/vcardigan/vcard.rb
 - lib/vcardigan/version.rb
 - lib/vcardigan.rb
-- spec/examples/property_spec.rb
-- spec/examples/vcard_spec.rb
-- spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/brewster/vcardigan
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby vCard Builder/Parser
-test_files:
+test_files: 
 - spec/examples/property_spec.rb
 - spec/examples/vcard_spec.rb
 - spec/spec_helper.rb