tiny_cms 0.2.8 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.10

data/lib/tiny_cms/node.rb

@@ -91,9 +91,12 @@ module TinyCMS
 
     # Dynamic routing
     def add_dynamic_route!
-      controller, action = dynamic_route.split('#')
+      controller, action      = dynamic_route.split('#')
       self.dynamic_route_uuid = @@uuid.generate
-      new_route = ActionController::Routing::Routes.builder.build(permalink, {:controller => controller, :action => action, :dynamic_route_uuid => dynamic_route_uuid})
+      action, params          = action.split('?') 
+      route                   = {:controller => controller, :action => action, :dynamic_route_uuid => dynamic_route_uuid}
+      route.merge! Rack::Utils.parse_query(params) if params
+      new_route = ActionController::Routing::Routes.builder.build(path, route)
       ActionController::Routing::Routes.routes.unshift new_route
     end
 

data/test/test_node.rb

@@ -267,13 +267,18 @@ class PageTest < Test::Unit::TestCase
 
   context 'Dynamic routing' do
     setup do
-      @page = Factory :page, :dynamic_route => "dummy#index"
+      @page = Factory :page, :parent => Factory(:page),:dynamic_route => "dummy#index"
     end
 
     should 'generate route' do
       assert_routing @page.path, :controller => 'dummy', :action => 'index', :dynamic_route_uuid => @page.dynamic_route_uuid
     end
 
+    should 'generate route with params' do
+      @page = Factory :page, :dynamic_route => "dummy#index?one=1&two=2"
+      assert_recognizes({:controller => 'dummy', :action => 'index', :dynamic_route_uuid => @page.dynamic_route_uuid, :one => '1', :two => '2'}, @page.path) 
+    end
+
     should 'remove route on destroy' do
       @page.destroy
       assert_equal 0, ActionController::Routing::Routes.routes.select{ |route| route.segments.inject(""){|str,s| str << s.to_s} == "#{@page.path}/" }.size
@@ -288,6 +293,9 @@ class PageTest < Test::Unit::TestCase
         assert_routing @page.path, :controller => 'dummy', :action => 'other', :dynamic_route_uuid => @page.dynamic_route_uuid
       end
 
+      should 'generate route' do
+        assert_routing @page.path, :controller => 'dummy', :action => 'other', :dynamic_route_uuid => @page.dynamic_route_uuid
+      end
       should 'should remove previous route' do
         assert_equal 1, ActionController::Routing::Routes.routes.select{ |route| route.segments.inject(""){|str,s| str << s.to_s} == "#{@page.path}/" }.size
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_cms
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Macario
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -05:00
+date: 2010-11-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency