angelo 0.0.7 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 19662f6ad2cd2af07d8468c0db06e79cace30ad6
+  data.tar.gz: e9f0dea09b6fdd129d627893024722dbce7a9836
+SHA512:
+  metadata.gz: 878aefb22125a90079c96e8647ccb607eb96033ab6f898482c07210561ed5abb4e82c5af9e4fa34aa06306d1f39dd87f683e48a30b81df7d61d85e28dba1d9d3
+  data.tar.gz: a7982735780dd4bd941c4a4a13d42857eaacfc95731c4b8c4aef19a0b36350221e41a1fd606356eb009dc2d43c425f97388327a2c979781b0350ad1bba3f343c

data/.travis.yml

@@ -2,5 +2,4 @@ language: ruby
 rvm:
   - "1.9.3"
   - "2.0.0"
-  - rbx-19mode
 script: bundle exec rspec

data/{CHANGELOG → CHANGELOG.md}

@@ -1,7 +1,18 @@
 changelog
 =========
 
-### 0.0.7 5 nov 2013 gunpowder treason
+### 0.0.9 20 feb 2014
+
+* memoize params
+* slight changes for mustermann
+* add '-o addr' bind to address cmd line option
+* add '-p port' bind to port cmd line option
+
+### 0.0.8 5 nov 2013 gunpowder treason
+
+* add mustermann support
+
+### 0.0.7 5 nov 2013
 
 * fix gemspec
 * add codename
@@ -25,7 +36,6 @@ changelog
 
 ### 0.0.3 30 oct 2013
 
-
 * added tilt/erb
 * added before/after
 * added content_type/headers

data/Gemfile

@@ -6,10 +6,13 @@ gem 'tilt'
 platform :rbx do
   gem 'rubysl-cgi'
   gem 'rubysl-erb'
-  gem 'rubysl-json'
   gem 'rubysl-prettyprint'
 end
 
+platform :ruby_20 do
+  gem 'mustermann'
+end
+
 group :development do
   gem 'pry'
   gem 'pry-nav'

data/README.md

@@ -3,9 +3,17 @@ Angelo
 
 [![Build Status](https://travis-ci.org/kenichi/angelo.png?branch=master)](https://travis-ci.org/kenichi/angelo)
 
-A Sinatra-esque DSL for Reel.
+A [Sinatra](https://github.com/sinatra/sinatra)-esque DSL for [Reel](https://github.com/celluloid/reel).
 
-__SUPER ALPHA!__
+### Notes/Features
+
+* "easy" websocket support via `socket '/path' do |s|` route handler
+* "easy" websocket stashing via `websockets` helper
+* no rack/rack-style params
+* optional tilt/erb support
+* optional mustermann support
+
+Lots of work left to do!
 
 ### Quick example
 
@@ -57,16 +65,11 @@ end
 Foo.run
 ```
 
-### Tilt / ERB
+### [Tilt](https://github.com/rtomayko/tilt) / ERB
 
 To make `erb` available in route blocks
 
-1. add `tilt` to your `Gemfile`:
-
-```ruby
-gem 'tilt'
-```
-
+1. add `tilt` to your `Gemfile`: `gem 'tilt'`
 2. require `angelo/tilt/erb`
 3. include `Angelo::Tilt::ERB` in your app
 
@@ -83,6 +86,46 @@ class Foo < Angelo::Base
 end
 ```
 
+### [Mustermann](https://github.com/rkh/mustermann)
+
+To make routes blocks match path with Mustermann patterns
+
+1. be using ruby &gt;=2.0.0
+2. add 'mustermann' to to your `Gemfile`: `platform(:ruby_20){ gem 'mustermann' }`
+3. require `angelo/mustermann`
+4. include `Angelo::Mustermann` in your app
+
+```ruby
+class Foo < Angelo::Base
+  include Angelo::Tilt::ERB
+  include Angelo::Mustermann
+
+  get '/:foo/things/:bar' do
+
+    # `params` is merged with the Mustermann object#params hash, so
+    # a "GET /some/things/are_good?foo=other&bar=are_bad" would have:
+    #   params: {
+    #     'foo' => 'some',
+    #     'bar' => 'are_good'
+    #   }
+
+    @foo = params[:foo]
+    @bar = params[:bar]
+    erb :index
+  end
+
+end
+```
+
+NOTE: this always sets the Mustermann object's `type` to `:sinatra`
+
+### Contributing
+
+YES, HAVE SOME
+
+* :fork_and_knife: Fork this repo, make changes, send PR!
+* :shipit: if Good stuff?
+
 ### License
 
 see LICENSE

data/lib/angelo.rb

@@ -8,29 +8,29 @@ require 'json'
 
 module Angelo
 
-  GET =     'GET'.freeze
-  POST =    'POST'.freeze
-  PUT =     'PUT'.freeze
-  DELETE =  'DELETE'.freeze
-  OPTIONS = 'OPTIONS'.freeze
+  GET =     'GET'
+  POST =    'POST'
+  PUT =     'PUT'
+  DELETE =  'DELETE'
+  OPTIONS = 'OPTIONS'
 
   ROUTABLE = [:get, :post, :put, :delete, :socket]
   HTTPABLE = [:get, :post, :put, :delete]
 
-  CONTENT_TYPE_HEADER_KEY = 'Content-Type'.freeze
+  CONTENT_TYPE_HEADER_KEY = 'Content-Type'
 
-  HTML_TYPE = 'text/html'.freeze
-  JSON_TYPE = 'application/json'.freeze
-  FORM_TYPE = 'application/x-www-form-urlencoded'.freeze
+  HTML_TYPE = 'text/html'
+  JSON_TYPE = 'application/json'
+  FORM_TYPE = 'application/x-www-form-urlencoded'
 
-  DEFAULT_ADDR = '127.0.0.1'.freeze
+  DEFAULT_ADDR = '127.0.0.1'
   DEFAULT_PORT = 4567
 
   DEFAULT_RESPONSE_HEADERS = {
     CONTENT_TYPE_HEADER_KEY => HTML_TYPE
   }
 
-  NOT_FOUND = 'Not Found'.freeze
+  NOT_FOUND = 'Not Found'
 
 end
 

data/lib/angelo/base.rb

@@ -7,6 +7,17 @@ module Angelo
     extend Forwardable
     def_delegators :@responder, :content_type, :headers, :request
 
+    @@addr = DEFAULT_ADDR
+    @@port = DEFAULT_PORT
+
+    if ARGV.any?
+      require 'optparse'
+      OptionParser.new { |op|
+        op.on('-p port',   'set the port (default is 4567)')      { |val| @@port = Integer(val) }
+        op.on('-o addr',   "set the host (default is #{@@addr})") { |val| @@addr = val }
+      }.parse!(ARGV.dup)
+    end
+
     attr_accessor :responder
 
     class << self
@@ -18,7 +29,6 @@ module Angelo
 
         def subclass.root
           @root ||= File.expand_path '..', app_file
-          @root
         end
 
         def subclass.view_dir
@@ -71,8 +81,8 @@ module Angelo
         Responder.content_type type
       end
 
-      def run host = DEFAULT_ADDR, port = DEFAULT_PORT
-        @server = Angelo::Server.new self, host, port
+      def run addr = @@addr, port = @@port
+        @server = Angelo::Server.new self, addr, port
         trap "INT" do
           @server.terminate if @server and @server.alive?
           exit
@@ -88,7 +98,6 @@ module Angelo
                   when POST; parse_post_body
                   when PUT;  parse_post_body
                   end
-      @params
     end
 
     def websockets; self.class.websockets; end

data/lib/angelo/mustermann.rb

@@ -0,0 +1,55 @@
+require 'mustermann'
+
+module Angelo
+
+  module Mustermann
+
+    # hrm, sneaky
+    #
+    def self.included base
+      base.extend ClassMethods
+      base.class_eval do
+        def_delegator :@responder, :mustermann
+      end
+
+      [Responder, WebsocketResponder].each do |res|
+        res.class_eval do
+          attr_accessor :mustermann
+        end
+      end
+    end
+
+    module ClassMethods
+
+      HTTPABLE.each do |m|
+        define_method m do |path, &block|
+          path = ::Mustermann.new path
+          routes[m][path] = Responder.new &block
+        end
+      end
+
+      def routes
+        @routes ||= {}
+        ROUTABLE.each do |m|
+          @routes[m] ||= RouteMap.new
+        end
+        @routes
+      end
+
+    end
+
+    def params
+      @params ||= super.merge mustermann.params(request.path)
+    end
+
+    class RouteMap < Hash
+      def [] route
+        mustermann = keys.select {|k| k.match(route)}.first
+        responder = fetch mustermann
+        responder.mustermann = mustermann
+        responder
+      end
+    end
+
+  end
+end

data/lib/angelo/params_parser.rb

@@ -4,8 +4,8 @@ module Angelo
 
   module ParamsParser
 
-    EMPTY_JSON = '{}'.freeze
-    SEMICOLON = ';'.freeze
+    EMPTY_JSON = '{}'
+    SEMICOLON = ';'
 
     def parse_formencoded str
       str.split('&').reduce(Responder.symhash) do |p, kv|

data/lib/angelo/responder.rb

@@ -50,25 +50,32 @@ module Angelo
     end
 
     def handle_request
-      begin
-        if @response_handler
-          @base.before if @base.respond_to? :before
-          @body = @response_handler.bind(@base).call || ''
-          @base.after if @base.respond_to? :after
-        else
-          raise NotImplementedError
-        end
-      rescue => e
-        error_message = case
-                        when respond_with?(:json)
-                          { error: e.message }.to_json
-                        else
-                          e.message
-                        end
-        @connection.respond :internal_server_error, headers, error_message
-        @connection.close
-        error "#{e.class} - #{e.message}"
-        ::STDERR.puts e.backtrace
+      if @response_handler
+        @base.before if @base.respond_to? :before
+        @body = @response_handler.bind(@base).call || ''
+        @base.after if @base.respond_to? :after
+      else
+        raise NotImplementedError
+      end
+    rescue => e
+      handle_error e
+    end
+
+    def handle_error _error, report = true
+      @connection.respond :internal_server_error, headers, error_message(_error)
+      @connection.close
+      if report
+        error "#{_error.class} - #{_error.message}"
+        ::STDERR.puts _error.backtrace
+      end
+    end
+
+    def error_message _error
+      case
+      when respond_with?(:json)
+        { error: _error.message }.to_json
+      else
+        _error.message
       end
     end
 
@@ -99,8 +106,17 @@ module Angelo
     end
 
     def respond
-      @body = @body.to_json if respond_with? :json
+      @body = case @body
+              when String
+                JSON.parse @body if respond_with? :json # for the raises
+                @body
+              when Hash
+                raise 'html response requires String' if respond_with? :html
+                @body.to_json if respond_with? :json
+              end
       @connection.respond :ok, headers, @body
+    rescue => e
+      handle_error e, false
     end
 
   end

data/lib/angelo/rspec/helpers.rb

@@ -3,15 +3,17 @@ module Angelo
 
     module Helpers
 
-      HTTP_URL = 'http://%s:%d'.freeze
-      WS_URL = 'ws://%s:%d'.freeze
+      HTTP_URL = 'http://%s:%d'
+      WS_URL = 'ws://%s:%d'
 
       attr_reader :last_response
 
       def define_app &block
 
         before do
-          app = Class.new Angelo::Base, &block
+          app = Class.new Angelo::Base
+          app.class_eval { content_type :html } # reset
+          app.class_eval &block
           @server = Angelo::Server.new app
         end
 

data/lib/angelo/server.rb

@@ -5,7 +5,7 @@ module Angelo
 
     def initialize base, host = '127.0.0.1', port = 4567
       @base = base
-      info "Angelo #{VERSION} \"#{CODENAME}\""
+      info "Angelo #{VERSION}"
       info "listening on #{host}:#{port}"
       super host, port, &method(:on_connection)
     end

data/lib/angelo/tilt/erb.rb

@@ -13,7 +13,7 @@ module Angelo
 
       module ClassMethods
 
-        DEFAULT_LAYOUT = 'layout.html.erb'.freeze
+        DEFAULT_LAYOUT = 'layout.html.erb'
 
         def view_glob *glob
           File.join view_dir, *glob

data/lib/angelo/version.rb

@@ -1,4 +1,3 @@
 module Angelo
-  CODENAME = 'Gunpowder Treason'
-  VERSION = '0.0.7'
+  VERSION = '0.0.9'
 end

data/spec/angelo/mustermann_spec.rb

@@ -0,0 +1,92 @@
+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
+
+      pattern = '/:foo/things/:bar'
+      let(:mm_pattern){ ::Mustermann.new(pattern) }
+
+      define_app do
+        include Angelo::Mustermann
+        content_type :json
+
+        get pattern do
+          params
+        end
+
+        [:post, :put].each do |m|
+          __send__ m, pattern do
+            params
+          end
+        end
+
+      end
+
+      it 'matches via mustermann routes objects' do
+        path = '/some/things/are_good'
+        get path
+        last_response_should_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)
+      end
+
+      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|
+          __send__ m, path, {foo: 'other', bar: 'are_bad'}.to_json, headers
+          last_response_should_be_json mm_pattern.params(path)
+        end
+      end
+
+    end
+
+    describe 'tilt/erb integration' do
+
+      define_app do
+        include Angelo::Tilt::ERB
+        include Angelo::Mustermann
+
+        @root = TILT_MM_TEST_ROOT
+
+        get '/:foo/things/:bar' do
+          @title = params[:foo]
+          @foo = 'bear'
+          erb :index, locals: {bar: params[:bar]}
+        end
+
+      end
+
+      it 'renders templates using mustermann params' do
+        get '/aardvark/things/alpaca'
+        expected = <<HTML
+<!doctype html>
+<html>
+  <head>
+    <title>aardvark</title>
+  </head>
+  <body>
+    foo - bear
+locals :bar - alpaca
+
+  </body>
+</html>
+HTML
+        last_response_should_be_html expected
+      end
+
+    end
+
+  end
+
+end

data/spec/angelo/websocket_spec.rb

@@ -83,7 +83,7 @@ describe Angelo::WebsocketResponder do
 
   describe 'helper contexts' do
     let(:obj){ {'foo' => 'bar'} }
-    let(:wait_for_block) { ->(client){ JSON.parse(client.recv).should eq obj}}
+    let(:wait_for_block){ ->(client){ JSON.parse(client.recv).should eq obj}}
 
     define_app do
 

data/spec/angelo_spec.rb

@@ -113,4 +113,173 @@ describe Angelo::Base do
 
   end
 
+  describe 'content_type helper' do
+
+    describe 'when in route block' do
+
+      define_app do
+        Angelo::HTTPABLE.each do |m|
+
+          __send__ m, '/html' do
+            content_type :html
+            '<html><body>hi</body></html>'
+          end
+
+          __send__ m, '/bad_html_h' do
+            content_type :html
+            {hi: 'there'}
+          end
+
+          __send__ m, '/json' do
+            content_type :json
+            {hi: 'there'}
+          end
+
+          __send__ m, '/json_s' do
+            content_type :json
+            {woo: 'woo'}.to_json
+          end
+
+          __send__ m, '/bad_json_s' do
+            content_type :json
+            {hi: 'there'}.to_json.gsub /{/, 'so doge'
+          end
+
+        end
+      end
+
+      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>'
+        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'
+        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'
+        end
+      end
+
+      it '500s on html hashes' do
+        Angelo::HTTPABLE.each do |m|
+          __send__ m, '/bad_html_h'
+          last_response.status.should eq 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
+        end
+      end
+
+    end
+
+    describe 'when in class def' do
+
+      describe 'html type' do
+
+        define_app do
+          content_type :html
+          Angelo::HTTPABLE.each do |m|
+            __send__ m, '/html' do
+              '<html><body>hi</body></html>'
+            end
+          end
+        end
+
+        it 'sets default content type' do
+          Angelo::HTTPABLE.each do |m|
+            __send__ m, '/html'
+            last_response_should_be_html '<html><body>hi</body></html>'
+          end
+        end
+
+      end
+
+      describe 'json type' do
+
+        define_app do
+          content_type :json
+          Angelo::HTTPABLE.each do |m|
+            __send__ m, '/json' do
+              {hi: 'there'}
+            end
+          end
+        end
+
+        it 'sets default content type' do
+          Angelo::HTTPABLE.each do |m|
+            __send__ m, '/json'
+            last_response_should_be_json 'hi' => 'there'
+          end
+        end
+      end
+
+    end
+
+    describe 'when in both' do
+
+      describe 'json in html' do
+
+        define_app do
+          content_type :html
+          Angelo::HTTPABLE.each do |m|
+            __send__ m, '/json' do
+              content_type :json
+              {hi: 'there'}
+            end
+          end
+        end
+
+        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'
+          end
+        end
+
+      end
+
+      describe 'html in json' do
+
+        define_app do
+          content_type :json
+          Angelo::HTTPABLE.each do |m|
+            __send__ m, '/html' do
+              content_type :html
+              '<html><body>hi</body></html>'
+            end
+          end
+        end
+
+        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>'
+          end
+        end
+
+      end
+
+    end
+
+  end
+
+  describe 'params helper' do
+  end
+
+  describe 'websockets helper' do
+  end
+
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Sinatra-esque DSL for Reel
@@ -36,13 +33,14 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - angelo.gemspec
 - lib/angelo.rb
 - lib/angelo/base.rb
+- lib/angelo/mustermann.rb
 - lib/angelo/params_parser.rb
 - lib/angelo/responder.rb
 - lib/angelo/responder/websocket.rb
@@ -51,6 +49,7 @@ files:
 - 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/views/index.html.erb
 - spec/angelo/views/layout.html.erb
@@ -60,33 +59,34 @@ files:
 homepage: https://github.com/kenichi/angelo
 licenses:
 - apache
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+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/views/index.html.erb
 - spec/angelo/views/layout.html.erb
 - spec/angelo/websocket_spec.rb
 - spec/angelo_spec.rb
 - spec/spec_helper.rb
+has_rdoc: