rack-i18n_routes 0.1 → 0.2

data/Rakefile

@@ -16,7 +16,7 @@ Bones {
 	email    'gioele@svario.it'
 	url      'https://github.com/gioele/rack-i18n_routes'
 
-	version  '0.1'
+	version  '0.2'
 
 	ignore_file  '.gitignore'
 

data/lib/rack/i18n_routes/alias_mapping.rb

@@ -76,24 +76,42 @@ class Rack::I18nRoutes::AliasMapping
 	# 	use Rack::I18nRoutes, MAPPING
 	#
 	# @param [Hash] aliases the aliases
+	# @param [Hash] opts extra options for the mapping
+	# @option opts [Foo] :default the language key associated with the
+	#                             normalized paths
 
-	def initialize(aliases)
+	def initialize(aliases, opts = {})
 		@aliases = aliases
+		@default_lang = opts[:default]
 	end
 
+	# @return [String]
+
 	def map(path)
+		normalized_path, found_langs = map_with_langs(path)
+
+		return normalized_path
+	end
+
+	# @return [(String, Array<Object>)]
+
+	def map_with_langs(path)
 		orig_pieces = path.split('/')
+
 		normalized_pieces = []
+		found_langs = []
 
 		normalized_pieces << orig_pieces.shift
+		found_langs << @default_lang
 
 		aliases = @aliases
 
 		orig_pieces.each do |orig_piece|
-			normalized = normalization_for(orig_piece, aliases)
+			normalized, lang = normalization_for(orig_piece, aliases)
 			replacement = (normalized || orig_piece)
 
 			normalized_pieces << replacement
+			found_langs << lang
 
 			if !aliases.nil?
 				subaliases = aliases[replacement]
@@ -103,28 +121,36 @@ class Rack::I18nRoutes::AliasMapping
 
 		if path.end_with?('/')
 			normalized_pieces << ""
+			found_langs << @default_lang
 		end
 
-		return normalized_pieces.join('/')
+		normalized_path = normalized_pieces.join('/')
+
+		return normalized_path, found_langs
 	end
 
+	# @return [(String, Object)]
+
 	def normalization_for(piece, aliases)
 		if aliases.nil?
-			return nil
+			return nil, @default_lang
 		end
 
 		entities = aliases.keys
 		entities.each do |entity|
 			if piece == entity
-				return entity
+				return entity, @default_lang
 			end
 
 			subentities = aliases[entity].values.reject { |e| e.is_a? Hash }
-			if subentities.any? { |subentity| Array(subentity).any? { |sube| piece == sube } }
-				return entity
+			subentity = subentities.find { |s| Array(s).any? { |sube| piece == sube } }
+			if !subentity.nil?
+				return entity, aliases[entity].index(subentity)
 			end
 		end
 
-		return nil
+		# the piece is not present in the aliases
+
+		return nil, @default_lang
 	end
 end

data/lib/rack/i18n_routes/alias_mapping_updater.rb

@@ -46,15 +46,28 @@ class Rack::I18nRoutes::AliasMappingUpdater
 	#
 	# @param [Proc] new_aliases_fn a parameter-less function that returns
 	#                              the new aliases
+	# @param [Hash] opts the options to be passed to the underlying
+	#                    AliasMapping object
 
-	def initialize(new_aliases_fn)
+	def initialize(new_aliases_fn, opts = {})
 		@new_aliases_fn = new_aliases_fn
+		@opts = opts
 	end
 
+	# @return [String]
+
 	def map(path)
+		normalized_path, found_langs = map_with_langs(path)
+
+		return normalized_path
+	end
+
+	# @return [(String, Array<Object>)]
+
+	def map_with_langs(path)
 		aliases = @new_aliases_fn[]
-		alias_mapping = Rack::I18nRoutes::AliasMapping.new(aliases)
+		alias_mapping = Rack::I18nRoutes::AliasMapping.new(aliases, @opts)
 
-		return alias_mapping.map(path)
+		return alias_mapping.map_with_langs(path)
 	end
 end

data/spec/i18n_routes_spec.rb

@@ -25,29 +25,35 @@ TEST_ALIASES = {
 	'paintings' => {
 		'fra' => 'peintures',
 		'spa' => 'pinturas',
+
+		:children => {
+			'gioconda' => {
+				'fra' => 'joconde',
+			}
+		}
 	}
 }
 
-describe Rack::I18nRoutes do
-	def app(*opts)
-		builder = Rack::Builder.new do
-			use Rack::Lint
-			use Rack::I18nRoutes, *opts
-			use Rack::Lint
-
-			run lambda { |env| [200, {"Content-Type" => "text/plain"}, [""]] }
-		end
+def app(*opts)
+	builder = Rack::Builder.new do
+		use Rack::Lint
+		use Rack::I18nRoutes, *opts
+		use Rack::Lint
 
-		return builder.to_app
+		run lambda { |env| [200, {"Content-Type" => "text/plain"}, [""]] }
 	end
 
-	def request_with(path, mapping_fn)
-		session = Rack::Test::Session.new(Rack::MockSession.new(app(mapping_fn)))
-	        session.request(path)
+	return builder.to_app
+end
 
-        	return session.last_request
-	end
+def request_with(path, mapping_fn)
+	session = Rack::Test::Session.new(Rack::MockSession.new(app(mapping_fn)))
+        session.request(path)
+
+	return session.last_request
+end
 
+describe Rack::I18nRoutes do
 	context "with an AliasMapping" do
 		let(:mapping) { Rack::I18nRoutes::AliasMapping.new(TEST_ALIASES) }
 
@@ -113,3 +119,28 @@ describe Rack::I18nRoutes do
 	end
 end
 
+describe Rack::I18nRoutes::AliasMapping do
+	let(:default_lang) { 'test-lang' }
+	let(:mapping) { Rack::I18nRoutes::AliasMapping.new(TEST_ALIASES, :default => default_lang) }
+
+	context "with a :default option set" do
+		it "returns the default key for normalized paths" do
+			ph, found_langs = mapping.map_with_langs('/paintings/gioconda/')
+
+			found_langs.should == [default_lang]*4
+		end
+
+		it "returns the non-default key when set" do
+			ph, found_langs = mapping.map_with_langs('/articulos/la-victoire/')
+
+			found_langs.should == [default_lang, 'spa', 'fra', default_lang]
+		end
+
+		it "returns the default key for unknown paths" do
+			ph, found_langs = mapping.map_with_langs('/articulos/fancy/')
+
+			found_langs.should == [default_lang, 'spa', default_lang, default_lang]
+		end
+	end
+end
+

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-i18n_routes
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Gioele Barabucci