galago-router 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24dc9a36ea2bca4e8d75e2722b5ae5a78010d19f
-  data.tar.gz: 39497251884dfba4e67bc8746029734b13a87642
+  metadata.gz: d57fe2ce224db366f326e84d2f12eba38bbe6120
+  data.tar.gz: 21925f7fdb67bfbb2766f2e862f588220c7a1eac
 SHA512:
-  metadata.gz: 7cba7c52f27784cb3fe98ab0b199f8d88dfd911808bdeece4039d969fa44eec49feefc99f9b908505a5003268a58aa82780daea0a197b722dcbcf2791a372286
-  data.tar.gz: 41bf1fdb47a22e7cdd7a873c3f8209c5ceedabaa60387bf37e2f0eb1e9a229c028dc7065383b4fa3a9b1cebaf34f1a3bf3dd289e4111e442e299f938794f56ef
+  metadata.gz: 7d27054aac2da1077f7f3adb2cb6e3b631bc95291d8571f31541015b59f8b913702630b38935f74b46fbf8b386aa59e84cd05cca115f79324f255e10d1914266
+  data.tar.gz: 69186fb89959bd9d8aa96537e0202c2c70924a5a58b3f3cf0b832ef09ff59aef7b13bfd562bc37edba2132575bf3d39861e2cf6ca87297725e59bbc6d97e195b

data/README.md

@@ -24,11 +24,17 @@ require 'galago/router'
 require 'rack/lobster'
 
 router = Galago::Router.new do
-  get    '/lobsters',       to: Rack::Lobster.new
-  post   '/lobsters',       to: Rack::Lobster.new
-  patch  '/lobsters/:name', to: Rack::Lobster.new
-  put    '/lobsters/:name', to: Rack::Lobster.new
-  delete '/lobsters/:name', to: Rack::Lobster.new
+  get    '/foo',       to: ->(env) { [200, {}, ['foo']] }
+  post   '/bar/:bar',  to: ->(env) { [200, {}, ['bar']] }
+
+  namespace 'lobsters' do
+    get  '/', to: Rack::Lobster.new
+    post '/', to: Rack::Lobster.new
+
+    patch  ':name', to: Rack::Lobster.new
+    put    ':name', to: Rack::Lobster.new
+    delete ':name', to: Rack::Lobster.new
+  end
 end
 
 run router

data/examples/readme.ru

@@ -0,0 +1,19 @@
+require 'galago/router'
+require 'rack/lobster'
+
+router = Galago::Router.new do
+  get    '/foo',       to: ->(env) { [200, {}, ['foo']] }
+  post   '/bar/:bar',  to: ->(env) { [200, {}, ['bar']] }
+
+  namespace :lobsters do
+    get  '/', to: Rack::Lobster.new
+    post '/', to: Rack::Lobster.new
+
+    patch  ':name', to: Rack::Lobster.new
+    put    ':name', to: Rack::Lobster.new
+    delete ':name', to: Rack::Lobster.new
+  end
+end
+
+run router
+

data/lib/galago/router/dsl.rb

@@ -3,27 +3,48 @@ module Galago
     class DSL
       def initialize(router, block)
         @router = router
+        @namespace = ''
         instance_eval(&block)
       end
 
+      def namespace(new_namespace)
+        @namespace << "/#{new_namespace}"
+        yield
+        @namespace = ''
+      end
+
       def get(path, options)
-        @router.add_route("GET", path, options[:to])
+        add_route("GET", path, options[:to])
       end
 
       def patch(path, options)
-        @router.add_route("PATCH", path, options[:to])
+        add_route("PATCH", path, options[:to])
       end
 
       def post(path, options)
-        @router.add_route("POST", path, options[:to])
+        add_route("POST", path, options[:to])
       end
 
       def put(path, options)
-        @router.add_route("PUT", path, options[:to])
+        add_route("PUT", path, options[:to])
       end
 
       def delete(path, options)
-        @router.add_route("DELETE", path, options[:to])
+        add_route("DELETE", path, options[:to])
+      end
+
+      private
+
+      def add_route(method, path, application)
+        path_with_namespace = add_namespace_to_path(path)
+        @router.add_route(method, path_with_namespace, application)
+      end
+
+      def add_namespace_to_path(path)
+        path = "#{@namespace}/#{path}"
+        path = path.gsub('//', '/')
+        path = path.gsub(/\/$/, '')
+        path
       end
     end
   end

data/lib/galago/router/path.rb

@@ -34,7 +34,7 @@ module Galago
 
       def convert_path_to_regex(path)
         regexp = path.to_s.gsub(/\:\w+/, '([\w-]+)')
-        Regexp.new("^#{regexp}$")
+        /\A#{regexp}$/
       end
 
       def identify_params_in_path(path)

data/lib/galago/router/version.rb

@@ -1,5 +1,5 @@
 module Galago
   class Router
-    VERSION = '0.0.2'
+    VERSION = '0.1.0'
   end
 end

data/spec/galago/router/path_spec.rb

@@ -18,6 +18,11 @@ module Galago
         path = Router::Path.new('/users/:id')
         expect(path).not_to be_recognizes '/users/:id'
       end
+
+      it "does not recognize paths with newlines" do
+        path = Router::Path.new('/users/:id')
+        expect(path).not_to be_recognizes "\n/users/1"
+      end
     end
 
     describe "#to_s" do

data/spec/galago/router_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Galago
   describe Router do
-    describe '.routes' do
+    describe 'routes' do
       it 'adds the specified routes' do
         router = Router.new do
           get    '/foo' , to: lambda { |env| 'bar' }
@@ -18,6 +18,50 @@ module Galago
         expect(router).to have_route(:put, '/foo')
         expect(router).to have_route(:delete, '/foo')
       end
+
+      it 'adds the namespace to the route' do
+        router = Router.new do
+          namespace :foo do
+            get  '/', to: ->(env) { [200, {}, ['foo']] }
+            post '/', to: ->(env) { [200, {}, ['post foo']] }
+
+            get    '/:foo', to: ->(env) { [200, {}, ['get :foo']] }
+            patch  '/:foo', to: ->(env) { [200, {}, ['patch :foo']] }
+            put    '/:foo', to: ->(env) { [200, {}, ['put :foo']] }
+            delete '/:foo', to: ->(env) { [200, {}, ['delete :foo']] }
+          end
+        end
+
+        expect(router).to have_route(:get, '/foo')
+        expect(router).to have_route(:post, '/foo')
+
+        expect(router).to have_route(:get, '/foo/1')
+        expect(router).to have_route(:patch, '/foo/2')
+        expect(router).to have_route(:put, '/foo/3')
+        expect(router).to have_route(:delete, '/foo/4')
+      end
+
+      it 'can have multiple namespaces' do
+        router = Router.new do
+          namespace :foo do
+            get '/', to: ->(env) { [200, {}, ['foo']] }
+
+            namespace :bar do
+              get '/',    to: ->(env) { [200, {}, ['foo bar']] }
+              get ':bar', to: ->(env) { [200, {}, ['foo bar']] }
+            end
+          end
+
+          namespace :hello do
+            get '/', to: ->(env) { [200, {}, ['hello']] }
+          end
+        end
+
+        expect(router).to have_route(:get, '/foo')
+        expect(router).to have_route(:get, '/foo/bar')
+        expect(router).to have_route(:get, '/foo/bar/1')
+        expect(router).to have_route(:get, '/hello')
+      end
     end
 
     describe "#add_route" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: galago-router
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Joe Karayusuf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -108,6 +108,7 @@ files:
 - Rakefile
 - examples/echo_param.ru
 - examples/lobster.ru
+- examples/readme.ru
 - galago-router.gemspec
 - lib/galago/router.rb
 - lib/galago/router/dsl.rb