padrino-routing 0.1.5 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/padrino-routing/controller_ext.rb

@@ -4,9 +4,8 @@ if defined?(Padrino::Application) # Extends padrino application if being used
       # Makes the routes defined in the block and in the Modules given
       # in `extensions` available to the application
       def controllers_with_namespaces(*namespace, &block)
-        must_use_namespaces = namespace.size == 1 and namespace.first.is_a?(Symbol)
+        must_use_namespaces = namespace.size == 1 && namespace.first.is_a?(Symbol)
         return controllers_without_namespaces(*namespace, &block) unless must_use_namespaces
-        self.reset_routes! if reload?
         namespace(namespace.first) { instance_eval(&block) } if block_given?
       end
 

data/lib/padrino-routing/named_route.rb

@@ -10,9 +10,11 @@ module Padrino
       end
 
       # Used to define the url mapping to the supplied alias
+      # Appends the application name to front of route if necessary
       # NamedRoute.new(@app, :account).to('/account/path')
       def to(path)
-        @app.named_paths[@names.unshift(@app.app_name.to_sym)] = path
+        @names.unshift(@app.app_name.to_sym) unless @names.first == @app.app_name.to_sym
+        @app.named_paths[@names] = path
       end
 
       # Used to define the url mappings for child aliases within a namespace

data/lib/padrino-routing.rb

@@ -18,8 +18,8 @@ module Padrino
       # map(:accounts).to('/accounts/url')
       # map(:admin, :show).to('/admin/show/:id')
       # map(:admin) { |namespace| namespace.map(:show).to('/admin/show/:id') }
-      def map(*args, &block)
-        named_router = Padrino::Routing::NamedRoute.new(self, *args)
+      def map(*names, &block)
+        named_router = Padrino::Routing::NamedRoute.new(self, *names)
         block_given? ? block.call(named_router) : named_router
       end
 

data/padrino-routing.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-routing}
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-routing
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Padrino Team