angelo 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5eddbc45b846a99f2c3970949b8bcaea4a8da2a
-  data.tar.gz: b03151aeabb0265da3b371d1dbaa9023de404499
+  metadata.gz: ab8dc2d9fc7243d0fafec32530e5509351ecfcec
+  data.tar.gz: 37488c61321c6ffd9d4524371eb295fd2b425a8b
 SHA512:
-  metadata.gz: b398233f7e0e60a647661ff90c92f78485e23561a64243548f5eacc59b8f7d07918c03d071520ffee784bf921d23d40afc189224ce6b3290e4eacd295622a078
-  data.tar.gz: 33d0251cf93ef34be952eecdfa5969f0e4278b8f22a73e00ee8ec5ee8a68b44d4cd797e51bc8a18425f04714f20246e95d26d67c8ab58f2362d4dd5aa60e4bc3
+  metadata.gz: 07c8b7aef24a27aece1e2d012bfd910598445241943b24714f21739cfbef8ac686c7594c873331fb4f71702af1dd11d7161db74861fdc79464bcea2abb822f81
+  data.tar.gz: 32ffbf2ce2540b29be61110aeaf7b14aef8d21fb50634ee07692e32eac0cb3a25ec7b0a356cdd5804ffb748df7e8e2b7cae5a8d2efaaee867154ba4be54ee616

data/.gitignore

@@ -1,3 +1,2 @@
 angelo-*.gem
-Gemfile.lock
 tmp

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 changelog
 =========
 
+### 0.1.14 3 jul 2014
+
+* add send_file with disposition support
+* remove disposition header from static file serving
+
 ### 0.1.13 19 jun 2014
 
 * add log level settings

data/Gemfile.lock

@@ -0,0 +1,63 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    coderay (1.1.0)
+    ffi (1.9.3-java)
+    http (0.6.1)
+      http_parser.rb (~> 0.6.0)
+    http_parser.rb (0.6.0)
+    http_parser.rb (0.6.0-java)
+    httpclient (2.4.0)
+    method_source (0.8.2)
+    mime-types (2.3)
+    minitest (5.3.5)
+    mustermann (0.2.0)
+    nio4r (1.0.0)
+    nio4r (1.0.0-java)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry (0.9.12.6-java)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    pry-nav (0.2.3)
+      pry (~> 0.9.10)
+    reel (0.5.0)
+      celluloid (>= 0.15.1)
+      celluloid-io (>= 0.15.0)
+      http (>= 0.6.0.pre)
+      http_parser.rb (>= 0.6.0)
+      websocket_parser (>= 0.1.6)
+    ruby-prof (0.15.1)
+    slop (3.5.0)
+    spoon (0.0.4)
+      ffi
+    tilt (2.0.1)
+    timers (1.1.0)
+    websocket-driver (0.3.3)
+    websocket-driver (0.3.3-java)
+    websocket_parser (0.1.6)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  httpclient
+  mime-types
+  minitest
+  mustermann
+  pry
+  pry-nav
+  reel
+  ruby-prof
+  tilt
+  websocket-driver

data/lib/angelo.rb

@@ -21,7 +21,7 @@ module Angelo
   CONTENT_TYPE_HEADER_KEY = 'Content-Type'
   CONTENT_DISPOSITION_HEADER_KEY = 'Content-Disposition'
   CONTENT_LENGTH_HEADER_KEY = 'Content-Length'
-  DEFAULT_CONTENT_DISPOSITION = 'attachment'
+  ATTACHMENT_CONTENT_DISPOSITION = 'attachment; filename="%s"'
   ETAG_HEADER_KEY = 'ETag'
   IF_NONE_MATCH_HEADER_KEY = 'If-None-Match'
   LOCATION_HEADER_KEY = 'Location'

data/lib/angelo/base.rb

@@ -119,6 +119,13 @@ module Angelo
         sleep
       end
 
+      def local_path path
+        if public_dir
+          lp = File.join(public_dir, path)
+          File.file?(lp) ? lp : nil
+        end
+      end
+
     end
 
     def async meth, *args
@@ -172,6 +179,28 @@ module Angelo
       throw :halt, HALT_STRUCT.new(status, body)
     end
 
+    def send_file local_file, opts = {}
+      lp = self.class.local_path local_file
+
+      # Content-Type
+      #
+      headers CONTENT_TYPE_HEADER_KEY =>
+        (MIME::Types.type_for(File.extname(lp))[0].content_type rescue HTML_TYPE)
+
+      # Content-Disposition
+      #
+      if opts[:disposition] == :attachment or opts[:filename]
+        headers CONTENT_DISPOSITION_HEADER_KEY =>
+          ATTACHMENT_CONTENT_DISPOSITION % (opts[:filename] or File.basename(lp))
+      end
+
+      # Content-Length
+      #
+      headers CONTENT_LENGTH_HEADER_KEY => File.size(lp)
+
+      halt 200, File.read(lp)
+    end
+
   end
 
 end

data/lib/angelo/server.rb

@@ -36,7 +36,7 @@ module Angelo
     private
 
     def dispatch! meth, connection, request
-      if staticable?(meth) and lp = local_path(request.path)
+      if staticable?(meth) and lp = @base.local_path(request.path)
         static! meth, connection, request, lp
       else
         route! meth, connection, request
@@ -56,13 +56,6 @@ module Angelo
       end
     end
 
-    def local_path path
-      if @base.public_dir
-        lp = File.join(@base.public_dir, path)
-        File.file?(lp) ? lp : nil
-      end
-    end
-
     def staticable? meth
       STATICABLE.include? meth
     end
@@ -80,11 +73,6 @@ module Angelo
           CONTENT_TYPE_HEADER_KEY =>
             (MIME::Types.type_for(File.extname(local_path))[0].content_type rescue HTML_TYPE),
 
-          # Content-Disposition
-          #
-          CONTENT_DISPOSITION_HEADER_KEY =>
-            DEFAULT_CONTENT_DISPOSITION + "; filename=#{File.basename local_path}",
-
           # Content-Length
           #
           CONTENT_LENGTH_HEADER_KEY => File.size(local_path),

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

data/test/angelo/static_spec.rb

@@ -5,7 +5,7 @@ describe Angelo::Server do
 
   describe 'serving static files' do
 
-    let(:css_etag) do
+    def css_etag
       fs = File::Stat.new File.join(TEST_APP_ROOT, 'public', 'test.css')
       OpenSSL::Digest::SHA.hexdigest fs.ino.to_s + fs.size.to_s + fs.mtime.to_s
     end
@@ -18,13 +18,25 @@ describe Angelo::Server do
         'you should not see this'
       end
 
+      get '/img' do
+        send_file 'what.png'
+      end
+
+      get '/what' do
+        send_file 'what.png', disposition: :attachment
+      end
+
+      get '/attachment.png' do
+        send_file 'what.png', filename: 'attachment.png'
+      end
+
     end
 
     it 'serves static files for gets' do
       get '/test.css'
       last_response.status.must_equal 200
       last_response.headers['Content-Type'].must_equal 'text/css'
-      last_response.headers['Content-Disposition'].must_equal 'attachment; filename=test.css'
+      last_response.headers['Content-Disposition'].must_be_nil
       last_response.headers['Content-Length'].must_equal '116'
       last_response.headers['Etag'].must_equal css_etag
       last_response.body.to_s.length.must_equal 116
@@ -35,7 +47,7 @@ describe Angelo::Server do
       head '/test.css'
       last_response.status.must_equal 200
       last_response.headers['Content-Type'].must_equal 'text/css'
-      last_response.headers['Content-Disposition'].must_equal 'attachment; filename=test.css'
+      last_response.headers['Content-Disposition'].must_be_nil
       last_response.headers['Content-Length'].must_equal '116'
       last_response.headers['Etag'].must_equal css_etag
       last_response.body.to_s.length.must_equal 0
@@ -45,7 +57,7 @@ describe Angelo::Server do
       get '/test.html'
       last_response.status.must_equal 200
       last_response.headers['Content-Type'].must_equal 'text/html'
-      last_response.headers['Content-Disposition'].must_equal 'attachment; filename=test.html'
+      last_response.headers['Content-Disposition'].must_be_nil
       last_response.body.to_s.must_equal File.read(File.join TEST_APP_ROOT, 'public', 'test.html')
     end
 
@@ -67,6 +79,26 @@ describe Angelo::Server do
       end
     end
 
-  end
+    it 'sends files' do
+      get '/img'
+      last_response.status.must_equal 200
+      last_response.headers['Content-Type'].must_equal 'image/png'
+      last_response.headers['Content-Disposition'].must_be_nil
+    end
+
+    it 'sends files with attachment disposition' do
+      get '/what'
+      last_response.status.must_equal 200
+      last_response.headers['Content-Type'].must_equal 'image/png'
+      last_response.headers['Content-Disposition'].must_equal 'attachment; filename="what.png"'
+    end
 
+    it 'sends files as different filename' do
+      get '/attachment.png'
+      last_response.status.must_equal 200
+      last_response.headers['Content-Type'].must_equal 'image/png'
+      last_response.headers['Content-Disposition'].must_equal 'attachment; filename="attachment.png"'
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -49,6 +49,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile