dav4rack_ext 0.0.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8373fe34e17cde3494f38752c00f4c06e8d733
-  data.tar.gz: 8284a1406a3238aa2855b26a9b444a12fa10269e
+  metadata.gz: 22bc67021255d19795f35d47d0e9299ae1db9c91
+  data.tar.gz: 3bd4d094d4eab7acae0ab1d1de74bdf4d5647968
 SHA512:
-  metadata.gz: e3a5971cb27a3589487f5f12ef45c4d720759dd62c10bc74a40d95c388313611a58ad8d127e5909efc5ca68cc323098e3a78ed35486bd6d3c86d8cdf6e2f8b47
-  data.tar.gz: bb2146a31439adc84c7dda16e44e7d6d88603a14ebc71428efa9a0534b968be0125456051bed722db47841e9ea3df371f732a4d0776211af10def181da1f58b5
+  metadata.gz: 64e22e835a41c7895882f4194e73cc8df9d2748bfc330551821f9354cbd82c471a170fcb3217a3ac9d601bb22fb47cdbc29a3442ceb582c384ab42190c759c43
+  data.tar.gz: ff0c650ca6eab05fccff13b2ad2e97f8da925ff9a10b10905e2b8449ae3c93aa13277f32c5c75e29258e19d79ac58dc0c9fd78323de64cf4801f74c56cd05444

data/Gemfile

@@ -23,7 +23,7 @@ group(:test) do
   gem 'virtus'
   
   gem 'simplecov'
-  gem 'guard',          '~> 1.5.4'
+  gem 'guard',          '~> 1.8.3'
   gem 'rb-fsevent'
   gem 'growl'
     

data/README.md

@@ -25,8 +25,8 @@ Once the server is started you can connect to it using http://127.0.0.1:3000/u/c
 (the example has no authentication set up)
 
 # Supported clients
-- Mac OS X (tested with Mountain Lion )
-- iPhone 5.x and 6.x
+- Mac OS X: recently tested on 10.11 (El Capitan)
+- iOS: recently tested on 8 and 9
 
 # Setting up development environment
 
@@ -41,4 +41,3 @@ the tests will run when a file changed, if only want to run all tests once:
 ```bash
 $ bundle exec rake
 ```
-

data/lib/dav4rack_ext/carddav/controller.rb

@@ -75,17 +75,22 @@ module DAV4Rack
 
         # collect the requested urls
         hrefs = request_document.css("C|addressbook-multiget D|href", NAMESPACES).map(&:content)
-
+        
+        
+        
+        children_ids = {}
+        hrefs.reject{|_href| resource.is_self?(_href) }.each do |_href|
+          path = File.split(URI.parse(_href).path).last
+          children_ids[_href] = File.split(path).last
+        end
+        
+        children = resource.find_children(children_ids)
+        
         multistatus do |xml|
           hrefs.each do |_href|
             xml.response do
               xml.href _href
-
-              path = File.split(URI.parse(_href).path).last
-              Logger.debug "Creating child w/ ORIG=#{resource.public_path} HREF=#{_href} FILE=#{path}!"
-
-              cur_resource = resource.is_self?(_href) ? resource : resource.find_child(File.split(path).last)
-
+              cur_resource = resource.is_self?(_href) ? resource : children[_href]
               if cur_resource && cur_resource.exist?
                 propstats(xml, get_properties(cur_resource, props))
               else

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

@@ -120,17 +120,15 @@ module DAV4Rack
           child(ContactResource, c, @address_book)
         end
       end
-            
-      def find_child(uid)
-        uid = File.basename(uid, '.vcf')
-        c = @address_book.find_contact(uid)
-        if c
-          child(ContactResource, c)
-        else
-          nil
+      
+      # { href: uid }
+      def find_children(ids)
+        @address_book.find_contacts(ids).each_with_object({}) do |(href, contact), ret|
+          if contact
+            ret[href] = child(ContactResource, contact)
+          end
         end
       end
-      
     end
     
   end

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

@@ -33,12 +33,8 @@ module DAV4Rack
             
             fields = el[:children].select{|e| e[:name] == 'prop' }.map{|e| e[:attributes]['name'] }
             data = @contact.vcard.to_s(fields)
-                      
-            <<-EOS
-            <C:address-data xmlns:C="#{CARDAV_NS}">
-              <![CDATA[#{data}]]>
-            </C:address-data>
-            EOS
+            
+            %{<C:address-data xmlns:C="#{CARDAV_NS}">#{data}</C:address-data>}
           end
         end
       end

data/lib/dav4rack_ext/version.rb

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

data/specs/support/models.rb

@@ -89,6 +89,13 @@ module Testing
     attribute :path, String
     attribute :contacts, Array[Contact], default: []
     
+    def find_contacts(ids)
+      ids.each_with_object({}) do |(href, path), ret|
+        uid = File.basename(path, '.vcf')
+        ret[href] = contacts.detect{|c| c.uid == uid.to_s }
+      end
+    end
+    
     def find_contact(uid)
       contacts.detect{|c| c.uid == uid.to_s }
     end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: dav4rack_ext
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.2.0
 platform: ruby
 authors:
 - Julien Ammous
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dav4rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: http_router
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcard_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8
 description: CardDAV / CalDAV implementation
@@ -59,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - ChangeLog
 - Gemfile
 - Guardfile
@@ -105,17 +105,17 @@ 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: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CardDAV / CalDAV implementation.