angelo 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29657358947009a8401893f8db01b0c3522706ed
-  data.tar.gz: 721f0e9ef56f280f761518a620aa2a7ef562ae57
+  metadata.gz: d83f66477be36fa5bdc6978464fe7e83570abdb0
+  data.tar.gz: 485caaa3bee9162a898ae98fba958ba71340fd82
 SHA512:
-  metadata.gz: 6519c472ea84aa9098fd2bb186323a21b7c216d7e3b6e4927666b77f0226bb57c379159784a38d83305cf64908defb2d9c3ebcfb0d126c59916ec35c00ea5069
-  data.tar.gz: 110fffc25ad3e75c459aa0a484f52b2c73b8b9a318b5c8c904ec45135abfdd5aca658219910a0d993c6befe1493e9286e76b895528eeadd0fe79eeb74be58c30
+  metadata.gz: 2fa7bd072ee33247abe3c7057bb0228d0299179fa1bb936c50f48d07929ef5824e80e7701e15f742d7d56307dd5303a5aa885c49ba6c31de38a61056e1df9015
+  data.tar.gz: 486387e0ce869192c93e2b0181598229c043d8a210f469fd399731015d11e541f76b61aff0e27a86cd4b51b9dbb36c330d1d7fcac0d73fb2ff9ccf39a8ccb8cf

data/.travis.yml

@@ -1,6 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - "2.2.4"
-  - "2.3.0"
-script: rake
+  - "2.2.8"
+  - "2.3.5"
+  - "2.4.2"
+script: bundle exec rake

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 changelog
 =========
 
+### 0.5.1 nov 2017
+
+thanks: @Mask, @tommay, @tenyo
+
+* dumps backtraces to configured logger (#66)
+* use Forwardable/def_delegators on main's eigenclass instead of instance (#67, #68)
+* add support for PATCH routes (#79)
+
 ### 0.5.0 mar 2016
 
 thanks: @tommay, @gunnarmarten, @nagius
@@ -28,7 +36,7 @@ thanks: @tommay, @kyledrake, @katjaeinsfeld
 * refactor UnboundMethod -> instance_exec (#38)
 * add angelo/main for sinatra-like top-level DSL (#37)
 * make SymHash.new recurse array values
-* remove 'layouts_' from view_dir/layouts/*
+* remove 'layouts\_' from view_dir/layouts/\*
 * return anything that respond_to? :to_json when content_type :json
 * remove event restriction to SSE stash contexts
 * add reload_templates! DSL method

data/Gemfile

@@ -1,12 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'reel', '~>0.6.1'
 gemspec
 
-group :development do
-  gem 'pry', '~>0.10'
-end
-
 group :profile do
   platform :mri do
     gem 'ruby-prof', '~>0.15'
@@ -14,9 +9,6 @@ group :profile do
 end
 
 group :test do
-  gem 'httpclient', '~>2.5'
-  gem 'minitest', '~>5.4'
-
   platform :mri do
     gem 'simplecov', '~>0.11'
   end

data/angelo.gemspec

@@ -4,7 +4,8 @@ require File.expand_path('../lib/angelo/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors          = ["Kenichi Nakamura"]
   gem.email            = ["kenichi.nakamura@gmail.com"]
-  gem.description      = gem.summary = "A Sinatra-like DSL for Reel"
+  gem.summary          = "A Sinatra-like DSL for Reel"
+  gem.description      = "A Sinatra-like DSL for Reel that supports websockets and SSE"
   gem.homepage         = "https://github.com/kenichi/angelo"
   gem.files            = `git ls-files | grep -Ev '^example'`.split("\n")
   gem.test_files       = `git ls-files -- spec/*`.split("\n")
@@ -12,9 +13,16 @@ Gem::Specification.new do |gem|
   gem.require_paths    = ["lib"]
   gem.version          = Angelo::VERSION
   gem.license          = 'apache'
+
   gem.required_ruby_version = '>= 2.1.0'
-  gem.add_runtime_dependency 'reel', '~>0.6.1'
+
+  gem.add_runtime_dependency 'reel', '>= 0.6.1'
   gem.add_runtime_dependency 'tilt', '~>2.0'
   gem.add_runtime_dependency 'mustermann', '~>0.4'
-  gem.add_runtime_dependency 'mime-types', '~>2.4'
+  gem.add_runtime_dependency 'mime-types', '~>3.1'
+
+  gem.add_development_dependency 'rake', '~>12.0'
+  gem.add_development_dependency 'pry', '~>0.10'
+  gem.add_development_dependency 'httpclient', '~>2.5'
+  gem.add_development_dependency 'minitest', '~>5.4'
 end

data/lib/angelo.rb

@@ -11,14 +11,15 @@ require 'mustermann'
 module Angelo
 
   GET =     'GET'
+  PATCH =   'PATCH'
   POST =    'POST'
   PUT =     'PUT'
   DELETE =  'DELETE'
   OPTIONS = 'OPTIONS'
 
-  HTTPABLE = [:get, :post, :put, :delete, :options]
+  HTTPABLE = [:get, :patch, :post, :put, :delete, :options]
   STATICABLE = [:get, :head]
-  POST_OVERRIDABLE = [:put, :delete]
+  POST_OVERRIDABLE = [:patch, :put, :delete]
 
   ACCEPT_REQUEST_HEADER_KEY = 'Accept'
 

data/lib/angelo/base.rb

@@ -242,7 +242,7 @@ module Angelo
       @params ||= case request.method
                   when GET, DELETE, OPTIONS
                     parse_query_string
-                  when POST, PUT
+                  when PATCH, POST, PUT
                     parse_query_string_and_post_body
                   end.merge mustermann.params(request.path)
     end

data/lib/angelo/main.rb

@@ -31,10 +31,13 @@ end
 if self.to_s == "main"
   # We are probably at the top level.
 
-  require "forwardable"
-  self.extend Forwardable
   @angelo_app = Class.new(Angelo::Base)
-  self.def_delegators :@angelo_app, *Angelo::Base::DSL.instance_methods
+
+  class << self
+    require "forwardable"
+    extend Forwardable
+    def_delegators :@angelo_app, *Angelo::Base::DSL.instance_methods
+  end
 
   at_exit do
     # Don't run @angelo_app on uncaught exceptions including exit

data/lib/angelo/minitest/helpers.rb

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

data/lib/angelo/responder.rb

@@ -73,10 +73,7 @@ module Angelo
       Angelo.log @method, @connection, @request, nil, type, err_msg.size
       @connection.respond type, headers, err_msg
       @connection.close
-      if report
-        error "#{_error.class} - #{_error.message}"
-        ::STDERR.puts _error.backtrace
-      end
+      error _error if report
     end
 
     def error_message _error

data/lib/angelo/version.rb

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

data/test/angelo/erb_spec.rb

@@ -1,6 +1,6 @@
 # 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.
+# autoloading 'tilt/erb' in a non thread-safe way" warning.
 #
 require 'tilt/erb'
 

data/test/angelo/filter_spec.rb

@@ -12,7 +12,7 @@ describe Angelo::Base do
           @set_by_before = params
         end
 
-        [:get, :post, :put].each do |m|
+        [:get, :patch, :post, :put].each do |m|
           __send__ m, '/before' do
             content_type :json
             @set_by_before
@@ -26,7 +26,7 @@ describe Angelo::Base do
         get '/before', obj
         last_response_must_be_json obj_s
 
-        [:post, :put].each do |m|
+        [:patch, :post, :put].each do |m|
           __send__ m, '/before', obj.to_json, {Angelo::CONTENT_TYPE_HEADER_KEY => Angelo::JSON_TYPE}
           last_response_must_be_json obj
         end
@@ -51,7 +51,7 @@ describe Angelo::Base do
           @bat = params[:bat] if @bar
         end
 
-        [:get, :post, :put].each do |m|
+        [:get, :patch, :post, :put].each do |m|
           __send__ m, '/before' do
             content_type :json
             { foo: @foo, bar: @bar, bat: @bat }
@@ -65,7 +65,7 @@ describe Angelo::Base do
         get '/before', obj
         last_response_must_be_json obj_s
 
-        [:post, :put].each do |m|
+        [:patch, :post, :put].each do |m|
           __send__ m, '/before', obj.to_json, {Angelo::CONTENT_TYPE_HEADER_KEY => Angelo::JSON_TYPE}
           last_response_must_be_json obj
         end
@@ -94,7 +94,7 @@ describe Angelo::Base do
           @id = params[:id].to_i
         end
 
-        [:get, :post, :put].each do |m|
+        [:get, :patch, :post, :put].each do |m|
 
           __send__ m, '/before' do
             content_type :json
@@ -124,7 +124,7 @@ describe Angelo::Base do
         get '/before', obj
         last_response_must_be_json obj_s.select {|k,v| k == 'foo'}
 
-        [:post, :put].each do |m|
+        [:patch, :post, :put].each do |m|
           __send__ m, '/before', obj.to_json, {Angelo::CONTENT_TYPE_HEADER_KEY => Angelo::JSON_TYPE}
           last_response_must_be_json obj.select {|k,v| k == 'foo'}
         end
@@ -136,7 +136,7 @@ describe Angelo::Base do
         get '/before_bar', obj
         last_response_must_be_json obj_s.select {|k,v| ['foo','bar'].include? k}
 
-        [:post, :put].each do |m|
+        [:patch, :post, :put].each do |m|
           __send__ m, '/before_bar', obj.to_json, {Angelo::CONTENT_TYPE_HEADER_KEY => Angelo::JSON_TYPE}
           last_response_must_be_json obj.select {|k,v| ['foo','bar'].include? k}
         end
@@ -144,7 +144,7 @@ describe Angelo::Base do
         get '/before_bat', obj
         last_response_must_be_json obj_s.select {|k,v| ['foo','bat'].include? k}
 
-        [:post, :put].each do |m|
+        [:patch, :post, :put].each do |m|
           __send__ m, '/before_bat', obj.to_json, {Angelo::CONTENT_TYPE_HEADER_KEY => Angelo::JSON_TYPE}
           last_response_must_be_json obj.select {|k,v| ['foo','bat'].include? k}
         end
@@ -152,7 +152,7 @@ describe Angelo::Base do
       end
 
       it 'matches regexes' do
-        [:get, :post, :put].each do |m|
+        [:get, :patch, :post, :put].each do |m|
           id = rand 1000
           __send__ m, "/before/#{id}"
           last_response_must_be_json({'id' => id})
@@ -188,8 +188,8 @@ describe Angelo::Base do
       end
 
       it 'runs after filters after routes' do
-        a = %w[2 6 14 30 62]
-        b = [4, 12, 28, 60, 124]
+        a = %w[2 6 14 30 62 126]
+        b = [4, 12, 28, 60, 124, 252]
 
         Angelo::HTTPABLE.each_with_index do |m,i|
           __send__ m, '/after', obj
@@ -227,8 +227,8 @@ describe Angelo::Base do
       end
 
       it 'runs after filters in order' do
-        a = %w[0 2 6 14 30]
-        b = [2, 6, 14, 30, 62]
+        a = %w[0 2 6 14 30 62]
+        b = [2, 6, 14, 30, 62, 126]
 
         Angelo::HTTPABLE.each_with_index do |m,i|
           __send__ m, '/after', obj
@@ -275,8 +275,8 @@ describe Angelo::Base do
 
       it 'runs default and specific after filters' do
 
-        a = %w[0 2 4 6 8]
-        b = [2, 4, 6, 8, 10]
+        a = %w[0 2 4 6 8 10]
+        b = [2, 4, 6, 8, 10, 12]
 
         Angelo::HTTPABLE.each_with_index do |m,i|
           __send__ m, '/after', obj
@@ -284,8 +284,9 @@ describe Angelo::Base do
           invoked.must_equal b[i]
         end
 
-        c = %w[10 24 52 108 220]
-        d = [24, 52, 108, 220, 444]
+        c = %w[12 28 60 124 252 508]
+        d = [28, 60, 124, 252, 508, 1020]
+
 
         Angelo::HTTPABLE.each_with_index do |m,i|
           __send__ m, '/after_bar', obj
@@ -293,8 +294,8 @@ describe Angelo::Base do
           invoked.must_equal d[i]
         end
 
-        e = %w[444 442 440 438 436]
-        f = [442, 440, 438, 436, 434]
+        e = %w[1020 1018 1016 1014 1012 1010]
+        f = [1018, 1016, 1014, 1012, 1010, 1008]
 
         Angelo::HTTPABLE.each_with_index do |m,i|
           __send__ m, '/after_bat', obj

data/test/angelo/mustermann_spec.rb

@@ -16,7 +16,7 @@ if RUBY_VERSION =~ /^2\.(\d)/ and $1.to_i > 0 and RUBY_PLATFORM != 'java'
           params
         end
 
-        [:post, :put].each do |m|
+        [:patch, :post, :put].each do |m|
           __send__ m, pattern do
             params
           end
@@ -39,7 +39,7 @@ if RUBY_VERSION =~ /^2\.(\d)/ and $1.to_i > 0 and RUBY_PLATFORM != 'java'
       it 'overrides post body params' do
         path = '/some/things/are_good'
         headers = {Angelo::CONTENT_TYPE_HEADER_KEY => Angelo::JSON_TYPE}
-        [:post, :put].each do |m|
+        [:patch, :post, :put].each do |m|
           __send__ m, path, {foo: 'other', bar: 'are_bad'}.to_json, headers
           last_response_must_be_json mm_pattern.params(path)
         end
@@ -101,7 +101,7 @@ HTML
 
         content_type :json
 
-        [:get, :post, :put].each do |m|
+        [:get, :patch, :post, :put].each do |m|
           __send__ m, '/before/:bar' do
             { bar: params[:bar], foo: params[:foo], foo_from_before: @foo }
           end
@@ -110,7 +110,7 @@ HTML
       end
 
       it 'does not infect route block params with filter pattern params' do
-        [:get, :post, :put].each do |m|
+        [:get, :patch, :post, :put].each do |m|
           __send__ m, '/before/hi'
           last_response_must_be_json 'bar' => 'hi', 'foo' => nil, 'foo_from_before' => 'hi'
         end
@@ -131,7 +131,7 @@ HTML
           @bat = params[:bat] if @foo
         end
 
-        [:get, :post, :put].each do |m|
+        [:get, :patch, :post, :put].each do |m|
 
           __send__ m, '/before' do
             content_type :json
@@ -156,7 +156,7 @@ HTML
         get '/before_bar', obj
         last_response_must_be_json obj_s
 
-        [:post, :put].each do |m|
+        [:patch, :post, :put].each do |m|
           __send__ m, '/before_bar', obj.to_json, {Angelo::CONTENT_TYPE_HEADER_KEY => Angelo::JSON_TYPE}
           last_response_must_be_json obj
         end
@@ -164,7 +164,7 @@ HTML
         get '/before_bat', obj
         last_response_must_be_json obj_s
 
-        [:post, :put].each do |m|
+        [:patch, :post, :put].each do |m|
           __send__ m, '/before_bat', obj.to_json, {Angelo::CONTENT_TYPE_HEADER_KEY => Angelo::JSON_TYPE}
           last_response_must_be_json obj
         end

data/test/angelo_spec.rb

@@ -32,6 +32,9 @@ describe Angelo::Base do
         nil
       end
 
+      get '/responder_test' do
+      end
+
     end
 
     it 'responds to http requests properly' do
@@ -94,7 +97,7 @@ describe Angelo::Base do
     end
 
     it 'does not crash when receiving unknown http request type' do
-      r = HTTP.patch(url('/'))
+      r = HTTP.trace(url('/'))
       assert @server.alive?
       r.status.must_equal 404
     end
@@ -108,6 +111,10 @@ describe Angelo::Base do
       r.must_match /400 Bad Request/
     end
 
+    it 'does not append responders to on_close array if on_close is not set' do
+      get '/responder_test', Angelo::SSE_HEADER
+    end
+
   end
 
   describe 'headers helper' do
@@ -350,7 +357,7 @@ describe Angelo::Base do
       last_response_must_be_json({})
     end
 
-    (Angelo::HTTPABLE - [:post, :put]).each do |m|
+    (Angelo::HTTPABLE - [:patch, :post, :put]).each do |m|
       it "returns a populated hash for #{m.to_s.upcase} requests" do
         send m, '/json?foo=bar'
         last_response_must_be_json('foo' => 'bar')

data/test/spec_helper.rb

@@ -7,6 +7,8 @@ if RUBY_ENGINE == "ruby" && ENV['TRAVIS'] != 'true'
   SimpleCov.command_name 'minitest'
 end
 
+$VERBOSE=nil # disable warnings turned on by default in rake 11.x
+
 require 'bundler'
 require 'celluloid/current'
 Bundler.require :default, :development, :test

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2017-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
@@ -58,15 +58,71 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-description: A Sinatra-like DSL for Reel
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
+description: A Sinatra-like DSL for Reel that supports websockets and SSE
 email:
 - kenichi.nakamura@gmail.com
 executables: []
@@ -140,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A Sinatra-like DSL for Reel