dav4rack_ext 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22bc67021255d19795f35d47d0e9299ae1db9c91
-  data.tar.gz: 3bd4d094d4eab7acae0ab1d1de74bdf4d5647968
+  metadata.gz: 7e9aba179c4d57f91f74b9a4ae41ff44d0290121
+  data.tar.gz: 6b0bf9822b2f75bccedc1d936570ba7b34d776ef
 SHA512:
-  metadata.gz: 64e22e835a41c7895882f4194e73cc8df9d2748bfc330551821f9354cbd82c471a170fcb3217a3ac9d601bb22fb47cdbc29a3442ceb582c384ab42190c759c43
-  data.tar.gz: ff0c650ca6eab05fccff13b2ad2e97f8da925ff9a10b10905e2b8449ae3c93aa13277f32c5c75e29258e19d79ac58dc0c9fd78323de64cf4801f74c56cd05444
+  metadata.gz: e7848ea5f4c8f6deab94e88ea184faaef5fe9e39e4733d6a094446c71f437c92323f90d0ba8b010f01714d562e347bce58c9d109cc9a3be2ba3f59048fdd7327
+  data.tar.gz: 6e37118a3554e3abaf02a3298f0fb7f314f0709868d7ee531c74ebc84d5142b598903e1db89d6625a157a597f89cd7f14695ed0d7aa294314e0da1995dc4ea9b

data/.travis.yml

@@ -1,6 +1,4 @@
 env: TRAVIS_CI=1
 bundler_args: --without local
 rvm:
-  - 1.9.3
-  - 2.0.0
-
+  - 2.3.1

data/lib/dav4rack_ext/carddav/controller.rb

@@ -28,6 +28,8 @@ module DAV4Rack
         case request_document.root.name
         when 'addressbook-multiget'
           addressbook_multiget(request_document)
+        when 'addressbook-query'
+          addressbook_query(request_document)
         else
           render_xml(:error) do |xml|
             xml.send :'supported-report'
@@ -53,6 +55,30 @@ module DAV4Rack
         end
         "*[local-name()='#{name}' and namespace-uri()='#{ns_uri}']"
       end
+      
+      
+      def addressbook_query(request_document)
+        
+        props = []
+        request_document.css("C|addressbook-query > D|prop", NAMESPACES).each do |el|
+          el.children.select(&:element?).each do |child|
+            props << to_element_hash(child)
+          end
+        end
+        
+        
+        contacts = resource.children
+        
+        multistatus do |xml|
+          contacts.each do |contact|
+            xml.response do
+              xml.href contact.path
+              propstats(xml, get_properties(contact, props))
+            end
+          end
+        end
+      end
+      
 
       def addressbook_multiget(request_document)
         # TODO: Include a DAV:error response

data/lib/dav4rack_ext/carddav/resources/addressbook_resource.rb

@@ -55,6 +55,12 @@ module DAV4Rack
           @address_book.updated_at
         end
         
+        explicit do
+          property('sync-token') do
+            @address_book.updated_at
+          end
+        end
+
       end
       
       

data/lib/dav4rack_ext/carddav/resources/contact_resource.rb

@@ -25,6 +25,13 @@ module DAV4Rack
         property('getlastmodified') do
           @contact.updated_at
         end
+        
+        explicit do
+          property('sync-token') do
+            @contact.etag
+          end
+        end
+
       end
       
       define_properties(CARDAV_NS) do
@@ -78,6 +85,8 @@ module DAV4Rack
         raise Conflict if (want_new_contact and @contact)
 
         if if_match = request.env['HTTP_IF_MATCH']
+          # remove quotes if present
+          if_match = if_match.tr('"', '')
           # client wants to update a contact, return an error if no
           # contact was found
           if (if_match == '*') || !@contact

data/lib/dav4rack_ext/version.rb

@@ -1,3 +1,3 @@
 module Dav4rackExt
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/specs/helpers/http_dav.rb

@@ -1,4 +1,34 @@
 module HTTPDAVTest
+  def report(url, properties = [], opts = {})
+    namespaces = {
+      'DAV:' => 'D',
+      'urn:ietf:params:xml:ns:carddav' => 'C'
+    }
+    
+    fields_list = properties.map do |prop_name|
+      %{<C:prop name="#{prop_name}"/>}
+    end.join("\n")
+    
+    body = <<~EOS
+      <D:prop>
+        <D:getetag/>
+        <C:address-data>
+          #{fields_list}
+        </C:address-data>
+      </D:prop>
+      <C:filter/>
+    EOS
+    
+    data = <<~EOS
+      <?xml version="1.0" encoding="UTF-8"?>
+      <C:addressbook-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
+        #{body}
+      </C:addressbook-query>
+    EOS
+    
+    request('REPORT', url, opts.merge(input: data))
+  end
+  
   def propfind(url, properties = :all, opts = {})
     namespaces = {
       'DAV:' => 'D',

data/specs/rfc/rfc6352_spec.rb

@@ -182,6 +182,20 @@ END:VCARD
       value.should == :empty
     end
     
+    it 'DAV:sync-token', focus: true do
+      response = propfind('/books/castor', [
+          ['displayname', @dav_ns],
+          ['sync-token', @dav_ns]
+        ])
+            
+      response.status.should == 207
+      
+      puts response.body
+      
+      value = element_content(response, 'D|sync-token', 'D' => @carddav_ns)
+      value.should == 'TOTO'
+
+    end
   end
   
   
@@ -218,15 +232,30 @@ END:VCARD
       end
     end
     
-    it '[8.6] CARDDAV:addressbook-query Report' do
-      # unsupported for now
+    describe '[8.6] CARDDAV:addressbook-query Report' do
+      before do
+        # @contact1 = FactoryGirl.build(:contact, uid: '1234-5678-9000-1')
+        # @contact2 = FactoryGirl.build(:contact, uid: '1234-5678-9000-2')
+      end
+      
+      should 'return results' do
+        response = report('/books/castor', %w(UID EMAIL FN))
+        # puts response.body
+        elements = ensure_element_exists(response, 'D|multistatus > D|response', 'D' => @dav_ns)
+        
+        elements[0].tap do |el|
+          el.css('D|href', 'D' => @dav_ns).first.content.should == "/books/castor/1234-5678-9000-1"
+          el.css('D|getetag', 'D' => @dav_ns).first.content.should == "ETAG"
+        end
+        
+      end
     end
     
     
     describe '[8.7] CARDDAV:addressbook-multiget Report' do
       before do
-        @contact = FactoryGirl.build(:contact, uid: '1234-5678-9000-1')
-        @contact.stubs(:vcard).returns(@parsed_vcard)
+        # @contact = FactoryGirl.build(:contact, uid: '1234-5678-9000-1')
+        # @contact.stubs(:vcard).returns(@parsed_vcard)
 
         
         @raw_query = <<-EOS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dav4rack_ext
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dav4rack
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: CardDAV / CalDAV implementation.