dav4rack_ext 0.0.4 → 0.0.5

data/Gemfile

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

data/Rakefile

@@ -13,7 +13,8 @@ task :test do
     SimpleCov.command_name "E.T."
     SimpleCov.start do
       add_filter ".*_spec"
-      add_filter "/helpers/"
+      add_filter "/specs/helpers/"
+      add_filter "/example/"
     end
   end
   

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

@@ -85,6 +85,21 @@ module DAV4Rack
         # If the client has explicitly stated they want a new contact
         raise Conflict if (want_new_contact and @contact)
         
+        if_match = request.env['HTTP_IF_MATCH']
+        if if_match
+          # client wants to update a contact, return an error if no
+          # contact was found
+          if (if_match == '*') || !@contact
+            raise PreconditionFailed unless @contact
+          
+          # client wants to update the contact with specific etag,
+          # return an error if the contact was updated by someone else
+          elsif (if_match != @contact.etag)
+            raise PreconditionFailed
+            
+          end
+        end
+        
         if @contact
           Logger.debug("Updating contact #{uid} (#{@contact.object_id})")
         else
@@ -95,7 +110,10 @@ module DAV4Rack
         @contact.update_from_vcard(vcf)
 
         if @contact.save
-          @public_path = File.join(@address_book.path, @contact.uid)
+          new_public = @public_path.split('/')[0...-1]
+          new_public << @contact.uid.to_s
+          
+          @public_path = new_public.join('/')
           response['ETag'] = @contact.etag
           Created
         else

data/lib/dav4rack_ext/version.rb

@@ -1,3 +1,3 @@
 module Dav4rackExt
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/specs/helpers/http_dav.rb

@@ -0,0 +1,63 @@
+module HTTPDAVTest
+  def propfind(url, properties = :all, opts = {})
+    namespaces = {
+      'DAV:' => 'D',
+      'urn:ietf:params:xml:ns:carddav' => 'C',
+      'http://calendarserver.org/ns/' => 'APPLE1'
+    }
+    
+    if properties == :all
+      body = "<D:allprop />"
+      
+    else
+      properties = properties.map do |(name, ns)|
+        ns_short = namespaces[ns]
+        raise "unknown namespace: #{ns}" unless ns_short
+        %.<#{ns_short}:#{name}/>.
+      end
+      
+      body = "<D:prop>#{properties.join("\n")}</D:prop>"
+    end
+    
+    
+    data = <<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav" xmlns:APPLE1="http://calendarserver.org/ns/">
+  #{body}
+</D:propfind>
+    EOS
+    
+    request('PROPFIND', url, opts.merge(input: data))
+  end
+  
+  def ensure_element_exists(response, expr, namespaces = {'D' => 'DAV:'})
+    ret = Nokogiri::XML(response.body)
+    ret.css(expr, namespaces).tap{|elements| elements.should.not.be.empty? }
+  rescue EEtee::AssertionFailed => err
+    raise EEtee::AssertionFailed.new("XML did not match: #{expr}")
+  end
+  
+  def ensure_element_does_not_exists(response, expr, namespaces = {})
+    ret = Nokogiri::XML(response.body)
+    ret.css(expr, namespaces).should.be.empty?
+  rescue EEtee::AssertionFailed => err
+    raise EEtee::AssertionFailed.new("XML did match: #{expr}")
+  end
+  
+  def element_content(response, expr, namespaces = {})
+    ret = Nokogiri::XML(response.body)
+    elements = ret.css(expr, namespaces)
+    if elements.empty?
+      :missing
+    else
+      children = elements.first.element_children
+      if children.empty?
+        :empty
+      else
+        children.first.text
+      end
+    end
+  end
+end
+
+EEtee::Context.__send__(:include, HTTPDAVTest)

data/specs/spec_helper.rb

@@ -3,16 +3,6 @@ require 'bundler/setup'
 
 require 'eetee'
 
-if ENV['COVERAGE']
-  
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter ".*_spec"
-    add_filter "/helpers/"
-  end
-  
-end
-
 $LOAD_PATH.unshift( File.expand_path('../../lib' , __FILE__) )
 require 'dav4rack_ext'
 require 'factory_girl'
@@ -21,6 +11,7 @@ require 'factory_girl'
 require 'eetee/ext/mocha'
 require 'eetee/ext/rack'
 
+require_relative 'helpers/http_dav'
 
 require_relative '../example/rack_sniffer'
 require_relative 'support/models'

data/specs/support/models.rb

@@ -93,6 +93,10 @@ module Testing
       contacts.detect{|c| c.uid == uid.to_s }
     end
     
+    def ctag
+      updated_at
+    end
+    
     def create_contact(uid)
       Contact.new(uid: uid).tap do |c|
         contacts << c

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

@@ -0,0 +1,96 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+
+describe 'Contact Resource' do
+  before do
+    @dav_ns = "DAV:"
+    @carddav_ns = "urn:ietf:params:xml:ns:carddav"
+    
+    @contact = contact = FactoryGirl.build(:contact, uid: '1234-5678-9000-1')
+
+    
+    user_builder = proc do |env|      
+      FactoryGirl.build(:user, env: env, login: 'john', addressbooks: [
+          FactoryGirl.build(:book, path: 'castor', name: "A book", contacts: [contact])
+        ])
+    end
+        
+    app = Rack::Builder.new do
+      # use XMLSniffer
+      run DAV4Rack::Carddav.app('/', current_user: user_builder)
+    end
+    
+    serve_app(app)
+  end
+  
+  should 'update contact and return correct location', :force => true do
+    # the url does not need to match the UID
+    response = request(:put, '/books/castor/crap',
+        input: @contact.vcard.to_s
+      )
+    
+    response.status.should == 201
+    response.headers['Location'].should == 'http://example.org:80/books/castor/1234-5678-9000-1'
+  end
+  
+  should 'return an error if If-Match do not match (rfc2068 14.25)' do
+    Testing::Contact.any_instance.expects(:etag).returns("ETAG")
+    
+    headers = {
+      'HTTP_IF_MATCH' => 'ETAG2'
+    }
+    
+    # the url does not need to match the UID
+    response = request(:put, '/books/castor/1234-5678-9000-1',
+        headers.merge(input: @contact.vcard.to_s)
+      )
+    
+    response.status.should == 412
+  end
+  
+  should 'return an error with If-Match and no contact (rfc2068 14.25)' do
+    headers = {
+      'HTTP_IF_MATCH' => 'ETAG2'
+    }
+    
+    c = @contact.dup
+    c.uid = '55TT'
+    
+    # the url does not need to match the UID
+    response = request(:put, '/books/castor/CRAP',
+        headers.merge(input: c.vcard.to_s)
+      )
+    
+    response.status.should == 412
+  end
+
+  
+  should 'update contact if If-Match="*" and contact was found (rfc2068 14.25)' do
+    headers = {
+      'HTTP_IF_MATCH' => '*'
+    }
+    
+    # the url does not need to match the UID
+    response = request(:put, '/books/castor/1234-5678-9000-1',
+        headers.merge(input: @contact.vcard.to_s)
+      )
+    
+    response.status.should == 201
+  end
+  
+  should 'not update contact if If-Match="*" and no contact found (rfc2068 14.25)' do
+    headers = {
+      'HTTP_IF_MATCH' => '*'
+    }
+    
+    c = @contact.dup
+    c.uid = '55TT'
+    
+    # the url does not need to match the UID
+    response = request(:put, '/books/castor/undefined',
+        headers.merge(input: c.vcard.to_s)
+      )
+    
+    response.status.should == 412
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dav4rack_ext
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dav4rack
@@ -91,6 +91,7 @@ files:
 - lib/dav4rack_ext/helpers/properties.rb
 - lib/dav4rack_ext/version.rb
 - specs/factories.rb
+- specs/helpers/http_dav.rb
 - specs/rfc/rfc3744_spec.rb
 - specs/rfc/rfc5397_spec.rb
 - specs/rfc/rfc6352_spec.rb
@@ -98,6 +99,7 @@ files:
 - specs/support/models.rb
 - specs/unit/carddav/app_spec.rb
 - specs/unit/carddav/resources/addressbook_collection_resource_spec.rb
+- specs/unit/carddav/resources/contact_resource_spec.rb
 - specs/unit/carddav/resources/principal_resource_spec.rb
 - specs/unit/helpers/properties_spec.rb
 homepage: ''
@@ -114,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1991080700414274761
+      hash: 2833907520245342566
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1991080700414274761
+      hash: 2833907520245342566
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23