protocol-caldav 1.0.2 → 1.1.0

data/lib/protocol/caldav/vcard/parser.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "scampi"
-
 require "protocol/caldav"
 
 module Protocol
@@ -12,77 +9,77 @@ module Protocol
         module_function
 
         def parse(text)
-          return nil if text.nil? || text.strip.empty?
-
-          text = text.sub(/\A\xEF\xBB\xBF/, '')
-
-          lines = ContentLine.unfold(text).split("\n").map(&:strip).reject(&:empty?)
-          props = []
-          inside = false
-
-          lines.each do |line|
-            parsed = ContentLine.parse_line(line)
-            next unless parsed
-
-            name, params, value = parsed
-
-            if name.casecmp?('BEGIN') && value.strip.casecmp?('VCARD')
-              inside = true
-            elsif name.casecmp?('END') && value.strip.casecmp?('VCARD')
-              break
-            elsif inside
-              props << Ical::Property.new(name: name, params: params, value: value)
+          if text.nil? || text.strip.empty?
+            nil
+          else
+            text = text.sub(/\A\xEF\xBB\xBF/, '')
+            lines = ContentLine.unfold(text).split("\n").map(&:strip).reject(&:empty?)
+            props = []
+            inside = false
+            lines.each do |line|
+              parsed = ContentLine.parse_line(line)
+              unless parsed
+                next
+              end
+
+              name, params, value = parsed
+
+              if name.casecmp?('BEGIN') && value.strip.casecmp?('VCARD')
+                inside = true
+              elsif name.casecmp?('END') && value.strip.casecmp?('VCARD')
+                break
+              elsif inside
+                props << Ical::Property.new(name: name, params: params, value: value)
+              end
             end
+            props.empty? ? nil : Card.new(properties: props)
           end
-
-          props.empty? ? nil : Card.new(properties: props)
         end
       end
     end
   end
 end
 
+__END__
 
-test do
-  describe "Protocol::Caldav::Vcard::Parser" do
-    def parse(text)
-      Protocol::Caldav::Vcard::Parser.parse(text)
-    end
+describe "Protocol::Caldav::Vcard::Parser" do
+  def parse(text)
+    Protocol::Caldav::Vcard::Parser.parse(text)
+  end
 
-    it "parses a flat BEGIN:VCARD / END:VCARD" do
-      card = parse("BEGIN:VCARD\r\nVERSION:3.0\r\nFN:John\r\nEND:VCARD")
-      card.should.not.be.nil
-      card.find_property("FN").value.should.equal "John"
-    end
+  it "parses a flat BEGIN:VCARD / END:VCARD" do
+    card = parse("BEGIN:VCARD\r\nVERSION:3.0\r\nFN:John\r\nEND:VCARD")
+    card.should.not.be.nil
+    card.find_property("FN").value.should.equal "John"
+  end
 
-    it "handles VERSION:3.0 and VERSION:4.0 without distinction" do
-      card3 = parse("BEGIN:VCARD\r\nVERSION:3.0\r\nFN:A\r\nEND:VCARD")
-      card4 = parse("BEGIN:VCARD\r\nVERSION:4.0\r\nFN:A\r\nEND:VCARD")
-      card3.find_property("VERSION").value.should.equal "3.0"
-      card4.find_property("VERSION").value.should.equal "4.0"
-    end
+  it "handles VERSION:3.0 and VERSION:4.0 without distinction" do
+    card3 = parse("BEGIN:VCARD\r\nVERSION:3.0\r\nFN:A\r\nEND:VCARD")
+    card4 = parse("BEGIN:VCARD\r\nVERSION:4.0\r\nFN:A\r\nEND:VCARD")
+    card3.find_property("VERSION").value.should.equal "3.0"
+    card4.find_property("VERSION").value.should.equal "4.0"
+  end
 
-    it "handles structured values in N property as raw string" do
-      card = parse("BEGIN:VCARD\r\nN:Doe;John;;;Jr.\r\nEND:VCARD")
-      card.find_property("N").value.should.equal "Doe;John;;;Jr."
-    end
+  it "handles structured values in N property as raw string" do
+    card = parse("BEGIN:VCARD\r\nN:Doe;John;;;Jr.\r\nEND:VCARD")
+    card.find_property("N").value.should.equal "Doe;John;;;Jr."
+  end
 
-    it "returns nil for empty input" do
-      parse("").should.be.nil
-    end
+  it "returns nil for empty input" do
+    parse("").should.be.nil
+  end
 
-    it "returns nil for nil input" do
-      parse(nil).should.be.nil
-    end
+  it "returns nil for nil input" do
+    parse(nil).should.be.nil
+  end
 
-    it "tolerates LF-only line endings" do
-      card = parse("BEGIN:VCARD\nFN:Test\nEND:VCARD")
-      card.find_property("FN").value.should.equal "Test"
-    end
+  it "tolerates LF-only line endings" do
+    card = parse("BEGIN:VCARD\nFN:Test\nEND:VCARD")
+    card.find_property("FN").value.should.equal "Test"
+  end
 
-    it "tolerates BOM" do
-      card = parse("\xEF\xBB\xBFBEGIN:VCARD\r\nFN:Test\r\nEND:VCARD")
-      card.should.not.be.nil
-    end
+  it "tolerates BOM" do
+    card = parse("\xEF\xBB\xBFBEGIN:VCARD\r\nFN:Test\r\nEND:VCARD")
+    card.should.not.be.nil
   end
 end

data/lib/protocol/caldav/version.rb

@@ -2,6 +2,6 @@
 
 module Protocol
   module Caldav
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

data/lib/protocol/caldav/xml.rb

@@ -1,122 +1,126 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "scampi"
-
 module Protocol
   module Caldav
     module Xml
       module_function
 
       def escape(str)
-        return '' unless str
-
-        str.to_s
-           .gsub('&', '&')
-           .gsub('<', '&lt;')
-           .gsub('>', '&gt;')
-           .gsub('"', '&quot;')
+        if str
+          str.to_s
+             .gsub('&', '&amp;')
+             .gsub('<', '&lt;')
+             .gsub('>', '&gt;')
+             .gsub('"', '&quot;')
+        else
+          ''
+        end
       end
 
       def extract_value(xml, tag)
-        return nil if xml.nil? || xml.empty?
-
-        match = xml.match(/<[^>]*#{Regexp.escape(tag)}[^>]*>([^<]*)</)
-        return nil unless match
-
-        value = match[1].strip
-        value.empty? ? nil : value
+        if xml.nil? || xml.empty?
+          nil
+        else
+          match = xml.match(/<[^>]*#{Regexp.escape(tag)}[^>]*>([^<]*)</)
+          if match
+            value = match[1].strip
+            value.empty? ? nil : value
+          else
+            nil
+          end
+        end
       end
 
       def extract_attr(xml, tag, attr)
-        return nil if xml.nil? || xml.empty?
-
-        match = xml.match(/<[^>]*#{Regexp.escape(tag)}[^>]*#{Regexp.escape(attr)}="([^"]*)"/)
-        match ? match[1] : nil
+        if xml.nil? || xml.empty?
+          nil
+        else
+          match = xml.match(/<[^>]*#{Regexp.escape(tag)}[^>]*#{Regexp.escape(attr)}="([^"]*)"/)
+          match ? match[1] : nil
+        end
       end
     end
   end
 end
 
+__END__
 
-test do
-  describe "Protocol::Caldav::Xml" do
-    describe ".escape" do
-      it "escapes ampersand" do
-        Protocol::Caldav::Xml.escape("a&b").should.equal "a&amp;b"
-      end
+describe "Protocol::Caldav::Xml" do
+  describe ".escape" do
+    it "escapes ampersand" do
+      Protocol::Caldav::Xml.escape("a&b").should.equal "a&amp;b"
+    end
 
-      it "escapes less-than" do
-        Protocol::Caldav::Xml.escape("a<b").should.equal "a&lt;b"
-      end
+    it "escapes less-than" do
+      Protocol::Caldav::Xml.escape("a<b").should.equal "a&lt;b"
+    end
 
-      it "escapes greater-than" do
-        Protocol::Caldav::Xml.escape("a>b").should.equal "a&gt;b"
-      end
+    it "escapes greater-than" do
+      Protocol::Caldav::Xml.escape("a>b").should.equal "a&gt;b"
+    end
 
-      it "escapes double-quote" do
-        Protocol::Caldav::Xml.escape('a"b').should.equal "a&quot;b"
-      end
+    it "escapes double-quote" do
+      Protocol::Caldav::Xml.escape('a"b').should.equal "a&quot;b"
+    end
 
-      it "escapes all five entities together" do
-        Protocol::Caldav::Xml.escape('&<>"').should.equal '&amp;&lt;&gt;&quot;'
-      end
+    it "escapes all five entities together" do
+      Protocol::Caldav::Xml.escape('&<>"').should.equal '&amp;&lt;&gt;&quot;'
+    end
 
-      it "returns empty string for nil" do
-        Protocol::Caldav::Xml.escape(nil).should.equal ''
-      end
+    it "returns empty string for nil" do
+      Protocol::Caldav::Xml.escape(nil).should.equal ''
+    end
 
-      it "returns empty string for empty string" do
-        Protocol::Caldav::Xml.escape('').should.equal ''
-      end
+    it "returns empty string for empty string" do
+      Protocol::Caldav::Xml.escape('').should.equal ''
+    end
 
-      it "passes through plain text unchanged" do
-        Protocol::Caldav::Xml.escape("hello world").should.equal "hello world"
-      end
+    it "passes through plain text unchanged" do
+      Protocol::Caldav::Xml.escape("hello world").should.equal "hello world"
     end
+  end
 
-    describe ".extract_value" do
-      it "extracts text content from a tag" do
-        Protocol::Caldav::Xml.extract_value('<d:displayname>Work</d:displayname>', 'displayname').should.equal 'Work'
-      end
+  describe ".extract_value" do
+    it "extracts text content from a tag" do
+      Protocol::Caldav::Xml.extract_value('<d:displayname>Work</d:displayname>', 'displayname').should.equal 'Work'
+    end
 
-      it "returns nil for empty content" do
-        Protocol::Caldav::Xml.extract_value('<d:displayname></d:displayname>', 'displayname').should.be.nil
-      end
+    it "returns nil for empty content" do
+      Protocol::Caldav::Xml.extract_value('<d:displayname></d:displayname>', 'displayname').should.be.nil
+    end
 
-      it "returns nil when tag not found" do
-        Protocol::Caldav::Xml.extract_value('<d:other>x</d:other>', 'displayname').should.be.nil
-      end
+    it "returns nil when tag not found" do
+      Protocol::Caldav::Xml.extract_value('<d:other>x</d:other>', 'displayname').should.be.nil
+    end
 
-      it "returns nil for nil input" do
-        Protocol::Caldav::Xml.extract_value(nil, 'displayname').should.be.nil
-      end
+    it "returns nil for nil input" do
+      Protocol::Caldav::Xml.extract_value(nil, 'displayname').should.be.nil
+    end
 
-      it "returns nil for empty input" do
-        Protocol::Caldav::Xml.extract_value('', 'displayname').should.be.nil
-      end
+    it "returns nil for empty input" do
+      Protocol::Caldav::Xml.extract_value('', 'displayname').should.be.nil
+    end
 
-      it "strips whitespace from value" do
-        Protocol::Caldav::Xml.extract_value('<d:displayname>  Work  </d:displayname>', 'displayname').should.equal 'Work'
-      end
+    it "strips whitespace from value" do
+      Protocol::Caldav::Xml.extract_value('<d:displayname>  Work  </d:displayname>', 'displayname').should.equal 'Work'
     end
+  end
 
-    describe ".extract_attr" do
-      it "extracts attribute value from a tag" do
-        Protocol::Caldav::Xml.extract_attr('<c:comp-filter name="VCALENDAR">', 'comp-filter', 'name').should.equal 'VCALENDAR'
-      end
+  describe ".extract_attr" do
+    it "extracts attribute value from a tag" do
+      Protocol::Caldav::Xml.extract_attr('<c:comp-filter name="VCALENDAR">', 'comp-filter', 'name').should.equal 'VCALENDAR'
+    end
 
-      it "returns nil when tag not found" do
-        Protocol::Caldav::Xml.extract_attr('<c:other name="x">', 'comp-filter', 'name').should.be.nil
-      end
+    it "returns nil when tag not found" do
+      Protocol::Caldav::Xml.extract_attr('<c:other name="x">', 'comp-filter', 'name').should.be.nil
+    end
 
-      it "returns nil for nil input" do
-        Protocol::Caldav::Xml.extract_attr(nil, 'comp-filter', 'name').should.be.nil
-      end
+    it "returns nil for nil input" do
+      Protocol::Caldav::Xml.extract_attr(nil, 'comp-filter', 'name').should.be.nil
+    end
 
-      it "returns nil for empty input" do
-        Protocol::Caldav::Xml.extract_attr('', 'comp-filter', 'name').should.be.nil
-      end
+    it "returns nil for empty input" do
+      Protocol::Caldav::Xml.extract_attr('', 'comp-filter', 'name').should.be.nil
     end
   end
 end

data/lib/protocol/caldav/xml_builder.rb

@@ -10,7 +10,7 @@ module Protocol
         "xmlns:c"  => "urn:ietf:params:xml:ns:caldav",
         "xmlns:cr" => "urn:ietf:params:xml:ns:carddav",
         "xmlns:cs" => "http://calendarserver.org/ns/",
-        "xmlns:x"  => "http://apple.com/ns/ical/"
+        "xmlns:x"  => "http://apple.com/ns/ical/",
       }.freeze
 
       module_function
@@ -27,7 +27,9 @@ module Protocol
       def response(xml, href:)
         xml.tag!("d:response") do
           xml.tag!("d:href", href)
-          yield xml if block_given?
+          if block_given?
+            yield xml
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-caldav
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Nathan K
@@ -37,20 +37,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.88'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.88'
 - !ruby/object:Gem::Dependency
   name: scampi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
-  type: :runtime
+        version: '1.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: '1.0'
 description: |
   Pure protocol code for CalDAV (RFC 4791) and CardDAV (RFC 6352).
   No rack, no async, no I/O. Pair with async-caldav for a server.