geo_tools 1.0.1 → 1.1.0

data/lib/geo_tools/validations.rb

@@ -0,0 +1,79 @@
+# encoding: utf-8
+module GeoTools
+  module Validations
+
+    # ActiveRecord::Validations::ClassMethods::ALL_NUMERICALITY_CHECKS
+    ALL_NUMERICALITY_CHECKS = { :greater_than => '>', :greater_than_or_equal_to => '>=',
+                                  :equal_to => '==', :less_than => '<', :less_than_or_equal_to => '<=',
+                                  :odd => 'odd?', :even => 'even?' }.freeze
+
+    # Sames as validates_numericality_of but additionally supports :for option
+    # which lets you attach an error to a different attribute.
+    def validates_inclusion_of_for(*attr_names)
+      configuration = { :on => :save }
+      configuration.update(attr_names.extract_options!)
+
+      enum = configuration[:in] || configuration[:within]
+
+      raise(ArgumentError, "An object with the method include? is required must be supplied as the :in option of the configuration hash") unless enum.respond_to?(:include?)
+
+      validates_each(attr_names, configuration) do |record, attr_name, value|
+        unless enum.include?(value)
+          attr_for = configuration[:for] || attr_name
+          record.errors.add(attr_for, :inclusion, :default => configuration[:message], :value => value) 
+        end
+      end
+    end
+
+    # Sames as validates_numericality_of but additionally supports :for option
+    # which lets you attach an error to a different attribute.
+    def validates_numericality_of_for(*attr_names)
+      configuration = { :on => :save, :only_integer => false, :allow_nil => false }
+      configuration.update(attr_names.extract_options!)
+
+      numericality_options = ALL_NUMERICALITY_CHECKS.keys & configuration.keys
+
+      (numericality_options - [ :odd, :even ]).each do |option|
+        raise ArgumentError, ":#{option} must be a number" unless configuration[option].is_a?(Numeric)
+      end
+
+      validates_each(attr_names,configuration) do |record, attr_name, value|
+        raw_value = record.send("#{attr_name}_before_type_cast") || value
+
+        next if configuration[:allow_nil] and raw_value.nil?
+
+        attr_for = configuration[:for] || attr_name
+
+        if configuration[:only_integer]
+          unless raw_value.to_s =~ /\A[+-]?\d+\Z/
+            record.errors.add(attr_for, :not_a_number, :value => raw_value, :default => configuration[:message])
+            next
+          end
+          raw_value = raw_value.to_i
+        else
+          begin
+            raw_value = Kernel.Float(raw_value)
+          rescue ArgumentError, TypeError
+            record.errors.add(attr_for, :not_a_number, :value => raw_value, :default => configuration[:message])
+            next
+          end
+        end
+
+        numericality_options.each do |option|
+          case option
+          when :odd, :even
+            unless raw_value.to_i.method( ALL_NUMERICALITY_CHECKS[option])[]
+              record.errors.add(attr_for, option, :value => raw_value, :default => configuration[:message]) 
+            end
+          else
+            record.errors.add(attr_for, option, :default => configuration[:message], :value => raw_value, :count => configuration[option]) unless raw_value.method( ALL_NUMERICALITY_CHECKS[option])[configuration[option]]
+          end
+        end
+      end
+    end
+
+  end
+end
+
+
+ActiveRecord::Base.send :extend, GeoTools::Validations

data/lib/geo_tools/version.rb

@@ -0,0 +1,3 @@
+module GeoTools
+  VERSION = '1.1.0'
+end

data/test/geo_tools_test.rb

@@ -1,4 +1,6 @@
+# encoding: utf-8
 require 'test_helper'
+require 'geo_tools'
 
 class Treasure < ActiveRecord::Base
   acts_as_location
@@ -6,9 +8,19 @@ end
 
 class GeoToolsTest < ActiveSupport::TestCase
 
-  context 'A location model' do
+  context 'A new location' do
     setup { @treasure = Treasure.new }
 
+    should 'display a sensible #to_s' do
+      assert_equal "00°00.00′, 00°00.00′", @treasure.to_s
+    end
+  end
+
+
+  context 'A location model' do
+    setup    { @treasure = Treasure.new }
+    teardown { Treasure.destroy_all }
+
     should 'convert northern hemisphere latitude fields to a positive float' do
       @treasure.update_attributes location
       assert_in_delta 42.95583, @treasure.latitude, 0.0001
@@ -33,19 +45,17 @@ class GeoToolsTest < ActiveSupport::TestCase
       @treasure.update_attributes location
       assert_equal "42°57.35′N, 153°22.27′E", @treasure.to_s
     end
-
-    teardown { Treasure.destroy_all }
   end
 
   context 'Location#within' do
-    # TODO: use Factory Girl.
-
     context 'NE quadrant' do
       setup do
-        @a = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'N', :longitude_degrees => '153', :longitude_hemisphere => 'E', :latitude_minutes => '12', :longitude_minutes => '47'
-        @b = Treasure.create :latitude_degrees => '43', :latitude_hemisphere => 'N', :longitude_degrees => '153', :longitude_hemisphere => 'E'
-        @c = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'N', :longitude_degrees => '154', :longitude_hemisphere => 'E'
+        @a = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'N', :longitude_degrees => 153, :longitude_hemisphere => 'E', :latitude_minutes => 12, :longitude_minutes => 47
+        @b = Treasure.create :latitude_degrees => 43, :latitude_hemisphere => 'N', :longitude_degrees => 153, :longitude_hemisphere => 'E'
+        @c = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'N', :longitude_degrees => 154, :longitude_hemisphere => 'E'
       end
+      teardown { Treasure.destroy_all }
+
       should 'return locations to nearest minute' do
         assert_same_elements [],           Treasure.within(1, 1, 42, 153)
         assert_same_elements [@a, @b, @c], Treasure.within(1, 1, 43, 154)
@@ -54,15 +64,16 @@ class GeoToolsTest < ActiveSupport::TestCase
         assert_same_elements [@b],         Treasure.within(1, 1, 43, f(153, 46))
         assert_same_elements [@a, @b],     Treasure.within(1, 1, 43, f(153, 47))
       end
-      teardown { Treasure.destroy_all }
     end
 
     context 'NW quadrant' do
       setup do
-        @a = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'N', :longitude_degrees => '153', :longitude_hemisphere => 'W', :latitude_minutes => '12', :longitude_minutes => '47'
-        @b = Treasure.create :latitude_degrees => '43', :latitude_hemisphere => 'N', :longitude_degrees => '153', :longitude_hemisphere => 'W'
-        @c = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'N', :longitude_degrees => '154', :longitude_hemisphere => 'W'
+        @a = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'N', :longitude_degrees => 153, :longitude_hemisphere => 'W', :latitude_minutes => 12, :longitude_minutes => 47
+        @b = Treasure.create :latitude_degrees => 43, :latitude_hemisphere => 'N', :longitude_degrees => 153, :longitude_hemisphere => 'W'
+        @c = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'N', :longitude_degrees => 154, :longitude_hemisphere => 'W'
       end
+      teardown { Treasure.destroy_all }
+
       should 'return locations to nearest minute' do
         assert_same_elements [],           Treasure.within(1, -153, 42, -1)
         assert_same_elements [@a, @b, @c], Treasure.within(1, -154, 43, -1)
@@ -71,15 +82,16 @@ class GeoToolsTest < ActiveSupport::TestCase
         assert_same_elements [@b],         Treasure.within(1, f(-153, 46), 43, -1)
         assert_same_elements [@a, @b],     Treasure.within(1, f(-153, 47), 43, -1)
       end
-      teardown { Treasure.destroy_all }
     end
 
     context 'SE quadrant' do
       setup do
-        @a = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'S', :longitude_degrees => '153', :longitude_hemisphere => 'E', :latitude_minutes => '12', :longitude_minutes => '47'
-        @b = Treasure.create :latitude_degrees => '43', :latitude_hemisphere => 'S', :longitude_degrees => '153', :longitude_hemisphere => 'E'
-        @c = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'S', :longitude_degrees => '154', :longitude_hemisphere => 'E'
+        @a = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'S', :longitude_degrees => 153, :longitude_hemisphere => 'E', :latitude_minutes => 12, :longitude_minutes => 47
+        @b = Treasure.create :latitude_degrees => 43, :latitude_hemisphere => 'S', :longitude_degrees => 153, :longitude_hemisphere => 'E'
+        @c = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'S', :longitude_degrees => 154, :longitude_hemisphere => 'E'
       end
+      teardown { Treasure.destroy_all }
+
       should 'return locations to nearest minute' do
         assert_same_elements [],           Treasure.within(-42, 1, -1, 153)
         assert_same_elements [@a, @b, @c], Treasure.within(-43, 1, -1, 154)
@@ -88,15 +100,16 @@ class GeoToolsTest < ActiveSupport::TestCase
         assert_same_elements [@b],         Treasure.within(-43, 1, -1, f(153, 46))
         assert_same_elements [@a, @b],     Treasure.within(-43, 1, -1, f(153, 47))
       end
-      teardown { Treasure.destroy_all }
     end
 
     context 'SW quadrant' do
       setup do
-        @a = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'S', :longitude_degrees => '153', :longitude_hemisphere => 'W', :latitude_minutes => '12', :longitude_minutes => '47'
-        @b = Treasure.create :latitude_degrees => '43', :latitude_hemisphere => 'S', :longitude_degrees => '153', :longitude_hemisphere => 'W'
-        @c = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'S', :longitude_degrees => '154', :longitude_hemisphere => 'W'
+        @a = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'S', :longitude_degrees => 153, :longitude_hemisphere => 'W', :latitude_minutes => 12, :longitude_minutes => 47
+        @b = Treasure.create :latitude_degrees => 43, :latitude_hemisphere => 'S', :longitude_degrees => 153, :longitude_hemisphere => 'W'
+        @c = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'S', :longitude_degrees => 154, :longitude_hemisphere => 'W'
       end
+      teardown { Treasure.destroy_all }
+
       should 'return locations to nearest minute' do
         assert_same_elements [],           Treasure.within(-42, -153, -1, -1)
         assert_same_elements [@a, @b, @c], Treasure.within(-43, -154, -1, -1)
@@ -105,16 +118,17 @@ class GeoToolsTest < ActiveSupport::TestCase
         assert_same_elements [@b],         Treasure.within(-43, f(-153, 46), -1, -1)
         assert_same_elements [@a, @b],     Treasure.within(-43, f(-153, 47), -1, -1)
       end
-      teardown { Treasure.destroy_all }
     end
 
     context 'straddling equator and prime meridian' do
       setup do
-        @a = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'N', :longitude_degrees => '153', :longitude_hemisphere => 'E', :latitude_minutes => '12', :longitude_minutes => '47'
-        @b = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'N', :longitude_degrees => '153', :longitude_hemisphere => 'W', :latitude_minutes => '12', :longitude_minutes => '47'
-        @c = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'S', :longitude_degrees => '153', :longitude_hemisphere => 'E', :latitude_minutes => '12', :longitude_minutes => '47'
-        @d = Treasure.create :latitude_degrees => '42', :latitude_hemisphere => 'S', :longitude_degrees => '153', :longitude_hemisphere => 'W', :latitude_minutes => '12', :longitude_minutes => '47'
+        @a = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'N', :longitude_degrees => 153, :longitude_hemisphere => 'E', :latitude_minutes => 12, :longitude_minutes => 47
+        @b = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'N', :longitude_degrees => 153, :longitude_hemisphere => 'W', :latitude_minutes => 12, :longitude_minutes => 47
+        @c = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'S', :longitude_degrees => 153, :longitude_hemisphere => 'E', :latitude_minutes => 12, :longitude_minutes => 47
+        @d = Treasure.create :latitude_degrees => 42, :latitude_hemisphere => 'S', :longitude_degrees => 153, :longitude_hemisphere => 'W', :latitude_minutes => 12, :longitude_minutes => 47
       end
+      teardown { Treasure.destroy_all }
+
       should 'return locations to nearest degree' do
         assert_same_elements [],               Treasure.within(-42, -153, 42, 153)
         assert_same_elements [@a, @b, @c, @d], Treasure.within(-43, -154, 43, 154)
@@ -131,15 +145,11 @@ class GeoToolsTest < ActiveSupport::TestCase
         assert_same_elements [@b, @d],         Treasure.within(-43, -154, 43, f(153, 46))
         assert_same_elements [@a, @b, @c, @d], Treasure.within(-43, -154, 43, f(153, 47))
       end
-      teardown { Treasure.destroy_all }
     end
   end
 
-
   private
 
-  # TODO: use FactoryGirl instead.
-
   def location(params = {})
     { :latitude_degrees          => 42,
       :latitude_minutes          => 57,

data/test/test_helper.rb

@@ -1,14 +1,11 @@
-require 'rubygems'
-
 require 'test/unit'
-require 'shoulda'
+require 'shoulda-context'
 
 require 'active_record'
 require 'action_view'
 require 'active_support'
 require 'active_support/test_case'
 
-require 'lib/geo_tools'
 
 ActiveRecord::Base.establish_connection(
   :adapter  => "sqlite3",
@@ -20,3 +17,19 @@ class ActiveSupport::TestCase
   # FIXME: why won't this work?
   #self.use_transactional_fixtures = true
 end
+
+class Test::Unit::TestCase
+
+  # Asserts that two arrays contain the same elements, the same number of times. Essentially ==, but unordered.
+  def assert_same_elements(a1, a2, msg=nil)
+    [:select, :inject, :size].each do |m|
+      [a1, a2].each {|a| assert_respond_to(a, m, "Are you sure that #{a.inspect} is an array?  It doesn't respond to #{m}.") }
+    end
+
+    assert a1h = a1.inject({}) { |h,e| h[e] = a1.select { |i| i == e }.size; h }
+    assert a2h = a2.inject({}) { |h,e| h[e] = a2.select { |i| i == e }.size; h }
+
+    assert_equal(a1h, a2h, msg)
+  end
+
+end

metadata

@@ -1,71 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geo_tools
-version: !ruby/object:Gem::Version 
-  version: 1.0.1
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Andy Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-16 00:00:00 +00:00
-default_executable: 
-dependencies: []
-
-description: 
-email: boss@airbladesoftware.com
+date: 2012-02-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2153836380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153836380
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &2153835940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2153835940
+- !ruby/object:Gem::Dependency
+  name: shoulda-context
+  requirement: &2153830760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *2153830760
+description: Makes using latitudes and longitudes on forms easier.
+email:
+- boss@airbladesoftware.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.md
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- .rbenv-version
+- Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- VERSION
-- init.rb
-- install.rb
-- lib/air_blade/geo_tools/form_helpers.rb
-- lib/air_blade/geo_tools/location.rb
-- lib/air_blade/geo_tools/validations.rb
+- geo_tools.gemspec
 - lib/geo_tools.rb
-- tasks/geo_tools_tasks.rake
+- lib/geo_tools/form_helpers.rb
+- lib/geo_tools/location.rb
+- lib/geo_tools/validations.rb
+- lib/geo_tools/version.rb
 - test/geo_tools_test.rb
 - test/schema.rb
 - test/test_helper.rb
-- uninstall.rb
-has_rdoc: true
-homepage: http://github.com/airblade/geo_tools
+homepage: https://github.com/airblade/geo_tools
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.5
+rubyforge_project: geo_tools
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: View helpers, validations, and named scopes for locations.
-test_files: 
+summary: Makes using latitudes and longitudes on forms easier.
+test_files:
 - test/geo_tools_test.rb
 - test/schema.rb
 - test/test_helper.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.1

data/init.rb

@@ -1 +0,0 @@
-require 'geo_tools'

data/install.rb

@@ -1 +0,0 @@
-# Install hook code here

data/lib/air_blade/geo_tools/form_helpers.rb

@@ -1,166 +0,0 @@
-module AirBlade
-  module GeoTools
-
-    module FormHelpers
-
-      # Options:
-      #   :latitude
-      #     :degrees
-      #       :symbol
-      #     :minutes
-      #       :symbol
-      #     :decimal_minutes
-      #       :symbol
-      #       :maxlength
-      #
-      # Assumes the latitude field is called 'latitude'.
-      #
-      # The 'method' argument is for consistency with other field helpers.  We don't use it
-      # when using the normal Rails form builder.
-      #
-      # 1/100th of a minute of latitude (or equitorial longitude) is approximately 20m.
-      def latitude_field(method, options = {})
-        opts = {
-          :degrees         => { :symbol => '°' },
-          :minutes         => { :symbol => '.'     },
-          :decimal_minutes => { :symbol => '′', :maxlength => 2 },
-        }
-        lat_options = options.delete :latitude
-        opts.merge! lat_options if lat_options
-        
-        output = []
-
-        # Degrees
-        width = 2
-        output << plain_text_field("latitude_degrees",
-                             options.merge(:maxlength => width,
-                                           :value     => "%0#{width}d" % @object.send("latitude_degrees")))
-        output << opts[:degrees][:symbol]
-
-        # Minutes
-        width = 2
-        output << plain_text_field("latitude_minutes",
-                             options.merge(:maxlength => width,
-                                           :value     => "%0#{width}d" % @object.send("latitude_minutes")))
-        output << opts[:minutes][:symbol]
-
-        # Decimal minutes
-        width = opts[:decimal_minutes][:maxlength]
-        output << plain_text_field("latitude_decimal_minutes",
-                             options.merge(:maxlength => width,
-                                           :value     => @object.send("latitude_decimal_minutes_as_string").ljust(width, '0')))
-        output << opts[:decimal_minutes][:symbol]
-
-        # Hemisphere.
-        # Hmm, we pass the options in the html_options position.
-        output << plain_select("latitude_hemisphere", %w( N S ), {}, options)
-
-        output.join "\n"
-      end
-
-      def longitude_field(method, options = {})
-        opts = {
-          :degrees         => { :symbol => '&deg;' },
-          :minutes         => { :symbol => '.'     },
-          :decimal_minutes => { :symbol => '&prime;', :maxlength => 2 },
-        }
-        long_options = options.delete :longitude
-        opts.merge! long_options if long_options
-
-        output = []
-        
-        # Degrees
-        width = 3
-        output << plain_text_field("longitude_degrees",
-                             options.merge(:maxlength => width,
-                                           :value     => "%0#{width}d" % @object.send("longitude_degrees")))
-        output << opts[:degrees][:symbol]
-
-        # Minutes
-        width = 2
-        output << plain_text_field("longitude_minutes",
-                             options.merge(:maxlength => width,
-                                           :value     => "%0#{width}d" % @object.send("longitude_minutes")))
-        output << opts[:minutes][:symbol]
-
-        # Decimal minutes
-        width = opts[:decimal_minutes][:maxlength]
-        output << plain_text_field("longitude_decimal_minutes",
-                             options.merge(:maxlength => width,
-                                           :value     => @object.send("longitude_decimal_minutes_as_string").ljust(width, '0')))
-        output << opts[:decimal_minutes][:symbol]
-
-        # Hemisphere.
-        # Hmm, we pass the options in the html_options position.
-        output << plain_select("longitude_hemisphere", %w( E W ), {}, options)
-
-        output.join "\n"
-      end
-
-      # A layer of indirection to allow us always to use a plain field helpers,
-      # regardless of the form builder being used.
-
-      def plain_text_field(*a, &b)
-        text_field(*a, &b)
-      end
-
-      def plain_select(*a, &b)
-        select(*a, &b)
-      end
-    end
-
-
-    module AirBuddFormHelpers
-      include AirBlade::GeoTools::FormHelpers
-      alias_method :plain_latitude_field,  :latitude_field
-      alias_method :plain_longitude_field, :longitude_field
-
-      # Override latitude_field to wrap it with the custom form builder gubbins.
-      # http://github.com/airblade/air_budd_form_builder/tree/master/lib/air_blade/air_budd/form_builder.rb
-      def latitude_field(method, options = {}, html_options = {})
-        @template.content_tag('p',
-          label_element(method, options, html_options) +
-          (
-            plain_latitude_field method, options
-          ) +
-          hint_element(options),
-          (errors_for?(method) ? {:class => 'error'} : {})
-        )
-      end
-
-      # Override longitude_field to wrap it with the custom form builder gubbins.
-      # http://github.com/airblade/air_budd_form_builder/tree/master/lib/air_blade/air_budd/form_builder.rb
-      def longitude_field(method, options = {}, html_options = {})
-        @template.content_tag('p',
-          label_element(method, options, html_options) +
-          (
-            plain_longitude_field method, options
-          ) +
-          hint_element(options),
-          (errors_for?(method) ? {:class => 'error'} : {})
-        )
-      end
-
-      # Use the standard Rails helpers for text fields and selects.
-      # These are overridden by the AirBudd form builder, so we define
-      # them ourselves.
-
-      def plain_text_field(method, options = {})
-        # From ActionView::Helpers::FormBuilder
-        @template.send('text_field', @object_name, method, objectify_options(options))
-      end
-      def plain_select(method, choices, options = {}, html_options = {})
-        # From ActionView::Helpers::FormOptionsHelper::FormBuilder
-        @template.select(@object_name, method, choices, objectify_options(options), @default_options.merge(html_options))
-      end
-    end
-
-  end
-end
-
-
-# Integrate with standard Rails form builder.
-ActionView::Helpers::FormBuilder.send :include, AirBlade::GeoTools::FormHelpers
-
-# Integrate with custom AirBudd form builder.
-AirBlade::AirBudd::FormBuilder.send(:include, AirBlade::GeoTools::AirBuddFormHelpers) rescue nil