Merge commit 'origin/master'

hobo/CHANGES.txt

@@ -90,6 +90,9 @@ Major enhancements:
     the "decorated join table" functionality that was deprecated in Rails 2.3
     is NOT supported.
 
+  - [#475](https://hobo.lighthouseapp.com/projects/8324-hobo/tickets/475)
+    User-defined rich types are now loaded from RAILS_ROOT/app/rich_types, if it exists.
+
   - EnumString's can now be translated.  The
     [manual](http://cookbook.hobocentral.net/manual/hobofields/rich_types)
     has been updated with the details.

hobofields/lib/hobo_fields.rb

@@ -100,6 +100,15 @@ def enable
     # Add the fields do declaration to ActiveRecord::Base
     ActiveRecord::Base.send(:include, HoboFields::FieldsDeclaration)
 
+    # automatically load other rich types from app/rich_types/*.rb
+    # don't assume we're in a Rails app
+    if defined?(::Rails)
+      Dir[File.join(::Rails.root, 'app', 'rich_types', '*.rb')].each do |f|
+        # TODO: should we complain if field_types doesn't get a new value? Might be useful to warn people if they're missing a register_type
+        require f
+      end
+    end
+
     # Monkey patch ActiveRecord so that the attribute read & write methods
     # automatically wrap richly-typed fields.
     ActiveRecord::AttributeMethods::ClassMethods.class_eval do