hobofields 1.0.2 → 1.0.3

data/Rakefile

@@ -3,7 +3,11 @@ 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} -S rubydoctest"
+if defined?(Bundler)
+  RUBYDOCTEST = 'bundle exec rubydoctest'
+else
+  RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} -S rubydoctest"
+end
 
 $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '/../hobofields/lib')
 $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '/../hobosupport/lib')
@@ -38,6 +42,3 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.add_dependency("hobosupport", ["= #{HoboFields::VERSION}"])    
 end
 Jeweler::GemcutterTasks.new
-Jeweler::RubyforgeTasks.new do |rubyforge|
-  rubyforge.doc_task = false
-end

data/hobofields.gemspec

@@ -0,0 +1,80 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{hobofields}
+  s.version = "1.0.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tom Locke"]
+  s.date = %q{2011-02-25}
+  s.email = %q{tom@tomlocke.com}
+  s.files = [
+    "CHANGES.txt",
+    "LICENSE.txt",
+    "README.txt",
+    "Rakefile",
+    "hobofields.gemspec",
+    "lib/hobo_fields.rb",
+    "lib/hobo_fields/email_address.rb",
+    "lib/hobo_fields/enum_string.rb",
+    "lib/hobo_fields/field_declaration_dsl.rb",
+    "lib/hobo_fields/field_spec.rb",
+    "lib/hobo_fields/fields_declaration.rb",
+    "lib/hobo_fields/html_string.rb",
+    "lib/hobo_fields/index_spec.rb",
+    "lib/hobo_fields/lifecycle_state.rb",
+    "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/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",
+    "rails_generators/hobofield_model/USAGE",
+    "rails_generators/hobofield_model/hobofield_model_generator.rb",
+    "rails_generators/hobofield_model/templates/fixtures.yml.erb",
+    "rails_generators/hobofield_model/templates/model.rb.erb",
+    "rails_generators/hobofield_model/templates/test.rb.erb",
+    "script/destroy",
+    "script/generate",
+    "test/hobofields.rdoctest",
+    "test/hobofields_api.rdoctest",
+    "test/migration_generator.rdoctest",
+    "test/migration_generator_primary_key.rdoctest",
+    "test/rich_types.rdoctest",
+    "test/test_generator_helper.rb",
+    "test/test_hobofield_model_generator.rb"
+  ]
+  s.homepage = %q{http://hobocentral.net/}
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{hobo}
+  s.rubygems_version = %q{1.4.2}
+  s.summary = %q{Rich field types and migration generator for Rails}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, [">= 2.2.2", "< 3.0.0"])
+      s.add_runtime_dependency(%q<hobosupport>, ["= 1.0.3"])
+    else
+      s.add_dependency(%q<rails>, [">= 2.2.2", "< 3.0.0"])
+      s.add_dependency(%q<hobosupport>, ["= 1.0.3"])
+    end
+  else
+    s.add_dependency(%q<rails>, [">= 2.2.2", "< 3.0.0"])
+    s.add_dependency(%q<hobosupport>, ["= 1.0.3"])
+  end
+end
+

data/lib/hobo_fields/model_extensions.rb

@@ -22,13 +22,17 @@ module HoboFields
     inheriting_cattr_reader :index_specs => []
     inheriting_cattr_reader :ignore_indexes => []
 
-    def self.inherited(klass)
-      fields do |f|
-        f.field(inheritance_column, :string)
+    # eval avoids the ruby 1.9.2 "super from singleton method ..." error
+    # see LH#840
+    eval %(
+      def self.inherited(klass)
+        fields do |f|
+          f.field(inheritance_column, :string)
+        end
+        index(inheritance_column)
+        super
       end
-      index(inheritance_column)
-      super
-    end
+    )
 
     def self.index(fields, options = {})
       # don't double-index fields

data/lib/hobo_fields/serialized_object.rb

@@ -5,7 +5,7 @@ module HoboFields
     COLUMN_TYPE = :text
     
     def self.declared(model, name, options)
-      model.serialize name, options.delete(:class)
+      model.serialize name, options.delete(:class) || Object
     end
     
     HoboFields.register_type(:serialized, self)

data/lib/hobo_fields.rb

@@ -13,7 +13,7 @@ end
 
 module HoboFields
 
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 
   extend self
 
@@ -68,12 +68,27 @@ module HoboFields
   end
 
 
-  def can_wrap?(type, val)
-    col_type = type::COLUMN_TYPE
-    return false if val.blank? && (col_type == :integer || col_type == :float || col_type == :decimal)
-    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 }
+  if Object.instance_method(:initialize).arity!=0
+    # version for Ruby 1.9.
+    def can_wrap?(type, val)
+      col_type = type::COLUMN_TYPE
+      return false if val.blank? && (col_type == :integer || col_type == :float || col_type == :decimal)
+      klass = Object.instance_method(:class).bind(val).call # Make sure we get the *real* class
+      init_method = type.instance_method(:initialize)
+      [-1,1].include?(init_method.arity) &&
+        init_method.owner != Object.instance_method(:initialize).owner &&
+        !@never_wrap_types.any? { |c| klass <= c }
+    end
+  else
+    # Ruby 1.8.  1.8.6 doesn't include Method#owner.   1.8.7 could use
+    # the 1.9 function, but this one is faster.
+    def can_wrap?(type, val)
+      col_type = type::COLUMN_TYPE
+      return false if val.blank? && (col_type == :integer || col_type == :float || col_type == :decimal)
+      klass = Object.instance_method(:class).bind(val).call # Make sure we get the *real* class
+      init_method = type.instance_method(:initialize)
+      [-1,1].include?(init_method.arity) && !@never_wrap_types.any? { |c| klass <= c }
+    end
   end
 
 

data/test/hobofields_api.rdoctest

@@ -169,7 +169,7 @@ In your HoboFields models you can also give type information to "virtual fields"
 
 ## Field validations
 
-HoboFields gives you some shorthands for declaring some common validations right in the field declaration
+HoboFields gives you some shorthands for declaring some common validations right in the field declaration.  HoboFields also supports all of the options supported by the [Rails column declaration](http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/TableDefinition.html#method-i-column)
 
 ### Required fields
 

data/test/rich_types.rdoctest

@@ -23,9 +23,9 @@ though we don't need it for this test:
         >> mysql_database = "hobofields_doctest"
         >> system "mysqladmin #{mysql_login} --force drop #{mysql_database} 2> /dev/null"
         >> system("mysqladmin #{mysql_login} create #{mysql_database}") or raise "could not create database"
-        >> ActiveRecord::Base.establish_connection(:adapter => "mysql",
+        >> ActiveRecord::Base.establish_connection(:adapter => mysql_adapter,
                                                :database => mysql_database,
-                                               :host => "localhost", :user => mysql_user, :password => mysql_password)
+                                               :host => "localhost", :username => mysql_user, :password => mysql_password)
 {.hidden}
 
 Some load path manipulation you shouldn't need:
@@ -165,8 +165,52 @@ Provides validation of correct email address format.
 
 ### `HoboFields::PasswordString`
 
-`HoboFields::PasswordString` provides a simple `to_html` to prevent accidental display of a password. It simply returns "`[password hidden]`". The type is also used to indicate the need for an `<input type='password'>`
+`HoboFields::PasswordString` provides a simple `to_html` to prevent
+accidental display of a password. It simply returns "`[password
+hidden]`". The type is also used to indicate the need for an `<input
+type='password'>`
 
+### `HoboFields::Serialized`
+
+This type lets you store an arbitrary object as serialized text into
+the database column.   You can optionally pass the :class option to
+restrict the column type.
+
+    >>
+     def migrate(renames={})
+       up, down = HoboFields::MigrationGenerator.run(renames)
+       ActiveRecord::Migration.class_eval(up)
+       ActiveRecord::Base.send(:subclasses).each { |model| model.reset_column_information }
+       [up, down]
+     end
+{.hidden}
+
+    >>
+     class Vault1 < ActiveRecord::Base
+       fields do
+         content :serialized
+       end
+     end
+
+    >> migrate
+    >> Vault1.create!(:content => {:key => "in Vault"})
+    >> Vault1.first.content
+    => {:key => "in Vault"}
+
+    >>
+     class Vault2 < ActiveRecord::Base
+       fields do
+         content :serialized, :class => Hash
+       end
+     end
+
+    >> migrate
+    >> Vault2.create!(:content => {:key => "in Vault"})
+    >> Vault2.first.content
+    => {:key => "in Vault"}
+    >> Vault2.create!(:content => 17) rescue ActiveRecord::SerializationTypeMismatch
+    >> Vault2.all.size
+    => 1   # second record not created because of type mismatch
 
 ## Enum Strings
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hobofields
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Tom Locke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 -05:00
+date: 2011-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,12 +50,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 1
         - 0
-        - 2
-        version: 1.0.2
+        - 3
+        version: 1.0.3
   type: :runtime
   version_requirements: *id002
 description: 
@@ -71,6 +71,7 @@ files:
 - LICENSE.txt
 - README.txt
 - Rakefile
+- hobofields.gemspec
 - lib/hobo_fields.rb
 - lib/hobo_fields/email_address.rb
 - lib/hobo_fields/enum_string.rb
@@ -114,8 +115,8 @@ homepage: http://hobocentral.net/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Rich field types and migration generator for Rails