hobofields 0.9.103 → 0.9.104

data/Rakefile

@@ -3,7 +3,7 @@ require 'active_record'
 ActiveRecord::ActiveRecordError # hack for https://rails.lighthouseapp.com/projects/8994/tickets/2577-when-using-activerecordassociations-outside-of-rails-a-nameerror-is-thrown
 
 RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
-RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} `which rubydoctest`"
+RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
 
 $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '/../hobofields/lib')
 $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '/../hobosupport/lib')
@@ -13,7 +13,8 @@ require 'hobofields'
 namespace "test" do
   desc "Run the doctests"
   task :doctest do |t|
-    exit(1) if !system("#{RUBYDOCTEST} test/*.rdoctest")
+    files=Dir['test/*.rdoctest'].map {|f| File.expand_path(f)}.join(' ')
+    exit(1) if !system("#{RUBYDOCTEST} #{files}")
   end
 
   desc "Run the unit tests"

data/lib/hobo_fields/migration_generator.rb

@@ -375,7 +375,9 @@ module HoboFields
     end
 
     def drop_index(table, name)
-      "remove_index :#{table}, :name => :#{name}"
+      # see https://hobo.lighthouseapp.com/projects/8324/tickets/566
+      # for why the rescue exists
+      "remove_index :#{table}, :name => :#{name} rescue ActiveRecord::StatementInvalid"
     end
 
     def format_options(options, type, changing=false)

data/lib/hobo_fields.rb

@@ -9,7 +9,7 @@ end
 
 module HoboFields
 
-  VERSION = "0.9.103"
+  VERSION = "0.9.104"
 
   extend self
 
@@ -103,10 +103,15 @@ module HoboFields
     # 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
+      plugins = Rails.configuration.plugin_loader.new(HoboFields.rails_initializer).plugins
+      ([::Rails.root] + plugins.map(&:directory)).each do |dir|
+        ActiveSupport::Dependencies.load_paths << File.join(dir, 'app', 'rich_types')
+        Dir[File.join(dir, '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_dependency f
+        end
       end
+
     end
 
     # Monkey patch ActiveRecord so that the attribute read & write methods
@@ -155,6 +160,3 @@ module HoboFields
   end
 
 end
-
-
-HoboFields.enable if defined? ActiveRecord

data/rails/init.rb

@@ -0,0 +1,9 @@
+module ::HoboFields
+  class << self
+    attr_accessor :rails_initializer
+  end
+end
+::HoboFields.rails_initializer = initializer
+
+require File.dirname(__FILE__) + "/../lib/hobofields"
+HoboFields.enable

data/test/hobofields.rdoctest

@@ -62,9 +62,9 @@ The source lives on GitHub as part of the main Hobo repo:
 
  - [http://github.com/tablatom/hobo](http://github.com/tablatom/hobo)
 
-The simplest way to install HoboFields as a plugin is to use the subversion mirror:
-
-        svn export svn://hobocentral.net/hobo/tags/rel_0.7.5/hobofields vendor/plugins
+To use hobofields as a plugin is not as simple as it should be.  You
+will have to clone `git://github.com/tablatom/hobo` and then copy the
+`hobofields` subdirectory into `/vendors/plugins`
 
 ## Rich Types
 

data/test/hobofields_api.rdoctest

@@ -41,6 +41,7 @@ Require the module we're testing:
 
     >> require 'hobosupport'
     >> require 'hobofields'
+    >> HoboFields.enable
 
 ## Example Models
 

data/test/migration_generator.rdoctest

@@ -39,6 +39,7 @@ And we'll require:
 
     >> require 'hobosupport'
     >> require 'hobofields'
+    >> HoboFields.enable
 
 ## The migration generator -- introduction
 
@@ -275,7 +276,7 @@ foreign-key field.  It also generates an index on the field.
         => 
          "remove_column :adverts, :category_id
 
-         remove_index :adverts, :name => :index_adverts_on_category_id"
+         remove_index :adverts, :name => :index_adverts_on_category_id rescue ActiveRecord::StatementInvalid"
 
 Cleanup:
 {.hidden}
@@ -571,7 +572,7 @@ Adding a subclass or two should introduce the 'type' column and no other changes
         => 
          "remove_column :adverts, :type
 
-         remove_index :adverts, :name => :index_adverts_on_type"
+         remove_index :adverts, :name => :index_adverts_on_type rescue ActiveRecord::StatementInvalid"
 
 Cleanup
 {.hidden}

data/test/migration_generator_primary_key.rdoctest

@@ -33,6 +33,7 @@ And we'll require:
 
     >> require 'hobosupport'
     >> require 'hobofields'
+    >> HoboFields.enable
 
 OK we're ready to get going.
 

data/test/rich_types.rdoctest

@@ -40,6 +40,7 @@ Finally we can require hobofields:
 
         >> require 'hobosupport'
         >> require 'hobofields'
+        >> HoboFields.enable
 
 ## `to_html` method
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hobofields
 version: !ruby/object:Gem::Version 
-  version: 0.9.103
+  version: 0.9.104
 platform: ruby
 authors: 
 - Tom Locke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 -05:00
+date: 2010-01-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.103
+        version: 0.9.104
     version: 
 description: 
 email: tom@tomlocke.com
@@ -45,7 +45,6 @@ files:
 - LICENSE.txt
 - README.txt
 - Rakefile
-- init.rb
 - lib/hobo_fields.rb
 - lib/hobo_fields/email_address.rb
 - lib/hobo_fields/enum_string.rb
@@ -66,6 +65,7 @@ files:
 - lib/hobo_fields/text.rb
 - lib/hobo_fields/textile_string.rb
 - lib/hobofields.rb
+- rails/init.rb
 - rails_generators/hobo_migration/USAGE
 - rails_generators/hobo_migration/hobo_migration_generator.rb
 - rails_generators/hobo_migration/templates/migration.rb

data/init.rb

@@ -1,4 +0,0 @@
-require 'hobosupport'
-
-# Use ActiveSupport to load if it hasn't been loaded already
-HoboFields