angelo 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1ed1fe692f13d99357085f5cdb4ac8a05f8158f
-  data.tar.gz: 8fce9323f6e7c1ccdf7aba3507f6618c7fcd5364
+  metadata.gz: 3c515e055a1dbd1a233df60640c31b82866edf6a
+  data.tar.gz: 617d5e38dec4a3ea40c27dc16eb094081f7b6b8f
 SHA512:
-  metadata.gz: 442a22ca6c5b0992956be8c12dcfebd7b307613b56b6f8972c06ea9f08069ef5be1e9d7be9e77596daa855fe26f74bc10b58531001c240e68d403be4957faa5f
-  data.tar.gz: db87f3ebc41b1bf8923fc36d05728a7825686d63caa27f4ba5dffba578fba2d266e975265856524441eab55d3aa6b7ba2fd9bfa50ee6812a841555979d60bf2d
+  metadata.gz: 51acea14b590f1ed28b8017c2b9d88b953a77f24ee5c1784e6681d1d0521487faf7c18d228d99a9f3bd98b0b168c6f69d4e58e95d0b6463738053c35282433d1
+  data.tar.gz: 95de633d4b58ffeb51c4f43f03ce09bdae4f68191bf6e0cd278d9c1a77204907ed64ef3ab6cca2371698b98ae6818fe9b431503da77a1671890fbf8eb0957faf

data/.travis.yml

@@ -2,4 +2,5 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
-script: bundle exec rspec
+  - "2.1.1"
+script: rake

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 changelog
 =========
 
+### 0.1.8 6 may 2014
+
+* leave RSpec for Minitest
+* fix for Reel::Connection::StateError -> Reel::StateError
+* rename "socket" route definition to "websocket"
+
 ### 0.1.7 17 apr 2014
 
 * reel 0.5.0 support (Reel::Server -> Reel::Server::HTTP)

data/Gemfile

@@ -5,13 +5,7 @@ gem 'tilt'
 gem 'mime-types'
 gem 'websocket-driver'
 
-platform :rbx do
-  gem 'rubysl-cgi'
-  gem 'rubysl-erb'
-  gem 'rubysl-prettyprint'
-end
-
-platform :ruby_20 do
+platform :ruby_20, :ruby_21 do
   gem 'mustermann'
 end
 
@@ -28,6 +22,5 @@ end
 
 group :test do
   gem 'httpclient'
-  gem 'rspec'
-  gem 'rspec-pride'
+  gem 'minitest'
 end

data/README.md

@@ -5,18 +5,163 @@ Angelo
 
 A [Sinatra](https://github.com/sinatra/sinatra)-esque DSL for [Reel](https://github.com/celluloid/reel).
 
-### Notes/Features
+### tl;dr
 
-* "easy" websocket support via `socket '/path' do |s|` route handler
-* "easy" websocket stashing via `websockets` helper
-* "easy" event handling via `async` helpers
+* websocket support via `websocket('/path'){|s| ... }` route builder
+* contextual websocket stashing via `websockets` helper
+* `task` handling via `async` and `future` helpers
 * no rack
 * optional tilt/erb support
 * optional mustermann support
 
+### What is Angelo?
+
+Just like Sinatra, Angelo gives you an expressive DSL for creating web applications. There are some
+notable differences, but the basics remain the same. It mostly follows the subclass style of Sinatra:
+you must define a subclass of `Angelo::Base` but also `.run` on that class for the service to start.
+In addition, and perhaps more importantly, **Angelo is built upon Reel, which is, in turn, built upon
+Celluloid::IO and gives you a reactor with evented IO in Ruby!**
+
+Note: There currently is no "standalone" capability where one can define route handlers at the top level.
+
+Things will feel very familiar to anyone experienced with Sinatra. Inside the subclass, you can define
+route handlers denoted by HTTP verb and path. Unlike Sinatra, the only acceptable return value from a
+route block is the body of the response in full. Chunked response support was recently added to Reel,
+and look for that support in Angelo soon.
+
+There is also [Mustermann](#mustermann) support for full-on, Sinatra-like path
+matching and params.
+
+### Websockets!
+
+One of the main motivations for Angelo was the ability to define websocket handlers with ease. Through
+the addition of a `websocket` route builder and a `websockets` helper, Angelo attempts to make it easy
+for you to build real-time web applications.
+
+##### Route Builder
+
+The `websocket` route builder accepts a path and a block, and passes the actual websocket to the block
+as the only argument. This socket is an instance of Reel's
+[WebSocket](https://github.com/celluloid/reel/blob/master/lib/reel/websocket.rb) class, and, as such,
+responds to methods like `on_message` and `on_close`. A service-wide `on_pong` handler (defined at the
+class-level of the Angelo app) is available to customize the behavior when a pong frame comes back from
+a connected websocket client.
+
+##### `websockets` helper
+
+Angelo includes a "stash" helper for connected websockets. One can `<<` a websocket into `websockets`
+from inside a websocket handler block. These can "later" be iterated over so one can do things like
+emit a message on every connected websocket when the service receives a POST request.
+
+The `websockets` helper also includes a context ability, so you can stash connected websocket clients
+into different "sections".
+
+##### Example!
+
+Here is an example of the `websocket` route builder, the `websockets` helper, and the context feature:
+
+```ruby
+require 'angelo'
+
+class Foo < Angelo::Base
+
+  websocket '/' do |ws|
+    websockets << ws
+  end
+
+  websocket '/bar' do |ws|
+    websockets[:bar] << ws
+  end
+
+  post '/' do
+    websockets.each {|ws| ws.write params[:foo]}
+  end
+
+  post '/bar' do
+    websockets[:bar].each {|ws| ws.write params[:bar]}
+  end
+
+end
+
+Foo.run
+```
+
+In this case, any clients that connected to a websocket at the path '/' would be stashed in the
+default websockets array; clients that connected to '/bar' would be stashed into the `:bar` section.
+
+Each "section" can accessed with a familiar, `Hash`-like syntax, and can be iterated over with
+a `.each` block.
+
+When a `POST /` with a 'foo' param is received, any value is messaged out to any '/' connected
+websockets. When a `POST /bar` with a 'bar' param is received, any value is messaged out to all
+websockets that connected to '/bar'.
+
+### Tasks + Async / Future
+
+Angelo is built on Reel and Celluloid::IO, giving your web application class the ability to define
+"tasks" and call them from route handler blocks in an `async` or `future` style.
+
+##### `task` builder
+
+You can define a task on the reactor using the `task` class method and giving it a symbol and a
+block. The block can take arguments that you can pass later, with `async` or `future`.
+
+```ruby
+# defining a task on the reactor called `:in_sec` which will sleep for
+# given number of seconds, then return the given message.
+#
+task :in_sec do |sec, msg|
+  sleep sec.to_i
+  msg
+end
+```
+
+##### `async` helper
+
+This helper is directly analogous to the Celluoid method of the same name. Once tasks are defined,
+you can call them with this helper method, passing the symbol of the task name and any arguments.
+The task will run on the reactor, asynchronously, and return immediately.
+
+```ruby
+get '/' do
+  # run the task defined above asynchronously, return immediately
+  #
+  async :in_sec, params[:sec], params[:msg]
+
+  # NOTE: params[:msg] is discarded, the return value of tasks called with `async` is nil.
+
+  # return this response body while the task is still running
+  # assuming params[:sec] is > 0
+  #
+  'hi'
+end
+```
+
+##### `future` helper
+
+Just like `async`, this comes from Celluloid as well. It behaves exactly like `async`, with the
+notable exception of returing a "future" object that you can call `#value` on later to retreive
+the return value of the task. Once `#value` is called, things will "block" until the task is
+finished.
+
+```ruby
+get '/' do
+  # run the task defined above asynchronously, return immediately
+  #
+  f = future :in_sec, params[:sec], params[:msg]
+
+  # now, block until the task is finished and return the task's value
+  # as a response body
+  #
+  f.value
+end
+```
+
+### WORK LEFT TO DO
+
 Lots of work left to do!
 
-### Quick example
+### Full-ish example
 
 ```ruby
 require 'angelo'
@@ -25,18 +170,28 @@ require 'angelo/mustermann'
 class Foo < Angelo::Base
   include Angelo::Mustermann
 
+  # just some constants to use in routes later...
+  #
   TEST = {foo: "bar", baz: 123, bat: false}.to_json
-
   HEART = '<3'
+
+  # a flag to know if the :heart task is running
+  #
   @@hearting = false
 
+  # you can define instance methods, just like Sinatra!
+  #
   def pong; 'pong'; end
   def foo; params[:foo]; end
 
+  # standard HTTP GET handler
+  #
   get '/ping' do
     pong
   end
 
+  # standard HTTP POST handler
+  #
   post '/foo' do
     foo
   end
@@ -45,12 +200,19 @@ class Foo < Angelo::Base
     params.to_json
   end
 
+  # emit the TEST JSON value on all :emit_test websockets
+  # return the params posted as JSON
+  #
   post '/emit' do
     websockets[:emit_test].each {|ws| ws.write TEST}
     params.to_json
   end
 
-  socket '/ws' do |ws|
+  # handle websocket requests at '/ws'
+  # stash them in the :emit_test context
+  # write 6 messages to the websocket whenever a message is received
+  #
+  websocket '/ws' do |ws|
     websockets[:emit_test] << ws
     ws.on_message do |msg|
       5.times { ws.write TEST }
@@ -58,19 +220,24 @@ class Foo < Angelo::Base
     end
   end
 
+  # emit the TEST JSON value on all :other websockets
+  #
   post '/other' do
     websockets[:other].each {|ws| ws.write TEST}
+    ''
   end
 
-  socket '/other/ws' do |ws|
+  # stash '/other/ws' connected websockets in the :other context
+  #
+  websocket '/other/ws' do |ws|
     websockets[:other] << ws
   end
 
-  socket '/hearts' do |ws|
+  websocket '/hearts' do |ws|
 
-    # this is a call to Base#async, actually calling 
+    # this is a call to Base#async, actually calling
     # the reactor to start the task
-    # 
+    #
     async :hearts unless @@hearting
 
     websockets[:hearts] << ws
@@ -87,12 +254,15 @@ class Foo < Angelo::Base
   post '/in/:sec/sec/:msg' do
 
     # this is a call to Base#future, telling the reactor
-    # do this thing and we'' want the value eventually
+    # do this thing and we'll want the value eventually
     #
     f = future :in_sec params[:sec], params[:msg]
     f.value
   end
 
+  # define a task on the reactor that sleeps for the given number of
+  # seconds and returns the given message
+  #
   task :in_sec do |sec, msg|
     sleep sec.to_i
     msg
@@ -155,8 +325,6 @@ class Foo < Angelo::Base
 end
 ```
 
-NOTE: this always sets the Mustermann object's `type` to `:sinatra`
-
 ### Contributing
 
 YES, HAVE SOME

data/Rakefile

@@ -0,0 +1,7 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.pattern = ENV['TEST_PATTERN'] || "test/**/*_spec.rb"
+end
+
+task :default => :test

data/lib/angelo/base.rb

@@ -74,7 +74,7 @@ module Angelo
         end
       end
 
-      def socket path, &block
+      def websocket path, &block
         routes[:socket][path] = WebsocketResponder.new &block
       end
 

data/lib/angelo/{rspec → minitest}/helpers.rb

@@ -1,7 +1,7 @@
 require 'websocket/driver'
 
 module Angelo
-  module RSpec
+  module Minitest
 
     module Helpers
 
@@ -61,16 +61,16 @@ module Angelo
         end
       end
 
-      def last_response_should_be_html body = ''
-        last_response.status.should eq 200
-        last_response.body.should eq body
-        last_response.headers['Content-Type'].split(';').should include HTML_TYPE
+      def last_response_must_be_html body = ''
+        last_response.status.must_equal 200
+        last_response.body.must_equal body
+        last_response.headers['Content-Type'].split(';').must_include HTML_TYPE
       end
 
-      def last_response_should_be_json obj = {}
-        last_response.status.should eq 200
-        JSON.parse(last_response.body).should eq obj
-        last_response.headers['Content-Type'].split(';').should include JSON_TYPE
+      def last_response_must_be_json obj = {}
+        last_response.status.must_equal 200
+        JSON.parse(last_response.body).must_equal obj
+        last_response.headers['Content-Type'].split(';').must_include JSON_TYPE
       end
 
     end

data/lib/angelo/mustermann.rb

@@ -28,9 +28,9 @@ module Angelo
         end
       end
 
-      def socket path, &block
+      def websocket path, &block
         path = ::Mustermann.new path
-        routes[:socket][path] = WebsocketResponder.new &block
+        super path, &block
       end
 
       def routes

data/lib/angelo/responder/websocket.rb

@@ -42,7 +42,7 @@ module Angelo
         ::STDERR.puts e.backtrace
         begin
           @connection.close
-        rescue Reel::Connection::StateError => rcse
+        rescue Reel::StateError => rcse
           close_websocket
         end
       end

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/{spec → test}/angelo/erb_spec.rb

@@ -42,7 +42,7 @@ locals :bar - bat
   </body>
 </html>
 HTML
-      last_response_should_be_html expected
+      last_response_must_be_html expected
     end
 
     it 'renders templates without layout' do
@@ -51,7 +51,7 @@ HTML
 foo - asdf
 locals :bar - bat
 HTML
-      last_response_should_be_html expected
+      last_response_must_be_html expected
     end
 
   end

data/{spec → test}/angelo/mustermann_spec.rb

@@ -30,13 +30,13 @@ if RUBY_VERSION =~ /^2\./
       it 'matches via mustermann routes objects' do
         path = '/some/things/are_good'
         get path
-        last_response_should_be_json mm_pattern.params(path)
+        last_response_must_be_json mm_pattern.params(path)
       end
 
       it 'overrides query string params' do
         path = '/some/things/are_good'
         get path, foo: 'other', bar: 'are_bad'
-        last_response_should_be_json mm_pattern.params(path)
+        last_response_must_be_json mm_pattern.params(path)
       end
 
       it 'overrides post body params' do
@@ -44,14 +44,14 @@ if RUBY_VERSION =~ /^2\./
         headers = {Angelo::CONTENT_TYPE_HEADER_KEY => Angelo::JSON_TYPE}
         [:post, :put].each do |m|
           __send__ m, path, {foo: 'other', bar: 'are_bad'}.to_json, headers
-          last_response_should_be_json mm_pattern.params(path)
+          last_response_must_be_json mm_pattern.params(path)
         end
       end
 
       it '404s correctly for not found routes' do
         path = '/bad/monkey'
         get path
-        last_response.status.should eq 404
+        last_response.status.must_equal 404
       end
 
     end
@@ -87,7 +87,7 @@ locals :bar - alpaca
   </body>
 </html>
 HTML
-        last_response_should_be_html expected
+        last_response_must_be_html expected
       end
 
     end

data/{spec → test}/angelo/params_spec.rb

@@ -43,21 +43,21 @@ describe Angelo::ParamsParser do
   let(:parser) { ParamsTester.new }
 
   it 'parses query string params in the normal, non-racked-up, way' do
-    parser.parse_formencoded(get_params).should eq params_s
+    parser.parse_formencoded(get_params).must_equal params_s
   end
 
   it 'parses formencoded POST bodies in the normal, non-racked-up, way' do
     parser.form_encoded = true
     parser.json = false
     parser.body = get_params
-    parser.parse_post_body.should eq params_s
+    parser.parse_post_body.must_equal params_s
   end
 
   it 'parses JSON POST bodies params' do
     parser.form_encoded = false
     parser.json = true
     parser.body = json_params
-    parser.parse_post_body.should eq post_params
+    parser.parse_post_body.must_equal post_params
   end
 
   it 'should override query string with JSON POST bodies params' do
@@ -65,7 +65,7 @@ describe Angelo::ParamsParser do
     parser.json = true
     parser.query_string = get_params
     parser.body = json_params
-    parser.parse_post_body.should eq post_params
+    parser.parse_post_body.must_equal post_params
   end
 
   it 'does not parse POST bodies if no Content-Type' do
@@ -73,8 +73,8 @@ describe Angelo::ParamsParser do
     parser.json = false
     parser.query_string = get_params
     parser.body = nil
-    parser.parse_post_body.should eq params_s
-    parser.parse_query_string.should eq params_s
+    parser.parse_post_body.must_equal params_s
+    parser.parse_query_string.must_equal params_s
   end
 
 end

data/test/angelo/static_spec.rb

@@ -0,0 +1,72 @@
+require_relative '../spec_helper'
+require 'openssl'
+
+describe Angelo::Server do
+
+  describe 'serving static files' do
+
+    let(: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'
+      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-Length'].must_equal '116'
+      last_response.headers['Etag'].must_equal css_etag
+      last_response.body.length.must_equal 116
+      last_response.body.must_equal File.read(File.join TEST_APP_ROOT, 'public', 'test.css')
+    end
+
+    it 'serves headers for static files on head' 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-Length'].must_equal '116'
+      last_response.headers['Etag'].must_equal css_etag
+      last_response.body.length.must_equal 0
+    end
+
+    it 'serves static file over route' 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.body.must_equal 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' => css_etag}
+      last_response.status.must_equal 304
+    end
+
+    it 'serves proper content-types' do
+      { 'test.js' => 'application/javascript',
+        'test.html' => 'text/html',
+        'test.css' => 'text/css',
+        'what.png' => 'image/png' }.each do |k,v|
+
+        get "/#{k}"
+        last_response.status.must_equal 200
+        last_response.headers['Content-Type'].must_equal v
+
+      end
+    end
+
+  end
+
+end

data/{spec → test}/angelo/websocket_spec.rb

@@ -32,7 +32,7 @@ describe Angelo::WebsocketResponder do
   describe 'basics' do
 
     define_app do
-      socket '/' do |ws|
+      websocket '/' do |ws|
         while msg = ws.read do
           ws.write msg
         end
@@ -44,7 +44,7 @@ describe Angelo::WebsocketResponder do
         latch = CountDownLatch.new 500
 
         wsh.on_message = ->(e) {
-          expect(e.data).to match(/hi there \d/)
+          assert_match /hi there \d/, e.data
           latch.count_down
         }
 
@@ -72,7 +72,7 @@ describe Angelo::WebsocketResponder do
       Reactor.testers[:wshs] = Array.new(CONCURRENCY).map do
         wsh = socket '/'
         wsh.on_message = ->(e) {
-          expect(e.data).to match(/hi there \d/)
+          assert_match /hi there \d/, e.data
           latch.count_down
         }
         wsh.init
@@ -118,7 +118,7 @@ describe Angelo::WebsocketResponder do
         end
       end
 
-      socket '/concur' do |ws|
+      websocket '/concur' do |ws|
         websockets << ws
       end
 
@@ -129,7 +129,7 @@ describe Angelo::WebsocketResponder do
       latch = CountDownLatch.new CONCURRENCY * Angelo::HTTPABLE.length
 
       expectation = ->(e){
-        expect(e.data).to match(/from http (#{Angelo::HTTPABLE.map(&:to_s).join('|')})/)
+        assert_match /from http (#{Angelo::HTTPABLE.map(&:to_s).join('|')})/, e.data
       }
 
       socket_wait_for '/concur', latch, expectation do
@@ -143,7 +143,7 @@ describe Angelo::WebsocketResponder do
 
   describe 'helper contexts' do
     let(:obj){ {'foo' => 'bar'} }
-    let(:wait_for_block){ ->(e){ expect(JSON.parse(e.data)).to eq(obj) }}
+    let(:wait_for_block){ ->(e){ assert_equal obj, JSON.parse(e.data) }}
 
     define_app do
 
@@ -152,7 +152,7 @@ describe Angelo::WebsocketResponder do
         ''
       end
 
-      socket '/' do |ws|
+      websocket '/' do |ws|
         websockets << ws
         while msg = ws.read do
           ws.write msg.to_json
@@ -164,7 +164,7 @@ describe Angelo::WebsocketResponder do
         ''
       end
 
-      socket '/one' do |ws|
+      websocket '/one' do |ws|
         websockets[:one] << ws
         while msg = ws.read do
           ws.write msg.to_json
@@ -176,7 +176,7 @@ describe Angelo::WebsocketResponder do
         ''
       end
 
-      socket '/other' do |ws|
+      websocket '/other' do |ws|
         websockets[:other] << ws
         while msg = ws.read do
           ws.write msg.to_json

data/{spec → test}/angelo_spec.rb

@@ -2,12 +2,13 @@ require_relative './spec_helper'
 
 describe Angelo::Base do
 
-  let :obj do
+  def obj
     {'foo' => 'bar', 'bar' => 123.4567890123456, 'bat' => true}
   end
-  let(:obj_s) {
+
+  def obj_s
     obj.keys.reduce({}){|h,k| h[k] = obj[k].to_s; h}
-  }
+  end
 
   describe 'the basics' do
 
@@ -35,24 +36,24 @@ describe Angelo::Base do
     it 'responds to http requests properly' do
       Angelo::HTTPABLE.each do |m|
         __send__ m, '/'
-        last_response_should_be_html m.to_s
+        last_response_must_be_html m.to_s
       end
     end
 
     it 'responds to get requests with json properly' do
       get '/json', obj
-      last_response_should_be_json obj_s
+      last_response_must_be_json obj_s
     end
 
     it 'responds to post requests with json properly' do
       post '/json', obj.to_json, {'Content-Type' => Angelo::JSON_TYPE}
-      last_response_should_be_json obj
+      last_response_must_be_json obj
     end
 
     it 'redirects' do
       get '/redirect'
-      expect(last_response.status).to eq(301)
-      expect(last_response.headers['Location']).to eq('/')
+      last_response.status.must_equal 301
+      last_response.headers['Location'].must_equal '/'
     end
 
   end
@@ -77,11 +78,11 @@ describe Angelo::Base do
     it 'runs before filters before routes' do
 
       get '/before', obj
-      last_response_should_be_json obj_s
+      last_response_must_be_json obj_s
 
       [:post, :put].each do |m|
         __send__ m, '/before', obj.to_json, {Angelo::CONTENT_TYPE_HEADER_KEY => Angelo::JSON_TYPE}
-        last_response_should_be_json obj
+        last_response_must_be_json obj
       end
 
     end
@@ -115,8 +116,8 @@ describe Angelo::Base do
       b = [4, 12, 28, 60]
       Angelo::HTTPABLE.each_with_index do |m,i|
         __send__ m, '/after', obj
-        last_response_should_be_html a[i]
-        invoked.should eq b[i]
+        last_response_must_be_html a[i]
+        invoked.must_equal b[i]
       end
     end
 
@@ -138,16 +139,16 @@ describe Angelo::Base do
 
     it 'sets headers for a response' do
       put '/incr'
-      expect(last_response.headers['X-Http-Angelo-Server']).to eq('catbutt')
+      last_response.headers['X-Http-Angelo-Server'].must_equal 'catbutt'
     end
 
     it 'does not carry headers over responses' do
       headers_count = 0
       put '/incr'
-      expect(last_response.headers['X-Http-Angelo-Server']).to eq('catbutt')
+      last_response.headers['X-Http-Angelo-Server'].must_equal 'catbutt'
 
       put '/incr'
-      expect(last_response.headers['X-Http-Angelo-Server']).to be_nil
+      last_response.headers['X-Http-Angelo-Server'].must_be_nil
     end
 
   end
@@ -190,35 +191,35 @@ describe Angelo::Base do
       it 'sets html content type for current route' do
         Angelo::HTTPABLE.each do |m|
           __send__ m, '/html'
-          last_response_should_be_html '<html><body>hi</body></html>'
+          last_response_must_be_html '<html><body>hi</body></html>'
         end
       end
 
       it 'sets json content type for current route and to_jsons hashes' do
         Angelo::HTTPABLE.each do |m|
           __send__ m, '/json'
-          last_response_should_be_json 'hi' => 'there'
+          last_response_must_be_json 'hi' => 'there'
         end
       end
 
       it 'does not to_json strings' do
         Angelo::HTTPABLE.each do |m|
           __send__ m, '/json_s'
-          last_response_should_be_json 'woo' => 'woo'
+          last_response_must_be_json 'woo' => 'woo'
         end
       end
 
       it '500s on html hashes' do
         Angelo::HTTPABLE.each do |m|
           __send__ m, '/bad_html_h'
-          last_response.status.should eq 500
+          last_response.status.must_equal 500
         end
       end
 
       it '500s on bad json strings' do
         Angelo::HTTPABLE.each do |m|
           __send__ m, '/bad_json_s'
-          last_response.status.should eq 500
+          last_response.status.must_equal 500
         end
       end
 
@@ -240,7 +241,7 @@ describe Angelo::Base do
         it 'sets default content type' do
           Angelo::HTTPABLE.each do |m|
             __send__ m, '/html'
-            last_response_should_be_html '<html><body>hi</body></html>'
+            last_response_must_be_html '<html><body>hi</body></html>'
           end
         end
 
@@ -260,7 +261,7 @@ describe Angelo::Base do
         it 'sets default content type' do
           Angelo::HTTPABLE.each do |m|
             __send__ m, '/json'
-            last_response_should_be_json 'hi' => 'there'
+            last_response_must_be_json 'hi' => 'there'
           end
         end
       end
@@ -284,7 +285,7 @@ describe Angelo::Base do
         it 'sets html content type for current route when default is set json' do
           Angelo::HTTPABLE.each do |m|
             __send__ m, '/json'
-            last_response_should_be_json 'hi' => 'there'
+            last_response_must_be_json 'hi' => 'there'
           end
         end
 
@@ -305,7 +306,7 @@ describe Angelo::Base do
         it 'sets json content type for current route when default is set html' do
           Angelo::HTTPABLE.each do |m|
             __send__ m, '/html'
-            last_response_should_be_html '<html><body>hi</body></html>'
+            last_response_must_be_html '<html><body>hi</body></html>'
           end
         end
 
@@ -330,17 +331,17 @@ describe Angelo::Base do
 
     it 'parses formencoded body when content-type is formencoded' do
       post '/json', obj, {'Content-Type' => Angelo::FORM_TYPE}
-      last_response_should_be_json obj_s
+      last_response_must_be_json obj_s
     end
 
     it 'does not parse JSON body when content-type is formencoded' do
       post '/json', obj.to_json, {'Content-Type' => Angelo::FORM_TYPE}
-      last_response.status.should eq 400
+      last_response.status.must_equal 400
     end
 
     it 'does not parse body when request content-type not set' do
       post '/json', obj, {'Content-Type' => ''}
-      last_response_should_be_json({})
+      last_response_must_be_json({})
     end
 
   end
@@ -375,7 +376,7 @@ describe Angelo::Base do
       }
 
       get '/rh', ps, hs
-      last_response_should_be_json 'values' => hs.values
+      last_response_must_be_json 'values' => hs.values
     end
 
   end

data/{spec → test}/spec_helper.rb

@@ -1,11 +1,13 @@
-$:.unshift File.expand_path '../../../lib', __FILE__
+$:.unshift File.expand_path '../../lib', __FILE__
 
 require 'bundler'
 Bundler.require :default, :development, :test
+require 'minitest/pride'
+require 'minitest/autorun'
 require 'angelo'
-require 'angelo/rspec/helpers'
+require 'angelo/minitest/helpers'
 Celluloid.logger.level = ::Logger::ERROR
-include Angelo::RSpec::Helpers
+include Angelo::Minitest::Helpers
 
 TEST_APP_ROOT = File.expand_path '../test_app_root', __FILE__
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
   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'
 - !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
@@ -45,36 +45,37 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - angelo.gemspec
 - lib/angelo.rb
 - lib/angelo/base.rb
+- lib/angelo/minitest/helpers.rb
 - lib/angelo/mustermann.rb
 - lib/angelo/params_parser.rb
 - lib/angelo/responder.rb
 - lib/angelo/responder/websocket.rb
-- lib/angelo/rspec/helpers.rb
 - lib/angelo/server.rb
 - lib/angelo/tilt/erb.rb
 - lib/angelo/version.rb
-- spec/angelo/erb_spec.rb
-- spec/angelo/mustermann_spec.rb
-- spec/angelo/params_spec.rb
-- 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
+- test/angelo/erb_spec.rb
+- test/angelo/mustermann_spec.rb
+- test/angelo/params_spec.rb
+- test/angelo/static_spec.rb
+- test/angelo/websocket_spec.rb
+- test/angelo_spec.rb
+- test/spec_helper.rb
+- test/test_app_root/public/test.css
+- test/test_app_root/public/test.html
+- test/test_app_root/public/test.js
+- test/test_app_root/public/what.png
+- test/test_app_root/views/index.html.erb
+- test/test_app_root/views/layout.html.erb
 homepage: https://github.com/kenichi/angelo
 licenses:
 - apache
@@ -85,31 +86,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Sinatra-esque DSL for Reel
-test_files:
-- spec/angelo/erb_spec.rb
-- spec/angelo/mustermann_spec.rb
-- spec/angelo/params_spec.rb
-- 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
+test_files: []

data/spec/angelo/static_spec.rb

@@ -1,72 +0,0 @@
-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
-
-    it 'serves proper content-types' do
-      { 'test.js' => 'application/javascript',
-        'test.html' => 'text/html',
-        'test.css' => 'text/css',
-        'what.png' => 'image/png' }.each do |k,v|
-
-        get "/#{k}"
-        expect(last_response.status).to be(200)
-        expect(last_response.headers['Content-Type']).to eq(v)
-
-      end
-    end
-
-  end
-
-end