rasti-web 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7228c96c1a32e1eca7001403d09d17031d1bdc22
-  data.tar.gz: a07edbbbbc8ef67d38932d7e4badd46fa8968cab
+  metadata.gz: 50a62a6c007c11424a97fd9eb207ca0cb1641bb0
+  data.tar.gz: 04bf7b2fe637a40625b401227d8c1ffe61088b6c
 SHA512:
-  metadata.gz: 85d1b34deeeee8725d484d713d262b14bbd47651c62f41cc4c723b75a1449846077d3fff716a48df79dedabdfde4ed3b8ae54f4734b6bfc591d0b952cac6cffd
-  data.tar.gz: 19b9db628da84226503daf87be120ea6f298c692d6a6a566119c7e0eb241fd118849505e2972cf96c2809a53ec6f3177a0e71c067024fb476ae3870ae356bb8d
+  metadata.gz: 22684f3a9e873bdf5e3a30e468013ebe310d33c555e7b37068f016e765eecfbd0d89e9109d2434305ba2b90afd21e6b4fc972fd1e00e5a0967848b9da90bdb95
+  data.tar.gz: f8ec4a69517f0c2c8eec1d130b0b70bb3ae34ac7752cdff43da466fa49b439dd072df5ed243ff303adcce1090a9b5fa28ceefa53f6c3dd12b6f223cd3ec0fda1

data/.travis.yml

@@ -5,8 +5,7 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.0
+  - 2.4.0
   - jruby
 before_install:
-  - gem install bundler
-services:
-  - redis-server
+  - gem install bundler

data/lib/rasti/web/render.rb

@@ -72,14 +72,6 @@ module Rasti
         layout(layout_template) { view_context.render template, locals }
       end
 
-      def server_sent_events(channel_id)
-        response.status = 200
-        response['Content-Type']  = 'text/event-stream'
-        response['Cache-Control'] = 'no-cache'
-        response['Connection']    = 'keep-alive'
-        response.body = Channel[channel_id].subscribe
-      end
-
       private
 
       def respond_with(status, headers, body)

data/lib/rasti/web/route.rb

@@ -15,8 +15,8 @@ module Rasti
       end
 
       def extract_params(path)
-        result = @regexp.match path
-        result ? result.names.each_with_object({}) { |v,h| h[v] = result[v] } : {}
+        result = @regexp.match normalize(path)
+        result ? result.names.each_with_object(Hash::Indifferent.new) { |v,h| h[v] = result[v] } : {}
       end
 
       def call(env)
@@ -26,7 +26,10 @@ module Rasti
       private
 
       def compile
-        %r{^#{pattern.gsub(')', '){0,1}').gsub(/:[a-z0-9_-]+/) { |var| "(?<#{var[1..-1]}>[^\/?#]+)" }}$}
+        compiled = pattern.gsub(')', '){0,1}')
+                          .gsub('/*', '(\/(?<wildcard>.*))?')
+                          .gsub(/:[a-z0-9_-]+/) { |var| "(?<#{var[1..-1]}>[^\/?#]+)" }
+        %r{^#{compiled}$}
       end
 
       def normalize(path)

data/lib/rasti/web/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module Web
-    VERSION = '0.2.3'
+    VERSION = '1.0.0'
   end
 end

data/lib/rasti/web.rb

@@ -7,7 +7,6 @@ require 'class_config'
 require 'forwardable'
 require 'logger'
 require 'hash_ext'
-require 'broadcaster'
 
 require_relative 'web/route'
 require_relative 'web/router'
@@ -18,13 +17,11 @@ require_relative 'web/view_context'
 require_relative 'web/render'
 require_relative 'web/request'
 require_relative 'web/controller'
-require_relative 'web/channel'
-require_relative 'web/stream'
-require_relative 'web/server_sent_event'
 require_relative 'web/version'
 
 module Rasti
   module Web
+
     ROUTE_PARAMS = 'rack.request.route_params'
 
     extend ClassConfig
@@ -34,10 +31,10 @@ module Rasti
     attr_config :default_layout, 'layout'
     attr_config :helpers, []
     attr_config :logger, Logger.new(STDOUT)
-    attr_config :channels_prefix, 'rasti-web:channels'
 
     after_config do |config|
       config.helpers.each { |h| ViewContext.send :include, h }
     end
+
   end
 end

data/rasti-web.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'class_config', '~> 0.0.2'
   spec.add_dependency 'hash_ext', '~> 0.1'
   spec.add_dependency 'content-type', '~> 0.0'
-  spec.add_dependency 'broadcaster', '~> 0.1'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 11.0'
@@ -34,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'pry-nav', '~> 0.2'
-  spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'rack-test', '~> 0.6'
 
   if RUBY_VERSION < '2'
     spec.add_development_dependency 'term-ansicolor', '~> 1.3.0'

data/spec/minitest_helper.rb

@@ -15,8 +15,4 @@ Rasti::Web.configure do |config|
   config.views_path = File.expand_path '../views', __FILE__
   config.helpers << ContextMethodHelper
   config.logger.level = Logger::ERROR
-end
-
-Broadcaster.configure do |config|
-  config.logger = Rasti::Web.logger
 end

data/spec/route_spec.rb

@@ -4,6 +4,10 @@ describe Rasti::Web::Route do
 
   ROUTES = [
     '/', 
+    '/*/wildcard/action',
+    '/wildcard/*/action',
+    '/wildcard/*/action/:id',
+    '/wildcard/*',
     '/resource', 
     '/resource/:id/:action',
     '/:resource(/:id(/:action))'
@@ -45,7 +49,7 @@ describe Rasti::Web::Route do
     route = route_for path
 
     route.pattern.must_equal '/resource/:id/:action'
-    route.extract_params(path).must_equal 'id' => '123', 'action' => 'show'
+    route.extract_params(path).must_equal id: '123', action: 'show'
     route.call({}).must_equal RESPONSE
   end
 
@@ -55,7 +59,49 @@ describe Rasti::Web::Route do
       sections = path[1..-1].split('/')
 
       route.pattern.must_equal '/:resource(/:id(/:action))'
-      route.extract_params(path).must_equal 'resource' => sections[0], 'id' => sections[1], 'action' => sections[2]
+      route.extract_params(path).must_equal resource: sections[0], id: sections[1], action: sections[2]
+      route.call({}).must_equal RESPONSE
+    end
+  end
+
+  describe 'Wildcard' do
+    it 'Head' do
+      path = '/section/sub_section/wildcard/action'
+
+      route = route_for path
+
+      route.pattern.must_equal '/*/wildcard/action'
+      route.extract_params(path).must_equal wildcard: 'section/sub_section'
+      route.call({}).must_equal RESPONSE      
+    end
+
+    it 'Middle' do
+      path = '/wildcard/section/sub_section/action'
+
+      route = route_for path
+
+      route.pattern.must_equal '/wildcard/*/action'
+      route.extract_params(path).must_equal wildcard: 'section/sub_section'
+      route.call({}).must_equal RESPONSE
+    end
+
+    ['/wildcard', '/wildcard/123', '/wildcard/123/edit'].each do |path|
+      it "Tail #{path}" do
+        route = route_for path
+
+        route.pattern.must_equal '/wildcard/*'
+        route.extract_params(path).must_equal wildcard: path["/wildcard/".size..-1]
+        route.call({}).must_equal RESPONSE
+      end
+    end
+
+    it 'Params' do
+      path = '/wildcard/section/sub_section/action/123'
+      
+      route = route_for path
+
+      route.pattern.must_equal '/wildcard/*/action/:id'
+      route.extract_params(path).must_equal wildcard: 'section/sub_section', id: '123'
       route.call({}).must_equal RESPONSE
     end
   end

data/spec/router_spec.rb

@@ -32,6 +32,7 @@ describe Rasti::Web::Router do
     status, headers, response = router.call get('/not_found')
 
     status.must_equal 404
+    headers.must_equal 'Content-Length' => '25'
     response.body.must_equal ['Not found: GET /not_found']
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-web
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: broadcaster
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -224,16 +210,16 @@ dependencies:
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 description: Web blocks to build robust applications
 email:
 - gabynaiman@gmail.com
@@ -253,15 +239,12 @@ files:
 - lib/rasti-web.rb
 - lib/rasti/web.rb
 - lib/rasti/web/application.rb
-- lib/rasti/web/channel.rb
 - lib/rasti/web/controller.rb
 - lib/rasti/web/endpoint.rb
 - lib/rasti/web/render.rb
 - lib/rasti/web/request.rb
 - lib/rasti/web/route.rb
 - lib/rasti/web/router.rb
-- lib/rasti/web/server_sent_event.rb
-- lib/rasti/web/stream.rb
 - lib/rasti/web/template.rb
 - lib/rasti/web/version.rb
 - lib/rasti/web/view_context.rb
@@ -276,7 +259,6 @@ files:
 - spec/route_spec.rb
 - spec/router_spec.rb
 - spec/sample_file.zip
-- spec/streaming_spec.rb
 - spec/template_spec.rb
 - spec/views/context_and_locals.erb
 - spec/views/context_method.erb
@@ -319,7 +301,6 @@ test_files:
 - spec/route_spec.rb
 - spec/router_spec.rb
 - spec/sample_file.zip
-- spec/streaming_spec.rb
 - spec/template_spec.rb
 - spec/views/context_and_locals.erb
 - spec/views/context_method.erb

data/lib/rasti/web/channel.rb

@@ -1,54 +0,0 @@
-module Rasti
-  module Web
-
-    class Channel
-
-      attr_reader :id
-
-      def initialize(id)
-        @id = id
-        @subscriptions = {}
-        @mutex = Mutex.new
-      end
-
-      def subscribe
-        stream = Stream.new
-        
-        subscription_id = broadcaster.subscribe id do |message|
-          if stream.open?
-            stream.write message
-          else
-            sid = mutex.synchronize { subscriptions.delete stream }
-            broadcaster.unsubscribe sid
-          end
-        end
-
-        mutex.synchronize { subscriptions[stream] = subscription_id }
-
-        stream
-      end
-
-      def publish(message)
-        broadcaster.publish id, message
-      end
-
-      def self.broadcaster
-        @broadcaster ||= Broadcaster.new id: Web.channels_prefix, logger: Web.logger
-      end
-
-      def self.[](id)
-        @channels ||= Hash.new { |h,k| h[k] = self.new k }
-        @channels[id]
-      end
-
-      private
-
-      attr_reader :subscriptions, :mutex
-
-      def broadcaster
-        self.class.broadcaster
-      end
-
-    end
-  end
-end

data/lib/rasti/web/server_sent_event.rb

@@ -1,31 +0,0 @@
-module Rasti
-  module Web
-    class ServerSentEvent < String
-
-      attr_reader :data, :id, :event
-
-      private
-
-      def initialize(data, options={})
-        @data  = data
-        @id    = options[:id]
-        @event = options[:event]
-
-        super serialize
-      end
-
-      def serialize
-        serialized_data = data.respond_to?(:to_json) ? data.to_json : data.to_s
-
-        message = ''
-        message << "id: #{id}\n" if id
-        message << "event: #{event}\n" if event
-        serialized_data.split("\n").each do |d|
-          message << "data: #{d}\n"
-        end
-        message << "\n"
-      end
-
-    end
-  end
-end

data/lib/rasti/web/stream.rb

@@ -1,39 +0,0 @@
-module Rasti
-  module Web
-    class Stream
-
-      TIMEOUT = 0.0001
-
-      def initialize
-        @queue = Queue.new
-        @closed = false
-      end
-
-      def write(message)
-        raise 'Closed stream' if closed?
-        @queue << message
-      end
-
-      def each
-        while open?
-          message = @queue.pop
-          yield message if message
-          sleep TIMEOUT
-        end
-      end
-
-      def close
-        @closed = true
-      end
-
-      def closed?
-        @closed
-      end
-
-      def open?
-        !closed?
-      end
-
-    end
-  end
-end

data/spec/streaming_spec.rb

@@ -1,49 +0,0 @@
-require 'minitest_helper'
-
-describe 'Straming' do
-
-  let(:request) { Rack::Request.new Hash.new }
-  let(:response) { Rack::Response.new }
-  let(:render) { Rasti::Web::Render.new request, response }
-
-  def wait_for(&block)
-    Timeout.timeout(3) do
-      while !block.call
-        sleep 0.0001
-      end
-    end
-  end
-  
-  it 'Server sent events' do
-    render.server_sent_events :channel_1
-
-    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.new do
-      response.body.each { |e| events << e }
-    end
-
-    channel_1 = Rasti::Web::Channel[:channel_1]
-    channel_2 = Rasti::Web::Channel[:channel_2]
-
-    3.times do |i|
-      data = {text: "Tick #{i}"}
-      event = Rasti::Web::ServerSentEvent.new data, id: i, event: 'tick'
-      channel_1.publish event
-      channel_2.publish event
-    end
-
-    wait_for { events.count == 3 }
-    
-    response.body.close 
-
-    events.must_equal 3.times.map { |i| "id: #{i}\nevent: tick\ndata: {\"text\":\"Tick #{i}\"}\n\n" }
-  end
-
-end