angelo 0.4.1 → 0.5.0

data/lib/angelo/tilt/erb.rb

@@ -1,118 +1,33 @@
-require 'erb'
-require 'tilt'
+require 'tilt/erb'
 
 module Angelo
   module Tilt
     module ERB
 
-      DEFAULT_LAYOUT = 'layout.%s.erb'
+      DEFAULT_LAYOUT = 'layout.%s'
       DEFAULT_TYPE = :html
       LAYOUTS_DIR = 'layouts'
       ACCEPT_ALL = '*/*'
 
-      # hrm, sneaky
-      #
-      def self.included base
-        base.extend ClassMethods
-      end
-
-      module ClassMethods
-
-        @reload_templates = false
-
-        def view_glob *glob
-          File.join views_dir, *glob
-        end
-
-        def templatify *glob
-          Dir[view_glob *glob].reduce({}) do |h,v|
-            sym = v.gsub views_dir + File::SEPARATOR, ''
-            return h if (block_given? && yield(v))
-            sym.gsub! File::SEPARATOR, UNDERSCORE
-            sym.gsub! /\.\w+?\.erb$/, EMPTY_STRING
-            sym.gsub! /^#{LAYOUTS_DIR}#{UNDERSCORE}/, EMPTY_STRING
-            h[sym.to_sym] = ::Tilt::ERBTemplate.new v
-            h
-          end
-        end
-
-        def templates type = DEFAULT_TYPE
-          @templates ||= {}
-          if reload_templates?
-            @templates[type] = load_templates(type)
-          else
-            @templates[type] ||= load_templates(type)
-          end
-        end
-
-        def load_templates type = DEFAULT_TYPE
-          templatify('**', "*.#{type}.erb") do |v|
-            v =~ /^#{LAYOUTS_DIR}#{File::SEPARATOR}/
-          end
-        end
-
-        def layout_templates type = DEFAULT_TYPE
-          if reload_templates?
-            @layout_templates = load_layout_templates(type)
-          else
-            @layout_templates ||= load_layout_templates(type)
-          end
-        end
+      def erb view, opts = {}
+        type = opts.delete(:type) || template_type
+        content_type type
 
-        def load_layout_templates type = DEFAULT_TYPE
-          templatify LAYOUTS_DIR, "*.#{type}.erb"
+        if view.is_a? Symbol
+          view = :"#{view}.#{type}"
         end
 
-        def default_layout type = DEFAULT_TYPE
-          @default_layout ||= {}
-          if reload_templates?
-            @default_layout[type] = load_default_layout(type)
+        layout =
+          case opts[:layout]
+          when false
+            false
+          when Symbol
+            :"#{LAYOUTS_DIR}/#{layout}.#{type}"
           else
-            @default_layout[type] ||= load_default_layout(type)
+            :"#{DEFAULT_LAYOUT % type}"
           end
-        end
-
-        def load_default_layout type = DEFAULT_TYPE
-          l = view_glob(DEFAULT_LAYOUT % type)
-          ::Tilt::ERBTemplate.new l if File.exist? l
-        end
-
-        def reload_templates! on = true
-          @reload_templates = on
-        end
-
-        def reload_templates?
-          @reload_templates
-        end
 
-      end
-
-      def erb view, opts = {locals: {}}
-        type = opts[:type] || template_type
-        content_type type
-        locals = Hash === opts[:locals] ? opts[:locals] : {}
-        render = case view
-                 when String
-                   ->{ view }
-                 when Symbol
-                   ->{self.class.templates(type)[view].render self, locals}
-                 end
-        case opts[:layout]
-        when false
-          render[]
-        when Symbol
-          if lt = self.class.layout_templates(type)[opts[:layout]]
-            lt.render self, locals, &render
-          else
-            raise ArgumentError.new "unknown layout - :#{opts[:layout]}"
-          end
-        else
-          if self.class.default_layout(type)
-            self.class.default_layout(type).render self, locals, &render
-          else
-            render[]
-          end
-        end
+        _erb view, layout: layout, locals: opts[:locals]
       end
 
       def template_type

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/test/angelo/erb_spec.rb

@@ -1,3 +1,9 @@
+# Having to require this sucks because tilt is an implementation
+# detail we shouldn't have to know about.  But this avoids a "tilt
+# autoloading 'tilt/erb' in a non thread-safe way" wanring.
+#
+require 'tilt/erb'
+
 require_relative '../spec_helper'
 
 describe Angelo::Base do

data/test/angelo/filter_spec.rb

@@ -90,6 +90,10 @@ describe Angelo::Base do
           @bat = params[:bat] if @foo
         end
 
+        before %r{/before/(\d+)} do
+          @id = params[:id].to_i
+        end
+
         [:get, :post, :put].each do |m|
 
           __send__ m, '/before' do
@@ -106,6 +110,11 @@ describe Angelo::Base do
             content_type :json
             { foo: @foo, bar: @bar, bat: @bat }.select! {|k,v| !v.nil?}
           end
+
+          __send__ m, '/before/:id' do
+            content_type :json
+            { id: @id }
+          end
         end
 
       end
@@ -142,6 +151,14 @@ describe Angelo::Base do
 
       end
 
+      it 'matches regexes' do
+        [:get, :post, :put].each do |m|
+          id = rand 1000
+          __send__ m, "/before/#{id}"
+          last_response_must_be_json({'id' => id})
+        end
+      end
+
     end
 
   end

data/test/angelo/params_spec.rb

@@ -67,6 +67,27 @@ describe Angelo::ParamsParser do
     parser.parse_post_body.must_equal({})
   end
 
+  it "doesn't barf on JSON array POST bodies" do
+    parser.form_encoded = false
+    parser.json = true
+    parser.body = [123,234].to_json
+    ->{ parser.parse_post_body }.must_be_silent
+  end
+
+  it 'raises properly on malformed JSON' do
+    parser.form_encoded = false
+    parser.json = true
+    parser.body = "{F(34nfnlv,-935;:fho2fhlj}}}function(){console.log('hi');}"
+    ->{ parser.parse_post_body }.must_raise JSON::ParserError
+  end
+
+  it 'parses JSON array POST bodies' do
+    parser.form_encoded = false
+    parser.json = true
+    parser.body = [123,234].to_json
+    parser.parse_post_body.must_equal [123,234]
+  end
+
   it 'recursively symhashes JSON POST bodies params' do
     nested = {
       foo: {

data/test/angelo/stash_spec.rb

@@ -25,23 +25,53 @@ describe Angelo::Stash do
         stashes[@context] << s
       end
 
+      def self.clear
+        stashes.values.each &:clear
+      end
+
     end
 
-    it 'does not skip live sockets when removing dead sockets' do
-      err_sock = ErrorSocket.new
+    after do
+      TestStash.clear
+    end
 
+    def mock_good_sock
       good_sock = Minitest::Mock.new
       good_sock.expect :read, "hi"
       good_sock.expect :hash, 123
-      def good_sock.== o; o == self; end
+      def good_sock.== o
+        o == self
+      end
+      def good_sock.eql? o
+        self.object_id == o.object_id
+      end
+      good_sock
+    end
 
+    it 'does not skip live sockets when removing dead sockets' do
       stash = TestStash.new nil
+      good_sock = mock_good_sock
+      err_sock = ErrorSocket.new
 
       stash << err_sock
       stash << good_sock
 
       stash.each {|s| s.read}
       good_sock.verify
+      stash.each {|s| err_sock.wont_equal s}
+    end
+
+    it 'removes sockets from contexts during all_each' do
+      stash = TestStash.new nil
+      good_sock = mock_good_sock
+      err_sock = ErrorSocket.new
+
+      stash[:foo] << err_sock
+      stash[:bar] << good_sock
+
+      stash.all_each {|s| s.read}
+      good_sock.verify
+      stash.all_each {|s| err_sock.wont_equal s}
     end
 
   end

data/test/angelo/websocket_spec.rb

@@ -14,10 +14,10 @@ describe Angelo::Responder::Websocket do
     end
     action = (key.to_s + '_go').to_sym
     Reactor.define_action action do |n|
-      every(0.01){ terminate if Reactor.stop? }
       Reactor.testers[key][n].go
     end
     Reactor.unstop!
+    $reactor.async.wait_for_stop
     CONCURRENCY.times {|n| $reactor.async.__send__(action, n)}
 
     sleep 0.01 * CONCURRENCY
@@ -51,10 +51,10 @@ describe Angelo::Responder::Websocket do
         wsh.init
         Reactor.testers[:tester] = wsh
         Reactor.define_action :go do
-          every(0.01){ terminate if Reactor.stop? }
           Reactor.testers[:tester].go
         end
         Reactor.unstop!
+        $reactor.async.wait_for_stop
         $reactor.async.go
 
         500.times {|n| wsh.text "hi there #{n}"}
@@ -69,7 +69,7 @@ describe Angelo::Responder::Websocket do
     it 'responds on multiple websockets properly' do
       latch = CountDownLatch.new CONCURRENCY * 500
 
-      Reactor.testers[:wshs] = Array.new(CONCURRENCY).map do
+      Reactor.testers[:wshs] = Array.new CONCURRENCY do
         wsh = websocket_helper '/'
         wsh.on_message = ->(e) {
           assert_match /hi there \d/, e.data
@@ -80,18 +80,18 @@ describe Angelo::Responder::Websocket do
       end
 
       Reactor.define_action :go do |n|
-        every(0.01){ terminate if Reactor.stop? }
         Reactor.testers[:wshs][n].go
       end
       Reactor.unstop!
+      $reactor.async.wait_for_stop
       CONCURRENCY.times {|n| $reactor.async.go n}
 
       sleep 0.01 * CONCURRENCY
 
-      ActorPool.define_action :go do |n|
+      Actor.define_action :go do |n|
         500.times {|x| Reactor.testers[:wshs][n].text "hi there #{x}"}
       end
-      CONCURRENCY.times {|n| $pool.async.go n}
+      CONCURRENCY.times {|n| $pool[n].async.go n}
       latch.wait
 
       Reactor.testers[:wshs].map &:close
@@ -99,7 +99,7 @@ describe Angelo::Responder::Websocket do
       Reactor.testers.delete :wshs
       Reactor.remove_action :go
 
-      ActorPool.remove_action :go
+      Actor.remove_action :go
     end
 
   end
@@ -127,10 +127,10 @@ describe Angelo::Responder::Websocket do
         wsh.init
         Reactor.testers[:tester] = wsh
         Reactor.define_action :go do
-          every(0.01){ terminate if Reactor.stop? }
           Reactor.testers[:tester].go
         end
         Reactor.unstop!
+        $reactor.async.wait_for_stop
         $reactor.async.go
 
         latch.wait
@@ -168,10 +168,10 @@ describe Angelo::Responder::Websocket do
         wsh.init
         Reactor.testers[:tester] = wsh
         Reactor.define_action :go do
-          every(0.01){ terminate if Reactor.stop? }
           Reactor.testers[:tester].go
         end
         Reactor.unstop!
+        $reactor.async.wait_for_stop
         $reactor.async.go
 
         latch.wait
@@ -286,7 +286,7 @@ describe Angelo::Responder::Websocket do
 
       latch = CountDownLatch.new CONCURRENCY
 
-      Reactor.testers[:hmc] = Array.new(CONCURRENCY).map do
+      Reactor.testers[:hmc] = Array.new CONCURRENCY do
         wsh = websocket_helper '/'
         wsh.on_message = ->(e) {
           wait_for_block[e]
@@ -298,7 +298,7 @@ describe Angelo::Responder::Websocket do
 
       one_latch = CountDownLatch.new CONCURRENCY
 
-      Reactor.testers[:hmc_one] = Array.new(CONCURRENCY).map do
+      Reactor.testers[:hmc_one] = Array.new CONCURRENCY do
         wsh = websocket_helper '/one'
         wsh.on_message = ->(e) {
           wait_for_block[e]
@@ -310,7 +310,7 @@ describe Angelo::Responder::Websocket do
 
       other_latch = CountDownLatch.new CONCURRENCY
 
-      Reactor.testers[:hmc_other] = Array.new(CONCURRENCY).map do
+      Reactor.testers[:hmc_other] = Array.new CONCURRENCY do
         wsh = websocket_helper '/other'
         wsh.on_message = ->(e) {
           wait_for_block[e]

data/test/angelo_spec.rb

@@ -23,6 +23,10 @@ describe Angelo::Base do
         redirect '/'
       end
 
+      get '/redirect_forever' do
+        redirect! '/'
+      end
+
       get '/wait' do
         sleep 3
         nil
@@ -49,6 +53,12 @@ describe Angelo::Base do
 
     it 'redirects' do
       get '/redirect'
+      last_response.status.must_equal 302
+      last_response.headers['Location'].must_equal '/'
+    end
+
+    it 'redirects permanently' do
+      get '/redirect_forever'
       last_response.status.must_equal 301
       last_response.headers['Location'].must_equal '/'
     end
@@ -58,29 +68,29 @@ describe Angelo::Base do
       get_end = nil
       latch = CountDownLatch.new 2
 
-      ActorPool.define_action :do_wait do
+      Actor.define_action :do_wait do
         get '/wait'
         wait_end = Time.now
         latch.count_down
       end
 
-      ActorPool.define_action :do_get do
+      Actor.define_action :do_get do
         sleep 1
         get '/'
         get_end = Time.now
         latch.count_down
       end
 
-      ActorPool.unstop!
-      $pool.async :do_wait
-      $pool.async :do_get
+      Actor.unstop!
+      $pool[0].async :do_wait
+      $pool[1].async :do_get
 
       latch.wait
       get_end.must_be :<, wait_end
 
-      ActorPool.stop!
-      ActorPool.remove_action :do_wait
-      ActorPool.remove_action :do_get
+      Actor.stop!
+      Actor.remove_action :do_wait
+      Actor.remove_action :do_get
     end
 
     it 'does not crash when receiving unknown http request type' do
@@ -318,6 +328,11 @@ describe Angelo::Base do
         end
       end
 
+      post '/json_array' do
+        content_type :json
+        {params: params, body: request_body}
+      end
+
     end
 
     it 'parses formencoded body when content-type is formencoded' do
@@ -349,6 +364,19 @@ describe Angelo::Base do
       end
     end
 
+    it 'parses JSON array bodies but does not merge into params' do
+      post '/json_array?foo=bar', [123,234].to_json, {'Content-Type' => Angelo::JSON_TYPE}
+      last_response_must_be_json({
+        "params" => {"foo" => "bar"},
+        "body" => [123,234]
+      })
+    end
+
+    it 'does not die on malformed JSON' do
+      post '/json_array?foo=bar', '{]sdfj2if08yth4j]j,:jsd;f; function()', {'Content-Type' => Angelo::JSON_TYPE}
+      last_response.status.must_equal 400
+    end
+
   end
 
   describe 'request_headers helper' do
@@ -555,6 +583,20 @@ describe Angelo::Base do
 
     end
 
+    describe 'default_headers' do
+
+      define_app do
+        default_headers "Access-Control-Allow-Origin" => "*"
+        get('/'){ 'hi' }
+      end
+
+      it 'adds a default headers' do
+        get '/'
+	last_response.headers['Access-Control-Allow-Origin'].must_equal "*"
+      end
+
+    end
+
   end
 
 end