valid_route 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd3f318f6e79d420b9f41465980ea0f334f98d86
-  data.tar.gz: 70923f6e407e55a9d0f96eb0e2f8770c6f5ee490
+  metadata.gz: 1130cb6b268faab104c6f5f98cbb3f627c8c9efb
+  data.tar.gz: 176d8334566adbcf622b4f8fc155194b963e338e
 SHA512:
-  metadata.gz: a2c74f43755922cd08238e68e4edeeef7cc1b55a09abada9dfbfaf6f9bda3a667dbdc1a21945b292cfff3bae9b9af4e3c9d452ec6d763f0942e7f1c8f3908045
-  data.tar.gz: 8cab5c0c3f9d91a8de8090564af351f9c110776c4b2cf6a7328b7acaac267de35cfb6b3f47e27c22a43d952562c632a6d4c9c0b195fa1f091c077268db9cdd53
+  metadata.gz: b58aba0c6901d37f5470ebb5605d3fd1ade2cdccffd1a2a32ee51f35d63dfe34b4b280898d86625ec0446403ac15a3cd561441fb57a718c959e1a4f40beda12e
+  data.tar.gz: a2383ab34be4985ba2f5272f2553493c9b39ee4ada97b94d3d37d605b9b6cc4f92d11e6e03f32035b67ec08e38998ae6556bcf9232108bcd2052ea3930de7e8a

data/lib/valid_route/route_formatter.rb

@@ -2,17 +2,30 @@ module ValidRoute
 	class RouteFormatter
 		def initialize
 			@buffer = []
+			@current_route_set = nil
+			@main_app_routes = []
+			@engine_routes = []
 		end
 
 		def result
 			@buffer #.compact.uniq
 		end
 
-		def section_title(title)
+		def section_title(title) # only called for engines
+			engine_regexp = /Routes for (.*)/
+			if title.match(engine_regexp)
+				@current_route_set = title.slice(engine_regexp,1)
+			end
 		end
 
 		def section(routes)
-			@buffer << array_paths(routes)
+			formatted_routes = array_paths(routes)
+			if @main_app_routes.empty?
+				@main_app_routes = formatted_routes
+			else
+				@engine_routes << formatted_routes
+			end
+			@buffer << formatted_routes
 			@buffer.flatten!
 		end
 
@@ -25,10 +38,24 @@ module ValidRoute
 
 		private
 		def array_paths(routes)
-			regexp = "(.:format)"
+			format_regexp = "(.:format)"
+			path_prefix = ""
+			unless @current_route_set.nil?
+				engine_route = @main_app_routes.select { |r| r[:reqs] == @current_route_set}
+				unless engine_route.empty?
+					path_prefix = engine_route.first[:path]
+					@buffer = @buffer - engine_route
+					# @main_app_routes = @main_app_routes - engine_route
+				end
+				@current_route_set = nil
+			end
 			paths = []
 			routes.map do |r|
-				paths << {path: r[:path].sub(regexp, ""), verb: r[:verb], reqs: r[:reqs] }
+				path = r[:path].sub(format_regexp, "")
+				path = path_prefix + path
+				path = path[1..-1] if path[0..1] == "//"
+				path.chop! if path[-1, 1] == "/" and path != "/"
+				paths << {path: path, verb: r[:verb], reqs: r[:reqs], name: r[:name] }
 			end
 			paths
 		end

data/lib/valid_route/route_validator.rb

@@ -43,7 +43,7 @@ class RouteValidator < ActiveModel::EachValidator
 				unless route == route_to_create
 					parameter = route_to_create[:path].split(/.*?(:[^\/]*)/).last || ""
 					substituted_route = route_to_create[:path].sub(parameter, record.to_param)
-					if (route[:path] == route_to_create[:path]) or (route[:path] == substituted_route)
+					if (route[:path] == route_to_create[:path]) or (route[:path] == substituted_route) and route[:reqs] != route_to_create[:reqs]
 						possible_conflicts.push route 
 					end
 				end
@@ -71,6 +71,7 @@ class RouteValidator < ActiveModel::EachValidator
 			routes_to_create.each {|route_to_create|
 				if route[:reqs].include?("#show") or route[:reqs].include?("#edit")
 					if route[:reqs].include?("/") # is this a namespaced route or anything?
+						puts route[:reqs]
 						route_controller_segments = route[:reqs].slice(/(.*)(#)(.*)/, 1).split(/^(.*\/)(.*)$/)
 						last_segment = route_controller_segments.pop.singularize
 						klass_underscored = route_controller_segments.join("") + last_segment

data/lib/valid_route/version.rb

@@ -1,3 +1,3 @@
 module ValidRoute
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/dummy/db/seeds.rb

@@ -1,4 +1,17 @@
-FactoryGirl.create(:home_page)
-FactoryGirl.create(:contact_page)
+unless Page.exists?('home')
+	Page.create(
+		{:name => 'Home', :permalink => 'home', :content => 'Home Page'},
+	)
+end
 
-FactoryGirl.create(:user, username: "vjm", first_name: "Vince", password: "weekend")
+unless Page.exists?('contact')
+	Page.create(
+		{:name => 'Contact', :permalink => 'contact', :content => 'Contact Page'}
+	)
+end
+
+unless User.exists?('admin')
+	User.create(
+		{:username => 'admin', :first_name => 'Admin', :password => 'password'}
+	)
+end