actionpack 0.9.0 → 0.9.5

data/lib/action_controller/cgi_process.rb

@@ -71,7 +71,7 @@ module ActionController #:nodoc:
         @session["__valid_session"]
         return @session
       rescue ArgumentError => e
-        @session.delete
+        @session.delete if @session
         raise(
           ActionController::SessionRestoreError, 
           "Session contained objects where the class definition wasn't available. " +
@@ -104,6 +104,7 @@ module ActionController #:nodoc:
 
     def out
       convert_content_type!(@headers)
+      $stdout.binmode if $stdout.respond_to?(:binmode)
       print @cgi.header(@headers)
       if @body.respond_to?(:call)
         @body.call(self)
@@ -111,7 +112,7 @@ module ActionController #:nodoc:
         print @body
       end
     end
-    
+
     private
       def convert_content_type!(headers)
         if headers["Content-Type"]

data/lib/action_controller/helpers.rb

@@ -0,0 +1,89 @@
+module ActionController #:nodoc:
+  module Helpers #:nodoc:
+    def self.append_features(base)
+      super
+      base.extend(ClassMethods)
+    end
+
+    # The template helpers serves to relieve the templates from including the same inline code again and again. It's a
+    # set of standardized methods for working with forms (FormHelper), dates (DateHelper), texts (TextHelper), and 
+    # Active Records (ActiveRecordHelper) that's available to all templates by default.
+    #
+    # It's also really easy to make your own helpers and it's much encouraged to keep the template files free
+    # from complicated logic. It's even encouraged to bundle common compositions of methods from other helpers 
+    # (often the common helpers) as they're used by the specific application.
+    # 
+    #   module MyHelper
+    #     def hello_world() "hello world" end
+    #   end
+    # 
+    # MyHelper can now be included in a controller, like this:
+    # 
+    #   class MyController < ActionController::Base
+    #     helper :my_helper
+    #   end
+    # 
+    # ...and, same as above, used in any template rendered from MyController, like this:
+    # 
+    # Let's hear what the helper has to say: <tt><%= hello_world %></tt>
+    module ClassMethods
+      # Makes all the (instance) methods in the helper module available to templates rendered through this controller.
+      # See ActionView::Helpers (link:classes/ActionView/Helpers.html) for more about making your own helper modules 
+      # available to the templates.
+      def add_template_helper(helper_module)
+        template_class.class_eval "include #{helper_module}"
+      end
+
+      # Declare a helper.  If you use this method in your controller, you don't
+      # have to do the +self.append_features+ incantation in your helper class.
+      #   helper :foo
+      # requires 'foo_helper' and includes FooHelper in the template class.
+      #   helper FooHelper
+      # includes FooHelper in the template class.
+      #   helper { def foo() "#{bar} is the very best" end }
+      # evaluates the block in the template class, adding method #foo.
+      #   helper(:three, BlindHelper) { def mice() 'mice' end }
+      # does all three.
+      def helper(*args, &block)
+        args.flatten.each do |arg|
+          case arg
+          when Module
+            add_template_helper(arg)
+          when String, Symbol
+            file_name  = Inflector.underscore(arg.to_s.downcase) + '_helper'
+            class_name = Inflector.camelize(file_name)
+            begin
+              require file_name
+            rescue LoadError
+              raise ArgumentError, "Missing helper file helpers/#{file_name}.rb"
+            end
+            raise ArgumentError, "Missing #{class_name} module in helpers/#{file_name}.rb" unless Object.const_defined?(class_name)
+            add_template_helper(Object.const_get(class_name))
+          else
+            raise ArgumentError, 'helper expects String, Symbol, or Module argument'
+          end
+        end
+
+        # Evaluate block in template class if given.
+        template_class.module_eval(&block) if block_given?
+      end
+
+      # Declare a controller method as a helper.  For example,
+      #   helper_method :link_to
+      #   def link_to(name, options) ... end
+      # makes the link_to controller method available in the view.
+      def helper_method(*methods)
+        template_class.controller_delegate(*methods)
+      end
+
+      # Declare a controller attribute as a helper.  For example,
+      #   helper_attr :name
+      #   attr_accessor :name
+      # makes the name and name= controller methods available in the view.
+      # The is a convenience wrapper for helper_method.
+      def helper_attr(*attrs)
+        attrs.flatten.each { |attr| helper_method(attr, "#{attr}=") }
+      end
+    end
+  end
+end

data/lib/action_controller/layout.rb

@@ -105,6 +105,12 @@ module ActionController #:nodoc:
     #
     #   class WeblogController < ActionController::Base
     #     layout "layouts/weblog_standard"
+    #
+    # == Avoiding the use of a layout
+    #
+    # If you have a layout that by default is applied to all the actions of a controller, you still have the option to rendering
+    # a given action without a layout. Just use the method <tt>render_without_layout</tt>, which works just like Base.render --
+    # it just doesn't apply any layouts.
     module ClassMethods
       # If a layout is specified, all actions rendered through render and render_action will have their result assigned 
       # to <tt>@content_for_layout</tt>, which can then be used by the layout to insert their contents with
@@ -130,11 +136,11 @@ module ActionController #:nodoc:
     end
 
     def render_with_layout(template_name = "#{controller_name}/#{action_name}", status = nil, layout = nil) #:nodoc:
-      if layout || active_layout
+      if layout ||= active_layout
         add_variables_to_assigns
-        logger.info("Rendering #{template_name} within #{layout || active_layout}") unless logger.nil?
+        logger.info("Rendering #{template_name} within #{layout}") unless logger.nil?
         @content_for_layout = @template.render_file(template_name, true)
-        render_without_layout(layout || self.active_layout, status)
+        render_without_layout(layout, status)
       else
         render_without_layout(template_name, status)
       end

data/lib/action_controller/request.rb

@@ -1,5 +1,6 @@
 module ActionController
-  class AbstractRequest #:nodoc:
+  # These methods are available in both the production and test Request objects.
+  class AbstractRequest
     # Returns both GET and POST parameters in a single hash.
     def parameters
       @parameters ||= request_parameters.update(query_parameters)
@@ -60,14 +61,18 @@ module ActionController
     end
 
     def host_with_port
-      if (protocol == "http://" && port == 80) || (protocol == "https://" && port == 443)
+      if env['HTTP_HOST']
+        env['HTTP_HOST']
+      elsif (protocol == "http://" && port == 80) || (protocol == "https://" && port == 443)
         host
       else
         host + ":#{port}"
       end
     end
 
+    #--
     # Must be implemented in the concrete request
+    #++
     def query_parameters
     end
 

data/lib/action_controller/response.rb

@@ -1,10 +1,10 @@
 module ActionController
   class AbstractResponse #:nodoc:
-    DEFAULT_HEADERS = { "Cache-Control" => "no-cache", "cookie" => [] }
+    DEFAULT_HEADERS = { "Cache-Control" => "no-cache" }
     attr_accessor :body, :headers, :session, :cookies, :assigns, :template, :redirected_to, :redirected_to_method_params
 
     def initialize
-      @body, @headers, @session, @assigns = "", DEFAULT_HEADERS.dup, [], []
+      @body, @headers, @session, @assigns = "", DEFAULT_HEADERS.merge("cookie" => []), [], []
     end
 
     def redirect(to_url)

data/lib/action_controller/support/class_inheritable_attributes.rb

@@ -1,4 +1,4 @@
-# Allows attributes to be shared within an inheritance hierarchy, but where each descentent gets a copy of
+# Allows attributes to be shared within an inheritance hierarchy, but where each descendant gets a copy of
 # their parents' attributes, instead of just a pointer to the same. This means that the child can add elements
 # to, for example, an array without those additions being shared with either their parent, siblings, or
 # children, which is unlike the regular class-level attributes that are shared across the entire hierarchy.

data/lib/action_controller/support/inflector.rb

@@ -31,6 +31,14 @@ module Inflector
     class_name_in_module.gsub(/^.*::/, '')
   end
 
+  def tableize(class_name)
+    pluralize(underscore(class_name))
+  end
+  
+  def classify(table_name)
+    camelize(singularize(table_name))
+  end
+
   def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
     Inflector.underscore(Inflector.demodulize(class_name)) + 
       (separate_class_name_and_id_with_underscore ? "_id" : "id")

data/lib/action_controller/test_process.rb

@@ -186,9 +186,10 @@ end
 class Test::Unit::TestCase #:nodoc:
   private  
     # execute the request and set/volley the response
-    def process(action, parameters = {})
+    def process(action, parameters = nil, session = nil)
       @request.action = action.to_s
-      @request.parameters.update(parameters)
+      @request.parameters.update(parameters) unless parameters.nil?
+      @request.session = ActionController::TestSession.new(session) unless session.nil?
       @controller.process(@request, @response)
     end
 end

data/lib/action_controller/url_rewriter.rb

@@ -50,25 +50,41 @@ module ActionController
         path = rewrite_controller(path, options)  if options[:controller] || options[:controller_prefix]
         return path
       end
-      
+
       def rewrite_path_params(path, options)
-        options[:path_params].inject(path) do |path, pair|
-          if options[:action].nil? && @request.parameters[pair.first]
-            path.sub(/\b#{@request.parameters[pair.first]}\b/, pair.last.to_s)
-          else
-            path += "/#{pair.last}"
+        index_action = options[:action] == 'index' || options[:action].nil? && @action == 'index'
+        id_only = options[:path_params].size == 1 && options[:path_params]['id']
+
+        if index_action && id_only
+          path += '/' unless path[-1..-1] == '/'
+          path += "index/#{options[:path_params]['id']}"
+          path
+        else
+          options[:path_params].inject(path) do |path, pair|
+            if options[:action].nil? && @request.parameters[pair.first]
+              path.sub(/\b#{@request.parameters[pair.first]}\b/, pair.last.to_s)
+            else
+              path += "/#{pair.last}"
+            end
           end
         end
       end
 
       def rewrite_action(path, options)
-        all, controller_prefix, action_prefix, action_suffix = 
+        # This regex assumes that "index" actions won't be included in the URL
+        all, controller_prefix, action_prefix, action_suffix =
           /^\/(.*)#{@controller}\/(.*)#{@action == "index" ? "" : @action}(.*)/.match(path).to_a
 
-        if @action == "index" && action_prefix && !action_prefix.empty?
-          path = path.sub(action_prefix, action_name(options, action_prefix))
-        elsif @action == "index"
-          path = path.sub(/#{@controller}\//, @controller + "/" + action_name(options))
+        if @action == "index" 
+          if action_prefix == "index" 
+            # we broke the parsing assumption that this would be excluded, so
+            # don't tell action_name about our little boo-boo
+            path = path.sub(action_prefix, action_name(options, nil))
+          elsif action_prefix && !action_prefix.empty?
+            path = path.sub(action_prefix, action_name(options, action_prefix))
+          else
+            path = path.sub(%r(#{@controller}/?), @controller + "/" + action_name(options)) # " ruby-mode
+          end
         else
           path = path.sub((action_prefix || "") + @action + (action_suffix || ""), action_name(options, action_prefix))
         end

data/lib/action_view/base.rb

@@ -141,6 +141,16 @@ module ActionView #:nodoc:
       end
     end
 
+    def self.controller_delegate(*methods)
+      methods.flatten.each do |method|
+        class_eval <<-end_eval
+          def #{method}(*args, &block)
+            controller.send(%(#{method}), *args, &block)
+          end
+        end_eval
+      end
+    end
+
     def initialize(base_path = nil, assigns_for_first_render = {}, controller = nil)#:nodoc:
       @base_path, @assigns = base_path, assigns_for_first_render
       @controller = controller
@@ -245,6 +255,7 @@ module ActionView #:nodoc:
       end
 
       def rxml_render(template, binding)
+        @controller.headers["Content-Type"] ||= 'text/xml'
         eval(template, binding)
       end
   end

data/lib/action_view/helpers/active_record_helper.rb

@@ -26,11 +26,11 @@ module ActionView
       #   form("post") =>
       #     <form action='create' method='POST'>
       #       <p>
-      #         <b>Title</b><br />
+      #         <label for="post_title">Title</label><br />
       #         <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />
       #       </p>
       #       <p>
-      #         <b>Body</b><br />
+      #         <label for="post_body">Body</label><br />
       #         <textarea cols="40" id="post_body" name="post[body]" rows="20" wrap="virtual">
       #           Back to the hill and over it again!
       #         </textarea>
@@ -71,8 +71,8 @@ module ActionView
       #   <%= error_message_on "post", "title", "Title simply ", " (or it won't work)", "inputError" %> =>
       #     <div class="inputError">Title simply can't be empty (or it won't work)</div>
       def error_message_on(object, method, prepend_text = "", append_text = "", css_class = "formError")
-        if instance_eval("@#{object}").errors.on(method)
-          "<div class=\"#{css_class}\">#{prepend_text + instance_eval("@#{object}").errors.on(method) + append_text}</div>"
+        if errors = instance_eval("@#{object}").errors.on(method)
+          "<div class=\"#{css_class}\">#{prepend_text + (errors.is_a?(Array) ? errors.first : errors) + append_text}</div>"
         end
       end
       
@@ -94,7 +94,7 @@ module ActionView
         end
 
         def default_input_block
-          Proc.new { |record, column| "<p><b>#{column.human_name}</b><br />#{input(record, column.name)}</p>" }
+          Proc.new { |record, column| "<p><label for=\"#{record}_#{column.name}\">#{column.human_name}</label><br />#{input(record, column.name)}</p>" }
         end        
     end
 

data/lib/action_view/helpers/date_helper.rb

@@ -19,13 +19,20 @@ module ActionView
         distance_in_minutes = ((to_time - from_time) / 60).round
         
         case distance_in_minutes
-          when 0..45      then "#{distance_in_minutes} minutes"
+          when 0          then "less than a minute"
+          when 1          then "1 minute"
+          when 2..45      then "#{distance_in_minutes} minutes"
           when 46..90     then "about 1 hour"
           when 90..1440   then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
           when 1441..2880 then "1 day"
           else                 "#{(distance_in_minutes / 1440).round} days"
         end
       end
+      
+      # Like distance_of_time_in_words, but where <tt>to_time</tt> is fixed to <tt>Time.now</tt>.
+      def distance_of_time_in_words_to_now(from_time)
+        distance_of_time_in_words(from_time, Time.now)
+      end
 
       # Returns a set of select tags (one for year, month, and day) pre-selected for accessing a specified date-based attribute (identified by
       # +method+) on an object assigned to the template (identified by +object+). It's possible to tailor the selects through the +options+ hash, 

data/lib/action_view/helpers/form_helper.rb

@@ -85,13 +85,19 @@ module ActionView
       # Returns a checkbox tag tailored for accessing a specified attribute (identified by +method+) on an object
       # assigned to the template (identified by +object+). It's intended that +method+ returns an integer and if that
       # integer is above zero, then the checkbox is checked. Additional options on the input tag can be passed as a
-      # hash with +options+. The +value+ defaults to 1, which is convenient for boolean values. 
+      # hash with +options+. The +checked_value+ defaults to 1 while the default +unchecked_value+
+      # is set to 0 which is convenient for boolean values. Usually unchecked checkboxes don't post anything. 
+      # We work around this problem by adding a hidden value with the same name as the checkbox.
       #
       # Example (call, result). Imagine that @post.validated? returns 1:
       #   check_box("post", "validated")
-      #     <input type="checkbox" id="post_validate" name="post[validated] value="1" checked="checked" />
-      def check_box(object, method, options = {}, value = "1")
-        InstanceTag.new(object, method, self).to_check_box_tag(options, value)
+      #     <input type="checkbox" id="post_validate" name="post[validated] value="1" checked="checked" /><input name="post[validated]" type="hidden" value="0" />
+      #
+      # Example (call, result). Imagine that @puppy.gooddog returns no:
+      #   check_box("puppy", "gooddog", {}, "yes", "no")
+      #     <input type="checkbox" id="puppy_gooddog" name="puppy[gooddog] value="yes" /><input name="puppy[gooddog]" type="hidden" value="no" />
+      def check_box(object, method, options = {}, checked_value = "1", unchecked_value = "0")
+        InstanceTag.new(object, method, self).to_check_box_tag(options, checked_value, unchecked_value)
       end
     end
 
@@ -122,11 +128,11 @@ module ActionView
         content_tag("textarea", html_escape(value), options)
       end
 
-      def to_check_box_tag(options = {}, checked_value = "1")
+      def to_check_box_tag(options = {}, checked_value = "1", unchecked_value = "0")
         options.merge!({"checked" => "checked"}) if !value.nil? && ((value.is_a?(TrueClass) || value.is_a?(FalseClass)) ? value : value.to_i > 0)
         options.merge!({ "type" => "checkbox", "value" => checked_value })
         add_default_name_and_id(options)
-        tag("input", options)
+        tag("input", options) << tag("input", ({ "name" => options['name'], "type" => "hidden", "value" => unchecked_value }))
       end
 
       def to_date_tag()

data/lib/action_view/helpers/form_options_helper.rb

@@ -137,7 +137,50 @@ module ActionView
 
       private
         # All the countries included in the country_options output.
-        COUNTRIES = [ "Albania", "Algeria", "American Samoa", "Andorra", "Angola", "Anguilla", "Antarctica", "Antigua And Barbuda", "Argentina", "Armenia", "Aruba", "Australia", "Austria", "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin", "Bermuda", "Bhutan", "Bolivia", "Bosnia and Herzegowina", "Botswana", "Bouvet Island", "Brazil", "British Indian Ocean Territory", "Brunei Darussalam", "Bulgaria", "Burkina Faso", "Burma", "Burundi", "Cambodia", "Cameroon", "Canada", "Cape Verde", "Cayman Islands", "Central African Republic", "Chad", "Chile", "China", "Christmas Island", "Cocos (Keeling) Islands", "Colombia", "Comoros", "Congo", "Congo, the Democratic Republic of the", "Cook Islands", "Costa Rica", "Cote d'Ivoire", "Croatia", "Cyprus", "Czech Republic", "Denmark", "Djibouti", "Dominica", "Dominican Republic", "East Timor", "Ecuador", "Egypt", "El Salvador", "England", "Equatorial Guinea", "Eritrea", "Espana", "Estonia", "Ethiopia", "Falkland Islands", "Faroe Islands", "Fiji", "Finland", "France", "French Guiana", "French Polynesia", "French Southern Territories", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Gibraltar", "Great Britain", "Greece", "Greenland", "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guinea", "Guinea-Bissau", "Guyana", "Haiti", "Heard and Mc Donald Islands", "Honduras", "Hong Kong", "Hungary", "Iceland", "India", "Indonesia", "Ireland", "Israel", "Italy", "Jamaica", "Japan", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "Korea, Republic of", "Korea (South)", "Kuwait", "Kyrgyzstan", "Lao People's Democratic Republic", "Latvia", "Lebanon", "Lesotho", "Liberia", "Liechtenstein", "Lithuania", "Luxembourg", "Macau", "Macedonia", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Martinique", "Mauritania", "Mauritius", "Mayotte", "Mexico", "Micronesia, Federated States of", "Moldova, Republic of", "Monaco", "Mongolia", "Montserrat", "Morocco", "Mozambique", "Myanmar", "Namibia", "Nauru", "Nepal", "Netherlands", "Netherlands Antilles", "New Caledonia", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Niue", "Norfolk Island", "Northern Ireland", "Northern Mariana Islands", "Norway", "Oman", "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Pitcairn", "Poland", "Portugal", "Puerto Rico", "Qatar", "Reunion", "Romania", "Russia", "Russian Federation", "Rwanda", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "Samoa (Independent)", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Scotland", "Senegal", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa", "South Georgia and the South Sandwich Islands", "South Korea", "Spain", "Sri Lanka", "St. Helena", "St. Pierre and Miquelon", "Suriname", "Svalbard and Jan Mayen Islands", "Swaziland", "Sweden", "Switzerland", "Taiwan", "Tajikistan", "Tanzania", "Thailand", "Togo", "Tokelau", "Tonga", "Trinidad", "Trinidad and Tobago", "Tunisia", "Turkey", "Turkmenistan", "Turks and Caicos Islands", "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom", "United States", "United States Minor Outlying Islands", "Uruguay", "Uzbekistan", "Vanuatu", "Vatican City State (Holy See)", "Venezuela", "Viet Nam", "Virgin Islands (British)", "Virgin Islands (U.S.)", "Wales", "Wallis and Futuna Islands", "Western Sahara", "Yemen", "Zambia", "Zimbabwe" ] unless const_defined?("COUNTRIES")
+        COUNTRIES = [ "Albania", "Algeria", "American Samoa", "Andorra", "Angola", "Anguilla", 
+            "Antarctica", "Antigua And Barbuda", "Argentina", "Armenia", "Aruba", "Australia", 
+            "Austria", "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", 
+            "Belgium", "Belize", "Benin", "Bermuda", "Bhutan", "Bolivia", "Bosnia and Herzegowina", 
+            "Botswana", "Bouvet Island", "Brazil", "British Indian Ocean Territory", 
+            "Brunei Darussalam", "Bulgaria", "Burkina Faso", "Burma", "Burundi", "Cambodia", 
+            "Cameroon", "Canada", "Cape Verde", "Cayman Islands", "Central African Republic", 
+            "Chad", "Chile", "China", "Christmas Island", "Cocos (Keeling) Islands", "Colombia", 
+            "Comoros", "Congo", "Congo, the Democratic Republic of the", "Cook Islands", 
+            "Costa Rica", "Cote d'Ivoire", "Croatia", "Cyprus", "Czech Republic", "Denmark", 
+            "Djibouti", "Dominica", "Dominican Republic", "East Timor", "Ecuador", "Egypt", 
+            "El Salvador", "England", "Equatorial Guinea", "Eritrea", "Espana", "Estonia", 
+            "Ethiopia", "Falkland Islands", "Faroe Islands", "Fiji", "Finland", "France", 
+            "French Guiana", "French Polynesia", "French Southern Territories", "Gabon", "Gambia", 
+            "Georgia", "Germany", "Ghana", "Gibraltar", "Great Britain", "Greece", "Greenland", 
+            "Grenada", "Guadeloupe", "Guam", "Guatemala", "Guinea", "Guinea-Bissau", "Guyana", 
+            "Haiti", "Heard and Mc Donald Islands", "Honduras", "Hong Kong", "Hungary", "Iceland", 
+            "India", "Indonesia", "Ireland", "Israel", "Italy", "Jamaica", "Japan", "Jordan", 
+            "Kazakhstan", "Kenya", "Kiribati", "Korea, Republic of", "Korea (South)", "Kuwait", 
+            "Kyrgyzstan", "Lao People's Democratic Republic", "Latvia", "Lebanon", "Lesotho", 
+            "Liberia", "Liechtenstein", "Lithuania", "Luxembourg", "Macau", "Macedonia", 
+            "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", 
+            "Martinique", "Mauritania", "Mauritius", "Mayotte", "Mexico", 
+            "Micronesia, Federated States of", "Moldova, Republic of", "Monaco", "Mongolia", 
+            "Montserrat", "Morocco", "Mozambique", "Myanmar", "Namibia", "Nauru", "Nepal", 
+            "Netherlands", "Netherlands Antilles", "New Caledonia", "New Zealand", "Nicaragua", 
+            "Niger", "Nigeria", "Niue", "Norfolk Island", "Northern Ireland", 
+            "Northern Mariana Islands", "Norway", "Oman", "Pakistan", "Palau", "Panama", 
+            "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Pitcairn", "Poland", 
+            "Portugal", "Puerto Rico", "Qatar", "Reunion", "Romania", "Russia", "Rwanda", 
+            "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", 
+            "Samoa (Independent)", "San Marino", "Sao Tome and Principe", "Saudi Arabia", 
+            "Scotland", "Senegal", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", 
+            "Slovenia", "Solomon Islands", "Somalia", "South Africa", 
+            "South Georgia and the South Sandwich Islands", "South Korea", "Spain", "Sri Lanka", 
+            "St. Helena", "St. Pierre and Miquelon", "Suriname", "Svalbard and Jan Mayen Islands", 
+            "Swaziland", "Sweden", "Switzerland", "Taiwan", "Tajikistan", "Tanzania", "Thailand", 
+            "Togo", "Tokelau", "Tonga", "Trinidad", "Trinidad and Tobago", "Tunisia", "Turkey", 
+            "Turkmenistan", "Turks and Caicos Islands", "Tuvalu", "Uganda", "Ukraine", 
+            "United Arab Emirates", "United Kingdom", "United States", 
+            "United States Minor Outlying Islands", "Uruguay", "Uzbekistan", "Vanuatu", 
+            "Vatican City State (Holy See)", "Venezuela", "Viet Nam", "Virgin Islands (British)", 
+            "Virgin Islands (U.S.)", "Wales", "Wallis and Futuna Islands", "Western Sahara", 
+            "Yemen", "Zambia", "Zimbabwe" ] unless const_defined?("COUNTRIES")
     end
 
     class InstanceTag #:nodoc: