omgdav 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc9720d03885d1269642550cceabf47b5fc9e2e8
-  data.tar.gz: fa741e1b07b302acd7e1c77bb0812d44bc543c9c
+  metadata.gz: 7f3a6e9e7c42aa5095c298edb334f4f692033d6d
+  data.tar.gz: 4ef711cda472a34c7265b772a66024682add2ef1
 SHA512:
-  metadata.gz: 8ae05ad0fd3588403d2361405e29ce63c8905564e5a731a534d11243e86b4d08cce328ded767ef529476983dc5fa21bc068cd87fd011ba078ab6443647120d01
-  data.tar.gz: e5a3ab615aeb24ea760c4ad7331f9410a4206de3b6d4e2b0941f88990b03109e573f8b56d070c87e1538c6ae7d98f24caa465b7b10a1db6dea302a4917972008
+  metadata.gz: 2981d63b2891643e9f1b96d48daa1dbc8671ffdeff6d6d1b41b0b78b40c93c86eb9eec637ce5bfe8cac2266df1fc74a9e6cc79eb6825f6a2c8623f5c62dedefb
+  data.tar.gz: c9432379b8424873364018a38df6c3a9a7785101c7a3345cf4013ab08069d0ecab37a79878efafa5cbbad66cf99d3f202e0bc666ffcfb44f11ac1f07162fd5bd

data/.document

@@ -1,3 +1,2 @@
-ChangeLog
 NEWS
 README

data/.gitignore

@@ -5,8 +5,7 @@
 log/
 pkg/
 /vendor
-/NEWS
-/ChangeLog
+/NEWS*
 /.manifest
 /GIT-VERSION-FILE
 /man

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -1,6 +1,5 @@
 all::
 RSYNC_DEST := bogomips.org:/srv/bogomips/omgdav
-rfproject := rainbows
 rfpackage := omgdav
 pkg_extra += lib/omgdav/version.rb
 include pkg.mk

data/lib/omgdav.rb

@@ -9,7 +9,6 @@ require 'nokogiri'
 require 'json'
 require 'sequel'
 require 'mogilefs'
-require 'fast_xs'
 require 'rack'
 require 'rack/request'
 # :startdoc:

data/lib/omgdav/input_wrapper.rb

@@ -20,6 +20,7 @@ class OMGDAV::InputWrapper # :nodoc:
         while @input.read(16384, buf)
           # drain input
         end
+        buf.clear
         raise "too many bytes for XML: #@bytes > #@max"
       end
     end

data/lib/omgdav/propfind_response.rb

@@ -16,7 +16,7 @@ class OMGDAV::PropfindResponse # :nodoc:
 
     # no line buffering
     def each
-      buf = ""
+      buf = Thread.current[:omgdav_xmltmp_rbuf] ||= ""
       while read(16384, buf)
         yield buf
       end
@@ -82,7 +82,8 @@ class OMGDAV::PropfindResponse # :nodoc:
     end
 
     x << %Q(<D:response #{prop_ns}xmlns:lp1="DAV:" xmlns:lp2="#{OMGDAV::LP2}">)
-    name = node_to_key(row, @n2k_cache).fast_xs
+    name = node_to_key(row, @n2k_cache)
+    name.encode!(xml: :text)
     name << "/" if is_col && ! row[:name].empty?
 
     x << "<D:href>#@script_name/#{name}</D:href>"
@@ -99,7 +100,12 @@ class OMGDAV::PropfindResponse # :nodoc:
       getcontenttype = content_type(row, @ct_cache)
       x << "<lp1:getcontenttype>#{getcontenttype}</lp1:getcontenttype>"
     end
-    x << props_str if props_str
+
+    if props_str
+      x << props_str
+      props_str.clear
+      prop_ns.clear
+    end
 
     created = Time.at(row[:created]).utc.xmlschema
     x << "<lp1:creationdate>#{created}</lp1:creationdate>"

data/lib/omgdav/rack_util.rb

@@ -42,6 +42,8 @@ module OMGDAV::RackUtil
     parts
   end
 
+  # some clients may send extra stuff in the input body we ignore, ensure
+  # persistent connections stay working
   def drain_input(env)
     input = env["rack.input"]
     bytes = 0
@@ -50,6 +52,7 @@ module OMGDAV::RackUtil
       while input.read(666, buf)
         bytes += buf.size
       end
+      buf.clear
     end
     bytes
   end

data/omgdav.gemspec

@@ -1,8 +1,8 @@
 # -*- encoding: binary -*-
 ENV["VERSION"] or abort "VERSION= must be specified"
 manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-require 'wrongdoc'
-extend Wrongdoc::Gemspec
+require 'olddoc'
+extend Olddoc::Gemspec
 name, summary, title = readme_metadata
 
 Gem::Specification.new do |s|
@@ -10,26 +10,23 @@ Gem::Specification.new do |s|
   s.version = ENV["VERSION"].dup
 
   s.authors = ["OMGDAV hackers"]
-  s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.description = readme_description
   s.email = %q{normalperson@yhbt.net}
   s.extra_rdoc_files = extra_rdoc_files(manifest)
   s.files = manifest
-  s.homepage = Wrongdoc.config[:rdoc_url]
+  s.homepage = Olddoc.config['rdoc_url']
   s.summary = summary
-  s.rdoc_options = rdoc_options
   s.executables = %w(omgdav-setup omgdav-sync)
   s.test_files = Dir['test/test_*.rb']
   s.add_dependency('rack', ['~> 1.4'])
   s.add_dependency('kgio', ['~> 2.7'])
   s.add_dependency('kcar', ['~> 0.4'])
-  s.add_dependency('fast_xs', ['~> 0.8'])
   s.add_dependency('mogilefs-client', ['~> 3.4'])
   s.add_dependency('nokogiri', ['~> 1.5'])
   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.8')
+  s.add_development_dependency('unicorn', '~> 4.4')
+  s.add_development_dependency('olddoc', '~> 1.0')
 
   s.licenses = %w(AGPLv3+)
 end

data/pkg.mk

@@ -1,7 +1,8 @@
 RUBY = ruby
 RAKE = rake
 RSYNC = rsync
-WRONGDOC = wrongdoc
+OLDDOC = olddoc
+RDOC = rdoc
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN
@@ -12,14 +13,6 @@ RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
 RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
 lib := lib
 
-ifeq ($(shell test -f script/isolate_for_tests && echo t),t)
-isolate_libs := tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION)/isolate.mk
-$(isolate_libs): script/isolate_for_tests
-	@$(RUBY) script/isolate_for_tests
--include $(isolate_libs)
-lib := $(lib):$(ISOLATE_LIBS)
-endif
-
 ext := $(firstword $(wildcard ext/*))
 ifneq ($(ext),)
 ext_pfx := tmp/ext/$(RUBY_ENGINE)-$(RUBY_VERSION)
@@ -36,7 +29,7 @@ $(ext_pfx)/$(ext)/%: $(ext)/% $(ext_d)
 	install -m 644 $< $@
 $(ext_pfx)/$(ext)/Makefile: $(ext)/extconf.rb $(ext_d) $(ext_h)
 	$(RM) -f $(@D)/*.o
-	cd $(@D) && $(RUBY) $(CURDIR)/$(ext)/extconf.rb
+	cd $(@D) && $(RUBY) $(CURDIR)/$(ext)/extconf.rb $(EXTCONF_ARGS)
 ext_sfx := _ext.$(DLEXT)
 ext_dl := $(ext_pfx)/$(ext)/$(notdir $(ext)_ext.$(DLEXT))
 $(ext_dl): $(ext_src) $(ext_pfx_src) $(ext_pfx)/$(ext)/Makefile
@@ -48,10 +41,10 @@ else
 build:
 endif
 
-pkg_extra += GIT-VERSION-FILE NEWS ChangeLog LATEST
-ChangeLog: GIT-VERSION-FILE .wrongdoc.yml
-	$(WRONGDOC) prepare
-NEWS LATEST: ChangeLog
+pkg_extra += GIT-VERSION-FILE NEWS LATEST
+NEWS: GIT-VERSION-FILE .olddoc.yml
+	$(OLDDOC) prepare
+LATEST: NEWS
 
 manifest:
 	$(RM) .manifest
@@ -63,28 +56,20 @@ manifest:
 	cmp $@+ $@ || mv $@+ $@
 	$(RM) $@+
 
-doc:: .document .wrongdoc.yml $(pkg_extra)
+doc:: .document .olddoc.yml $(pkg_extra) $(PLACEHOLDERS)
 	-find lib -type f -name '*.rbc' -exec rm -f '{}' ';'
 	-find ext -type f -name '*.rbc' -exec rm -f '{}' ';'
 	$(RM) -r doc
-	$(WRONGDOC) all
+	$(RDOC) -f oldweb
+	$(OLDDOC) merge
 	install -m644 COPYING doc/COPYING
+	install -m644 NEWS doc/NEWS
+	install -m644 NEWS.atom.xml doc/NEWS.atom.xml
 	install -m644 $(shell LC_ALL=C grep '^[A-Z]' .document) doc/
 
 ifneq ($(VERSION),)
 pkggem := pkg/$(rfpackage)-$(VERSION).gem
 pkgtgz := pkg/$(rfpackage)-$(VERSION).tgz
-release_notes := release_notes-$(VERSION)
-release_changes := release_changes-$(VERSION)
-
-release-notes: $(release_notes)
-release-changes: $(release_changes)
-$(release_changes):
-	$(WRONGDOC) release_changes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
-$(release_notes):
-	$(WRONGDOC) release_notes > $@+
-	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 
 # ensures we're actually on the tagged $(VERSION), only used for release
 verify:
@@ -120,31 +105,18 @@ $(pkgtgz): manifest fix-perms
 
 package: $(pkgtgz) $(pkggem)
 
-test-release:: verify package $(release_notes) $(release_changes)
-	# make tgz release on RubyForge
-	@echo rubyforge add_release -f \
-	  -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-	@echo gem push $(pkggem)
-	@echo rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
-release:: verify package $(release_notes) $(release_changes)
-	# make tgz release on RubyForge
-	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
+release:: verify package
 	# push gem to RubyGems.org
 	gem push $(pkggem)
-	# in case of gem downloads from RubyForge releases page
-	rubyforge add_file \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
 else
 gem install-gem: GIT-VERSION-FILE
 	$(MAKE) $@ VERSION=$(GIT_VERSION)
 endif
 
-all:: test
+all:: check
 test_units := $(wildcard test/test_*.rb)
-test: test-unit
+test: check
+check: test-unit
 test-unit: $(test_units)
 $(test_units): build
 	$(RUBY) -I $(lib) $@ $(RUBY_TEST_OPTS)
@@ -154,8 +126,6 @@ ifneq ($(RSYNC_DEST),)
 publish_doc:
 	-git set-file-times
 	$(MAKE) doc
-	find doc/images -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:06' doc/rdoc.css
 	$(MAKE) doc_gz
 	$(RSYNC) -av doc/ $(RSYNC_DEST)/
 	git ls-files | xargs touch
@@ -163,7 +133,7 @@ endif
 
 # Create gzip variants of the same timestamp as the original so nginx
 # "gzip_static on" can serve the gzipped versions directly.
-doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
+doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.gz$$')
 doc_gz:
 	for i in $(docs); do \
 	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
@@ -171,5 +141,10 @@ check-warnings:
 	@(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
 	  do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
 
-.PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
+ifneq ($(PLACEHOLDERS),)
+$(PLACEHOLDERS):
+	echo olddoc_placeholder > $@
+endif
+
+.PHONY: all .FORCE-GIT-VERSION-FILE doc check test $(test_units) manifest
 .PHONY: check-warnings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omgdav
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - OMGDAV hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: fast_xs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: mogilefs-client
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '4.4'
 - !ruby/object:Gem::Dependency
-  name: wrongdoc
+  name: olddoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.0'
 description: |-
   omgdav exposes an existing MogileFS domain over WebDAV.  There is
   absolutely no commitment or modification needed to your existing
@@ -146,16 +132,14 @@ executables:
 - omgdav-sync
 extensions: []
 extra_rdoc_files:
-- ChangeLog
 - NEWS
 - README
 files:
 - ".document"
 - ".gitignore"
 - ".manifest"
-- ".wrongdoc.yml"
+- ".olddoc.yml"
 - COPYING
-- ChangeLog
 - GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
@@ -211,11 +195,7 @@ licenses:
 - AGPLv3+
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "-t"
-- omgdav - Rack app for bridging WebDAV and MogileFS
-- "-W"
-- http://bogomips.org/omgdav.git/tree/%s
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -230,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rack app for bridging WebDAV and MogileFS