padrino-routing 0.1.3 → 0.1.4

data/README.rdoc

@@ -12,7 +12,7 @@ To install the 'full-stack' padrino framework, simply grab the latest version fr
   $ sudo gem install padrino --source http://gemcutter.org
   
 This will install the necessary padrino gems to get you started.
-Now you are ready to use this gem to enhance your sinatra projects or to create new Padrino applications.
+Now you are ready to use this gem to enhance your existing Sinatra projects or build new Padrino applications.
 
 You can also install only the padrino-routing gem for more fine-grained use:
 
@@ -117,7 +117,7 @@ This will put all named routes within this controller block into the 'admin' nam
   
 Note that controller namespaces are simply a shortcut for standard namespaces and do not differ in any other way.
   
-You can freely use both named route aliases and traditional Sinatra routes in the same application without conflict.
+You can freely use both named route aliases and traditional Sinatra routes in the same application without any conflicts.
 
 See the wiki article for additional information: <...WIKI...>
 

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.summary = "Named route mapping system"
     gem.description = "Enhances padrino with a named route mapping system allowing for advanced routes"
     gem.email = "nesquena@gmail.com"
-    gem.homepage = "http://github.com/padrino/padrino-routing"
+    gem.homepage = "http://github.com/padrino/padrino-framework/tree/master/padrino-routing"
     gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
     gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
     gem.add_runtime_dependency     "padrino-core",  ">= 0.1.1"

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/padrino-routing/helpers.rb

@@ -8,7 +8,7 @@ module Padrino
       # url_for(:admin, show, :id => 5, :name => "demo") => '/admin/path/5/demo'
       def url_for(*route_name)
         values = route_name.extract_options!
-        mapped_url = self.class.named_paths[route_name] || self.class.named_paths[route_name.dup.unshift(self.class.app_name)]
+        mapped_url = self.class.named_paths[route_name] || self.class.named_paths[route_name.dup.unshift(self.class.app_name.to_sym)]
         raise Padrino::RouteNotFound.new("Route alias #{route_name.inspect} is not mapped to a url") unless mapped_url
         result_url = String.new(File.join(self.class.uri_root, mapped_url))
         result_url.scan(%r{/?(:\S+?)(?:/|$)}).each do |placeholder|

data/lib/padrino-routing/named_route.rb

@@ -12,7 +12,7 @@ module Padrino
       # Used to define the url mapping to the supplied alias
       # NamedRoute.new(@app, :account).to('/account/path')
       def to(path)
-        @app.named_paths[@names.unshift(@app.app_name)] = path
+        @app.named_paths[@names.unshift(@app.app_name.to_sym)] = path
       end
 
       # Used to define the url mappings for child aliases within a namespace

data/lib/padrino-routing.rb

@@ -32,7 +32,7 @@ module Padrino
         @_namespace = original
       end
 
-      # Hijacking route method in sinatra to replace a route alias (i.e :account) with the full url string mapping
+      # Hijacking route method in Sinatra to replace a route alias (i.e :account) with the full url string mapping
       # Supports namespaces by accessing the instance variable and appending this to the route alias name
       # If the path is not a symbol, nothing is changed and the original route method is invoked
       def route(verb, path, options={}, &block)
@@ -42,7 +42,7 @@ module Padrino
             map(*route_name).to(mapped_url)
             path = mapped_url
           else # referencing prior named route
-            route_name.unshift(self.app_name)
+            route_name.unshift(self.app_name.to_sym)
             path = named_paths[route_name]
           end
         end

data/padrino-routing.gemspec

@@ -5,24 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-routing}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   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"]
-  s.date = %q{2009-11-20}
+  s.date = %q{2009-11-23}
   s.description = %q{Enhances padrino with a named route mapping system allowing for advanced routes}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
      ".gitignore",
      "LICENSE",
      "README.rdoc",
-     "README.rdoc",
-     "Rakefile",
      "Rakefile",
      "VERSION",
      "lib/padrino-routing.rb",
@@ -30,7 +27,6 @@ Gem::Specification.new do |s|
      "lib/padrino-routing/helpers.rb",
      "lib/padrino-routing/named_route.rb",
      "padrino-routing.gemspec",
-     "test/active_support_helpers.rb",
      "test/fixtures/adv_routing_app/Gemfile",
      "test/fixtures/adv_routing_app/app.rb",
      "test/fixtures/adv_routing_app/config/apps.rb",
@@ -44,7 +40,7 @@ Gem::Specification.new do |s|
      "test/test_padrino_adv_routing.rb",
      "test/test_padrino_routing.rb"
   ]
-  s.homepage = %q{http://github.com/padrino/padrino-routing}
+  s.homepage = %q{http://github.com/padrino/padrino-framework/tree/master/padrino-routing}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}

data/test/fixtures/adv_routing_app/app.rb

@@ -1,4 +1,3 @@
 class AdvRoutingDemo < Padrino::Application
   set :app_file, __FILE__
-  set :reload, false
 end

data/test/helper.rb

@@ -7,13 +7,9 @@ require 'webrat'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'active_support_helpers'
 require 'padrino-helpers'
 
 class Test::Unit::TestCase
-  include Padrino::Helpers::OutputHelpers
-  include Padrino::Helpers::TagHelpers
-  include Padrino::Helpers::AssetTagHelpers
   include Rack::Test::Methods
   include Webrat::Methods
   include Webrat::Matchers
@@ -47,27 +43,23 @@ class Test::Unit::TestCase
     assert matcher.matches?(html), matcher.failure_message
   end
 
-  # Silences the output by redirecting to stringIO
-  # silence_logger { ...commands... } => "...output..."
-  def silence_logger(&block)
-    self.class.silence_logger(&block)
+  # Asserts that a file matches the pattern
+  def assert_match_in_file(pattern, file)
+    assert File.exist?(file), "File '#{file}' does not exist!"
+    assert_match pattern, File.read(file)
   end
-  
+end
+
+class Object
   # Silences the output by redirecting to stringIO
   # silence_logger { ...commands... } => "...output..."
-  def self.silence_logger(&block)
+  def silence_logger(&block)
     orig_stdout = $stdout
     $stdout = log_buffer = StringIO.new
     block.call
     $stdout = orig_stdout
     log_buffer.rewind && log_buffer.read
   end
-
-  # Asserts that a file matches the pattern
-  def assert_match_in_file(pattern, file)
-    assert File.exist?(file), "File '#{file}' does not exist!"
-    assert_match pattern, File.read(file)
-  end
 end
 
 module Webrat

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-routing
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 -08:00
+date: 2009-11-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,7 +92,6 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
 files: 
 - .document
@@ -106,7 +105,6 @@ files:
 - lib/padrino-routing/helpers.rb
 - lib/padrino-routing/named_route.rb
 - padrino-routing.gemspec
-- test/active_support_helpers.rb
 - test/fixtures/adv_routing_app/Gemfile
 - test/fixtures/adv_routing_app/app.rb
 - test/fixtures/adv_routing_app/config/apps.rb
@@ -120,7 +118,7 @@ files:
 - test/test_padrino_adv_routing.rb
 - test/test_padrino_routing.rb
 has_rdoc: true
-homepage: http://github.com/padrino/padrino-routing
+homepage: http://github.com/padrino/padrino-framework/tree/master/padrino-routing
 licenses: []
 
 post_install_message: 

data/test/active_support_helpers.rb

@@ -1,7 +0,0 @@
-unless Fixnum.method_defined?(:days)
-  require 'active_support/core_ext/object/misc'
-  require 'active_support/core_ext/date'
-  require 'active_support/core_ext/time'
-  require 'active_support/core_ext/numeric'
-  require 'active_support/duration'
-end