view.rb in world-flags-0.3.0

- old
+ new

@@ -1,18 +1,14 @@
+require 'world_flags/helper/view/util'
+
 module WorldFlags
 	module Helper
 		module View
 			def self.flag_sizes
 				[16, 32, 64]
 			end
 
-			# define more mappings by setting WorldFlags.locale_flag_map to a Hash map
-			# http://en.wikipedia.org/wiki/ISO_639-1_language_matrix
-			def flag_code code
-				WorldFlags.flag_code code
-			end
-
 			def flags_list size = 16, &block
 				raise "Missing block" unless block_given?
 				unless WorldFlags::Helper::View.flag_sizes.include?(size.to_i)
 					raise "Supported sizes are only #{WorldFlags::Helper::View.flag_sizes}" 
 				end
@@ -22,60 +18,34 @@
 			alias_method :flag_list, :flags_list
 
 			# http://en.wikipedia.org/wiki/ISO_639-1_language_matrix
 
 			# should look up translation for each code
-			def flags flags_arr, options = {}
-				flags_arr.inject("") do |res, elem|
+			def flags *args
+				options = args.extract_options!
+				args.flatten!
+				args.inject("") do |res, elem|
 					case elem
-					when Array
-						code = elem.first
-						name = elem.last
 					when String, Symbol
 						code = elem
 						name = WorldFlags.label(code, options)
 					else
-						raise ArgumentError, "Bad argument: #{flags_arr}, must be Hash or Array"
+						raise ArgumentError, "Bad argument: #{args}, must be Array"
 					end				
 					res << flag(code, name, options)
 				end.html_safe
 			end
 
-			def flags_title flags_arr, options = {}
-				flags flags_arr, options.merge(:title => true)
+			def flags_title *args
+				options = args.extract_options!
+				flags args, options.merge(:title => true)
 			end
 
 			def flag code, name, options = {}
-				label = case options[:content]
-				when true 
-					name
-				when String
-					options[:content]
-				else
-					'&nbsp;'
-				end
+				label = WorldFlags::Helper::View::Util.label_for options
+				title = WorldFlags::Helper::View::Util.title_for name, options
 
-				title = case options[:title]
-				when true
-					name
-				when String
-					options[:title]
-				else
-					nil
-				end
-				locale = WorldFlags.locale(code)
-				extra_options = title ? {:title => title } : {}			
-				selected = flag_selected?(code, options) ? 'selected' : ''
-				content_tag :li,  label.html_safe, {:class => "flag #{code} #{selected}", :'data-country' => name, :'data-cc' => code, :'data-locale' => locale}.merge(options[:html] || {}).merge(extra_options)
-			end
-
-			def flag_selected? code, options = {}
-				code = code.to_sym
-				sel = options[:selected] || options[code]
-
-				auto_sel = flag_code(I18n.locale).to_sym if WorldFlags.auto_select?
-
-				selected ||= [sel, auto_sel].any?{|e| e == code }
+				content_tag :li,  label.html_safe, WorldFlags::Helper::View::Util.flag_options(code, title, name, options)
 			end
 
 			def flag_title code, name, options = {}
 				flag code, name, options.merge(:title => true)
 			end
\ No newline at end of file