rake_routes_normalizer 0.1.0 → 0.1.1

data/README.markdown

@@ -7,6 +7,23 @@ Rails 2 to 3 routes.
 
 (Yes, Rails 3 was released last year. But better late than never.)
 
+With rake_routes_normalizer, you can transform this:
+
+         user_session POST   /user_session(.:format)      {:action=>"create", :controller=>"user_sessions"}
+     new_user_session GET    /user_session/new(.:format)  {:action=>"new", :controller=>"user_sessions"}
+    edit_user_session GET    /user_session/edit(.:format) {:action=>"edit", :controller=>"user_sessions"}
+                      PUT    /user_session(.:format)      {:action=>"update", :controller=>"user_sessions"}
+                      DELETE /user_session(.:format)      {:action=>"destroy", :controller=>"user_sessions"}
+
+Into this!
+
+    /user_session(.:format)       DELETE  user_session        {"action"=>"destroy", "controller"=>"user_sessions"}
+    /user_session(.:format)       POST    user_session        {"action"=>"create", "controller"=>"user_sessions"}
+    /user_session(.:format)       PUT     user_session        {"action"=>"update", "controller"=>"user_sessions"}
+    /user_session/edit(.:format)  GET     edit_user_session   {"action"=>"edit", "controller"=>"user_sessions"}
+    /user_session/new(.:format)   GET     new_user_session    {"action"=>"new", "controller"=>"user_sessions"}
+
+
 Usage
 =====
 

data/lib/rake_routes_normalizer/app.rb

@@ -3,7 +3,7 @@ module RakeRoutesNormalizer
     desc "RAKE_PRINTOUT_FILE", "Print the normalized version of RAKE_PRINTOUT_FILE"
     def normalize(text)
       table = RouteSet.parse(text).normalize.routes.map do |route|
-        [route.name, route.http_verb, route.url_pattern, route.params.inspect]
+        [route.url_pattern, route.http_verb, route.name, route.params.inspect]
       end
       print_table table
     end

data/lib/rake_routes_normalizer/route.rb

@@ -28,12 +28,19 @@ module RakeRoutesNormalizer
     def normalize(options = {})
       clone.tap do |result|
         result.http_verb = 'GET' if result.http_verb.to_s =~ /^\s*$/
-        result.name = options[:previous_route].name if result.name =~ /^\s*$/
+        result.name = options[:previous_route].name if result.name =~ /^\s*$/ && options[:previous_route]
         result.params = Dictionary[KeyHash[params || {}]].order_by_key
+        result.url_pattern = "#{result.url_pattern}(.:format)" unless result.url_pattern =~ /\(\.:format\)/
       end
+
+    rescue Exception => e
+      raise CannotNormalizeRoute.new(:self => self, :options => options)
     end
 
     class CannotParseLine < ExceptionWithDefaultMessage
     end
+
+    class CannotNormalizeRoute < ExceptionWithDefaultMessage
+    end
   end
 end

data/lib/rake_routes_normalizer/route_set.rb

@@ -10,7 +10,8 @@ module RakeRoutesNormalizer
 
     def normalize
       result = routes.inject(RouteSet.new) do|route_set, route|
-        route_set.routes << route.normalize(:previous_route => route_set.routes.last)
+        previous_route = route_set.routes.detect{|r| route.url_pattern == r.url_pattern }
+        route_set.routes << route.normalize(:previous_route => previous_route)
         route_set
       end
       result.routes.sort!

data/lib/rake_routes_normalizer/version.rb

@@ -1,3 +1,3 @@
 module RakeRoutesNormalizer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/rake_routes_normalizer/route_set_spec.rb

@@ -57,14 +57,29 @@ describe RouteSet do
     it "should normalize a route based the route's previous route" do
       route_set = RouteSet.new(
         :routes => [
-          Route.new(:name => 'account'),
-          Route.new(:name => '')
+          Route.new(:name => 'account', :url_pattern => '/account(.:format)'),
+          Route.new(:name => '', :url_pattern => '/account(.:format)')
         ]
       )
       copy = route_set.normalize
-      copy.routes.map(&:name).uniq.must_equal ['account']
+      copy.routes.map(&:name).must_equal ['account', 'account']
     end
 
+    it "should normalize a route based on a previous route even if the previous route if not adjacent to the current route" do
+      route_set = RouteSet.new(
+        :routes => [
+          Route.new(:name => 'account', :http_verb => 'POST', :url_pattern => '/account(.:format)'),
+          Route.new(:name => 'new_account', :http_verb => 'GET', :url_pattern => '/account/new(.:format)'),
+          Route.new(:name => '', :http_verb => 'GET', :url_pattern => '/account(.:format)')
+        ]
+      )
+
+      copy = route_set.normalize
+      copy.routes.map(&:name).sort.must_equal ['account', 'account', 'new_account']
+    end
+
+
+
     it "should sort the routes" do
       route_set = RouteSet.new(
         :routes => [

data/spec/rake_routes_normalizer/route_spec.rb

@@ -68,10 +68,25 @@ describe Route do
       route.normalize(:previous_route => previous_route).name.must_equal 'account_path'
     end
 
+    it "should set the name to '' if the name is blank and the route does not have previous route" do
+      route = Route.new(:name => '')
+      route.normalize(:previous_route => nil).name.must_equal ''
+    end
+
     it "should sort the route's params by key" do
       route = Route.new(:params => {:controller=>"users", :action=>"edit_password", :protocol=>nil})
       route.normalize.params.inspect.must_equal %q|{"action"=>"edit_password", "controller"=>"users", "protocol"=>nil}|
     end
+
+    it "should append (.:format) to the route if it is not specified" do
+      route = Route.new(:url_pattern => "/jobs(/:job)")
+      route.normalize.url_pattern.must_equal "/jobs(/:job)(.:format)"
+    end
+
+    it "should not append (.:format) to the route if it is specified" do
+      route = Route.new(:url_pattern => "/account/edit_password(.:format)")
+      route.normalize.url_pattern.must_equal "/account/edit_password(.:format)"
+    end
   end
 
   describe "<=>(other)" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rake_routes_normalizer
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - George Mendoza