active_scaffold 3.4.36 → 3.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c0925aecdf8e8cb67457796ee92dda1238e643
-  data.tar.gz: ca9244cc82582adb62affbd49e316d5b4a5bafd4
+  metadata.gz: a4cba196e4425cbbb6fbf33eb6e53865030e87cf
+  data.tar.gz: ebf4fdae5434832d4c412c9d67f58a9d13aca510
 SHA512:
-  metadata.gz: 5bf876c309a71dd8a954782e51ce23ff8a20dc937f5562a110cd9814909f9bdd16c0da239cd40c2b79045895235194638d7b0383d68853e031e537b713892ef8
-  data.tar.gz: d7aef2c46b06c3a13a980ae5faf7f1df628802921643a9a92784f4b55066406f7b7da2a99e25c40c5307a0c7ad324d37dc8cd408d7166bf3d037eb7b4ee3e3a1
+  metadata.gz: dfc1186e00611b378bd728334cb52c9279df90bd02572abb27b31a3b39957181cd9aaae180397c186fa75850cbc8b44357b8f69797371ffc026ca833991a5776
+  data.tar.gz: 9a1ab9e777c2703f022c36e6d031a16a7af211af985cd37aad4e22286814603782eccb881e61b96c022ff80f870c1e2b82844c6e6569cf973f6cc81a0da17ab2

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 3.4.37
+- return valid css class for subgroups, e.g. when name with dot is used for translation scopes
+- check permissions for add existing and delete existing, use nested parent record authorized for update nested association column
+- TinyMCE bridge integrate better with the tinymce-rails (thanks to @subfusc)
+- Remove own country_select helpers and convert into bridge for country_select gem (now it will save country code instead of country name, migrate data or restore old behaviour setting columns[:col].options[:format] = :old)
+
 = 3.4.36
 - Fix tableless for rails >= 4.1 for associations with table
 - use number_with_precision for non-integer numbers with i18n_number format, so strip_insignificant_zeros and precision can be used

data/README.md

@@ -6,6 +6,7 @@ Overview
 [![Dependency Status](https://gemnasium.com/activescaffold/active_scaffold.svg)](https://gemnasium.com/activescaffold/active_scaffold)
 [![Gem Version](https://badge.fury.io/rb/active_scaffold.svg)](https://badge.fury.io/rb/active_scaffold)
 [![Inline docs](https://inch-ci.org/github/activescaffold/active_scaffold.svg?branch=master)](https://inch-ci.org/github/activescaffold/active_scaffold)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails 3.2 and 4.x are supported, ruby >= 1.9 required. For rails 4 is recommended >= 4.0.5.
 

data/lib/active_scaffold/actions/delete.rb

@@ -52,11 +52,11 @@ module ActiveScaffold::Actions
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def delete_authorized?(record = nil)
-      (!nested? || !nested.readonly?) && (record || self).send(:authorized_for?, :crud_type => :delete)
+      (!nested? || !nested.readonly?) && (record || self).authorized_for?(:crud_type => :delete)
     end
 
     def delete_ignore?(record = nil)
-      (nested? && nested.readonly?) || !send(:authorized_for?, :crud_type => :delete)
+      (nested? && nested.readonly?) || !self.authorized_for?(:crud_type => :delete)
     end
 
     private

data/lib/active_scaffold/actions/nested.rb

@@ -207,11 +207,11 @@ module ActiveScaffold::Actions::Nested
     end
 
     def add_existing_authorized?(record = nil)
-      true
+      nested_parent_record.authorized_for?(:crud_type => :update, :column => nested.association.try(:name))
     end
 
     def delete_existing_authorized?(record = nil)
-      true
+      nested_parent_record.authorized_for?(:crud_type => :update, :column => nested.association.try(:name))
     end
 
     def after_create_save(record)

data/lib/active_scaffold/bridges/country_select/country_select_bridge_helper.rb

@@ -0,0 +1,38 @@
+module ActiveScaffold::Bridges
+  class CountrySelect
+    module FormColumnHelpers
+      def active_scaffold_input_country(column, options)
+        select_options = {:prompt => as_(:_select_), :priority_countries => column.options[:priority] || [:us], :format => column.options[:format]}
+        select_options.merge!(options)
+        options.reverse_merge!(column.options).except!(:prompt, :priority, :format)
+        options[:name] += '[]' if options[:multiple]
+        country_select(:record, column.name, select_options, options.except(:object))
+      end
+    end
+
+    module ListColumnHelpers
+      def active_scaffold_column_country(record, column)
+        country_code = record.send(column.name)
+        return if country_code.blank?
+        country = ISO3166::Country[country_code]
+        return country_code unless country
+        country.translations[I18n.locale.to_s] || country.name
+      end
+    end
+
+    module SearchColumnHelpers
+      def active_scaffold_search_country(column, options)
+        active_scaffold_input_country(column, options.merge!(:selected => options.delete(:value)))
+      end
+    end
+  end
+end
+
+# To use old way, saving country name instead of CountrySelect default of country code
+CountrySelect::FORMATS[:old] = lambda { |country| [country.translations[I18n.locale.to_s] || country.name, country.name] }
+
+ActionView::Base.class_eval do
+  include ActiveScaffold::Bridges::CountrySelect::FormColumnHelpers
+  include ActiveScaffold::Bridges::CountrySelect::ListColumnHelpers
+  include ActiveScaffold::Bridges::CountrySelect::SearchColumnHelpers
+end

data/lib/active_scaffold/bridges/country_select.rb

@@ -0,0 +1,5 @@
+class ActiveScaffold::Bridges::CountrySelect < ActiveScaffold::DataStructures::Bridge
+  def self.install
+    require File.join(File.dirname(__FILE__), 'country_select/country_select_bridge_helper.rb')
+  end
+end

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

@@ -12,10 +12,18 @@ class ActiveScaffold::Bridges::TinyMce
         base.alias_method_chain :onsubmit, :tiny_mce
       end
 
+      # The two column options that can be set specifically for the text_editor input
+      # is :tinymce, which overrides single values in the tinymce config.
+      # E.g. column[:foo].options[:tinymce] = {theme: 'other'} will change the theme
+      # but not the plugins, toolbars etc.
+      # The other one is :tinymce_config, which selects the config to use from tinymce.yml.
+      # See the tinymce-rails gem documentation for usage.
       def active_scaffold_input_text_editor(column, options)
         options[:class] = "#{options[:class]} mceEditor #{column.options[:class]}".strip
 
-        settings = {:theme => 'modern'}.merge(column.options[:tinymce] || {})
+        settings = tinymce_configuration(column.options[:tinymce_config] || :default).options.
+          reject{|k,v| k =='selector'}.
+          merge(column.options[:tinymce] || {})
         settings = settings.to_json
         settings = "tinyMCE.settings = #{settings};"
 
@@ -34,6 +42,10 @@ class ActiveScaffold::Bridges::TinyMce
         end
         [onsubmit_without_tiny_mce, submit_js].compact.join ';'
       end
+
+      # The implementation is very tinymce specific, so it makes sense allowing :form_ui
+      # to be :tinymce as well
+      alias_method :active_scaffold_input_tinymce, :active_scaffold_input_text_editor
     end
 
     module SearchColumnHelpers

data/lib/active_scaffold/bridges/usa_state_select/usa_state_select_helper.rb

@@ -0,0 +1,84 @@
+module ActiveScaffold::Bridges
+  class UsaStateSelect
+    module UsaStateSelectHelpers
+      def usa_state_select_options(options)
+        # TODO remove when rails 3.2 support is dropped
+        defined?(ActionView::Helpers::InstanceTag) ? options[:object] : options
+      end
+
+      def usa_state_select(object, method, priority_states = nil, options = {}, html_options = {})
+        ActionView::Helpers::Tags::UsaStateSelect.new(object, method, self, usa_state_select_options(options)).to_usa_state_select_tag(priority_states, options, html_options)
+      end
+    end
+
+    module UsaStateSelectOptionsHelpers
+      # 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 => '')
+        else
+          state_options = options_for_select([])
+        end
+
+        if priority_states && priority_states.include?(selected)
+          state_options += options_for_select(USASTATES - priority_states, :selected => selected)
+        else
+          state_options += options_for_select(USASTATES, :selected => selected)
+        end
+
+        state_options
+      end
+
+      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
+      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.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_usa_state(column, options)
+        select_options = {:prompt => as_(:_select_)}
+        select_options.merge!(options)
+        options.reverse_merge!(column.options).except!(:prompt, :priority)
+        options[:name] += '[]' if options[:multiple]
+        usa_state_select(:record, column.name, column.options[:priority], select_options, options.except(:object))
+      end
+    end
+
+    module SearchColumnHelpers
+      def active_scaffold_search_usa_state(column, options)
+        active_scaffold_input_usa_state(column, options.merge!(:selected => options.delete(:value)))
+      end
+    end
+  end
+end
+
+ActionView::Base.class_eval do
+  include ActiveScaffold::Bridges::UsaStateSelect::UsaStateSelectHelpers
+  include ActiveScaffold::Bridges::UsaStateSelect::UsaStateSelectOptionsHelpers
+  include ActiveScaffold::Bridges::UsaStateSelect::FormColumnHelpers
+  include ActiveScaffold::Bridges::UsaStateSelect::SearchColumnHelpers
+end
+if defined? ActionView::Helpers::InstanceTag # TODO remove when rails 3.2 support is dropped
+  module ActionView::Helpers::Tags
+    class UsaStateSelect < ActionView::Helpers::InstanceTag
+      include ActiveScaffold::Bridges::UsaStateSelect::UsaStateSelectOptionsHelpers
+      include ActiveScaffold::Bridges::UsaStateSelect::InstanceTagMethods
+    end
+  end
+else
+  class ActionView::Helpers::Tags::UsaStateSelect < ActionView::Helpers::Tags::Base #:nodoc:
+    include ActiveScaffold::Bridges::UsaStateSelect::UsaStateSelectOptionsHelpers
+    include ActiveScaffold::Bridges::UsaStateSelect::InstanceTagMethods
+  end
+end

data/lib/active_scaffold/bridges/usa_state_select.rb

@@ -0,0 +1,9 @@
+class ActiveScaffold::Bridges::UsaStateSelect < ActiveScaffold::DataStructures::Bridge
+  def self.install
+    require File.join(File.dirname(__FILE__), 'usa_state_select/usa_state_select_helper.rb')
+  end
+
+  def self.install?
+    true
+  end
+end

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -18,7 +18,7 @@ module ActiveScaffold::DataStructures
     end
 
     def css_class
-      @label.to_s.underscore
+      @label.to_s.underscore.gsub /[^-_0-9a-zA-Z]/, '-'
     end
 
     # this is so that array.delete and array.include?, etc., will work by column name

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 36
+    PATCH = 37
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/test/bridges/tiny_mce_test.rb

@@ -4,6 +4,27 @@ class TinyMceTest < ActionView::TestCase
   include ActiveScaffold::Helpers::ViewHelpers
   include ActiveScaffold::Bridges::TinyMce::Helpers
 
+  # Mimic the behaviour of the tinymce-rails plugin function[1] to get
+  # configuration options from tinymce.yml
+  #
+  # [1]: https://github.com/spohlenz/tinymce-rails/blob/master/lib/tinymce/rails/helper.rb#L37
+  def tinymce_configuration(config=:default)
+    return case config
+           when :default
+             Class.new do
+               def options
+                 {theme: 'modern'}
+               end
+             end.new
+           when :alternate
+             Class.new do
+               def options
+                 {theme: 'alternate', toolbar: 'undo redo | format'}
+               end
+             end.new
+           end
+  end
+
   def test_includes
     ActiveScaffold::Bridges::TinyMce.expects(:install?).returns(true)
     ActiveScaffold.js_framework = :jquery
@@ -18,6 +39,15 @@ class TinyMceTest < ActionView::TestCase
     assert_dom_equal %{<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\">\n</textarea>\n<script#{' type="text/javascript"' if Rails::VERSION::MAJOR < 4}>\n//<![CDATA[\ntinyMCE.settings = {\"theme\":\"modern\"};tinyMCE.execCommand('mceAddEditor', false, 'record_name');\n//]]>\n</script>}, active_scaffold_input_text_editor(config.columns[:name], :name => 'record[name]', :id => 'record_name', :class => 'name-input', :object => record)
   end
 
+  def test_form_ui_alternate
+    config = ActiveScaffold::Config::Core.new(:company)
+    record = Company.new
+    expects(:request).returns(stub(:xhr? => true))
+    config.columns[:name].options[:tinymce_config] = :alternate
+
+    assert_dom_equal %{<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\">\n</textarea>\n<script#{' type="text/javascript"' if Rails::VERSION::MAJOR < 4}>\n//<![CDATA[\ntinyMCE.settings = {\"theme\":\"alternate\",\"toolbar\":\"undo redo | format\"};tinyMCE.execCommand('mceAddEditor', false, 'record_name');\n//]]>\n</script>}, active_scaffold_input_tinymce(config.columns[:name], :name => 'record[name]', :id => 'record_name', :class => 'name-input', :object => record)
+  end
+
   protected
 
   def include_tiny_mce_if_needed; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.36
+  version: 3.4.37
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -233,8 +233,8 @@ files:
 - lib/active_scaffold/bridges/carrierwave/list_ui.rb
 - lib/active_scaffold/bridges/chosen.rb
 - lib/active_scaffold/bridges/chosen/helpers.rb
-- lib/active_scaffold/bridges/country_helper.rb
-- lib/active_scaffold/bridges/country_helper/country_helper_bridge.rb
+- lib/active_scaffold/bridges/country_select.rb
+- lib/active_scaffold/bridges/country_select/country_select_bridge_helper.rb
 - lib/active_scaffold/bridges/date_picker.rb
 - lib/active_scaffold/bridges/date_picker/ext.rb
 - lib/active_scaffold/bridges/date_picker/helper.rb
@@ -268,6 +268,8 @@ files:
 - lib/active_scaffold/bridges/shared/date_bridge.rb
 - lib/active_scaffold/bridges/tiny_mce.rb
 - lib/active_scaffold/bridges/tiny_mce/helpers.rb
+- lib/active_scaffold/bridges/usa_state_select.rb
+- lib/active_scaffold/bridges/usa_state_select/usa_state_select_helper.rb
 - lib/active_scaffold/config/base.rb
 - lib/active_scaffold/config/core.rb
 - lib/active_scaffold/config/create.rb

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

@@ -1,380 +0,0 @@
-module ActiveScaffold::Bridges
-  class CountryHelper
-    module CountryHelpers
-      def country_select_class
-        # TODO remove when rails 3.2 support is dropped
-        defined?(ActionView::Helpers::InstanceTag) ? ActionView::Helpers::InstanceTag : ActionView::Helpers::Tags::CountrySelect
-      end
-
-      def country_select_options(options)
-        # TODO remove when rails 3.2 support is dropped
-        defined?(ActionView::Helpers::InstanceTag) ? options[:object] : options
-      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 = {})
-        country_select_class.new(object, method, self, country_select_options(options)).to_country_select_tag(priority_countries, options, html_options)
-      end
-
-      def usa_state_select(object, method, priority_states = nil, options = {}, html_options = {})
-        country_select_class.new(object, method, self, country_select_options(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.
-      #
-      # 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 => '')
-        else
-          country_options = options_for_select([])
-        end
-
-        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>
-      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 = options_for_select([])
-        end
-
-        if priority_states && priority_states.include?(selected)
-          state_options += options_for_select(USASTATES - priority_states, :selected => selected)
-        else
-          state_options += options_for_select(USASTATES, :selected => selected)
-        end
-
-        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')
-
-      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
-      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.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.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_)}
-        select_options.merge!(options)
-        options.reverse_merge!(column.options).except!(:prompt, :priority)
-        options[:name] += '[]' if options[:multiple]
-        country_select(:record, column.name, column.options[:priority] || [:united_states], select_options, options)
-      end
-
-      def active_scaffold_input_usa_state(column, options)
-        select_options = {:prompt => as_(:_select_)}
-        select_options.merge!(options)
-        options.reverse_merge!(column.options).except!(:prompt, :priority)
-        options[:name] += '[]' if options[:multiple]
-        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)))
-      end
-
-      def active_scaffold_search_usa_state(column, options)
-        active_scaffold_input_usa_state(column, options.merge!(:selected => options.delete(:value)))
-      end
-    end
-  end
-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 # TODO remove when rails 3.2 support is dropped
-  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/bridges/country_helper.rb

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