hobo_fields 1.3.3 → 1.4.0.pre2

data/Rakefile

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'active_record'
 require 'tmpdir'
 
+include Rake::DSL
+
 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, '"\&"')
@@ -13,7 +15,7 @@ require 'hobo_support'
 require 'hobo_fields'
 
 GEM_ROOT = File.expand_path('../', __FILE__)
-TESTAPP_PATH = File.join Dir.tmpdir, 'hobo_fields_testapp'
+TESTAPP_PATH = ENV['TESTAPP_PATH'] || File.join(Dir.tmpdir, 'hobo_fields_testapp')
 BIN = File.expand_path('../bin/hobofields', __FILE__)
 require 'hobo_support/common_tasks'
 include HoboSupport::CommonTasks

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.4.0.pre2

data/hobo_fields.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
   s.add_development_dependency('rubydoctest', [">= 0"])
-  s.add_development_dependency('redcloth', [">= 0"]) # for testing rich types
+  s.add_development_dependency('RedCloth', [">= 0"]) # for testing rich types
   s.add_development_dependency('bluecloth', [">= 0"])  # for testing rich types
 
   s.executables = ["hobofields"]

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

@@ -7,7 +7,7 @@ module Generators
         def self.from_reflection(refl)
           result = self.new
           result.join_table = refl.options[:join_table].to_s
-          result.foreign_keys = [refl.primary_key_name.to_s, refl.association_foreign_key.to_s].sort
+          result.foreign_keys = [refl.foreign_key.to_s, refl.association_foreign_key.to_s].sort
           # this may fail in weird ways if HABTM is running across two DB connections (assuming that's even supported)
           # figure that anybody who sets THAT up can deal with their own migrations...
           result.connection = refl.active_record.connection

data/lib/hobo_fields/model.rb

@@ -92,7 +92,7 @@ module HoboFields
       index_options[:name] = options.delete(:index) if options.has_key?(:index)
       bt = belongs_to_without_field_declarations(name, options, &block)
       refl = reflections[name.to_sym]
-      fkey = refl.primary_key_name
+      fkey = refl.foreign_key
       declare_field(fkey.to_sym, :integer, column_options)
       if refl.options[:polymorphic]
         declare_polymorphic_type_field(name, column_options)

data/lib/hobo_fields/types/email_address.rb

@@ -15,7 +15,7 @@ module HoboFields
       end
 
       def to_html(xmldoctype = true)
-        ERB::Util.html_escape(self).sub('@', " at ").gsub('.', ' dot ')
+        ERB::Util.html_escape(self).sub('@', " at ").gsub('.', ' dot ').html_safe
       end
 
       HoboFields.register_type(:email_address, self)

data/test/generators.rdoctest

@@ -28,11 +28,17 @@ doctest: test file exists
 
 doctest: test content matches
 >> File.read 'test/unit/alpha/beta_test.rb'
-=> "require 'test_helper'\n\nclass Alpha::BetaTest < ActiveSupport::TestCase\n  # Replace this with your real tests.\n  test \"the truth\" do\n    assert true\n  end\nend\n"
+=>
+require 'test_helper'
 
+class Alpha::BetaTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
 
 doctest: fixture file exists
->> File.exist? 'test/fixtures/alpha/betas.yml'
+>> File.exist? 'test/fixtures/alpha/beta.yml'
 => true
 
 

data/test/interactive_primary_key.rdoctest

@@ -31,6 +31,7 @@ And requires also that you enter the right choice when prompted. OK we're ready
     class Foo < ActiveRecord::Base
       set_primary_key "id"
     end
+    puts "\n\e[45m Please enter 'id' (no quotes) at the next prompt \e[0m"
    >> Rails::Generators.invoke 'hobo:migration', %w(-n -m)
    >> Foo.primary_key
    => 'id'
@@ -42,6 +43,7 @@ And requires also that you enter the right choice when prompted. OK we're ready
     class Foo < ActiveRecord::Base
       set_primary_key "foo_id"
     end
+    puts "\n\e[45m Please enter 'drop id' (no quotes) at the next prompt \e[0m"
    >> Rails::Generators.invoke 'hobo:migration', %w(-n -m)
    >> Foo.primary_key
    => 'foo_id'

data/test/{migration_generator_comments.rdoctest → migration_generator_comments.rdoctestDISABLED}

@@ -5,7 +5,7 @@ Our test requires to prepare the testapp for a different environment:
 
     doctest_require: ENV["RAILS_ENV"] = 'mysql_test'; 'prepare_testapp'
 
-    >> system "cd #{TESTAPP_PATH} && rake db:setup"
+    >> system "cd #{TESTAPP_PATH} && rake --trace db:setup"
     => true
 
     >> p Rails.env

data/test/prepare_testapp.rb

@@ -1,8 +1,11 @@
 require 'fileutils'
-system %(rake test:prepare_testapp)
-TESTAPP_PATH = '/tmp/hobo_fields_testapp'
+require 'tmpdir'
+
+TESTAPP_PATH = ENV['TESTAPP_PATH'] || File.join(Dir.tmpdir, 'hobo_fields_testapp')
+system %(rake test:prepare_testapp TESTAPP_PATH=#{TESTAPP_PATH})
+system %(echo "gem 'bluecloth'" >> #{TESTAPP_PATH}/Gemfile)
+system %(echo "gem 'RedCloth'" >> #{TESTAPP_PATH}/Gemfile)
 FileUtils.chdir TESTAPP_PATH
 require "#{TESTAPP_PATH}/config/environment"
 require 'rails/generators'
 Rails::Generators.configure!
-

data/test/rich_types.rdoctest

@@ -97,7 +97,7 @@ Provides validation of correct email address format.
 
         >> nasty = HoboFields::Types::EmailAddress.new("foo<nasty>&lt;nasty&gt;@baa.com")
         >> nasty.to_html
-        => "foo&lt;nasty&gt;&lt;nasty&gt; at baa dot com"
+        => "foo&lt;nasty&gt;&amp;lt;nasty&amp;gt; at baa dot com"
         >> nasty.to_html.html_safe?
         => true
 
@@ -134,7 +134,6 @@ Provides validation of correct email address format.
 
 `HoboFields::Types::MarkdownString` provides a `to_html` that renders markdown syntax into html. It requires the bluecloth gem.
 
-        >> require 'bluecloth'
         >> markdown = HoboFields::Types::MarkdownString.new %(
           This is a heading
           =================
@@ -158,7 +157,6 @@ Provides validation of correct email address format.
 
 `HoboFields::Types::TextileString` provides a `to_html` that renders markdown syntax into html. It requires the redcloth gem.
 
-        >> require 'redcloth'
         >> textile = HoboFields::Types::TextileString.new %(
          Text can be _emphasised_
          )
@@ -242,9 +240,12 @@ restrict the column type.
     >> 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
+    >> puts Vault2.count
+    >> v = Vault2.create!(:content => 17)
+    >> Vault2.count
+    => 2   # Invalid type is successfully created...
+    >> v.reload rescue 'broken' # ActiveRecord::SerializationTypeMismatch
+    => 'broken'
 
 ## Enum Strings
 

metadata

@@ -1,87 +1,70 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: hobo_fields
-version: !ruby/object:Gem::Version
-  version: 1.3.3
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: 6
+  version: 1.4.0.pre2
 platform: ruby
-authors:
+authors: 
 - Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: hobo_support
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0.pre2
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rubydoctest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcloth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bluecloth
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Rich field types and migration generator for Rails
 email: tom@tomlocke.com
-executables:
+executables: 
 - hobofields
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - CHANGES.txt
 - LICENSE.txt
 - README.txt
@@ -121,33 +104,36 @@ files:
 - test/generators.rdoctest
 - test/interactive_primary_key.rdoctest
 - test/migration_generator.rdoctest
-- test/migration_generator_comments.rdoctest
+- test/migration_generator_comments.rdoctestDISABLED
 - test/prepare_testapp.rb
 - test/rich_types.rdoctest
 homepage: http://hobocentral.net
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.3.6
 requirements: []
+
 rubyforge_project: hobo
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Rich field types and migration generator for Rails
 test_files: []
+
 has_rdoc: