sinatra_more 0.3.14 → 0.3.15

data/README.rdoc

@@ -580,7 +580,7 @@ or perhaps we want to have a short body without the need for a template file:
 
 See the wiki article for additional information: <http://wiki.github.com/nesquena/sinatra_more/mailerplugin>
 
-== RoutingPlugin
+=== RoutingPlugin
 
 This component provides Sinatra with an enhanced url routing system which enables named route aliases to be defined
 and used throughout your application to refer to urls. The benefits of this is that instead of having to hard-code route urls

data/ROADMAP

@@ -14,12 +14,19 @@ Use Bundler for managing dependencies:
 Framework structure:
 
  * sinatra-core    (the existing sinatra framework)          <= from Sinatra
+ * sinatra-gen     (easy generation of and for sinatra apps) <= from Generator
  * sinatra-helpers (adds the markup and renderer helpers)    <= from MarkupPlugin, RenderPlugin
  * sinatra-mailer  (mail handling for sinatra applications)  <= from MailerPlugin
- * sinatra-gen     (easy generation of and for sinatra apps) <= from Generator
- * sinatra-admin   (admin management dashboard for content)  <= from Lipsiadmin (ported)
  * sinatra-routing (sinatra route mapping system)            <= from RoutingPlugin
  * sinatra-cache   (page and fragment caching support)       
+ * sinatra-admin   (admin management dashboard for content)  <= from Lipsiadmin (ported)
+ 
+Additional wish-list features (integrate existing plugin) (?)
+
+ * Internationalization  - http://r18n.rubyforge.org/#sinatra
+ * Asynchronous Commands - http://github.com/deadprogrammer/spork
+ * Capistrano Deployment - http://github.com/nakajima/capinatra (?)
+ * Job Queue             - http://github.com/adamcooke/resque (or http://github.com/bmizerany/sinatra-dj)
 
 'sinatra-cache' Caching concept:
 

data/TODO

@@ -1,10 +1,7 @@
 = RESOURCES
 
 - Check out the following sinatra extensions:
-  * http://github.com/emk/sinatra-url-for/
   * http://github.com/wbzyl/sinatra-static-assets
-  * http://github.com/hallison/sinatra-mapping/
-  * http://github.com/bcarlso/snap/
   * http://github.com/giraffesoft/classy_resources
   * http://github.com/nakajima/capinatra
   * http://github.com/deadprogrammer/spork
@@ -31,6 +28,8 @@
 
 = COMPLETED
 
+* Add support for multiple applications being mounted into routing system
+* Add support for RoutingPlugin for easy to use named alias routes for urls
 * Add support for bundler (http://github.com/wycats/bundler) to make setting up a generated app easy
 * Add support for button tag method, mail_to helper
 * Add support for simple fields_for tag helper

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.3.15

data/lib/sinatra_more/routing_plugin/named_route.rb

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

data/lib/sinatra_more/routing_plugin/routing_helpers.rb

@@ -5,9 +5,10 @@ module SinatraMore
     # url_for(:accounts) => '/accounts'
     # url_for(:account, :id => 5) => '/account/5'
     # url_for(:admin, show, :id => 5, :name => "demo") => '/admin/path/5/demo'
-    def url_for(*names)
-      values = names.extract_options!
-      mapped_url = self.class.named_paths[names]
+    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)]
+      raise SinatraMore::RouteNotFound.new("Route alias #{route_name.inspect} is not mapped to a url") unless mapped_url
       result_url = String.new(mapped_url)
       result_url.scan(%r{/?(:\S+?)(?:/|$)}).each do |placeholder|
         value_key = placeholder[0][1..-1].to_sym

data/lib/sinatra_more/routing_plugin.rb

@@ -2,11 +2,14 @@ require File.dirname(__FILE__) + '/support_lite'
 Dir[File.dirname(__FILE__) + '/routing_plugin/**/*.rb'].each {|file| load file }
 
 module SinatraMore
+  class RouteNotFound < RuntimeError; end
+
   module RoutingPlugin
     def self.registered(app)
       # Named paths stores the named route aliases mapping to the url
       # i.e { [:account] => '/account/path', [:admin, :show] => '/admin/show/:id' }
       app.set :named_paths, {}
+      app.set :app_name, app.name.underscore.to_sym
       app.helpers SinatraMore::RoutingHelpers
 
       # map constructs a mapping between a named route and a specified alias
@@ -32,8 +35,11 @@ module SinatraMore
       # 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)
-        route_name = [@_namespace, path].flatten.compact
-        path = named_paths[route_name] if path.kind_of? Symbol
+        if path.kind_of? Symbol
+          route_name = [self.app_name, @_namespace, path].flatten.compact
+          path = named_paths[route_name]
+          raise RouteNotFound.new("Route alias #{route_name.inspect} is not mapped to a url") unless path
+        end
         super verb, path, options, &block
       end
     end

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.14"
+  s.version = "0.3.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]

data/test/fixtures/routing_app/app.rb

@@ -41,4 +41,8 @@ class RoutingDemo < Sinatra::Base
   get '/links' do
     haml :index
   end
+  
+  get '/failed_route' do
+    url_for(:some, :not_real, :id => 5)
+  end
 end

data/test/fixtures/routing_app/views/index.haml

@@ -1,5 +1,7 @@
 %p.admin_url= url_for(:admin, :show, :id => 25)
+%p.app_admin_url= url_for(:routing_demo, :admin, :show, :id => 25)
 %p.admin_url2= url_for(:admin, :update, :id => 10, :name => "test")
 %p.admin_url3= url_for(:admin, :destroy, :id => 12)
 %p.account_url= url_for(:account, :name => 'foobar', :id => 10)
 %p.accounts_index=url_for(:accounts)
+%p.app_accounts_index=url_for(:routing_demo, :accounts)

data/test/test_routing_plugin.rb

@@ -17,6 +17,27 @@ class TestRoutingPlugin < Test::Unit::TestCase
       assert_have_selector :p, :class => 'admin_url2', :content => '/admin/10/update/test'
       assert_have_selector :p, :class => 'admin_url3', :content => '/admin/12/destroy'
     end
+    should "support app namespaces" do
+      assert_have_selector :p, :class => 'app_accounts_index', :content => '/the/accounts/index'
+      assert_have_selector :p, :class => 'app_admin_url', :content => '/admin/25/show'
+    end
+  end
+  
+  context 'for failed or missing routes' do
+    should "properly not raise when found" do
+      assert_nothing_raised { app.new.url_for(:accounts) } 
+      assert_nothing_raised { app.new.url_for(:routing_demo, :admin, :show, :id => 5) } 
+    end
+    should "properly raise not found exception" do
+      assert_raises(SinatraMore::RouteNotFound) { visit '/failed_route' } 
+      assert_raises(SinatraMore::RouteNotFound) { app.new.url_for(:admin, :fake) } 
+    end
+    should "properly raise about an invalid alias for route definition" do
+      assert_raises(SinatraMore::RouteNotFound) { app.get(:fake) }
+    end
+    should "properly work when alias is used in proper route definition" do
+      assert_nothing_raised { app.get(:accounts) do; end }
+    end
   end
 
   context 'for no namespaced account route' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors: 
 - Nathan Esquenazi