apache_upload_merger 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ea995b05557c1680e8ba7cb1cde93aa53450f576
+  data.tar.gz: 07fb98df77c5e5f17fbd2fe3210ba3738ca45aaf
+SHA512:
+  metadata.gz: 934b7fa5cb575a44af96a732af7d31e1e2fd2a991559d9c09afc348b449df840f474972f746d380512d1f8b584c395b6f3a208917b63e37a11fd7c683a19bb92
+  data.tar.gz: d7cb11bf89f4f7af812ee9ee47d906028bbcb86a6037c43c30539b3b5f1e06d7a07e3e08dbba707cc587994b765c00126bb36ae2a88b12f850efcbb708ba72e9

data/ChangeLog

@@ -1,3 +1,5 @@
+# markup: rd
+
 = Revision history for apache_upload_merger
 
 == 0.0.1 [2010-02-22]

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to apache_upload_merger version 0.0.2
+This documentation refers to apache_upload_merger version 0.0.3
 
 
 == DESCRIPTION
@@ -31,19 +31,22 @@ Place the following snippet in your Apache config:
 == LINKS
 
 <b></b>
-Documentation:: <http://blackwinter.github.com/apache_upload_merger>
-Source code::   <http://github.com/blackwinter/apache_upload_merger>
+Documentation:: http://blackwinter.github.com/apache_upload_merger
+Source code::   http://github.com/blackwinter/apache_upload_merger
+RubyGem::       http://rubygems.org/gems/apache_upload_merger
 
 
 == AUTHORS
 
-* Jens Wille <mailto:jens.wille@uni-koeln.de>
+* Jens Wille <mailto:jens.wille@gmail.com>
 
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2010 University of Cologne,
-Albertus-Magnus-Platz, 50932 Cologne, Germany
+Copyright (C) 2010-2012 University of Cologne,
+Albertus-Magnus-Platz, 50923 Cologne, Germany
+
+Copyright (C) 2013 Jens Wille
 
 apache_upload_merger is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

data/Rakefile

@@ -1,4 +1,4 @@
-require %q{lib/apache/upload_merger/version}
+require File.expand_path(%q{../lib/apache/upload_merger/version}, __FILE__)
 
 begin
   require 'hen'
@@ -8,14 +8,13 @@ begin
       :name         => %q{apache_upload_merger},
       :version      => Apache::UploadMerger::VERSION,
       :summary      => %q{Apache module providing upload merging functionality.},
-      :homepage     => 'http://github.com/blackwinter/apache_upload_merger',
-      :files        => FileList['lib/**/*.rb'].to_a,
-      :extra_files  => FileList['[A-Z]*'].to_a,
+      :author       => %q{Jens Wille},
+      :email        => %q{jens.wille@gmail.com},
+      :license      => %q{AGPL-3.0},
+      :homepage     => :blackwinter,
       :dependencies => %w[]
     }
   }}
-rescue LoadError
-  abort "Please install the 'hen' gem first."
+rescue LoadError => err
+  abort "Please install the `hen' gem first. (#{err})"
 end
-
-### Place your custom Rake tasks here.

data/lib/apache/upload_merger.rb

@@ -4,12 +4,14 @@
 # apache_upload_merger -- Apache module providing upload merging              #
 #                         functionality                                       #
 #                                                                             #
-# Copyright (C) 2010 University of Cologne,                                   #
-#                    Albertus-Magnus-Platz,                                   #
-#                    50932 Cologne, Germany                                   #
+# Copyright (C) 2010-2012 University of Cologne,                              #
+#                         Albertus-Magnus-Platz,                              #
+#                         50923 Cologne, Germany                              #
+#                                                                             #
+# Copyright (C) 2013 Jens Wille                                               #
 #                                                                             #
 # Authors:                                                                    #
-#     Jens Wille <jens.wille@uni-koeln.de>                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
 #                                                                             #
 # apache_upload_merger is free software: you can redistribute it and/or       #
 # modify it under the terms of the GNU General Public License as published by #
@@ -34,17 +36,26 @@ module Apache
 
   class UploadMerger
 
-    MERGE_SIZE = 32 * 1024 * 1024
+    DEFAULT_MERGE_THRESHOLD = 32 * 1024 * 1024
 
-    MODE = Fcntl::O_CREAT|Fcntl::O_WRONLY|Fcntl::O_EXCL
+    CREATE_MODE = Fcntl::O_CREAT|Fcntl::O_WRONLY|Fcntl::O_EXCL
 
     # Creates a new RubyHandler instance for the Apache web server. It
     # is to be installed as a custom 404 ErrorDocument handler.
     #
     # The argument +map+ contains key/value pairs of URL prefixes and
     # upload base directories.
-    def initialize(map = {})
-      @map = {}
+    #
+    # +strategy+ determines how merging happens:
+    #
+    # <tt>:symlink</tt>:: Files are symlinked
+    # <tt>:copy</tt>::    Files are copied
+    # <tt>Integer</tt>::  Files whose size is below that threshold are
+    #                     copied, others are symlinked (default)
+    def initialize(map = {}, strategy = DEFAULT_MERGE_THRESHOLD)
+      @map, @strategy = {}, strategy
+
+      define_merger
 
       map.each { |prefix, dir|
         @map[prefix] = [%r{\A#{prefix}/(.*)}, dir]
@@ -52,20 +63,19 @@ module Apache
     end
 
     # If the current +request+ asked for a resource that's not there,
-    # it will be copied from one of the appropriate upload directories,
-    # determined by its URL prefix. Otherwise, the original error will
-    # be thrown.
+    # it will be merged from one of the appropriate upload directories,
+    # determined by its URL prefix. If no matching resource could be
+    # found, the original error will be thrown.
     def handler(request)
       request.add_common_vars  # REDIRECT_URL
 
       if url    = request.subprocess_env['REDIRECT_URL'] and
-         prefix = request.path_info                      and
+         prefix = request.path_info.untaint              and
          map    = @map[prefix]                           and
          path   = url[map[0], 1].untaint                 and
          src    = find(map[1], path)
 
-        merge(src,
-          File.join(request.server.document_root, prefix, path).untaint)
+        merge(src, File.join(request.server.document_root, prefix, path))
 
         request.status = HTTP_OK
         request.internal_redirect(url)
@@ -86,19 +96,31 @@ module Apache
       }
     end
 
-    # TODO: optimize the copying case
-    def merge(src, dest)
+    def define_merger
+      class << self; self; end.send :alias_method, :merge, case @strategy
+        when :symlink, :copy then @strategy
+        when Integer         then :copy_or_symlink
+        else raise ArgumentError, "illegal strategy #{@strategy.inspect}"
+      end
+    end
+
+    def copy_or_symlink(src, dest)
       stat = File.stat(src)
+      stat.size > @strategy ? symlink(src, dest) : copy(src, dest, stat)
+    end
 
-      if stat.size > MERGE_SIZE
-        File.symlink(src, dest)
-      else
-        File.open(src) { |src_|
-          File.open(dest, MODE, stat.mode) { |dest_|
-            FileUtils.copy_stream(src_, dest_)
-          }
+    def symlink(src, dest)
+      File.symlink(src, dest)
+    rescue Errno::EEXIST
+    end
+
+    # TODO: optimize?
+    def copy(src, dest, stat = File.stat(src))
+      File.open(src) { |src_|
+        File.open(dest, CREATE_MODE, stat.mode) { |dest_|
+          FileUtils.copy_stream(src_, dest_)
         }
-      end
+      }
     rescue Errno::EEXIST
     end
 

data/lib/apache/upload_merger/version.rb

@@ -6,7 +6,7 @@ module Apache
 
       MAJOR = 0
       MINOR = 0
-      TINY  = 2
+      TINY  = 3
 
       class << self
 

metadata

@@ -1,77 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: apache_upload_merger
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-02-26 00:00:00 +01:00
-default_executable: 
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies: []
-
 description: Apache module providing upload merging functionality.
-email: jens.wille@uni-koeln.de
+email: jens.wille@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- README
 - COPYING
 - ChangeLog
-- README
-files: 
+files:
 - lib/apache/upload_merger.rb
 - lib/apache/upload_merger/version.rb
-- README
+- COPYING
 - ChangeLog
+- README
 - Rakefile
-- COPYING
-has_rdoc: true
 homepage: http://github.com/blackwinter/apache_upload_merger
-licenses: []
-
+licenses:
+- AGPL-3.0
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset
+rdoc_options:
+- "--title"
+- apache_upload_merger Application documentation (v0.0.3)
+- "--charset"
 - UTF-8
-- --title
-- apache_upload_merger Application documentation
-- --main
+- "--line-numbers"
+- "--all"
+- "--main"
 - README
-- --line-numbers
-- --inline-source
-- --all
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Apache module providing upload merging functionality.
 test_files: []
-