active_scaffold-sequel 0.6.2 → 0.7.0

data/frontends/default/views/_list_record.html.erb

@@ -1,5 +1,5 @@
 <%
-record = list_record if list_record # compat with render :partial :collection
+record = list_record if defined?(list_record)  # compat with render :partial :collection
 columns ||= list_columns
 tr_class = cycle("", "even-record")
 tr_class += " #{list_row_class(record)}" if respond_to? :list_row_class

data/lib/active_scaffold.rb

@@ -1,7 +1,3 @@
-unless Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
-  raise "This version of ActiveScaffold requires Rails 3.1 or higher.  Please use an earlier version."
-end
-
 require 'active_scaffold/version'
 require 'active_scaffold/engine' unless defined? ACTIVE_SCAFFOLD_PLUGIN
 require 'json'  # for js_config

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

@@ -1,15 +1,21 @@
 module ActiveScaffold::Bridges
   class CountryHelper
     module CountryHelpers
+      def country_select_class
+        defined?(ActionView::Helpers::InstanceTag) ? ActionView::Helpers::InstanceTag : ActionView::Helpers::Tags::CountrySelect
+      end
+
       # 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)
+        country_select_class.new(object, method, self, options).to_country_select_tag(priority_countries, options, html_options)
       end
 
       def usa_state_select(object, method, priority_states = nil, options = {}, html_options = {})
-        ActionView::Helpers::InstanceTag.new(object, method, self, options.delete(:object)).to_usa_state_select_tag(priority_states, options, html_options)
+        country_select_class.new(object, method, self, options).to_usa_state_select_tag(priority_states, options, html_options)
       end
+    end
 
+    module CountryOptionsHelpers
       # 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.
@@ -19,21 +25,21 @@ module ActiveScaffold::Bridges
         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 => '')
         else
-          country_options = ""
+          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)
       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)
         if priority_states
           state_options = options_for_select(priority_states + [['-------------', '']], :selected => selected, :disabled => '')
         else
-          state_options = ""
+          state_options = options_for_select([])
         end
 
         if priority_states && priority_states.include?(selected)
@@ -44,283 +50,281 @@ module ActiveScaffold::Bridges
 
         return state_options
       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,                                         
-      :zimbabwe] unless const_defined?("COUNTRIES")
 
+      # 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")
 
-    	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
+      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")
+    end
 
-        def to_country_select_tag(priority_countries, options, html_options)
-          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(
-              country_options_for_select(selected_value, priority_countries),
-              options, selected_value
-            ), html_options
-          )
-        end
+    module InstanceTagMethods
+      def to_country_select_tag(priority_countries, options, html_options)
+        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(
+            country_options_for_select(selected_value, priority_countries),
+            options, selected_value
+          ), html_options
+        )
+      end
 
-        def to_usa_state_select_tag(priority_states, options, html_options)
-          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)
-        end
+      def to_usa_state_select_tag(priority_states, options, html_options)
+        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)
       end
     end
-    
+
     module FormColumnHelpers
       def active_scaffold_input_country(column, options)
         select_options = {:prompt => as_(:_select_)}
@@ -338,14 +342,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
@@ -353,6 +357,19 @@ end
 
 ActionView::Base.class_eval do
   include ActiveScaffold::Bridges::CountryHelper::CountryHelpers
+  include ActiveScaffold::Bridges::CountryHelper::CountryOptionsHelpers
   include ActiveScaffold::Bridges::CountryHelper::FormColumnHelpers
   include ActiveScaffold::Bridges::CountryHelper::SearchColumnHelpers
 end
+
+if defined? ActionView::Helpers::InstanceTag
+  ActionView::Helpers::InstanceTag.class_eval do
+    include ActiveScaffold::Bridges::CountryHelper::CountryOptionsHelpers
+    include ActiveScaffold::Bridges::CountryHelper::InstanceTagMethods
+  end
+else
+  class ActionView::Helpers::Tags::CountrySelect < ActionView::Helpers::Tags::Base #:nodoc:
+    include ActiveScaffold::Bridges::CountryHelper::CountryOptionsHelpers
+    include ActiveScaffold::Bridges::CountryHelper::InstanceTagMethods
+  end
+end

data/lib/active_scaffold/extensions/name_option_for_datetime.rb

@@ -1,12 +1,17 @@
-module ActionView
-  module Helpers
-    class InstanceTag
-      private
-      def datetime_selector_with_name(options, html_options)
-        options.merge!(:prefix => options[:name].gsub(/\[[^\[]*\]$/,'')) if options[:name]
-        datetime_selector_without_name(options, html_options)        
+module ActiveScaffold
+  module DateSelectExtension
+    def datetime_selector_with_name(options, html_options)
+      options.merge!(:prefix => options[:name].gsub(/\[[^\[]*\]$/,'')) if options[:name]
+      datetime_selector_without_name(options, html_options)
+    end
+    def self.included(base)
+      base.class_eval do
+        alias_method_chain :datetime_selector, :name
+        private :datetime_selector_without_name, :datetime_selector_with_name, :datetime_selector
       end
-      alias_method_chain :datetime_selector, :name
     end
   end
 end
+(defined?(ActionView::Helpers::Tags::DateSelect) ? ActionView::Helpers::Tags::DateSelect : ActionView::Helpers::InstanceTag).class_eval do
+  include ActiveScaffold::DateSelectExtension
+end

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -45,7 +45,7 @@ module ActiveScaffold
                 options = active_scaffold_input_text_options(options) if text_types.include?(column.column[:type])
                 if column.column[:type] == :string && options[:maxlength].blank?
                   options[:maxlength] = column.maxlength
-                  options[:size] ||= ActionView::Helpers::InstanceTag::DEFAULT_FIELD_OPTIONS["size"]
+                  options[:size] ||= options[:maxlength].to_i > 30 ? 30 : options[:maxlength]
                 end
                 options[:include_blank] = true if column.column[:allow_null] and [:date, :datetime, :time].include?(column.column[:type])
                 options[:value] = format_number_value(@record.send(column.name), column.options) if column.number?

data/lib/active_scaffold/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffold
   module Version
     MAJOR = 0
-    MINOR = 6
-    PATCH = 2
+    MINOR = 7
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold-sequel
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -244,8 +244,8 @@ files:
 - lib/active_scaffold/config/show.rb
 - lib/active_scaffold/config/subform.rb
 - lib/active_scaffold/config/update.rb
-- lib/active_scaffold/data_structures/action_columns.rb
 - lib/active_scaffold/data_structures/action_link.rb
+- lib/active_scaffold/data_structures/action_columns.rb
 - lib/active_scaffold/data_structures/action_links.rb
 - lib/active_scaffold/data_structures/actions.rb
 - lib/active_scaffold/data_structures/bridge.rb
@@ -263,7 +263,6 @@ files:
 - lib/active_scaffold/extensions/to_label.rb
 - lib/active_scaffold/extensions/unsaved_associated.rb
 - lib/active_scaffold/extensions/unsaved_record.rb
-- lib/active_scaffold/extensions/usa_state.rb
 - lib/active_scaffold/helpers/human_condition_helpers.rb
 - lib/active_scaffold/helpers/association_helpers.rb
 - lib/active_scaffold/helpers/controller_helpers.rb
@@ -272,8 +271,8 @@ files:
 - lib/active_scaffold/helpers/id_helpers.rb
 - lib/active_scaffold/helpers/search_column_helpers.rb
 - lib/active_scaffold/helpers/pagination_helpers.rb
-- lib/active_scaffold/helpers/show_column_helpers.rb
 - lib/active_scaffold/helpers/view_helpers.rb
+- lib/active_scaffold/helpers/show_column_helpers.rb
 - lib/active_scaffold/model_permissions.rb
 - lib/active_scaffold/attribute_params.rb
 - lib/active_scaffold/bridges.rb
@@ -416,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: ActiveScaffold version supporting Sequel with Rails 3.1.

data/lib/active_scaffold/extensions/usa_state.rb

@@ -1,46 +0,0 @@
-module ActionView
-  module Helpers
-    module FormOptionsHelper
-
-      # Return a full select and option tags for the given object and method, using usa_state_options_for_select to generate the list of option <tags>.
-      def usa_state_select(object, method, priority_states = nil, options = {}, html_options = {})
-        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 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)
-        state_options = ""
-        if priority_states
-          state_options += options_for_select(priority_states, selected)
-          state_options += "<option>-------------</option>\n"
-        end
-
-        if priority_states && priority_states.include?(selected)
-          state_options += options_for_select(USASTATES - priority_states, selected)
-        else
-          state_options += options_for_select(USASTATES, selected)
-        end
-
-        return state_options
-      end
-
-    	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")
- 
-    end
-  
-    class InstanceTag #:nodoc:
-      include FormOptionsHelper
- 
-      def to_usa_state_select_tag(priority_states, options, html_options)
-        html_options = html_options.stringify_keys
-        add_default_name_and_id(html_options)
-        value = value(object) if method(:value).arity > 0
-        content_tag("select", add_options(usa_state_options_for_select(value, priority_states), options, value), html_options)
-      end
-    end
-  end
-end