Navigation Menu

Skip to content

Commit

Permalink
Don't use custom parser for routing path
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Apr 30, 2015
1 parent dfd9708 commit ecabd8a
Showing 1 changed file with 25 additions and 28 deletions.
53 changes: 25 additions & 28 deletions lib/droonga/engine_state.rb
Expand Up @@ -17,6 +17,7 @@

require "droonga/loggable"
require "droonga/deferrable"
require "droonga/address"
require "droonga/event_loop"
require "droonga/forwarder"
require "droonga/replier"
Expand Down Expand Up @@ -66,52 +67,48 @@ def local_route?(route)
route.start_with?(@name) or route.start_with?(@internal_name)
end

FARM_PATH_MATCHER = /\A[^:]+:\d+\/[^.]+/

def internal_route(route)
if FARM_PATH_MATCHER =~ route
name = $MATCH
if name == @name or name == @internal_name
return route.sub(name, @internal_name)
end
name = Address.parse(route).node
if name == @name
route.sub(name, @internal_name)
else
route
end
rescue ArgumentError
route
end

def public_route(route)
if FARM_PATH_MATCHER =~ route
name = $MATCH
if name == @internal_name
return route.sub(name, @name)
end
name = Address.parse(route).node
if name == @internal_name
route.sub(name, @name)
else
route
end
rescue ArgumentError
route
end

def internal_farm_path(route)
if FARM_PATH_MATCHER =~ route
name = $MATCH
if name == @name or name == @internal_name
@internal_name
else
name
end
name = Address.parse(route).node
if name == @name
@internal_name
else
route
name
end
rescue ArgumentError
route
end

def public_farm_path(route)
if FARM_PATH_MATCHER =~ route
name = $MATCH
if name == @internal_name
@name
else
name
end
name = Address.parse(route).node
if name == @internal_name
@name
else
route
name
end
rescue ArgumentError
route
end

def generate_id
Expand Down

0 comments on commit ecabd8a

Please sign in to comment.