hobo_fields 1.3.0.RC2 → 1.3.0.RC3

data/VERSION

@@ -1 +1 @@
-1.3.0.RC2
+1.3.0.RC3

data/lib/generators/hobo/migration/migrator.rb

@@ -130,7 +130,7 @@ module Generators
           all_models = table_model_classes
           hobo_models = all_models.select { |m| m.try.include_in_migration && m.name.underscore.not_in?(ignore_model_names) }
           non_hobo_models = all_models - hobo_models
-          db_tables = connection.tables - Migrator.ignore_tables.*.to_s - non_hobo_models.*.table_name
+          db_tables = connection.tables - Migrator.ignore_tables.*.to_s - non_hobo_models.reject { |t| t.try.hobo_shim? }.*.table_name
           [hobo_models, db_tables]
         end
 
@@ -391,6 +391,8 @@ module Generators
         def drop_index(table, name)
           # see https://hobo.lighthouseapp.com/projects/8324/tickets/566
           # for why the rescue exists
+          max_length = connection.index_name_length
+          name = name[0,max_length] if name.length > max_length
           "remove_index :#{table}, :name => :#{name} rescue ActiveRecord::StatementInvalid"
         end
 

data/lib/hobo_fields/model/index_spec.rb

@@ -28,7 +28,17 @@ module HoboFields
       def to_add_statement(new_table_name)
         r = "add_index :#{new_table_name}, #{fields.*.to_sym.inspect}"
         r += ", :unique => true" if unique
-        r += ", :name => '#{name}'" unless default_name?
+        if default_name?
+          check_name = @model.connection.index_name(self.table, :column => self.fields)
+        else
+          check_name = name
+        end
+        if check_name.length > @model.connection.index_name_length
+          r += ", :name => '#{name[0,@model.connection.index_name_length]}'"
+          $stderr.puts("WARNING: index name #{check_name} too long, trimming")
+        else
+          r += ", :name => '#{name}'" unless default_name?
+        end
         r
       end
 

data/lib/hobo_fields/model.rb

@@ -170,7 +170,11 @@ module HoboFields
 
     def self.add_index_for_field(name, args, options)
       to_name = options.delete(:index)
-      return unless to_name
+      unless to_name
+        # passing :unique => true doesn't do anything without an index
+        Rails.logger.error('ERROR: passing :unique => true without :index => true does nothing. Use :unique instead.') if options[:unique]
+        return
+      end
       index_opts = {}
       index_opts[:unique] = :unique.in?(args) || options.delete(:unique)
       # support :index => true declaration

data/lib/hobo_fields/types/text.rb

@@ -6,7 +6,7 @@ module HoboFields
       COLUMN_TYPE = :text
 
       def to_html(xmldoctype = true)
-        ERB::Util.html_escape(self).gsub("\n", "<br#{xmldoctype ? ' /' : ''}>\n")
+        ERB::Util.html_escape(self).gsub("\n", "<br#{xmldoctype ? ' /' : ''}>\n").html_safe
       end
 
       HoboFields.register_type(:text, self)

data/lib/hobo_fields.rb

@@ -1,6 +1,7 @@
 require 'hobo_support'
 
 ActiveSupport::Dependencies.autoload_paths |= [ File.dirname(__FILE__) ]
+ActiveSupport::Dependencies.autoload_once_paths |= [ File.dirname(__FILE__) ]
 
 module Hobo
   # Empty class to represent the boolean type.

metadata

@@ -2,7 +2,7 @@
 name: hobo_fields
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.3.0.RC2
+  version: 1.3.0.RC3
 platform: ruby
 authors: 
 - Tom Locke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 -04:00
+date: 2011-10-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.RC2
+        version: 1.3.0.RC3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rich field types and migration generator for Rails