angelo 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f5dba260998174e061615d20082882201023653
-  data.tar.gz: 95f76832e3a797bc886e93a822ee541640f18df7
+  metadata.gz: bfff4ac5299ee639afca3b56bc130f71b36940fb
+  data.tar.gz: bae829642aefa5762ff1f1b612d5bf7cfd707d99
 SHA512:
-  metadata.gz: 1cda696fa0204160276711d8927393d680b28149af53d564421a227768e57601e30f6d9e70876c1fb805ffc96df534785965ccee4fa9c825db751ee6af390e0d
-  data.tar.gz: 1d062a3d517d8c3a463ca339f8344c6b4b501a89d187a201f6ccb6fd243f8559d236605254ec2baae190b62adef5fb9df069dab71eb7f90988d6d3077146643b
+  metadata.gz: 100f313a038eb3dd61f1a87542f9339158c7e0e7b8e4f179c01f7ef83b08a7860f1c49db9ce01a7ba14d1765540d556f98c6f4994cb44a6535a3567a0f5e5da9
+  data.tar.gz: 29708a62189bb0ee987e84d34d2b31c19a56f710ab7147c304f7575a5a59d1a9b20ce4edb0b3d8b0ac96818a5886ab2de29fd041a3d567777127eb536e2fd243

data/.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 rvm:
   - "1.9.3"
@@ -5,4 +6,8 @@ rvm:
   - "2.1.2"
   - "2.1.3"
   - "2.1.5"
+  - "rbx-2"
 script: rake
+matrix:
+  allow_failures:
+    - rvm: rbx-2

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 changelog
 =========
 
+### 0.3.3 16 jan 2015
+
+thanks: @mighe, @tarcieri, @jc00ke, @gunnarmarten, @tommay
+
+* RuntimeError if Angelo::Tilt::ERB is included and Tilt is < 2.0
+    * add deprecation warning - plan for Tilt inclusion by default
+* fix/simplify routing hash (#27)
+* Base.run, Base.run! now accept an options hash to pass to Reel (#26)
+* update tests for 2.2.0 URI.parse (https://bugs.ruby-lang.org/issues/10669)
+* `public_dir` accessor forwarded from base now
+* `redirect` returns nil
+* travis tests against rbx (#23)
+
 ### 0.3.2 27 nov 2014 ¡gracias!
 
 thanks: @mighe, @artworx

data/Gemfile

@@ -5,7 +5,7 @@ gem 'tilt', '~>2.0'
 gem 'mime-types', '~>2.4'
 gem 'websocket-driver', '~>0.3'
 
-platform :ruby_21 do
+platform :ruby_21, :ruby_22 do
   gem 'mustermann', '~>0.4'
 end
 

data/README.md

@@ -93,7 +93,7 @@ class Foo < Angelo::Base
 
 end
 
-Foo.run
+Foo.run!
 ```
 
 In this case, any clients that connected to a websocket at the path '/' would be stashed in the

data/lib/angelo.rb

@@ -14,7 +14,6 @@ module Angelo
   DELETE =  'DELETE'
   OPTIONS = 'OPTIONS'
 
-  ROUTABLE = [:get, :post, :put, :delete, :options, :websocket]
   HTTPABLE = [:get, :post, :put, :delete, :options]
   STATICABLE = [:get, :head]
 
@@ -59,6 +58,9 @@ module Angelo
   DASH = '-'
   EMPTY_STRING = ''
   NEWLINE = "\n"
+  SEMICOLON = ';'
+  EQUALS = '='
+  AMPERSAND = '&'
 
   HALT_STRUCT = Struct.new :status, :body
 

data/lib/angelo/base.rb

@@ -6,7 +6,7 @@ module Angelo
 
     extend Forwardable
     def_delegators :@responder, :content_type, :headers, :redirect, :request, :transfer_encoding
-    def_delegators :@klass, :report_errors?, :sse_event, :sse_message, :sses, :websockets
+    def_delegators :@klass, :public_dir, :report_errors?, :sse_event, :sse_message, :sses, :websockets
 
     attr_accessor :responder
 
@@ -88,11 +88,7 @@ module Angelo
       end
 
       def routes
-        @routes ||= {}
-        ROUTABLE.each do |m|
-          @routes[m] ||= {}
-        end
-        @routes
+        @routes ||= Hash.new{|h,k| h[k] = {}}
       end
 
       def filters
@@ -164,13 +160,13 @@ module Angelo
         Responder.content_type type
       end
 
-      def run! _addr = addr, _port = port
-        run _addr, _port, true
+      def run! _addr = addr, _port = port, options = {}
+        run _addr, _port, options, true
       end
 
-      def run _addr = addr, _port = port, blocking = false
+      def run _addr = addr, _port = port, options = {}, blocking = false
         Celluloid.logger.level = log_level
-        @server = Angelo::Server.new self, _addr, _port
+        @server = Angelo::Server.new self, _addr, _port, options
         @server.async.ping_websockets
         if blocking
           trap "INT" do

data/lib/angelo/mustermann.rb

@@ -39,11 +39,7 @@ module Angelo
       end
 
       def routes
-        @routes ||= {}
-        ROUTABLE.each do |m|
-          @routes[m] ||= RouteMap.new
-        end
-        @routes
+        @routes ||= Hash.new{|h,k| h[k] = RouteMap.new}
       end
 
       def filter_by which, path, meth

data/lib/angelo/params_parser.rb

@@ -7,9 +7,6 @@ module Angelo
   module ParamsParser
 
     EMPTY_JSON = '{}'
-    SEMICOLON = ';'
-    EQUALS = '='
-    AMPERSAND = '&'
 
     def parse_formencoded str
       str.split(AMPERSAND).reduce(Responder.symhash) do |p, kv|
@@ -20,7 +17,7 @@ module Angelo
     end
 
     def parse_query_string
-      parse_formencoded(request.query_string || '')
+      parse_formencoded(request.query_string || EMPTY_STRING)
     end
 
     def parse_post_body

data/lib/angelo/responder.rb

@@ -199,6 +199,7 @@ module Angelo
 
     def redirect url
       @redirect = url
+      nil
     end
 
     def on_close= on_close

data/lib/angelo/server.rb

@@ -11,13 +11,13 @@ module Angelo
 
     attr_reader :base
 
-    def initialize base, addr = nil, port = nil
+    def initialize base, addr = nil, port = nil, options = {}
       @base = base
       addr ||= @base.addr
       port ||= @base.port
       info "Angelo #{VERSION}"
       info "listening on #{addr}:#{port}"
-      super addr, port, &method(:on_connection)
+      super addr, port, options, &method(:on_connection)
     end
 
     def on_connection connection
@@ -56,7 +56,7 @@ module Angelo
     end
 
     def route! meth, connection, request
-      if @base.routes[meth] and rs = @base.routes[meth][request.path]
+      if rs = @base.routes[meth][request.path]
         responder = rs.dup
         responder.reset!
         responder.base = @base.new responder

data/lib/angelo/tilt/erb.rb

@@ -13,6 +13,11 @@ module Angelo
       # hrm, sneaky
       #
       def self.included base
+
+        # TODO: remove at 0.4
+        warn "[DEPRECATED] Angelo::Tilt::ERB will be included by default in angelo >= 0.4"
+        raise "Angelo requires Tilt >= 2.0, you have #{::Tilt::VERSION}" unless ::Tilt::VERSION.to_i >= 2
+
         base.extend ClassMethods
       end
 

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/test/angelo_spec.rb

@@ -91,7 +91,7 @@ describe Angelo::Base do
 
     it 'does not crash when receiving invalid uri' do
       s = TCPSocket.new Angelo::DEFAULT_ADDR, Angelo::DEFAULT_PORT
-      s.write 'GET /?file=<SCRIPT>window.alert</SCRIPT>' + "\n\n"
+      s.write 'GET /?file=<SCRIPT>window.alert&*(#%)(^&*</SCRIPT>' + "\n\n"
       r = s.read
       s.close
       assert @server.alive?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Sinatra-esque DSL for Reel