hobofields 0.8.3 → 0.8.4

data/Manifest

@@ -10,6 +10,10 @@ lib/hobo_fields/markdown_string.rb
 lib/hobo_fields/migration_generator.rb
 lib/hobo_fields/model_extensions.rb
 lib/hobo_fields/password_string.rb
+lib/hobo_fields/raw_html_string.rb
+lib/hobo_fields/raw_markdown_string.rb
+lib/hobo_fields/sanitize_html.rb
+lib/hobo_fields/serialized_object.rb
 lib/hobo_fields/text.rb
 lib/hobo_fields/textile_string.rb
 lib/hobo_fields.rb

data/Rakefile

@@ -8,9 +8,8 @@ Echoe.new('hobofields') do |p|
   p.project = "hobo"
 
   p.changelog = "CHANGES.txt"
-  p.version   = "0.8.3"
+  p.version   = "0.8.4"
 
-  p.dependencies = ['hobosupport >=0.8.3', 'rails >=2.1']
+  p.dependencies = ['hobosupport =0.8.4', 'rails >=2.2.2']
   p.development_dependencies = []
 end
-

data/hobofields.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Hobofields-0.8.3
+# Gem::Specification for Hobofields-0.8.4
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: hobofields
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Tom Locke
 autorequire: 
 bindir: bin
 
-date: 2008-10-15 00:00:00 +01:00
+date: 2008-12-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,9 +21,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.3
+        version: 0.8.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.1"
+        version: 2.2.2
     version: 
 description: Rich field types and migration generator for Rails
 email: tom@tomlocke.com
@@ -52,6 +52,10 @@ extra_rdoc_files:
 - lib/hobo_fields/migration_generator.rb
 - lib/hobo_fields/model_extensions.rb
 - lib/hobo_fields/password_string.rb
+- lib/hobo_fields/raw_html_string.rb
+- lib/hobo_fields/raw_markdown_string.rb
+- lib/hobo_fields/sanitize_html.rb
+- lib/hobo_fields/serialized_object.rb
 - lib/hobo_fields/text.rb
 - lib/hobo_fields/textile_string.rb
 - lib/hobo_fields.rb
@@ -71,6 +75,10 @@ files:
 - lib/hobo_fields/migration_generator.rb
 - lib/hobo_fields/model_extensions.rb
 - lib/hobo_fields/password_string.rb
+- lib/hobo_fields/raw_html_string.rb
+- lib/hobo_fields/raw_markdown_string.rb
+- lib/hobo_fields/sanitize_html.rb
+- lib/hobo_fields/serialized_object.rb
 - lib/hobo_fields/text.rb
 - lib/hobo_fields/textile_string.rb
 - lib/hobo_fields.rb
@@ -122,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 specification_version: 2
 summary: Rich field types and migration generator for Rails
 test_files: 

data/lib/hobo_fields/enum_string.rb

@@ -27,7 +27,7 @@ module HoboFields
         values = values.*.to_s
         c = Class.new(EnumString) do
           values.each do |v|
-            const_name = v.upcase
+            const_name = v.upcase.gsub(/[^a-z0-9_]/i, '_').gsub(/_+/, '_')
             const_set(const_name, self.new(v)) unless const_defined?(const_name)
 
             method_name = "is_#{v.underscore}?"

data/lib/hobo_fields/field_spec.rb

@@ -49,10 +49,10 @@ module HoboFields
     def different_to?(col_spec)
       sql_type != col_spec.type ||
         begin
-          check_cols = [:null, :default]
-          check_cols += [:precision, :scale] if sql_type == :decimal
-          check_cols << :limit if sql_type.in?([:string, :text, :binary, :integer])
-          check_cols.any? { |k| col_spec.send(k) != self.send(k) }
+          check_attributes = [:null, :default]
+          check_attributes += [:precision, :scale] if sql_type == :decimal
+          check_attributes << :limit if sql_type.in?([:string, :text, :binary, :integer])
+          check_attributes.any? { |k| col_spec.send(k) != self.send(k) }
         end
     end
 

data/lib/hobo_fields/html_string.rb

@@ -1,13 +1,14 @@
 module HoboFields
+  
+  class HtmlString < RawHtmlString
 
-  class HtmlString < HoboFields::Text
-
-    def to_html(xmldoctype = true)
-      self
+    include SanitizeHtml
+    
+    def self.declared(model, name, options)
+      model.before_save { |record| record[name] = HoboFields::SanitizeHtml.sanitize(record[name]) }
     end
-
+    
     HoboFields.register_type(:html, self)
-
   end
 
 end

data/lib/hobo_fields/markdown_string.rb

@@ -1,11 +1,12 @@
 module HoboFields
 
-  class MarkdownString < HoboFields::Text
+  class MarkdownString < RawMarkdownString
+    include SanitizeHtml
 
     HoboFields.register_type(:markdown, self)
-
+    
     def to_html(xmldoctype = true)
-      blank? ? "" : BlueCloth.new(self).to_html
+      blank? ? "" : HoboFields::SanitizeHtml.sanitize(BlueCloth.new(self).to_html)
     end
 
   end

data/lib/hobo_fields/migration_generator.rb

@@ -17,13 +17,17 @@ module HoboFields
       g.generate
     end
 
-    def initialize(ambiguity_resolver=nil)
-      @ambiguity_resolver = ambiguity_resolver
+    def initialize(*args)
+      options = args.extract_options!
+      @ambiguity_resolver = args.first
       @drops = []
       @renames = nil
+      @force_drop = options[:force_drop]
     end
 
     attr_accessor :renames
+    
+    def force_drop?; @force_drop end
 
 
     def load_rails_models
@@ -76,7 +80,11 @@ module HoboFields
     # return a hash of table renames and modifies the passed arrays so
     # that renamed tables are no longer listed as to_create or to_drop
     def extract_table_renames!(to_create, to_drop)
-      if renames
+      if force_drop?
+        # no renames at all
+        {}
+        
+      elsif renames
         # A hash of table renames has been provided
 
         to_rename = {}
@@ -102,7 +110,11 @@ module HoboFields
 
 
     def extract_column_renames!(to_add, to_remove, table_name)
-      if renames
+      if force_drop?
+        # no renames at all
+        {}
+        
+      elsif renames
         to_rename = {}
         column_renames = renames._?[table_name.to_sym]
         if column_renames
@@ -129,6 +141,8 @@ module HoboFields
     
     def always_ignore_tables
       sessions_table = CGI::Session::ActiveRecordStore::Session.table_name if
+        defined?(CGI::Session::ActiveRecordStore::Session) &&
+        defined?(ActionController::Base) &&
         ActionController::Base.session_store == CGI::Session::ActiveRecordStore
       ['schema_info', 'schema_migrations',  sessions_table].compact
     end

data/lib/hobo_fields/model_extensions.rb

@@ -20,6 +20,7 @@ module HoboFields
       fields do |f|
         f.field(inheritance_column, :string)
       end
+      super
     end
 
 
@@ -51,9 +52,9 @@ module HoboFields
       if type
         type = HoboFields.to_class(type)
         attrs.each do |attr|
-          declare_attr_type attr, type
+          declare_attr_type attr, type, options
           define_method "#{attr}=" do |val|
-            if !val.is_a?(type) && HoboFields.can_wrap?(val)
+            if !val.is_a?(type) && HoboFields.can_wrap?(type, val)
               val = type.new(val.to_s)
             end
             instance_variable_set("@#{attr}", val)
@@ -94,8 +95,10 @@ module HoboFields
     # Declare a rich-type for any attribute (i.e. getter method). This
     # does not effect the attribute in any way - it just records the
     # metadata.
-    def self.declare_attr_type(name, type)
+    def self.declare_attr_type(name, type, options={})
+      klass = HoboFields.to_class(type)
       attr_types[name] = HoboFields.to_class(type)
+      klass.try.declared(self, name, options)
     end
 
 
@@ -107,7 +110,7 @@ module HoboFields
       options = args.extract_options!
       try.field_added(name, type, args, options)
       add_validations_for_field(name, type, args, options)
-      declare_attr_type(name, type) unless HoboFields.plain_type?(type)
+      declare_attr_type(name, type, options) unless HoboFields.plain_type?(type)
       field_specs[name] = FieldSpec.new(self, name, type, options)
       attr_order << name unless name.in?(attr_order)
     end

data/lib/hobo_fields/raw_html_string.rb

@@ -0,0 +1,13 @@
+module HoboFields
+  
+  class RawHtmlString < HoboFields::Text
+
+    def to_html(xmldoctype = true)
+      self
+    end
+
+    HoboFields.register_type(:raw_html, self)
+
+  end
+  
+end

data/lib/hobo_fields/raw_markdown_string.rb

@@ -0,0 +1,13 @@
+module HoboFields
+
+  class RawMarkdownString < HoboFields::Text
+
+    HoboFields.register_type(:raw_markdown, self)
+
+    def to_html(xmldoctype = true)
+      blank? ? "" : BlueCloth.new(self).to_html
+    end
+
+  end
+
+end

data/lib/hobo_fields/sanitize_html.rb

@@ -0,0 +1,20 @@
+module HoboFields
+
+  module SanitizeHtml
+
+    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
+                              th thead tr tt u ul var)
+
+    PERMITTED_ATTRIBUTES = %w(href title class style align name src label target)
+
+    class Helper; include ActionView::Helpers::SanitizeHelper; extend ActionView::Helpers::SanitizeHelper::ClassMethods; end
+        
+    def self.sanitize(s)
+      Helper.new.sanitize(s, :tags => PERMITTED_TAGS, :attributes => PERMITTED_ATTRIBUTES)
+    end
+
+  end
+
+end

data/lib/hobo_fields/serialized_object.rb

@@ -0,0 +1,15 @@
+module HoboFields
+
+  class SerializedObject < Object
+    
+    COLUMN_TYPE = :text
+    
+    def self.declared(model, name, options)
+      model.serialize name, options.delete(:class)
+    end
+    
+    HoboFields.register_type(:serialized, self)
+
+  end
+
+end

data/lib/hobo_fields/textile_string.rb

@@ -4,6 +4,8 @@ module HoboFields
 
   class TextileString < HoboFields::Text
 
+    include SanitizeHtml
+
     def to_html(xmldoctype = true)
       if blank?
         ""

data/lib/hobo_fields.rb

@@ -1,6 +1,6 @@
 require 'hobosupport'
 
-(defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : Dependencies).load_paths |= [ File.dirname(__FILE__) ]
+ActiveSupport::Dependencies.load_paths |= [ File.dirname(__FILE__) ]
 
 module Hobo
   # Empty class to represent the boolean type.
@@ -9,7 +9,7 @@ end
 
 module HoboFields
 
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 
   extend self
 
@@ -26,16 +26,19 @@ module HoboFields
   }
 
   # Provide a lookup for these rather than loading them all preemptively
+  
   STANDARD_TYPES = {
     :html          => "HtmlString",
     :markdown      => "MarkdownString",
     :textile       => "TextileString",
     :password      => "PasswordString",
     :text          => "Text",
-    :email_address => "EmailAddress"
+    :email_address => "EmailAddress",
+    :serialized    => "SerializedObject"
   }
 
-  @field_types   = HashWithIndifferentAccess.new(PLAIN_TYPES)
+  @field_types   = PLAIN_TYPES.with_indifferent_access
+  
   @never_wrap_types = Set.new([NilClass, Hobo::Boolean, TrueClass, FalseClass])
 
   attr_reader :field_types
@@ -55,10 +58,10 @@ module HoboFields
   end
 
 
-  def can_wrap?(val)
-    # Make sure we get the *real* class
-    klass = Object.instance_method(:class).bind(val).call
-    !@never_wrap_types.any? { |c| klass <= c }
+  def can_wrap?(type, val)
+    klass = Object.instance_method(:class).bind(val).call # Make sure we get the *real* class
+    arity = type.instance_method(:initialize).arity
+    (arity == 1 || arity == -1) && !@never_wrap_types.any? { |c| klass <= c }
   end
 
 
@@ -107,8 +110,8 @@ module HoboFields
         # value if we have a special type defined
         src = if connected? && (type_wrapper = try.attr_type(symbol)) &&
                   type_wrapper.is_a?(Class) && type_wrapper.not_in?(HoboFields::PLAIN_TYPES.values)
-                "val = begin; #{access_code}; end; " +
-                  "if HoboFields.can_wrap?(val); self.class.attr_type(:#{attr_name}).new(val); else; val; end"
+                "val = begin; #{access_code}; end; wrapper_type = self.class.attr_type(:#{attr_name}); " +
+                  "if HoboFields.can_wrap?(wrapper_type, val); wrapper_type.new(val); else; val; end"
               else
                 access_code
               end
@@ -121,7 +124,7 @@ module HoboFields
         src = if connected? && (type_wrapper = try.attr_type(attr_name)) &&
                   type_wrapper.is_a?(Class) && type_wrapper.not_in?(HoboFields::PLAIN_TYPES.values)
                 "begin; wrapper_type = self.class.attr_type(:#{attr_name}); " +
-                  "if !val.is_a?(wrapper_type) && HoboFields.can_wrap?(val); wrapper_type.new(val); else; val; end; end"
+                  "if !val.is_a?(wrapper_type) && HoboFields.can_wrap?(wrapper_type, val); wrapper_type.new(val); else; val; end; end"
               else
                 "val"
               end
@@ -132,7 +135,6 @@ module HoboFields
 
     end
 
-
   end
 
 end

data/rails_generators/hobo_migration/hobo_migration_generator.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/../../lib/hobofields'
 class HoboMigrationGenerator < Rails::Generator::Base
 
+  default_options :force_drop => false
+
   def initialize(runtime_args, runtime_options = {})
     super
     @migration_name = runtime_args.first || begin
@@ -27,7 +29,7 @@ class HoboMigrationGenerator < Rails::Generator::Base
   def manifest
     return record {|m| } if migrations_pending?
 
-    generator = HoboFields::MigrationGenerator.new(self)
+    generator = HoboFields::MigrationGenerator.new(self, :force_drop => options[:force_drop])
     up, down = generator.generate
 
     if up.blank?
@@ -117,6 +119,21 @@ class HoboMigrationGenerator < Rails::Generator::Base
       system "rake db:migrate"
     end
   end
+  
+  protected
+    def banner
+      "Usage: #{$0} #{spec.name} [<migration-name>] [--force-drop]"
+    end
+
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+      opt.on("--force-drop",
+             "Don't prompt to disambiguate drops from renames - drop everything") do |v|
+        options[:force_drop] = true
+      end
+    end
+  
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hobofields
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Tom Locke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-15 00:00:00 +01:00
+date: 2008-12-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.3
+        version: 0.8.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.1"
+        version: 2.2.2
     version: 
 description: Rich field types and migration generator for Rails
 email: tom@tomlocke.com
@@ -49,6 +49,10 @@ extra_rdoc_files:
 - lib/hobo_fields/migration_generator.rb
 - lib/hobo_fields/model_extensions.rb
 - lib/hobo_fields/password_string.rb
+- lib/hobo_fields/raw_html_string.rb
+- lib/hobo_fields/raw_markdown_string.rb
+- lib/hobo_fields/sanitize_html.rb
+- lib/hobo_fields/serialized_object.rb
 - lib/hobo_fields/text.rb
 - lib/hobo_fields/textile_string.rb
 - lib/hobo_fields.rb
@@ -68,6 +72,10 @@ files:
 - lib/hobo_fields/migration_generator.rb
 - lib/hobo_fields/model_extensions.rb
 - lib/hobo_fields/password_string.rb
+- lib/hobo_fields/raw_html_string.rb
+- lib/hobo_fields/raw_markdown_string.rb
+- lib/hobo_fields/sanitize_html.rb
+- lib/hobo_fields/serialized_object.rb
 - lib/hobo_fields/text.rb
 - lib/hobo_fields/textile_string.rb
 - lib/hobo_fields.rb
@@ -119,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Rich field types and migration generator for Rails