omgdav 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dc9720d03885d1269642550cceabf47b5fc9e2e8
+  data.tar.gz: fa741e1b07b302acd7e1c77bb0812d44bc543c9c
+SHA512:
+  metadata.gz: 8ae05ad0fd3588403d2361405e29ce63c8905564e5a731a534d11243e86b4d08cce328ded767ef529476983dc5fa21bc068cd87fd011ba078ab6443647120d01
+  data.tar.gz: e5a3ab615aeb24ea760c4ad7331f9410a4206de3b6d4e2b0941f88990b03109e573f8b56d070c87e1538c6ae7d98f24caa465b7b10a1db6dea302a4917972008

data/GIT-VERSION-GEN

@@ -2,7 +2,7 @@
 CONSTANT = "OMGDAV::VERSION"
 RVF = "lib/omgdav/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v0.0.1"
+DEF_VER = "v0.0.2"
 vn = DEF_VER
 
 # First see if there is a version file (included in release tarballs),

data/lib/omgdav/app.rb

@@ -67,4 +67,8 @@ class OMGDAV::App # :nodoc:
     e.backtrace.each { |line| l.error(line) }
     r(500)
   end
+
+  def cache_invalidate(key)
+    # noop, see get_cache_*
+  end
 end

data/lib/omgdav/db.rb

@@ -26,10 +26,6 @@ module OMGDAV::DB
     node_id = node.delete(:id)
     @db[:paths].where(id: node_id).update(node)
 
-    unless node[:collection]
-      @db[:paths].where(id: node[:parent_id]).update(mtime: mtime)
-    end
-
     node[:id] = node_id
   end
 
@@ -51,18 +47,21 @@ module OMGDAV::DB
       node_update_maybe(node, info)
     else
       # brand new node
+      new = false
       node = q.dup
       node[:created] = node[:mtime] = Time.now.to_i
       node[:collection] = collection
       node_merge_info(node, info)
       begin
         node[:id] = @db[:paths].insert(node)
+        new = true
       rescue Sequel::DatabaseError
         # we may conflict on insert if we didn't use a transaction
         raise if @db.in_transaction?
         node = @db[:paths][q] or raise
         raise OMGDAV::TypeConflict if node[:collection] != collection
       end
+      update_parent_mtime(node) if new
     end
 
     node
@@ -78,6 +77,10 @@ module OMGDAV::DB
     node_ensure(parent_id, filename, info)
   end
 
+  def update_parent_mtime(node, mtime = nil)
+    @db[:paths].where(id: node[:parent_id]).update(mtime: mtime || node[:mtime])
+  end
+
   def node_lookup(parent_id, name)
     @db[:paths][name: name, domain_id: @domain_id, parent_id: parent_id]
   end

data/lib/omgdav/delete.rb

@@ -12,6 +12,7 @@ module OMGDAV::Delete
   def delete_file(node, cache)
     node_delete(node)
     key = node_to_key(node, cache)
+    cache_invalidate(key)
     @mogc.delete(key)
   rescue MogileFS::Backend::UnknownKeyError
     warn "key=#{key.inspect} missing on delete from domain=#{@mogc.domain}"

data/lib/omgdav/get.rb

@@ -9,14 +9,18 @@ module OMGDAV::Get
   include OMGDAV::DB
   include OMGDAV::RackUtil
 
-  def call_get(env)
-    parts = path_split(env)
+  def resolve_node(key, parts)
     basename = parts.pop
-    parent = col_resolve(parts) or return r(404)
-    node = node_lookup(parent[:id], basename) or return r(404)
-    length = node[:length]
+    parent = col_resolve(parts) or return
     parts << basename
-    @mogc.get_uris(parts.join("/"), @get_path_opts).each do |uri|
+    node_lookup(parent[:id], basename)
+  end
+
+  def call_get(env)
+    parts = path_split(env)
+    key = parts.join("/")
+    node = resolve_node(key, parts) or return r(404)
+    @mogc.get_uris(key, @get_path_opts).each do |uri|
       case res = OMGDAV::HttpGet.run(env, uri)
       when Array
         headers = res[1]

data/lib/omgdav/get_cache1.rb

@@ -0,0 +1,33 @@
+# -*- encoding: binary -*-
+# :enddoc:
+# Copyright (C) 2012, Eric Wong <normalperson@yhbt.net>
+# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+
+# Allows optional caching of the most-recently-read URL for GET requests
+# This can helps with fusedav (and possibly other things) which fetch
+# files in many small chunks using partial requests.
+module OMGDAV::GetCache1
+  def self.extended(owner)
+    owner.instance_eval do
+      @last_lock = Mutex.new
+      @last_key = nil
+      @last_node = nil
+    end
+  end
+
+  # see omgdav/get
+  def resolve_node(key, parts)
+    @last_lock.synchronize do
+      return @last_node if @last_key == key
+    end
+    node = super
+    @last_lock.synchronize do
+      @last_key = key
+      @last_node = node
+    end
+  end
+
+  def cache_invalidate(key)
+    @last_key = nil # no need to lock for assignment
+  end
+end

data/lib/omgdav/get_cache_dalli.rb

@@ -0,0 +1,43 @@
+# -*- encoding: binary -*-
+# :enddoc:
+# Copyright (C) 2012, Eric Wong <normalperson@yhbt.net>
+# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+
+# Allows optional caching of recent URLs for GET requests
+# This can helps with fusedav (and possibly other things) which fetch
+# files in many small chunks using partial requests.
+require 'dalli'
+module OMGDAV::GetCacheDalli
+  def self.extended(owner)
+    owner.instance_eval do
+      @dalli_gen = Time.now.to_i.to_s
+      @dalli = Dalli::Client.new("localhost:11211")
+    end
+  end
+
+  attr_accessor :dalli
+
+  # see omgdav/get
+  def resolve_node(key, parts)
+    ckey = "#@dalli_gen#{key}"
+    node = @dalli.get(ckey) and return node
+    node = super
+    @dalli.set(ckey, node)
+    node
+  rescue Dalli::RingError, Dalli::NetworkError
+    node || super
+  end
+
+  def cache_invalidate(key)
+    if key
+      begin
+        @dalli.delete("#@dalli_gen#{key}")
+      rescue Dalli::RingError, Dalli::NetworkError
+        @dalli_gen.succ!
+      end
+    else
+      # nuke everything by changing prefix
+      @dalli_gen.succ!
+    end
+  end
+end

data/lib/omgdav/http_get.rb

@@ -115,7 +115,7 @@ class OMGDAV::HttpGet < Kcar::Response # :nodoc:
       end
 
       case status.to_i
-      when 206, 200
+      when 206, 200, 416
         res
       else
         OMGDAV::BadResponse.new(status.to_s)

data/lib/omgdav/move.rb

@@ -28,6 +28,12 @@ module OMGDAV::Move
       @mogc.rename(src[:key], dst_key)
     end
     @db[:paths].where(id: src[:node][:id]).update(dst_node)
+    if dst_key
+      cache_invalidate(src[:key])
+      cache_invalidate(dst_key)
+    else
+      cache_invalidate(nil) # just kill everything
+    end
     r(dst[:node] ? 204 : 201)
   end
 

data/lib/omgdav/proppatch.rb

@@ -80,7 +80,8 @@ module OMGDAV::Proppatch
   end
 
   def call_proppatch(env)
-    node = node_resolve(path_split(env)) or return r(404)
+    parts = path_split(env)
+    node = node_resolve(parts) or return r(404)
     input = OMGDAV::InputWrapper.new(env)
     xml = Nokogiri::XML(input)
     xmlns = xml.root.namespace
@@ -98,6 +99,7 @@ module OMGDAV::Proppatch
       end
     end
     @db[:paths].where(id: node.delete(:id)).update(node)
+    cache_invalidate(parts.join("/"))
     r(200)
   rescue Nokogiri::SyntaxError => e
     r(400, "syntax error #{e.message}")

data/lib/omgdav/put.rb

@@ -99,6 +99,7 @@ module OMGDAV::Put
 
     if node
       node_update(node, info)
+      cache_invalidate(key)
       r(204)
     else
       file_ensure(parent[:id], basename, info)

data/omgdav.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |s|
   s.add_dependency('fast_xs', ['~> 0.8'])
   s.add_dependency('mogilefs-client', ['~> 3.4'])
   s.add_dependency('nokogiri', ['~> 1.5'])
-  s.add_dependency('sequel', ['~> 3.41', '>= 3.41.0'])
-  s.required_ruby_version = '~> 1.9'
+  s.add_dependency('sequel', ['~> 4.0'])
+  s.required_ruby_version = '>= 1.9'
   s.add_development_dependency('unicorn', '~> 4.4.0')
-  s.add_development_dependency('wrongdoc', '~> 1.6.1')
+  s.add_development_dependency('wrongdoc', '~> 1.8')
 
   s.licenses = %w(AGPLv3+)
 end

data/test/test_litmus.rb

@@ -28,6 +28,7 @@ EOF
       $stderr.reopen(@uni_err.path, "a")
       uni = Unicorn::HttpServer.new(@app, listeners: ["#@test_host:#{port}"])
       uni.start.join
+      exit! 0
     end
     uni_sock.close
   end

data/test/test_mtime.rb

@@ -0,0 +1,52 @@
+# -*- encoding: binary -*-
+# Copyright (C) 2012, Eric Wong <normalperson@yhbt.net>
+# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+require './test/integration'
+class TestMtime < MiniTest::Unit::TestCase
+  include TestMogileFSIntegration
+
+  def test_mtime
+    assert_equal 201, req("MKCOL", "/a")[0].to_i
+    assert_equal 201, req("MKCOL", "/a/b")[0].to_i
+    now = Time.now
+    before = @db[:paths].where(name: "a").to_a
+    assert_equal before.size, 1
+    before_mtime = Time.at(before[0][:mtime])
+    assert_in_delta before_mtime, now, 2
+
+    # creating a new directory sets mtime in parent (only), not grandparent
+    sleep 1
+    assert_equal 201, req("MKCOL", "/a/b/c")[0].to_i
+    after = @db[:paths].where(name: "a").to_a
+    assert_equal after.size, 1
+    after_mtime = Time.at(after[0][:mtime])
+    assert_equal before_mtime, after_mtime
+
+    # creating a new file sets mtime in parent (only), not grandparent
+    sleep 1
+    resp = @req.put("/a/b/f", input: StringIO.new("HELLO"))
+    assert_equal 201, resp.status.to_i
+    after = @db[:paths].where(name: "a").to_a
+    assert_equal after.size, 1
+    after_mtime = Time.at(after[0][:mtime])
+    assert_equal before_mtime, after_mtime
+
+    b = @db[:paths].where(name: "b").to_a
+    f = @db[:paths].where(name: "f").to_a
+    assert_equal b.size, 1
+    assert_equal f.size, 1
+    assert_equal b[0][:mtime], f[0][:mtime]
+
+    # updating existing file should not change mtime
+    sleep 1
+    resp = @req.put("/a/b/f", input: StringIO.new("HELLO"))
+    assert_equal 204, resp.status.to_i
+    f = @db[:paths].where(name: "f").to_a
+    assert_equal f.size, 1
+    assert_operator f[0][:mtime], :>, b[0][:mtime]
+
+    bb = @db[:paths].where(name: "b").to_a
+    assert_equal bb.size, 1
+    assert_equal bb[0][:mtime], b[0][:mtime]
+  end
+end

metadata

@@ -1,239 +1,159 @@
 --- !ruby/object:Gem::Specification
-name: !binary |-
-  b21nZGF2
+name: omgdav
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
-- !binary |-
-  T01HREFWIGhhY2tlcnM=
+- OMGDAV hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    cmFjaw==
+  name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS40
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS40
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    a2dpbw==
+  name: kgio
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi43
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi43
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    a2Nhcg==
+  name: kcar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC40
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC40
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    ZmFzdF94cw==
+  name: fast_xs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC44
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MC44
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    bW9naWxlZnMtY2xpZW50
+  name: mogilefs-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My40
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My40
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    bm9rb2dpcmk=
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS41
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS41
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    c2VxdWVs
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My40MQ==
-    - - !binary |-
-        Pj0=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          My40MS4w
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          My40MQ==
-    - - !binary |-
-        Pj0=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My40MS4w
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    dW5pY29ybg==
+  name: unicorn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          NC40LjA=
+        version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          NC40LjA=
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
-  name: !binary |-
-    d3Jvbmdkb2M=
+  name: wrongdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS42LjE=
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - !binary |-
-        fj4=
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS42LjE=
-description: ! 'omgdav exposes an existing MogileFS domain over WebDAV.  There is
-
+        version: '1.8'
+description: |-
+  omgdav exposes an existing MogileFS domain over WebDAV.  There is
   absolutely no commitment or modification needed to your existing
-
-  MogileFS installation to try omgdav in read-only mode.'
-email: !binary |-
-  bm9ybWFscGVyc29uQHloYnQubmV0
+  MogileFS installation to try omgdav in read-only mode.
+email: normalperson@yhbt.net
 executables:
-- !binary |-
-  b21nZGF2LXNldHVw
-- !binary |-
-  b21nZGF2LXN5bmM=
+- omgdav-setup
+- omgdav-sync
 extensions: []
 extra_rdoc_files:
 - ChangeLog
 - NEWS
 - README
 files:
-- .document
-- .gitignore
-- .manifest
-- .wrongdoc.yml
+- ".document"
+- ".gitignore"
+- ".manifest"
+- ".wrongdoc.yml"
 - COPYING
 - ChangeLog
 - GIT-VERSION-FILE
@@ -251,6 +171,8 @@ files:
 - lib/omgdav/db.rb
 - lib/omgdav/delete.rb
 - lib/omgdav/get.rb
+- lib/omgdav/get_cache1.rb
+- lib/omgdav/get_cache_dalli.rb
 - lib/omgdav/http_get.rb
 - lib/omgdav/input_wrapper.rb
 - lib/omgdav/migrations/0001_initial.rb
@@ -275,6 +197,7 @@ files:
 - test/test_delete.rb
 - test/test_litmus.rb
 - test/test_move.rb
+- test/test_mtime.rb
 - test/test_omgdav_app.rb
 - test/test_propfind.rb
 - test/test_proppatch.rb
@@ -285,58 +208,43 @@ files:
 - test/test_worm.rb
 homepage: http://bogomips.org/omgdav/README
 licenses:
-- !binary |-
-  QUdQTHYzKw==
+- AGPLv3+
+metadata: {}
 post_install_message: 
 rdoc_options:
-- -t
+- "-t"
 - omgdav - Rack app for bridging WebDAV and MogileFS
-- -W
+- "-W"
 - http://bogomips.org/omgdav.git/tree/%s
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - !binary |-
-      fj4=
+  - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MS45
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rack app for bridging WebDAV and MogileFS
 test_files:
-- !binary |-
-  dGVzdC90ZXN0X2xpdG11cy5yYg==
-- !binary |-
-  dGVzdC90ZXN0X29tZ2Rhdl9hcHAucmI=
-- !binary |-
-  dGVzdC90ZXN0X3N5bmMucmI=
-- !binary |-
-  dGVzdC90ZXN0X21vdmUucmI=
-- !binary |-
-  dGVzdC90ZXN0X3dvcm0ucmI=
-- !binary |-
-  dGVzdC90ZXN0X3B1dC5yYg==
-- !binary |-
-  dGVzdC90ZXN0X3Byb3BmaW5kLnJi
-- !binary |-
-  dGVzdC90ZXN0X3VybG1hcC5yYg==
-- !binary |-
-  dGVzdC90ZXN0X2RlbGV0ZS5yYg==
-- !binary |-
-  dGVzdC90ZXN0X3JlYWRvbmx5LnJi
-- !binary |-
-  dGVzdC90ZXN0X3Byb3BwYXRjaC5yYg==
-- !binary |-
-  dGVzdC90ZXN0X2NvcHkucmI=
+- test/test_copy.rb
+- test/test_readonly.rb
+- test/test_litmus.rb
+- test/test_put.rb
+- test/test_propfind.rb
+- test/test_move.rb
+- test/test_mtime.rb
+- test/test_worm.rb
+- test/test_sync.rb
+- test/test_proppatch.rb
+- test/test_delete.rb
+- test/test_urlmap.rb
+- test/test_omgdav_app.rb