mistiq 0.0.89 → 0.0.91

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODg3ZjBjZDdkZjkzNjA4ODFhMzk4ZjE5NmM5YjIzNTZiMDdjNzJmMQ==
+    ZmFhOTQ3NDUyZjBlYzBjMzBlMjNlZjNmOGUxYWUwMTA0ZGVlNTJiNQ==
   data.tar.gz: !binary |-
-    ZTc5MmU4YjY5YTQzZjVlMWNmMTc0ZWJhOGRhMTZlZWI5ZTAxMzM2Yg==
+    NDI0NjAyYTEyZjA1YjA3NGFiMGI1N2NmYWNkMTFlNDI4YjQzMDY0NQ==
 SHA512:
   metadata.gz: !binary |-
-    NDY3NTNhNDc3OTM5MTliNjQwZTg4ZDgzMzFkMzQ3ZTQ4NTNlMzkzMzVhOWMy
-    ODA3NzU1YmEyMTk3OGQyYzM4ZTU5Yjk4ZjhjZjQzN2E1NTBlM2I0MjRlYjEw
-    M2M0YWZmYTFlNWVlYmRlMWZlMTM1ZWFmZGM2ZTYxZmZmNGJhYzE=
+    ZDc3ZWU0ZDQyZTkyMDdmNzFmZjk5NzM1YTgzYjI5MmVhY2NiYTAyM2E1OWM2
+    Njc5NjE5NDc3ZGE0MGZlZDY1NWYwZmE0OTEwMTlhNDJhNTI1M2UzNzE2ODVl
+    NjRjMWMxNmQ2MGNhOWFlZDY2NGQ4NWFiMTJlYjBhNTc1OGQ3MTM=
   data.tar.gz: !binary |-
-    NGQyYTUwNzE3N2ViMzE0ZmQzYzEwNGFkYzAzMzQwYzI2NjBhNzYxMTU0YjAy
-    MTVlMDZkNzM5MzliMzc3YjA4MmQyMWJlZjk4MjliNGM1MzEyMTc4ODkzZmE5
-    ZjdkMTZjYzQ1MjMzMWMzODdmOTcyZmExNTdlZjc5MDlkMDg3Y2Q=
+    NDVkMjk2MDc4MGY0OTU4YzVjOWQyYjkxZmMwZjJkNWMzZTU5Y2VlMjE3ZjEx
+    OTIxNDVjODcwMTc5Nzc5NzE4MjZiZmNiY2ZiYzZlYTYzNjhlYmJmODAxMmY0
+    N2Y1NzRkZTdiMmQ0ODVlZWJkYjM1NTk0ODEzMWEzNzQ3OWU2ZWQ=

data/lib/mistiq/defaults.rb

@@ -13,7 +13,7 @@ module Mistiq
 	def disable_create_ops()
 		Railtie.get_regex_hash.each {
 			|r,p|
-			set_guard_rule(true,r) if r.match(/.*#add/) || r.match(/.*#create/) || r.match(/.*#new/)
+			set_guard_rule(true,r) if r.match(/.*#new/) || r.match(/.*#add/)
 		}
 	end
 

data/lib/mistiq/init.rb

@@ -5,64 +5,49 @@ module Mistiq
 			#to redact links in the views
 			Rails.application.config.after_initialize do
 				@LINK_REGEX_HASH = Hash.new
-				clashes = Hash.new
 
 				#pre-load routes
 				Rails.application.reload_routes!
 				
 				#get routes
 				routes = Rails.application.routes.routes
+				inspector = RoutesInspector.new(routes)
+				routes = inspector.get_routes
 				
 				routes.each {
 					|r|
-					controller = r.defaults[:controller]
-					action = r.defaults[:action]
-					
-					route = r.path.spec.to_s
 
-					#removes (.:format)
-					if route.match("(.:format)")
-						pattern = route.sub("(.:format)","")
-					else
-						pattern = route
-					end
-					
-					#if there are any parameters in
-					#the route use regex to ignore them
-					if pattern.match(/(:.*\/)/)
-						pattern.gsub!(/(:.*\/)/,".*/")
-					end
-					
-					#if there is a parameter at the end
-					if pattern.match(/(:.*)/)
-						pattern.gsub!(/(:.*)/,"[^\/\"]*")
-					end
+					reqs = r[:reqs].split('#')
+
+					controller = reqs[0]
+					action = reqs[1]
 					
-					if action == "destroy"
-						destroy_regex = "data-method=(\"|')delete(\"|')";
-						pattern = "<a.*#{destroy_regex}.*href=(\"|')#{pattern}(\"|').*>.*<\/a>"
-						#also check if destroy_regex occurs after the href attribute
-						pattern = pattern+"@@@<a.*href=(\"|')#{pattern}(\"|').*#{destroy_regex}.*>.*<\/a>"
-					else
-						pattern = "<a.*href=(\"|')#{pattern}(\"|').*>.*<\/a>"
+					route = r[:path]
+					verb = r[:verb]
+
+					#get regex-ed route
+					regex_len = r[:regexp].length
+					regex = r[:regexp].slice(1..regex_len-2)
+
+					#if action#controller's data method is not GET and not POST
+					if verb != "GET" && verb != "POST" && verb != ""
+						method_regex = "data-method=(\"|')#{verb.downcase}(\"|')";
+						pattern = "<a.*#{method_regex}.*href=(\"|')#{regex}(\"|').*>.*<\/a>"
+
+						#also check if method_regex occurs after the href attribute
+						pattern = pattern+"@@@<a.*href=(\"|')#{regex}(\"|').*#{method_regex}.*>.*<\/a>"
+					elsif verb == "GET"
+						#if action#controller's data method is GET
+						#pattern = "<a(.*href=(\"|')#{pattern}(\"|'))(?!.*data\-method)[^<]*<\/a>"
+						pattern = "<a(?!.*data\-method)(.*href=(\"|')#{regex}(\"|'))[^<]*<\/a>"
 					end
 					
-					#espace / characters
-					pattern.gsub!(/\//,"\\/")
-					
-					#check if the current route clashes with another one
-					if !clashes[route].nil?
-						puts "Route clash at #{controller}##{action} for route #{route} with route for #{clashes[route]}"
-					else
-						#add route to the clashes hash to detect
-						#any future route clashes
-						clashes[route] = "#{controller}##{action}"
+					if verb == "GET" || (verb != "POST" && verb != "")
+						@LINK_REGEX_HASH["#{controller}##{action}"] = pattern
 					end
-
-					@LINK_REGEX_HASH["#{controller}##{action}"] = pattern
 				}
 				
-				puts "Link REGEX hash has been computed. #{clashes.size} route clashes have been found."
+				puts "Link REGEX hash has been computed. #{@LINK_REGEX_HASH.size} routes were hashed."
 			end
 		end
 
@@ -70,4 +55,128 @@ module Mistiq
 			@LINK_REGEX_HASH
 		end
 	end
+
+	class RouteWrapper < SimpleDelegator
+		def endpoint
+			rack_app ? rack_app.inspect : "#{controller}##{action}"
+		end
+
+	    def constraints
+	        requirements.except(:controller, :action)
+	    end
+
+	    def rack_app(app = self.app)
+			@rack_app ||= begin
+				class_name = app.class.name.to_s
+				if class_name == "ActionDispatch::Routing::Mapper::Constraints"
+					rack_app(app.app)
+	        	elsif ActionDispatch::Routing::Redirect === app || class_name !~ /^ActionDispatch::Routing/
+	            	app
+	          	end
+	        end
+	    end
+
+		def verb
+			super.source.gsub(/[$^]/, '')
+		end
+
+		def path
+			super.spec.to_s
+		end
+
+		def name
+			super.to_s
+		end
+
+		def regexp
+			__getobj__.path.to_regexp
+		end
+
+		def json_regexp
+			str = regexp.inspect.
+					sub('\\A' , '^').
+					sub('\\Z' , '$').
+					sub('\\z' , '$').
+					sub(/^\// , '').
+					sub(/\/[a-z]*$/ , '').
+					gsub(/\(\?#.+\)/ , '').
+					gsub(/\(\?-\w+:/ , '(').
+					gsub(/\s/ , '')
+			Regexp.new(str).source
+		end
+
+		def reqs
+			@reqs ||= begin
+				reqs = endpoint
+				reqs += " #{constraints.to_s}" unless constraints.empty?
+				reqs
+			end
+		end
+
+		def controller
+			requirements[:controller] || ':controller'
+		end
+
+		def action
+			requirements[:action] || ':action'
+		end
+
+		def internal?
+			controller.to_s =~ %r{\Arails/(info|welcome)} || path =~ %r{\A#{Rails.application.config.assets.prefix}}
+		end
+
+		def engine?
+			rack_app && rack_app.respond_to?(:routes)
+		end
+    end
+
+    class RoutesInspector
+		def initialize(routes)
+			@engines = {}
+			@routes = routes
+		end
+
+		def get_routes
+			routes_to_display = filter_routes(nil)
+			routes = collect_routes(routes_to_display)
+			return routes
+		end
+
+		private
+
+		def filter_routes(filter)
+			if filter
+				@routes.select { |route| route.defaults[:controller] == filter }
+			else
+				@routes
+			end
+		end
+
+      	def collect_routes(routes)
+			routes.collect do |route|
+			  RouteWrapper.new(route)
+			end.reject do |route|
+			  route.internal?
+			end.collect do |route|
+			  collect_engine_routes(route)
+
+			  { name:   route.name,
+			    verb:   route.verb,
+			    path:   route.path,
+			    reqs:   route.reqs,
+			    regexp: route.json_regexp }
+			end
+      	end
+
+      	def collect_engine_routes(route)
+			name = route.endpoint
+			return unless route.engine?
+			return if @engines[name]
+
+			routes = route.rack_app.routes
+			if routes.is_a?(ActionDispatch::Routing::RouteSet)
+				@engines[name] = collect_routes(routes.routes)
+			end
+      	end
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mistiq
 version: !ruby/object:Gem::Version
-  version: 0.0.89
+  version: 0.0.91
 platform: ruby
 authors:
 - Andrei Papancea