lib/dolly/name_space.rb in dolly-0.5.7 vs lib/dolly/name_space.rb in dolly-0.6.0

@@ -1,21 +1,22 @@
 require "active_model/naming"
 
+#TODO: remove this module to be part of Dolly::Document
 module Dolly
   module NameSpace
     include ActiveModel::Naming
 
     def name_paramitized
       model_name.element
     end
 
     def base_id id
-      return id unless id =~ /^#{name_paramitized}\//
-      id.match("[^/]+[/](.+)")[1]
+      id = URI.unescape id
+      id.sub %r~^#{name_paramitized}/~, ''
     end
 
     def namespace id
-      return id if id =~ /^#{name_paramitized}/
+      return id if id =~ %r~^#{name_paramitized}/~
       "#{name_paramitized}/#{id}"
     end
   end
 end