active_scaffold 3.4.17 → 3.4.18

data/lib/active_scaffold/bridges/chosen/helpers.rb

@@ -13,13 +13,13 @@ class ActiveScaffold::Bridges::Chosen
         html_options[:class] << ' chosen'
         if column.plural_association?
           associated_options, select_options = active_scaffold_plural_association_options(column)
-          options = {:selected => associated_options.collect {|a| a.id}, :include_blank => as_(:_select_)}
+          options = {:selected => associated_options.collect(&:id), :include_blank => as_(:_select_)}
 
           html_options.update(:multiple => true).update(column.options[:html_options] || {})
           options.update(column.options)
-          html_options[:name] = "#{html_options[:name]}[]" if html_options[:multiple] == true && !html_options[:name].to_s.ends_with?("[]")
+          html_options[:name] = "#{html_options[:name]}[]" if html_options[:multiple] == true && !html_options[:name].to_s.ends_with?('[]')
 
-          if optgroup = options.delete(:optgroup)
+          if (optgroup = options.delete(:optgroup))
             select(:record, column.name, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
           else
             collection_select(:record, column.name, select_options, :id, column.options[:label_method] || :to_label, options, html_options)
@@ -35,7 +35,7 @@ class ActiveScaffold::Bridges::Chosen
         options[:class] << ' chosen'
         active_scaffold_search_select(column, options)
       end
-      
+
       def active_scaffold_search_multi_chosen(column, options)
         options[:class] << ' chosen'
         options[:multiple] = true

data/lib/active_scaffold/bridges/country_helper.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::CountryHelper < ActiveScaffold::DataStructures::Bridge
   def self.install
-    require File.join(File.dirname(__FILE__), "country_helper/country_helper_bridge.rb")
+    require File.join(File.dirname(__FILE__), 'country_helper/country_helper_bridge.rb')
   end
 
   def self.install?

data/lib/active_scaffold/bridges/country_helper/country_helper_bridge.rb

@@ -22,16 +22,16 @@ module ActiveScaffold::Bridges
       # NOTE: Only the option tags are returned, you have to wrap this call in a regular HTML select tag.
       def country_options_for_select(selected = nil, priority_countries = nil)
         if priority_countries
-          country_options = options_for_select(priority_countries.collect {|country| [I18n.t("countries.#{country}", :default => country.to_s.titleize), country.to_s]} + [['-------------', '']], :selected => selected, :disabled => '')
+          country_options = options_for_select(priority_countries.collect { |country| [I18n.t("countries.#{country}", :default => country.to_s.titleize), country.to_s] } + [['-------------', '']], :selected => selected, :disabled => '')
         else
           country_options = options_for_select([])
         end
 
-        return country_options + options_for_select(COUNTRIES.collect {|country| [I18n.t("countries.#{country}", :default => country.to_s.titleize), country.to_s]}, :selected => selected)
+        country_options + options_for_select(COUNTRIES.collect { |country| [I18n.t("countries.#{country}", :default => country.to_s.titleize), country.to_s] }, :selected => selected)
       end
 
       # Returns a string of option tags for the states in the United States. Supply a state name as +selected to
-      # have it marked as the selected option tag. Included also is the option to set a couple of +priority_states+ 
+      # have it marked as the selected option tag. Included also is the option to set a couple of +priority_states+
       # in case you want to highligh a local area
       # NOTE: Only the option tags are returned from this method, wrap it in a <select>
       def usa_state_options_for_select(selected = nil, priority_states = nil)
@@ -47,258 +47,257 @@ module ActiveScaffold::Bridges
           state_options += options_for_select(USASTATES, :selected => selected)
         end
 
-        return state_options
+        state_options
       end
-            # All the countries included in the country_options output.
+      # All the countries included in the country_options output.
       COUNTRIES = [
-      :afghanistan,                                    
-      :aland_islands,                                  
-      :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,                                   
-      :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_divoire,                                  
-      :croatia,                                        
-      :cuba,                                           
-      :cyprus,                                         
-      :czech_republic,                                 
-      :denmark,                                        
-      :djibouti,                                       
-      :dominica,                                       
-      :dominican_republic,                             
-      :ecuador,                                        
-      :egypt,                                          
-      :el_salvador,                                    
-      :equatorial_guinea,                              
-      :eritrea,                                        
-      :estonia,                                        
-      :ethiopia,                                       
-      :falkland_islands_malvinas,                      
-      :faroe_islands,                                  
-      :fiji,                                           
-      :finland,                                        
-      :france,                                         
-      :french_guiana,                                  
-      :french_polynesia,                               
-      :french_southern_territories,                    
-      :gabon,                                          
-      :gambia,                                         
-      :georgia,                                        
-      :germany,                                        
-      :ghana,                                          
-      :gibraltar,                                      
-      :greece,                                         
-      :greenland,                                      
-      :grenada,                                        
-      :guadeloupe,                                     
-      :guam,                                           
-      :guatemala,                                      
-      :guernsey,                                       
-      :guinea,                                         
-      :guinea_bissau,                                  
-      :guyana,                                         
-      :haiti,                                          
-      :heard_and_mcdonald_islands,                     
-      :holy_see_vatican_city_state,                    
-      :honduras,                                       
-      :hong_kong,                                      
-      :hungary,                                        
-      :iceland,                                        
-      :india,                                          
-      :indonesia,                                      
-      :iran_islamic_republic_of,                       
-      :iraq,                                           
-      :ireland,                                        
-      :isle_of_man,                                    
-      :israel,                                         
-      :italy,                                          
-      :jamaica,                                        
-      :japan,                                          
-      :jersey,                                         
-      :jordan,                                         
-      :kazakhstan,                                     
-      :kenya,                                          
-      :kiribati,                                       
-      :korea_democratic_peoples_republic_of,          
-      :korea_republic_of,                              
-      :kuwait,                                         
-      :kyrgyzstan,                                     
-      :lao_peoples_democratic_republic,               
-      :latvia,                                         
-      :lebanon,                                        
-      :lesotho,                                        
-      :liberia,                                        
-      :libyan_arab_jamahiriya,                         
-      :liechtenstein,                                  
-      :lithuania,                                      
-      :luxembourg,                                     
-      :macao,                                          
-      :macedonia_the_former_yugoslav_republic_of,      
-      :madagascar,                                     
-      :malawi,                                         
-      :malaysia,                                       
-      :maldives,                                       
-      :mali,                                           
-      :malta,                                          
-      :marshall_islands,                               
-      :martinique,                                     
-      :mauritania,                                     
-      :mauritius,                                      
-      :mayotte,                                        
-      :mexico,                                         
-      :micronesia_federated_states_of,                 
-      :moldova_republic_of,                            
-      :monaco,                                         
-      :mongolia,                                       
-      :montenegro,                                     
-      :montserrat,                                     
-      :morocco,                                        
-      :mozambique,                                     
-      :myanmar,                                        
-      :namibia,                                        
-      :nauru,                                          
-      :nepal,                                          
-      :netherlands,                                    
-      :netherlands_antilles,                           
-      :new_caledonia,                                  
-      :new_zealand,                                    
-      :nicaragua,                                      
-      :niger,                                          
-      :nigeria,                                        
-      :niue,                                           
-      :norfolk_island,                                 
-      :northern_mariana_islands,                       
-      :norway,                                         
-      :oman,                                           
-      :pakistan,                                       
-      :palau,                                          
-      :palestinian_territory_occupied,                 
-      :panama,                                         
-      :papua_new_guinea,                               
-      :paraguay,                                       
-      :peru,                                           
-      :philippines,                                    
-      :pitcairn,                                       
-      :poland,                                         
-      :portugal,                                       
-      :puerto_rico,                                    
-      :qatar,                                          
-      :reunion,                                        
-      :romania,                                        
-      :russian_federation,                             
-      :rwanda,                                         
-      :saint_barthelemy,                               
-      :saint_helena,                                   
-      :saint_kitts_and_nevis,                          
-      :saint_lucia,                                    
-      :saint_pierre_and_miquelon,                      
-      :saint_vincent_and_the_grenadines,               
-      :samoa,                                          
-      :san_marino,                                     
-      :sao_tome_and_principe,                          
-      :saudi_arabia,                                   
-      :senegal,                                        
-      :serbia,                                         
-      :seychelles,                                     
-      :sierra_leone,                                   
-      :singapore,                                      
-      :slovakia,                                       
-      :slovenia,                                       
-      :solomon_islands,                                
-      :somalia,                                        
-      :south_africa,                                   
-      :south_georgia_and_the_south_sandwich_islands,   
-      :spain,                                          
-      :sri_lanka,                                      
-      :sudan,                                          
-      :suriname,                                       
-      :svalbard_and_jan_mayen,                         
-      :swaziland,                                      
-      :sweden,                                         
-      :switzerland,                                    
-      :syrian_arab_republic,                           
-      :taiwan_province_of_china,                       
-      :tajikistan,                                     
-      :tanzania_united_republic_of,                    
-      :thailand,                                       
-      :timor_leste,                                    
-      :togo,                                           
-      :tokelau,                                        
-      :tonga,                                          
-      :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,                                        
-      :venezuela,                                      
-      :viet_nam,                                       
-      :virgin_islands_british,                         
-      :virgin_islands_us,                              
-      :wallis_and_futuna,                              
-      :western_sahara,                                 
-      :yemen,                                          
-      :zambia,                                         
-      :zimbabwe] unless const_defined?("COUNTRIES")
+        :afghanistan,
+        :aland_islands,
+        :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,
+        :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_divoire,
+        :croatia,
+        :cuba,
+        :cyprus,
+        :czech_republic,
+        :denmark,
+        :djibouti,
+        :dominica,
+        :dominican_republic,
+        :ecuador,
+        :egypt,
+        :el_salvador,
+        :equatorial_guinea,
+        :eritrea,
+        :estonia,
+        :ethiopia,
+        :falkland_islands_malvinas,
+        :faroe_islands,
+        :fiji,
+        :finland,
+        :france,
+        :french_guiana,
+        :french_polynesia,
+        :french_southern_territories,
+        :gabon,
+        :gambia,
+        :georgia,
+        :germany,
+        :ghana,
+        :gibraltar,
+        :greece,
+        :greenland,
+        :grenada,
+        :guadeloupe,
+        :guam,
+        :guatemala,
+        :guernsey,
+        :guinea,
+        :guinea_bissau,
+        :guyana,
+        :haiti,
+        :heard_and_mcdonald_islands,
+        :holy_see_vatican_city_state,
+        :honduras,
+        :hong_kong,
+        :hungary,
+        :iceland,
+        :india,
+        :indonesia,
+        :iran_islamic_republic_of,
+        :iraq,
+        :ireland,
+        :isle_of_man,
+        :israel,
+        :italy,
+        :jamaica,
+        :japan,
+        :jersey,
+        :jordan,
+        :kazakhstan,
+        :kenya,
+        :kiribati,
+        :korea_democratic_peoples_republic_of,
+        :korea_republic_of,
+        :kuwait,
+        :kyrgyzstan,
+        :lao_peoples_democratic_republic,
+        :latvia,
+        :lebanon,
+        :lesotho,
+        :liberia,
+        :libyan_arab_jamahiriya,
+        :liechtenstein,
+        :lithuania,
+        :luxembourg,
+        :macao,
+        :macedonia_the_former_yugoslav_republic_of,
+        :madagascar,
+        :malawi,
+        :malaysia,
+        :maldives,
+        :mali,
+        :malta,
+        :marshall_islands,
+        :martinique,
+        :mauritania,
+        :mauritius,
+        :mayotte,
+        :mexico,
+        :micronesia_federated_states_of,
+        :moldova_republic_of,
+        :monaco,
+        :mongolia,
+        :montenegro,
+        :montserrat,
+        :morocco,
+        :mozambique,
+        :myanmar,
+        :namibia,
+        :nauru,
+        :nepal,
+        :netherlands,
+        :netherlands_antilles,
+        :new_caledonia,
+        :new_zealand,
+        :nicaragua,
+        :niger,
+        :nigeria,
+        :niue,
+        :norfolk_island,
+        :northern_mariana_islands,
+        :norway,
+        :oman,
+        :pakistan,
+        :palau,
+        :palestinian_territory_occupied,
+        :panama,
+        :papua_new_guinea,
+        :paraguay,
+        :peru,
+        :philippines,
+        :pitcairn,
+        :poland,
+        :portugal,
+        :puerto_rico,
+        :qatar,
+        :reunion,
+        :romania,
+        :russian_federation,
+        :rwanda,
+        :saint_barthelemy,
+        :saint_helena,
+        :saint_kitts_and_nevis,
+        :saint_lucia,
+        :saint_pierre_and_miquelon,
+        :saint_vincent_and_the_grenadines,
+        :samoa,
+        :san_marino,
+        :sao_tome_and_principe,
+        :saudi_arabia,
+        :senegal,
+        :serbia,
+        :seychelles,
+        :sierra_leone,
+        :singapore,
+        :slovakia,
+        :slovenia,
+        :solomon_islands,
+        :somalia,
+        :south_africa,
+        :south_georgia_and_the_south_sandwich_islands,
+        :spain,
+        :sri_lanka,
+        :sudan,
+        :suriname,
+        :svalbard_and_jan_mayen,
+        :swaziland,
+        :sweden,
+        :switzerland,
+        :syrian_arab_republic,
+        :taiwan_province_of_china,
+        :tajikistan,
+        :tanzania_united_republic_of,
+        :thailand,
+        :timor_leste,
+        :togo,
+        :tokelau,
+        :tonga,
+        :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,
+        :venezuela,
+        :viet_nam,
+        :virgin_islands_british,
+        :virgin_islands_us,
+        :wallis_and_futuna,
+        :western_sahara,
+        :yemen,
+        :zambia,
+        :zimbabwe] unless const_defined?('COUNTRIES')
 
-
-      USASTATES = [["Alabama", "AL"], ["Alaska", "AK"], ["Arizona", "AZ"], ["Arkansas", "AR"], ["California", "CA"], ["Colorado", "CO"], ["Connecticut", "CT"], ["Delaware", "DE"], ["District of Columbia", "DC"], ["Florida", "FL"], ["Georgia", "GA"], ["Hawaii", "HI"], ["Idaho", "ID"], ["Illinois", "IL"], ["Indiana", "IN"], ["Iowa", "IA"], ["Kansas", "KS"], ["Kentucky", "KY"], ["Louisiana", "LA"], ["Maine", "ME"], ["Maryland", "MD"], ["Massachusetts", "MA"], ["Michigan", "MI"], ["Minnesota", "MN"], ["Mississippi", "MS"], ["Missouri", "MO"], ["Montana", "MT"], ["Nebraska", "NE"], ["Nevada", "NV"], ["New Hampshire", "NH"], ["New Jersey", "NJ"], ["New Mexico", "NM"], ["New York", "NY"], ["North Carolina", "NC"], ["North Dakota", "ND"], ["Ohio", "OH"], ["Oklahoma", "OK"], ["Oregon", "OR"], ["Pennsylvania", "PA"], ["Rhode Island", "RI"], ["South Carolina", "SC"], ["South Dakota", "SD"], ["Tennessee", "TN"], ["Texas", "TX"], ["Utah", "UT"], ["Vermont", "VT"], ["Virginia", "VA"], ["Washington", "WA"], ["Wisconsin", "WI"], ["West Virginia", "WV"], ["Wyoming", "WY"]] unless const_defined?("USASTATES")
+      USASTATES = [%w(Alabama AL), %w(Alaska AK), %w(Arizona AZ), %w(Arkansas AR), %w(California CA), %w(Colorado CO), %w(Connecticut CT), %w(Delaware DE), ['District of Columbia', 'DC'], %w(Florida FL), %w(Georgia GA), %w(Hawaii HI), %w(Idaho ID), %w(Illinois IL), %w(Indiana IN), %w(Iowa IA), %w(Kansas KS), %w(Kentucky KY), %w(Louisiana LA), %w(Maine ME), %w(Maryland MD), %w(Massachusetts MA), %w(Michigan MI), %w(Minnesota MN), %w(Mississippi MS), %w(Missouri MO), %w(Montana MT), %w(Nebraska NE), %w(Nevada NV), ['New Hampshire', 'NH'], ['New Jersey', 'NJ'], ['New Mexico', 'NM'], ['New York', 'NY'], ['North Carolina', 'NC'], ['North Dakota', 'ND'], %w(Ohio OH), %w(Oklahoma OK), %w(Oregon OR), %w(Pennsylvania PA), ['Rhode Island', 'RI'], ['South Carolina', 'SC'], ['South Dakota', 'SD'], %w(Tennessee TN), %w(Texas TX), %w(Utah UT), %w(Vermont VT), %w(Virginia VA), %w(Washington WA), %w(Wisconsin WI), ['West Virginia', 'WV'], %w(Wyoming WY)] unless const_defined?('USASTATES')
     end
 
     module InstanceTagMethods
@@ -306,8 +305,9 @@ module ActiveScaffold::Bridges
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
         value = value(object)
-        selected_value = options.has_key?(:selected) ? options[:selected] : value
-        content_tag("select",
+        selected_value = options.key?(:selected) ? options[:selected] : value
+        content_tag(
+          'select',
           add_options(
             country_options_for_select(selected_value, priority_countries),
             options, selected_value
@@ -319,8 +319,8 @@ module ActiveScaffold::Bridges
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
         value = value(object)
-        selected_value = options.has_key?(:selected) ? options[:selected] : value
-        content_tag("select", add_options(usa_state_options_for_select(selected_value, priority_states), options, selected_value), html_options)
+        selected_value = options.key?(:selected) ? options[:selected] : value
+        content_tag('select', add_options(usa_state_options_for_select(selected_value, priority_states), options, selected_value), html_options)
       end
     end
 
@@ -341,14 +341,14 @@ module ActiveScaffold::Bridges
         usa_state_select(:record, column.name, column.options[:priority], select_options, options)
       end
     end
-    
+
     module SearchColumnHelpers
       def active_scaffold_search_country(column, options)
-        active_scaffold_input_country(column, options.merge!(:selected => options.delete(:value)))       
+        active_scaffold_input_country(column, options.merge!(:selected => options.delete(:value)))
       end
 
       def active_scaffold_search_usa_state(column, options)
-        active_scaffold_input_usa_state(column, options.merge!(:selected => options.delete(:value)))       
+        active_scaffold_input_usa_state(column, options.merge!(:selected => options.delete(:value)))
       end
     end
   end
@@ -371,4 +371,3 @@ else
     include ActiveScaffold::Bridges::CountryHelper::InstanceTagMethods
   end
 end
-