dav4rack_ext 0.0.2 → 0.0.3

data/Gemfile

@@ -13,7 +13,7 @@ group(:example) do
 end
 
 group(:test) do
-  gem 'eetee',          '= 0.0.1'
+  gem 'eetee',          '~> 0.0.1'
   gem 'mocha',          '~> 0.12.0'
   gem 'factory_girl',   '~> 4.0'
   gem 'virtus'

data/example/config.ru

@@ -40,7 +40,7 @@ app2 = DAV4Rack::Carddav.app('/:prefix/cards/',
     current_user: method(:create_user),
     root_uri_path: lambda do |env|
       path = env['REQUEST_PATH']
-      n = path.index("/cards/")
+      n = path.index("/cards")
       path[0...(n + 7)]
     end
   )

data/lib/dav4rack_ext/carddav/app.rb

@@ -10,21 +10,28 @@ module DAV4Rack
       current_user = opts.delete(:current_user)
       root_uri_path = opts.delete(:root_uri_path) || root_path
       
-      if root_path[-1] != '/'
-        root_path << '/'
+      if (root_path != '/') && root_path[-1] == '/'
+        root_path.slice!(-1..-1)
       end
       
       raise "unknown options: #{opts}" unless opts.empty?
       
       HttpRouter.new do |r|
-        # try to help iOS
-        r.add("#{root_path}/.well_known/carddav/").to do |env|
-          root = env['REQUEST_PATH']
-          pos = root.index('.well_known')
-          [302, {'Location' => root[0...pos]}, []]
+        
+        last_root_path_part = root_path.split('/').last
+        
+        # try to help iOS find its way
+        r.add(%r{(?<root>.*/#{last_root_path_part})(?::[0-9]+)?/\.well(?:_|-)known/carddav/?}).to do |env|
+                  
+          headers = {
+            'Location'  => env['router.params'][:root],
+            'Content-Type' => 'text/html',
+          }
+          
+          [301, headers, []]
         end
 
-        r.add("#{root_path}").to DAV4RackExt::Handler.new(
+        r.add("#{root_path}/").to DAV4RackExt::Handler.new(
             :logger                   => logger,
             :dav_extensions           => DAV_EXTENSIONS,
             :alway_include_dav_header => true,
@@ -38,7 +45,7 @@ module DAV4Rack
             :books_collection         => "/books/"
           )
         
-        r.add("#{root_path}books/").to DAV4RackExt::Handler.new(
+        r.add("#{root_path}/books/").to DAV4RackExt::Handler.new(
             :logger                   => logger,
             :dav_extensions           => DAV_EXTENSIONS,
             :alway_include_dav_header => true,
@@ -49,7 +56,7 @@ module DAV4Rack
             :current_user             => current_user
           )
         
-        r.add("#{root_path}books/:book_id/:contact_id(.vcf)").to DAV4RackExt::Handler.new(
+        r.add("#{root_path}/books/:book_id/:contact_id(.vcf)").to DAV4RackExt::Handler.new(
             :logger                   => logger,
             :dav_extensions           => DAV_EXTENSIONS,
             :alway_include_dav_header => true,
@@ -60,7 +67,7 @@ module DAV4Rack
             :current_user             => current_user
           )
         
-        r.add("#{root_path}books/:book_id").to DAV4RackExt::Handler.new(
+        r.add("#{root_path}/books/:book_id").to DAV4RackExt::Handler.new(
             :logger                   => logger,
             :dav_extensions           => DAV_EXTENSIONS,
             :alway_include_dav_header => true,
@@ -71,6 +78,38 @@ module DAV4Rack
             :current_user             => current_user
           )
         
+        # Another hack for iOS 6
+        # 
+        r.default ->(env){
+          # iOS will consider the principal urls to be  relative to
+          # the current path so it will request a path like this:
+          # /tt/cards/tt/cards/
+          # 
+          # if we detect something like this we issue a redirect to
+          # /tt/cards
+          # 
+          # after that iOS 6 seems to behave as expected.
+          path = env['REQUEST_PATH'] || env['PATH_INFO']
+          
+          parts = path.split('/').reject(&:empty?)
+          
+          if parts.size % 2 == 0
+            half1 = parts[0...parts.size / 2]
+            half2 = parts[parts.size / 2..-1]
+            
+            if half1 == half2
+              headers = {
+                'Location'  => "/#{half1.join('/')}",
+                'Content-Type' => 'text/html',
+              }
+              
+              return [301, headers, []]
+            end
+          end
+          
+          
+          [404, {}, []]
+        }
       end
     end
     

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

@@ -26,20 +26,14 @@ module DAV4Rack
           # "<D:group-membership-set xmlns:D='DAV:' />"
         end
         
-        # iOS 6.0 expect "/
-        # UA: iOS/6.0 (10A403) Preferences/1.0
         property('principal-URL') do
           <<-EOS
             <D:principal-URL xmlns:D='DAV:'>
-              <D:href>#{principal_uri}</D:href>
+              <D:href>#{root_uri_path}</D:href>
             </D:principal-URL>
           EOS
         end
         
-        # This violates the spec that requires an HTTP or HTTPS URL.  Unfortunately,
-        # Apple's AddressBook.app treats everything as a pathname.  Also, the model
-        # shouldn't need to know about the URL scheme and such.
-        # iOS 6.0 expect /
         property('current-user-principal') do
           <<-EOS
             <D:current-user-principal xmlns:D='DAV:'>
@@ -115,13 +109,6 @@ module DAV4Rack
       end
     
     private
-      def principal_uri
-        if user_agent.start_with?("iOS/6.0")
-          '/'
-        else
-          root_uri_path
-        end
-      end
       
       def books_collection_url
         File.join(root_uri_path, options[:books_collection])

data/lib/dav4rack_ext/version.rb

@@ -1,3 +1,3 @@
 module Dav4rackExt
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/specs/support/models.rb

@@ -44,10 +44,10 @@ module Testing
         end
         
         if existing_field
-          puts "Updated '#{a.group}.#{a.name}' to '#{a.value}'"
+          # puts "Updated '#{a.group}.#{a.name}' to '#{a.value}'"
           existing_field.value = a.value
         else
-          puts "Created '#{a.group}.#{a.name}' with '#{a.value}'"
+          # puts "Created '#{a.group}.#{a.name}' with '#{a.value}'"
           fields << Field.from_vcf_field(a)
         end
       end
@@ -55,8 +55,6 @@ module Testing
     end
     
     def save
-      p fields
-      
       # no-op
       true
     end

data/specs/unit/carddav/resources/principal_resource_spec.rb

@@ -26,19 +26,20 @@ describe 'Principal Resource' do
         ['principal-URL', @dav_ns]
       ], headers)
     
-    ensure_element_exists(response, %{D|prop > D|principal-URL > D|href[text()="/cards/"]})
+    ensure_element_exists(response, %{D|prop > D|principal-URL > D|href[text()="/cards"]})
   end
   
-  should 'return / as principal-URI for iOS 6.0' do
+  should 'handle stupid requests from iOS 6.0' do
     headers = {
       'HTTP_USER_AGENT' => 'iOS/6.0 (10A403) Preferences/1.0'
     }
     
-    response = propfind('/cards/', [
+    response = propfind('/something/cards/something/cards/', [
         ['principal-URL', @dav_ns]
       ], headers)
     
-    ensure_element_exists(response, %{D|prop > D|principal-URL > D|href[text()="/"]})
+    response.status.should == 301
+    response.headers['Location'].should == '/something/cards'
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dav4rack_ext
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dav4rack
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 29217618825468100
+      hash: -3870677578492079712
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 29217618825468100
+      hash: -3870677578492079712
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23