hobofields 1.1.0.pre0 → 1.1.0.pre2

data/Rakefile

@@ -34,7 +34,7 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.homepage     = "http://hobocentral.net/"
   gemspec.authors      = ["Tom Locke"]
   gemspec.rubyforge_project = "hobo"
-  gemspec.add_dependency("rails", [">= 2.2.2"])
+  gemspec.add_dependency("rails", [">= 2.2.2", "< 3.0.0"])
   gemspec.add_dependency("hobosupport", ["= #{HoboFields::VERSION}"])    
 end
 Jeweler::GemcutterTasks.new

data/lib/hobo_fields.rb

@@ -1,6 +1,10 @@
 require 'hobosupport'
 
-ActiveSupport::Dependencies.load_paths |= [ File.dirname(__FILE__) ]
+if ActiveSupport::Dependencies.respond_to?(:autoload_paths)
+  ActiveSupport::Dependencies.autoload_paths |= [ File.dirname(__FILE__)]
+else
+  ActiveSupport::Dependencies.load_paths |= [ File.dirname(__FILE__)]
+end
 
 module Hobo
   # Empty class to represent the boolean type.
@@ -9,7 +13,7 @@ end
 
 module HoboFields
 
-  VERSION = "1.1.0.pre0"
+  VERSION = "1.1.0.pre2"
 
   extend self
 
@@ -105,7 +109,11 @@ module HoboFields
     if defined?(::Rails)
       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')
+        if ActiveSupport::Dependencies.respond_to?(:autoload_paths)
+          ActiveSupport::Dependencies.autoload_paths << File.join(dir, 'app', 'rich_types')
+        else
+          ActiveSupport::Dependencies.load_paths << File.join(dir, 'app', 'rich_types')
+        end
         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

data/lib/hobo_fields/enum_string.rb

@@ -82,7 +82,7 @@ module HoboFields
     COLUMN_TYPE = :string
 
     def initialize(value)
-      super(self.class.detranslated_values.nil? ? value : self.class.detranslated_values[value.to_s])
+      super(self.class.detranslated_values.nil? ? value: (self.class.detranslated_values[value.to_s] || value))
     end
 
     def validate

data/lib/hobo_fields/model_extensions.rb

@@ -87,18 +87,17 @@ module HoboFields
 
       index_options = {}
       index_options[:name] = options.delete(:index) if options.has_key?(:index)
-
-      returning belongs_to_without_field_declarations(name, options, &block) do
-        refl = reflections[name.to_sym]
-        fkey = refl.primary_key_name
-        declare_field(fkey.to_sym, :integer, column_options)
-        if refl.options[:polymorphic]
-          declare_polymorphic_type_field(name, column_options)
-          index(["#{name}_type", fkey], index_options) if index_options[:name]!=false
-        else
-          index(fkey, index_options) if index_options[:name]!=false
-        end
+      bt = belongs_to_without_field_declarations(name, options, &block)
+      refl = reflections[name.to_sym]
+      fkey = refl.primary_key_name
+      declare_field(fkey.to_sym, :integer, column_options)
+      if refl.options[:polymorphic]
+        declare_polymorphic_type_field(name, column_options)
+        index(["#{name}_type", fkey], index_options) if index_options[:name]!=false
+      else
+        index(fkey, index_options) if index_options[:name]!=false
       end
+      bt
     end
     class << self
       alias_method_chain :belongs_to, :field_declarations

data/lib/hobo_fields/sanitize_html.rb

@@ -4,10 +4,10 @@ module HoboFields
 
     PERMITTED_TAGS       = %w(a abbr acronym address b bdo big blockquote br caption center cite code colgroup dd del dfn dir
                               div dl dt em fieldset font h1 h2 h3 h4 h5 h6 i img ins kbd label legend li map menu ol optgroup
-                              option p pre q s samp select small span strike strong sub sup tbody td textarea tfoot
+                              option p pre q s samp select small span strike strong sub sup table tbody td textarea tfoot
                               th thead tr tt u ul var)
 
-    PERMITTED_ATTRIBUTES = %w(href title class style align name src label target)
+    PERMITTED_ATTRIBUTES = %w(href title class style align name src label target border)
 
     class Helper; include ActionView::Helpers::SanitizeHelper; extend ActionView::Helpers::SanitizeHelper::ClassMethods; end
         
@@ -17,4 +17,4 @@ module HoboFields
 
   end
 
-end
+end

data/test/test_hobofield_model_generator.rb

@@ -4,7 +4,7 @@ require 'rails_generator'
 # we get a SystemStackError on JRuby
 exit(0) if defined? JRUBY_VERSION
 
-require File.join(File.dirname(__FILE__), "test_generator_helper.rb")
+require "./#{File.join(File.dirname(__FILE__), 'test_generator_helper.rb')}"
 
 class TestHobofieldModelGenerator < Test::Unit::TestCase
   include RubiGen::GeneratorTestHelper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobofields
 version: !ruby/object:Gem::Version 
-  hash: -1876988165
+  hash: -1876988167
   prerelease: true
   segments: 
   - 1
   - 1
   - 0
-  - pre0
-  version: 1.1.0.pre0
+  - pre2
+  version: 1.1.0.pre2
 platform: ruby
 authors: 
 - Tom Locke
@@ -33,6 +33,14 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,13 +51,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1876988165
+        hash: -1876988167
         segments: 
         - 1
         - 1
         - 0
-        - pre0
-        version: 1.1.0.pre0
+        - pre2
+        version: 1.1.0.pre2
   type: :runtime
   version_requirements: *id002
 description: