RubyGems - active_scaffold - Versions diffs - 3.0.4 → 3.0.5 - Mend

active_scaffold 3.0.4 → 3.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

data/CHANGELOG +5 -0
data/active_scaffold.gemspec +1 -1
data/frontends/default/stylesheets/stylesheet.css +40 -2
data/lib/active_scaffold.rb +111 -21
data/lib/active_scaffold/actions/nested.rb +5 -1
data/lib/active_scaffold/actions/subform.rb +4 -1
data/lib/active_scaffold/attribute_params.rb +4 -4
data/lib/active_scaffold/bridges/bridge.rb +2 -5
data/lib/active_scaffold/config/list.rb +9 -9
data/lib/active_scaffold/config/update.rb +1 -1
data/lib/active_scaffold/data_structures/action_links.rb +4 -3
data/lib/active_scaffold/finder.rb +13 -13
data/lib/active_scaffold/helpers/controller_helpers.rb +5 -3
data/lib/active_scaffold/helpers/country_helpers.rb +263 -257
data/lib/active_scaffold/helpers/form_column_helpers.rb +5 -5
data/lib/active_scaffold/helpers/id_helpers.rb +2 -2
data/lib/active_scaffold/helpers/search_column_helpers.rb +11 -11
data/lib/active_scaffold/helpers/view_helpers.rb +15 -15
data/lib/active_scaffold/marked_model.rb +6 -6
data/lib/extensions/action_view_rendering.rb +5 -5
data/lib/extensions/active_record_offset.rb +7 -7
data/lib/extensions/localize.rb +1 -1
data/lib/extensions/name_option_for_datetime.rb +1 -1
data/lib/extensions/paginator_extensions.rb +2 -2
data/lib/extensions/reverse_associations.rb +1 -1
data/lib/extensions/routing_mapper.rb +2 -2
data/lib/extensions/usa_state.rb +15 -11
data/lib/generators/active_scaffold/active_scaffold_generator.rb +5 -5
data/lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb +2 -2
data/lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb +10 -10
metadata +4 -6
data/environment.rb +0 -24
data/install_assets.rb +0 -44

data/lib/active_scaffold/helpers/controller_helpers.rb CHANGED Viewed

@@ -4,9 +4,9 @@ module ActiveScaffold
       def self.included(controller)
         controller.class_eval { helper_method :params_for, :main_path_to_return }
       end
       include ActiveScaffold::Helpers::IdHelpers
       def params_for(options = {})
         # :adapter and :position are one-use rendering arguments. they should not propagate.
         # :sort, :sort_direction, and :page are arguments that stored in the session. they need not propagate.
@@ -22,7 +22,9 @@ module ActiveScaffold
         @params_for.merge(options)
       end
-      # Parameters to generate url to the main page (override if the ActiveScaffold is used as a component on another controllers page)
+      # Parameters to generate url to the main page (override if the
+      # ActiveScaffold is used as a component on another controllers
+      # page)
       def main_path_to_return
         parameters = {}
         if params[:parent_controller]

data/lib/active_scaffold/helpers/country_helpers.rb CHANGED Viewed

@@ -1,7 +1,9 @@
 module ActiveScaffold
   module Helpers
     module CountryHelpers
-      # Return select and option tags for the given object and method, using country_options_for_select to generate the list of option tags.
+      # Return select and option tags for the given object and method,
+      # using country_options_for_select to generate the list of
+      # option tags.
       def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
         ActionView::Helpers::InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
       end
@@ -10,9 +12,11 @@ module ActiveScaffold
         ActionView::Helpers::InstanceTag.new(object, method, self, options.delete(:object)).to_usa_state_select_tag(priority_states, options, html_options)
       end
-      # Returns a string of option tags for pretty much any country in the world. Supply a country name as +selected+ to
-      # have it marked as the selected option tag. You can also supply an array of countries as +priority_countries+, so
-      # that they will be listed above the rest of the (long) list.
+      # Returns a string of option tags for pretty much any country in
+      # the world. Supply a country name as +selected+ to have it
+      # marked as the selected option tag. You can also supply an
+      # array of countries as +priority_countries+, so that they will
+      # be listed above the rest of the (long) list.
       #
       # 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)
@@ -25,10 +29,12 @@ module ActiveScaffold
         return 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+
-      # in case you want to highligh a local area
-      # NOTE: Only the option tags are returned from this method, wrap it in a <select>
+      # 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+ 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)
         if priority_states
           state_options = options_for_select(priority_states + [['-------------', '']], :selected => selected, :disabled => '')
@@ -46,254 +52,254 @@ module ActiveScaffold
       end
             # 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,
+      :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 = [["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")
       class ActionView::Helpers::InstanceTag #:nodoc:
         include CountryHelpers
@@ -320,7 +326,7 @@ module ActiveScaffold
         end
       end
     end
     module FormColumnHelpers
       def active_scaffold_input_country(column, options)
         select_options = {:prompt => as_(:_select_)}
@@ -338,14 +344,14 @@ module ActiveScaffold
         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