galago-router 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d57fe2ce224db366f326e84d2f12eba38bbe6120
-  data.tar.gz: 21925f7fdb67bfbb2766f2e862f588220c7a1eac
+  metadata.gz: 7ca65e8d3da9c0e6e460c0b264402285bd9d2dfa
+  data.tar.gz: 774adf1034c62b50bd690092cc6e1efc6e9dccaf
 SHA512:
-  metadata.gz: 7d27054aac2da1077f7f3adb2cb6e3b631bc95291d8571f31541015b59f8b913702630b38935f74b46fbf8b386aa59e84cd05cca115f79324f255e10d1914266
-  data.tar.gz: 69186fb89959bd9d8aa96537e0202c2c70924a5a58b3f3cf0b832ef09ff59aef7b13bfd562bc37edba2132575bf3d39861e2cf6ca87297725e59bbc6d97e195b
+  metadata.gz: e72781d341817aada32d6f133fecb622e6f58954491acbfdc3d5f7698301b8e8cd189addc592195478c431a9cc4cbffa4fa7539fb009baa8182eed08c25e1eeb
+  data.tar.gz: 8db3316782ebb5076861c3701db5ff52bd7ab6b51363d8ba87513cbf702457ec48978cf88f7f4a12badbec04571889ba7c493eef54962c33645d28c2be6a05bf

data/lib/galago/router/dsl.rb

@@ -36,16 +36,10 @@ module Galago
       private
 
       def add_route(method, path, application)
-        path_with_namespace = add_namespace_to_path(path)
+        path_with_namespace = Path.join(@namespace, 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
 end

data/lib/galago/router/path.rb

@@ -2,6 +2,16 @@ module Galago
   class Router
     class Path
 
+      REPEATED_SLASH = /\/{1,}/
+      TRAILING_SLASH = /\/$/
+
+      def self.join(*paths)
+        path = "/#{paths.join('/')}"
+        path = path.gsub(REPEATED_SLASH, '/')
+        path = path.gsub(TRAILING_SLASH, '')
+        path
+      end
+
       def initialize(path)
         @path = path.to_s
       end

data/lib/galago/router/version.rb

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

data/spec/galago/router/path_spec.rb

@@ -3,6 +3,23 @@ require 'spec_helper'
 module Galago
   describe Router::Path do
 
+    describe ".join" do
+      it "joins the provided segments with a '/'" do
+        path = Router::Path.join('foo', 'bar')
+        expect(path).to eql '/foo/bar'
+      end
+
+      it "removes repeated '/'" do
+        path = Router::Path.join('//foo', '///bar', '/baz')
+        expect(path).to eql '/foo/bar/baz'
+      end
+
+      it "removes trailing '/'" do
+        path = Router::Path.join('foo', 'bar/')
+        expect(path).to eql '/foo/bar'
+      end
+    end
+
     describe "#recognizes?" do
       it "recognizes exact matches" do
         path = Router::Path.new('/users')

data/spec/galago/router/version_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Galago
   describe 'Router::VERSION' do
     it "current" do
-      expect(Router::VERSION).to eql '0.0.2'
+      expect(Router::VERSION).to eql '0.1.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: galago-router
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joe Karayusuf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack