rasti-web 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7120ef16d98aaab088dc1d70dc5605cefce9bf
-  data.tar.gz: eba0f9c11f7df1078c299e10c108b83885eff925
+  metadata.gz: 764cf867ae8950a2b647667bd7ed1b3a9170abd8
+  data.tar.gz: 5d96989d2b5e261bc162c2076133016991f6a4e1
 SHA512:
-  metadata.gz: e0858476701c4d950f8827374183bed0cb69bbc341cf9755b5b0282a480770bcb8a6c4a81105ae5b4f435b9035a4d8ac53f01181fa2a237243b8a12e0cdeb390
-  data.tar.gz: 03ea9bd24694ad5fa7e38b892d84d52e3b24bf32702133fbcef4414812eeafad52228cc8430ba77508b3fc82bdbb29b4f68c79e7e3ebd4913ac6bf0c84bddbf1
+  metadata.gz: 4aa9e4e8a7cfd3453ba4358ad8cd8f5e6c0856886b4f689215fb87c7a374a5b4350ee8c5ce87702e9e22be0d11e45e4fe081200aa0de709a042823ddb0cd51fd
+  data.tar.gz: 5d867c009e657e111605a24e7dd3d3b9a564e5962d3d890d69c3ef5796d31fbd077bc8d3919babba0230d1c3b3acd6267d8895007de6196458913a188152f6ca

data/lib/rasti/web/controller.rb

@@ -15,22 +15,21 @@ module Rasti
         @render = render
       end
 
-      def execute(action_name)
-        public_send action_name
-      rescue => ex
-        if respond_to? ex.class.name
-          public_send ex.class.name, ex
-        else
-          raise ex
-        end
-      end
-
       class << self
         def action(action_name)
           raise "Undefined action '#{action_name}' in #{name}" unless instance_methods.include? action_name.to_sym
           
           Endpoint.new do |req, res, render|
-            new(req, res, render).execute(action_name)
+            controller = new req, res, render
+            begin
+              controller.public_send action_name
+            rescue => ex
+              if controller.respond_to? ex.class.name
+                controller.public_send ex.class.name, ex
+              else
+                raise ex
+              end
+            end
           end
         end
 

data/lib/rasti/web/route.rb

@@ -2,32 +2,31 @@ module Rasti
   module Web
     class Route
 
-      attr_reader :pattern, :endpoint, :regexp, :params
-      
+      attr_reader :pattern
+
       def initialize(pattern, endpoint=nil, &block)
         @pattern = normalize pattern
         @endpoint = endpoint || Endpoint.new(&block)
-        compile
+        @regexp = compile
       end
 
       def match?(path)
-        !regexp.match(normalize(path)).nil?
+        !@regexp.match(normalize(path)).nil?
       end
 
       def extract_params(path)
-        result = regexp.match path
-        result ? Hash[params.zip(result.captures)] : {}
+        result = @regexp.match path
+        result ? result.names.each_with_object({}) { |v,h| h[v] = result[v] } : {}
+      end
+
+      def call(env)
+        @endpoint.call env
       end
 
-      private 
+      private
 
       def compile
-        @params = []
-        regexp = pattern.gsub(/(:\w+)/) do |match| 
-          @params << match[1..-1]
-          "([^/?#]+)"
-        end
-        @regexp = %r{^#{regexp}$}
+        %r{^#{pattern.gsub(')', '){0,1}').gsub(/:[a-z0-9_-]+/) { |var| "(?<#{var[1..-1]}>[^\/?#]+)" }}$}
       end
 
       def normalize(path)

data/lib/rasti/web/router.rb

@@ -19,7 +19,7 @@ module Rasti
       def call(env)
         route = route_for env 
         env[ROUTE_PARAMS] = route.extract_params env['PATH_INFO']
-        route.endpoint.call env
+        route.call env
       end
 
       private

data/lib/rasti/web/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module Web
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/spec/route_spec.rb

@@ -2,66 +2,62 @@ require 'minitest_helper'
 
 describe Rasti::Web::Route do
 
-  def build_route(pattern, endpoint=:fake_endpoint)
-    Rasti::Web::Route.new pattern, :fake_endpoint 
-  end
+  ROUTES = [
+    '/', 
+    '/resource', 
+    '/resource/:id/:action',
+    '/:resource(/:id(/:action))'
+  ]
 
-  it 'Static' do
-    route = build_route '/resource'
+  RESPONSE = [200, {}, []]
 
-    route.pattern.must_equal '/resource'
-    route.regexp.to_s.must_equal /^\/resource$/.to_s
-    route.endpoint.must_equal :fake_endpoint
-    route.params.must_equal []
+  def build_route(pattern)
+    Rasti::Web::Route.new pattern, ->(env) { RESPONSE }
   end
 
-  it 'Params' do
-    route = build_route '/resource/:id/:action'
-
-    route.pattern.must_equal '/resource/:id/:action'
-    route.regexp.to_s.must_equal /^\/resource\/([^\/?#]+)\/([^\/?#]+)$/.to_s
-    route.endpoint.must_equal :fake_endpoint
-    route.params.must_equal %w(id action)
+  def route_for(path)
+    ROUTES.map    { |r| build_route r }
+          .detect { |r| r.match? path }
   end
 
-  it 'Match' do
-    build_route('/').must_be :match?, '/'
-    build_route('/').wont_be :match?, '/resource'
-    
-    build_route('/resource').must_be :match?, '/resource'
-    build_route('/resource').must_be :match?, '/resource/'
-    build_route('/resource').wont_be :match?, '/'
+  ['', '/'].each do |path|
+    it "Root '#{path}'" do
+      route = route_for path
 
-    build_route('/resource/:id/:action').must_be :match?, '/resource/123/show'
-    build_route('/resource/:id/:action').wont_be :match?, '/123/show'
+      route.pattern.must_equal '/'
+      route.extract_params(path).must_be_empty
+      route.call({}).must_equal RESPONSE
+    end
   end
 
-  it 'Extract params' do
-    build_route('/resource').extract_params('/resource').must_equal Hash.new
-    build_route('/resource/:id/:action').extract_params('/resource/123/show').must_equal 'id' => '123', 'action' => 'show'
-  end
+  ['/resource', '/resource/'].each do |path|
+    it "Static '#{path}'" do
+      route = route_for path
 
-  it 'Normalize path' do
-    build_route('').pattern.must_equal '/'
-    build_route('/').pattern.must_equal '/'
-    build_route('/resource').pattern.must_equal '/resource'
-    build_route('/resource/').pattern.must_equal '/resource'
+      route.pattern.must_equal '/resource'
+      route.extract_params(path).must_be_empty
+      route.call({}).must_equal RESPONSE
+    end
   end
 
-  it 'Block endpoint' do
-    route = Rasti::Web::Route.new('/') do |req, res|
-      res.status = 404
-      res['Content-Type'] = 'text/html'
-      res.write '<h1>Not found</h1>'
-    end
+  it 'Params' do
+    path = '/resource/123/show'
+    route = route_for path
 
-    route.endpoint.must_be_instance_of Rasti::Web::Endpoint
+    route.pattern.must_equal '/resource/:id/:action'
+    route.extract_params(path).must_equal 'id' => '123', 'action' => 'show'
+    route.call({}).must_equal RESPONSE
+  end
 
-    status, headers, response = route.endpoint.call(:fake_env)
+  ['/other', '/other/456', '/other/456/edit'].each do |path|
+    it "Optional params '#{path}'" do
+      route = route_for path
+      sections = path[1..-1].split('/')
 
-    status.must_equal 404
-    headers['Content-Type'].must_equal 'text/html'
-    response.body.must_equal ['<h1>Not found</h1>']
+      route.pattern.must_equal '/:resource(/:id(/:action))'
+      route.extract_params(path).must_equal 'resource' => sections[0], 'id' => sections[1], 'action' => sections[2]
+      route.call({}).must_equal RESPONSE
+    end
   end
 
 end

data/spec/streaming_spec.rb

@@ -7,11 +7,17 @@ describe 'Straming' do
   let(:render) { Rasti::Web::Render.new request, response }
   
   it 'Server sent events' do
-    events = []
-    stream = render.server_sent_events :test_channel
+    render.server_sent_events :test_channel
+
+    response.status.must_equal 200
+    response['Content-Type'].must_equal 'text/event-stream'
+    response['Cache-Control'].must_equal 'no-cache'
+    response['Connection'].must_equal 'keep-alive'
+    response.body.must_be_instance_of Rasti::Web::Stream
 
+    events = []
     thread = Thread.new do
-      stream.each { |e| events << e }
+      response.body.each { |e| events << e }
     end
 
     3.times do |i|
@@ -21,7 +27,7 @@ describe 'Straming' do
     end
 
     while events.count < 3; sleep 0.0001 end
-    stream.close 
+    response.body.close 
 
     events.must_equal 3.times.map { |i| "id: #{i}\nevent: tick\ndata: {\"text\":\"Tick #{i}\"}\n\n" }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-web
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Web blocks to build robust applications