clearwater 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb24eb4af46552525a7cb79d00efd56b4c90b083
-  data.tar.gz: b7e10a82f1cca42eec4cf054cb404cb964c6a351
+  metadata.gz: 0f3b1ded6dac98af01bec9bdaedc42f78ddafc4e
+  data.tar.gz: 284c6c9a0481dd5e6991709422bb879ede4f9586
 SHA512:
-  metadata.gz: 8c94a24f020fb882c18425ef7b79b1799f2a4c8fc31b00bba21e0c776083cef8524fee2bde5f784941eb22cec37cb0b3a61bae7f065bc80d315021186a4dd486
-  data.tar.gz: a216d0c5987d376691857ad8c38f7cff6475f301471b54bce1ae56d627e9cd9d62efd915fef9a5ba2d3968406e391afdb09884890f7aeaad222152cf0ea9a844
+  metadata.gz: be833a327efea9000a92d936c1e78b33843e8f0222290d77175d797a87e2646e22c362e2960f27068d7bbd111ccd13c8cee5cf25c7e40a4ae07e68c85bad0036
+  data.tar.gz: 5ac50a1cca2683d81683dea330b613fa32841e5c1df92ddb98d6ffce400978c171189cf986a868cd870f5d8afadc4c74946da0538fdc1c4b4534c543e0d24153

data/lib/clearwater/version.rb

@@ -1,3 +1,3 @@
 module Clearwater
-  VERSION = "1.0.0.beta2"
+  VERSION = "1.0.0.beta3"
 end

data/opal/clearwater/router.rb

@@ -25,7 +25,10 @@ module Clearwater
     end
 
     def canonical_path_for_path path
-      routes_for_path(path).map { |r| "/#{r.key}" }.join
+      routes_for_path(path).map { |r|
+        namespace = r.namespace
+        "#{"/#{namespace}" if namespace}/#{r.key}"
+      }.join
     end
 
     def targets_for_path path
@@ -49,6 +52,10 @@ module Clearwater
     def canonical_path
     end
 
+    def nested_routes
+      @routes
+    end
+
     def current_path
       location.path
     end

data/opal/clearwater/router/route.rb

@@ -29,6 +29,10 @@ module Clearwater
         end
       end
 
+      def namespace
+        parent.nested_routes.namespace
+      end
+
       private
 
       def param_key?

data/opal/clearwater/router/route_collection.rb

@@ -28,8 +28,13 @@ module Clearwater
         @routes << route
       end
 
-      def namespace path
-        @namespace = path
+      def namespace *args
+        path = args.first
+        if path
+          @namespace = path
+        end
+
+        @namespace
       end
 
       def [] route_names

data/spec/clearwater/router_spec.rb

@@ -48,5 +48,18 @@ module Clearwater
     it 'gets the params from the path' do
       expect(router.params('/articles/123')).to eq({ article_id: '123' })
     end
+
+    it 'gets params with a namespace' do
+      component = routed_component
+      router = Router.new do
+        namespace 'clearwater'
+
+        route 'articles' => component do
+          route ':article_id' => component
+        end
+      end
+
+      expect(router.params('/clearwater/articles/123')).to eq({ article_id: '123' })
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clearwater
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal