hobo_fields 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae374e5d1218a6f0810c9f92c324ada484d6b6f7
-  data.tar.gz: d115ea2e44e137f51a47a20af4e0931c22460242
+  metadata.gz: 0cb6f597b6b09d18cc9a657af73a95a6c1b110a9
+  data.tar.gz: 4adaa4fce5fb6546fbd44df4b521a72286acd66c
 SHA512:
-  metadata.gz: ff3940da7cc52302e0b195453b86c641a9b57f2a6c8dc5e713fa2eed6ec804c7b8dbb4fa17e2fa8b231722df150d72bcaaf6aa62e75cecc5d70fc7ee4b2c61e7
-  data.tar.gz: 9e79e3f50365f9ff2ae05680dbabffda08b354847a14f6fce1b83403c1f38deaad3cf8c31d961ce185c301289e21efe93f69103f4ec1998abb5e5746d7ded979
+  metadata.gz: 2bb5b8f0f133084cddf90702eea6bae7d574cf98fcdfa39c19b5875d601c36d76467a3895bdee6b8dcbf7c5fe43faeaa1dc4015962b9c404e1c1157da1f8104b
+  data.tar.gz: 292b1aacb444a563a47d5d40c362749e057e3320e4d7b59d9e962a7960dbf5ce2ae708c8865ef1b549354404f081516b0bc81b420b57ac7b4ef3e3e68cfca209

data/Gemfile

@@ -4,6 +4,7 @@ gem 'rubydoctest', :git => 'git://github.com/bryanlarsen/rubydoctest.git'
 gem 'rails'
 gem 'yard'
 gem 'protected_attributes'
+gem 'responders', '~> 2.0'
 
 gemspec :path => "../hobo_support"
 gemspec

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.2.0

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

@@ -91,7 +91,7 @@ module Hobo
   private
 
     def migrations_pending?
-      pending_migrations = ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations
+      pending_migrations = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations('db/migrate')).pending_migrations
 
       if pending_migrations.any?
         say "You have #{pending_migrations.size} pending migration#{'s' if pending_migrations.size > 1}:"

data/lib/hobo_fields/extensions/active_record/attribute_methods.rb

@@ -1,9 +1,9 @@
 ActiveRecord::Base.class_eval do
-  def read_attribute_with_hobo(attr_name)
+  def _read_attribute_with_hobo(attr_name)
     name = attr_name.to_s
     if self.class.can_wrap_with_hobo_type?(name)
       attr_name = attr_name.to_sym
-      val = read_attribute_without_hobo(name)
+      val = _read_attribute_without_hobo(name)
       wrapper_type = self.class.attr_type(attr_name)
       if HoboFields.can_wrap?(wrapper_type, val)
         wrapper_type.new(val)
@@ -11,10 +11,10 @@ ActiveRecord::Base.class_eval do
         val
       end
     else
-      read_attribute_without_hobo(name)
+      _read_attribute_without_hobo(name)
     end
   end
-  alias_method_chain :read_attribute, :hobo
+  alias_method_chain :_read_attribute, :hobo
 
   class << self
 

data/lib/hobo_fields/model.rb

@@ -98,7 +98,7 @@ module HoboFields
       index_options = {}
       index_options[:name] = options.delete(:index) if options.has_key?(:index)
       bt = belongs_to_without_field_declarations(name, *args, &block)
-      refl = reflections[name.to_sym]
+      refl = reflections[name.to_s]
       fkey = refl.foreign_key
       declare_field(fkey.to_sym, :integer, column_options)
       if refl.options[:polymorphic]
@@ -157,6 +157,7 @@ module HoboFields
       validates_presence_of   name if :required.in?(args)
       validates_uniqueness_of name, :allow_nil => !:required.in?(args) if :unique.in?(args)
 
+      # Support for custom validations in Hobo Fields
       type_class = HoboFields.to_class(type)
       if type_class && type_class.public_method_defined?("validate")
         self.validate do |record|
@@ -164,6 +165,7 @@ module HoboFields
           record.errors.add(name, v) if v.is_a?(String)
         end
       end
+
     end
 
     def self.add_formatting_for_field(name, type, args)
@@ -209,7 +211,7 @@ module HoboFields
 
       attr_types[name] or
 
-        if (refl = reflections[name.to_sym])
+        if (refl = reflections[name.to_s])
           if refl.macro.in?([:has_one, :belongs_to]) && !refl.options[:polymorphic]
             refl.klass
           else

data/lib/hobo_fields/types/html_string.rb

@@ -1,15 +1,7 @@
 module HoboFields
   module Types
     class HtmlString < RawHtmlString
-
-      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
 end

data/test/migration_generator.rdoctest

@@ -166,7 +166,7 @@ Let's apply that change to the database
      end
     >> up, down = Generators::Hobo::Migration::Migrator.run
     >> up
-    => "change_column :adverts, :title, :text, :limit => nil"
+    => "change_column :adverts, :title, :text"
     >> down
     => "change_column :adverts, :title, :string"
 
@@ -184,7 +184,7 @@ Let's apply that change to the database
     >> up.split(',').slice(0,3).join(',')
     => 'change_column :adverts, :title, :string'
     >> up.split(',').slice(3,2).sort.join(',')
-    => ' :default => "Untitled", :limit => 255'
+    => " :default => \"Untitled\""
     >> down
     => "change_column :adverts, :title, :string"
 

data/test/rich_types.rdoctest

@@ -7,13 +7,6 @@ Our test requires to prepare the testapp:
 
     doctest_require: 'prepare_testapp'
 
-    >>
-     ActiveRecord::Migration.create_table :articles do |t|
-       t.text :body
-       t.string :status
-     end
-    >>
-
 {.hidden}
 
 ## `to_html` method
@@ -103,7 +96,7 @@ Provides validation of correct email address format.
 
 ### `HoboFields::Types::HtmlString`
 
-`HtmlString` provides no special behavior. The main reason for using this type is that the `to_html` method does not do any html-escaping. Use this for columns that store raw HTML in the database.
+`HtmlString` provides no special behavior. The main reason for using this type is that the `to_html` method does not do any html-escaping. Use this for columns that store raw HTML in the database. Exactly the same as RawHtmlString.
 
         # no safety treatments are done by `to_html`.
         # even if `nasty.to_html` is actually unsafe, it is marked as html_safe.
@@ -113,23 +106,6 @@ Provides validation of correct email address format.
         >> nasty.to_html.html_safe?
         => true
 
-        >>
-         class Article < ActiveRecord::Base
-           fields do
-             body HoboFields::Types::HtmlString
-           end
-           attr_accessible :body
-         end
-        >> article = Article.create!(:body => "</div>>>p1<p>p2</p>p3<nasty>p4</nasty>p5&lt;script&gt;p6<script>p7</script>p8")
-        # some unsafe html fragements are removed on save,
-        # but there's no guarantees that it is well-formed
-        >> article.body
-        => "</div>>>p1<p>p2</p>p3p4p5&lt;script&gt;p6p8"
-        >> article.body == article.body.to_html
-        => true
-        >> article.body.to_html.html_safe?
-        => true
-
 
 ### `HoboFields::Types::MarkdownString`
 `HoboFields::Types::MarkdownString` provides a `to_html` that renders markdown syntax into html. It looks for RDiscount, Kramdown, Maruku or BlueCloth in that order.
@@ -148,7 +124,7 @@ Provides validation of correct email address format.
         # unsafe html behaviour depends on the parser used.
         >> markdown = HoboFields::Types::MarkdownString.new("</div>p1<script>p2")
         >> markdown.to_html
-        => "<p>&lt;/div&gt;p1</p>\n"
+        => "<p>&lt;/div&gt;p1p2</p>\n"
         # Bluecloth would return
         # => "<p></div>p1</p>"
         >> markdown.to_html.html_safe?
@@ -170,7 +146,7 @@ Provides validation of correct email address format.
         # but there's no guarantees that it is well-formed
         >> textile = HoboFields::Types::TextileString.new("</div>>>p1<script>p2")
         >> textile.to_html
-        => "<p></div>&gt;&gt;p1</p>"
+        => "<p>&gt;&gt;p1p2</p></p>"
         >> textile.to_html.html_safe?
         => true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobo_fields
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Tom Locke
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement