piedesaint 0.0.2 → 0.1.0

data/lib/piedesaint/cli.rb

@@ -18,7 +18,7 @@ module Piedesaint
       piedesanto.start
     end
 
-    def init ( parameters )
+    def init ( parameters = [] )
       if File.exist?(".piedesaint")
         abort "Configuration already exists at #{Dir.pwd}/.piedesaint"
       end
@@ -39,6 +39,7 @@ module Piedesaint
                     cert: File.join(".", ".piedesaint", "ssl", "server.crt" ),
                     username: "user",
                     password: "password",
+                    freshness: 3600,
                     folders: parameters }
 
         open 'config', 'w' do |io| io.write config.to_yaml end

data/lib/piedesaint/version.rb

@@ -1,3 +1,3 @@
 module Piedesaint
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/piedesaint.rb

@@ -6,8 +6,11 @@ require 'puma/events'
 require 'openssl'
 
 require 'rack/ssl-enforcer'
+require 'rack/cache'
+
 require 'rubygems/package'
 require "stringio"
+require 'time'
 
 
 module Piedesaint
@@ -15,17 +18,32 @@ module Piedesaint
   module Rack
     class DirectoryCompress < ::Rack::Directory
       def list_directory
-        return [200, {}, ::Piedesaint.tar(@path)]
+        tarball = ::Piedesaint.tar(@path)
+        etag = Digest::MD5.base64digest tarball.string
+        headers = {"Cache-Control" => "public", "ETag" => etag }
+
+        return [304, headers, []] if etag == @env['HTTP_IF_NONE_MATCH']
+        return [200, headers, tarball]
+      end
+    end
+
+    class FileEtag < ::Rack::File
+      def serving(env)
+        etag = Digest::MD5.file(@path).base64digest
+        @headers['Cache-Control'] = "public"
+        @headers['ETag'] = etag
+        super
       end
     end
 
-    class DirectoriesCompress
-      def initialize(roots, app=nil)
+    class DirectoriesTraversal
+      def initialize(options, app=nil)
         @apps = []
-        roots.each do |root|
+        @options = options.dup
+        @options[:folders].each do |root|
           root = File.expand_path root
           puts "Service root: #{root}"
-          @apps << Rack::DirectoryCompress.new(root, app)
+          @apps << Rack::DirectoryCompress.new(root, app ? app : Rack::FileEtag.new(root) )
         end
       end
 
@@ -61,9 +79,13 @@ module Piedesaint
       use ::Rack::Auth::Basic, "Icecreamland" do |username, password|
         ( options[:username] == username ) && ( options[:password] == password )
       end
-      
+      use ::Rack::Deflater
+      use ::Rack::Cache, verbose: true,
+          metastore: 'file:/tmp/rack/meta',
+          entitystore: 'file:/tmp/rack/body',
+          default_ttl: options[:freshness]
       map "/" do
-        run Rack::DirectoriesCompress.new(options[:folders])
+        run Rack::DirectoriesTraversal.new(options)
       end
     end
   end
@@ -90,7 +112,7 @@ module Piedesaint
     puma.add_ssl_listener options[:host], options[:https_port], ctx
 
     puma.min_threads = 1
-    puma.max_threads = 1
+    puma.max_threads = 10
 
     begin
       Signal.trap "SIGUSR2" do
@@ -116,10 +138,10 @@ module Piedesaint
       graceful_stop puma
     end
 
-  if @restart
-    p "* Restarting..."
-    @status.stop true if @status
-    restart!
+    if @restart
+      p "* Restarting..."
+      @status.stop true if @status
+      restart!
     end
   end
 
@@ -128,17 +150,9 @@ module Piedesaint
     p " - Gracefully stopping, waiting for requests to finish"
     @status.stop(true) if @status
     puma.stop(true)
-    delete_pidfile
     p " - Goodbye!"
   end
 
-  def self.delete_pidfile
-    #�if path = @options[:pidfile]
-    # File.unlink path
-   #end
-  end
-
-  
   def self.tar(path)
     tar = StringIO.new
     Gem::Package::TarWriter.new(tar) do |tarwriter|
@@ -160,4 +174,4 @@ module Piedesaint
     tar
   end
 
-end
+end

data/piedesaint.gemspec

@@ -29,4 +29,6 @@ EOF
   # runtime dependencies
   spec.add_dependency "puma", "~>1.6.3"
   spec.add_dependency "rack-ssl-enforcer"
+  spec.add_dependency "rack-cache"
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piedesaint
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-cache
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Drop-in web server to serve files and tar''ed directories.
 
   Use it as a tool to make available databse backups, installation packages that don''t
@@ -118,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1753294096530433718
+      hash: 2452808336996512805
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1753294096530433718
+      hash: 2452808336996512805
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25