angelo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49fed8026c10ee370aea064b5be14c7a38848b1
-  data.tar.gz: b56899e2f4ac2310c414b09bb2838357e223df6c
+  metadata.gz: 667a3b95c269095d00f41d03cadfe1e3cc40f404
+  data.tar.gz: 9143b9fee78b9b06591516f147a29ce147169447
 SHA512:
-  metadata.gz: bfcc2c164ab9d1908ff4f5c0557c115395d3ab48bd92c530d5040cac4e29c469c4a718cf15206e746d78da12d891bc01555a493b359b481bfed2c85987370a11
-  data.tar.gz: a586ff3c8271e29e7475b1c26a796240a0854e86f3c0449e7f099da02c95e725b0dd298623d9ecd7058bc4465c8061cee468cbf75bf12de32523ad35a64eca91
+  metadata.gz: 85107d56bb0446a5611a53eec5fd91b737f5e27362345bd9d87370d7183639da3254aa3101709297f9c7fcd90d15563e597de418255fcf14090a5bbb7b91c369
+  data.tar.gz: 8e248165128d31c5f4e891cf74d7508d982fc9798def4fea2fa022e6bf24fbcf77ce87b5d6b12c7e3e1eeef071bf24f123064386433ebbf03d1199b5c285fa3e

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 changelog
 =========
 
+### 0.1.2 5 mar 2014 burnout, denial
+
+* basic static file support (i.e. /public files)
+* basic ETag/If-None-Match support
+
+### 0.1.1 3 mar 2014
+
+* fix for params with no Content-Type header
+
+### 0.1.0 24 feb 2014
+
+* fix for socket paths with mustermann
+* sorta common log-ish-ness
+
 ### 0.0.9 20 feb 2014
 
 * memoize params

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'reel'
 gem 'tilt'
+gem 'mime-types'
 
 platform :rbx do
   gem 'rubysl-cgi'

data/angelo.gemspec

@@ -13,4 +13,5 @@ Gem::Specification.new do |gem|
   gem.version       = Angelo::VERSION
   gem.license       = 'apache'
   gem.add_dependency 'reel'
+  gem.add_dependency 'mime-types'
 end

data/lib/angelo/base.rb

@@ -32,10 +32,15 @@ module Angelo
         end
 
         def subclass.view_dir
-          v = self.class_variable_get(:@@views) rescue 'views'
+          v = self.class_variable_get(:@@views) rescue DEFAULT_VIEW_DIR
           File.join root, v
         end
 
+        def subclass.public_dir
+          p = self.class_variable_get(:@@public_dir) rescue DEFAULT_PUBLIC_DIR
+          File.join root, p
+        end
+
       end
 
       def compile! name, &block

data/lib/angelo/rspec/helpers.rb

@@ -36,7 +36,7 @@ module Angelo
       end
       private :hc_req
 
-      [:get, :post, :put, :delete, :options].each do |m|
+      [:get, :post, :put, :delete, :options, :head].each do |m|
         define_method m do |path, params = {}, headers = {}|
           hc_req m, path, params, headers
         end

data/lib/angelo/server.rb

@@ -1,3 +1,5 @@
+require 'openssl'
+
 module Angelo
 
   class Server < Reel::Server
@@ -14,13 +16,21 @@ module Angelo
       # RubyProf.resume
       connection.each_request do |request|
         meth = request.websocket? ? :socket : request.method.downcase.to_sym
-        route! meth, connection, request
+        dispatch! meth, connection, request
       end
       # RubyProf.pause
     end
 
     private
 
+    def dispatch! meth, connection, request
+      if staticable?(meth) and lp = local_path(request.path)
+        static! meth, connection, request, lp
+      else
+        route! meth, connection, request
+      end
+    end
+
     def route! meth, connection, request
       rs = @base.routes[meth][request.path]
       if rs
@@ -34,6 +44,54 @@ 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
+
+    def static! meth, connection, request, local_path
+      etag = etag_for local_path
+      if request.headers[IF_NONE_MATCH_HEADER_KEY] == etag
+        Angelo.log connection, request, nil, :not_modified, 0
+        connection.respond :not_modified
+      else
+        headers = {
+
+          # Content-Type
+          #
+          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),
+
+          # ETag
+          #
+          ETAG_HEADER_KEY => etag
+
+        }
+        Angelo.log connection, request, nil, :ok, headers[CONTENT_LENGTH_HEADER_KEY]
+        connection.respond :ok, headers, (meth == :head ? nil : File.read(local_path))
+      end
+    end
+
+    def etag_for local_path
+      fs = File::Stat.new local_path
+      OpenSSL::Digest::SHA.hexdigest fs.ino.to_s + fs.size.to_s + fs.mtime.to_s
+    end
+
   end
 
 end

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/angelo.rb

@@ -16,16 +16,26 @@ module Angelo
 
   ROUTABLE = [:get, :post, :put, :delete, :socket]
   HTTPABLE = [:get, :post, :put, :delete]
+  STATICABLE = [:get, :head]
 
   CONTENT_TYPE_HEADER_KEY = 'Content-Type'
+  CONTENT_DISPOSITION_HEADER_KEY = 'Content-Disposition'
+  CONTENT_LENGTH_HEADER_KEY = 'Content-Length'
+  DEFAULT_CONTENT_DISPOSITION = 'attachment'
+  ETAG_HEADER_KEY = 'ETag'
+  IF_NONE_MATCH_HEADER_KEY = 'If-None-Match'
 
   HTML_TYPE = 'text/html'
   JSON_TYPE = 'application/json'
   FORM_TYPE = 'application/x-www-form-urlencoded'
+  FILE_TYPE = 'application/octet-stream'
 
   DEFAULT_ADDR = '127.0.0.1'
   DEFAULT_PORT = 4567
 
+  DEFAULT_VIEW_DIR = 'views'
+  DEFAULT_PUBLIC_DIR = 'public'
+
   DEFAULT_RESPONSE_HEADERS = {
     CONTENT_TYPE_HEADER_KEY => HTML_TYPE
   }

data/spec/angelo/erb_spec.rb

@@ -1,8 +1,6 @@
 require_relative '../spec_helper'
 require 'angelo/tilt/erb'
 
-ROOT = File.expand_path '..', __FILE__
-
 describe Angelo::Base do
   describe Angelo::Tilt::ERB do
 
@@ -10,7 +8,7 @@ describe Angelo::Base do
 
       include Angelo::Tilt::ERB
 
-      @root = ROOT
+      @root = TEST_APP_ROOT
 
       def set_vars
         @title = 'test'

data/spec/angelo/mustermann_spec.rb

@@ -3,8 +3,6 @@ if RUBY_VERSION =~ /^2\./
   require_relative '../spec_helper'
   require 'angelo/mustermann'
 
-  TILT_MM_TEST_ROOT = File.expand_path '..', __FILE__
-
   describe Angelo::Mustermann do
 
     describe 'pattern matching' do
@@ -63,7 +61,7 @@ if RUBY_VERSION =~ /^2\./
         include Angelo::Tilt::ERB
         include Angelo::Mustermann
 
-        @root = TILT_MM_TEST_ROOT
+        @root = TEST_APP_ROOT
 
         get '/:foo/things/:bar' do
           @title = params[:foo]

data/spec/angelo/static_spec.rb

@@ -0,0 +1,59 @@
+require_relative '../spec_helper'
+require 'openssl'
+
+describe Angelo::Server do
+
+  describe 'serving static files' do
+
+    let(:test_css_etag) do
+      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
+
+    define_app do
+
+      @root = TEST_APP_ROOT
+
+      get '/test.html' do
+        'you should not see this'
+      end
+
+    end
+
+    it 'serves static files for gets' do
+      get '/test.css'
+      expect(last_response.status).to be(200)
+      expect(last_response.headers['Content-Type']).to eq('text/css')
+      expect(last_response.headers['Content-Disposition']).to eq('attachment; filename=test.css')
+      expect(last_response.headers['Content-Length']).to eq('116')
+      expect(last_response.headers['Etag']).to eq(test_css_etag)
+      expect(last_response.body.length).to be(116)
+      expect(last_response.body).to eq(File.read(File.join TEST_APP_ROOT, 'public', 'test.css'))
+    end
+
+    it 'serves headers for static files on head' do
+      head '/test.css'
+      expect(last_response.status).to be(200)
+      expect(last_response.headers['Content-Type']).to eq('text/css')
+      expect(last_response.headers['Content-Disposition']).to eq('attachment; filename=test.css')
+      expect(last_response.headers['Content-Length']).to eq('116')
+      expect(last_response.headers['Etag']).to eq(test_css_etag)
+      expect(last_response.body.length).to be(0)
+    end
+
+    it 'serves static file over route' do
+      get '/test.html'
+      expect(last_response.status).to be(200)
+      expect(last_response.headers['Content-Type']).to eq('text/html')
+      expect(last_response.headers['Content-Disposition']).to eq('attachment; filename=test.html')
+      expect(last_response.body).to eq(File.read(File.join TEST_APP_ROOT, 'public', 'test.html'))
+    end
+
+    it 'not modifieds when if-none-match matched etag' do
+      get '/test.css', {}, {'If-None-Match' => test_css_etag}
+      expect(last_response.status).to be(304)
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -6,3 +6,5 @@ require 'angelo'
 require 'angelo/rspec/helpers'
 Celluloid.logger.level = ::Logger::ERROR
 include Angelo::RSpec::Helpers
+
+TEST_APP_ROOT = File.expand_path '../test_app_root', __FILE__

data/spec/test_app_root/public/test.css

@@ -0,0 +1,6 @@
+body {
+    font-family: arial, helvetica;
+    font-size: 10em;
+    background-color: #000000;
+    color: #ff4ff5;
+}

data/spec/test_app_root/public/test.html

@@ -0,0 +1 @@
+this is a different story

data/spec/test_app_root/public/test.js

@@ -0,0 +1 @@
+setTimeout(function(){ alert('hi'); }, 3000);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Sinatra-esque DSL for Reel
 email:
 - kenichi.nakamura@gmail.com
@@ -51,11 +65,16 @@ files:
 - spec/angelo/erb_spec.rb
 - spec/angelo/mustermann_spec.rb
 - spec/angelo/params_spec.rb
-- spec/angelo/views/index.html.erb
-- spec/angelo/views/layout.html.erb
+- spec/angelo/static_spec.rb
 - spec/angelo/websocket_spec.rb
 - spec/angelo_spec.rb
 - spec/spec_helper.rb
+- spec/test_app_root/public/test.css
+- spec/test_app_root/public/test.html
+- spec/test_app_root/public/test.js
+- spec/test_app_root/public/what.png
+- spec/test_app_root/views/index.html.erb
+- spec/test_app_root/views/layout.html.erb
 homepage: https://github.com/kenichi/angelo
 licenses:
 - apache
@@ -84,9 +103,13 @@ test_files:
 - spec/angelo/erb_spec.rb
 - spec/angelo/mustermann_spec.rb
 - spec/angelo/params_spec.rb
-- spec/angelo/views/index.html.erb
-- spec/angelo/views/layout.html.erb
+- spec/angelo/static_spec.rb
 - spec/angelo/websocket_spec.rb
 - spec/angelo_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/test_app_root/public/test.css
+- spec/test_app_root/public/test.html
+- spec/test_app_root/public/test.js
+- spec/test_app_root/public/what.png
+- spec/test_app_root/views/index.html.erb
+- spec/test_app_root/views/layout.html.erb