hobo_fields 2.0.0.pre7 → 2.0.0.pre8

data/Gemfile

@@ -1,9 +1,13 @@
 source "http://rubygems.org"
 
 gem 'rubydoctest', :git => 'git://github.com/bryanlarsen/rubydoctest.git'
-gem 'rails', '3.2.8'
+gem 'rails', '3.2.11'
 gem 'yard'
 gemspec :path => "../hobo_support"
 gemspec
-gem 'sqlite3'
-
+platform :ruby do
+  gem 'sqlite3'
+end
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+end

data/VERSION

@@ -1 +1 @@
-2.0.0.pre7
+2.0.0.pre8

data/hobo_fields.gemspec

@@ -14,7 +14,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('bluecloth', [">= 0"])  # for testing rich types
+  s.add_development_dependency('kramdown', [">= 0"])  # for testing rich types
 
   s.executables = ["hobofields"]
   s.files = `git ls-files -x #{name}/* -z`.split("\0")

data/lib/generators/hobo/model/templates/model_injection.rb.erb

@@ -7,7 +7,7 @@
     timestamps
 <% end -%>
   end
-  attr_accessible <%= accessible_attributes.map {|a| ":#{a.name}"}.join ", " %>
+  attr_accessible <%= accessible_attributes.map {|a| ":#{a}"}.join ", " %>
 
 <% for bt in bts -%>
   belongs_to :<%= bt %>

data/lib/hobo_fields/types/markdown_string.rb

@@ -6,8 +6,19 @@ module HoboFields
 
       HoboFields.register_type(:markdown, self)
 
+      @@markdown_class = case
+        when defined?(RDiscount)
+          RDiscount
+        when defined?(Kramdown)
+          Kramdown::Document
+        when defined?(Maruku)
+          Maruku
+        else
+          Markdown
+        end
+
       def to_html(xmldoctype = true)
-        blank? ? "" : HoboFields::SanitizeHtml.sanitize(Markdown.new(self).to_html)
+        blank? ? "" : HoboFields::SanitizeHtml.sanitize(@@markdown_class.new(self).to_html)
       end
 
     end

data/lib/hobo_fields/types/raw_markdown_string.rb

@@ -2,10 +2,21 @@ module HoboFields
   module Types
     class RawMarkdownString < HoboFields::Types::Text
 
+      @@markdown_class = case
+        when defined?(RDiscount)
+          RDiscount
+        when defined?(Kramdown)
+          Kramdown::Document
+        when defined?(Maruku)
+          Maruku
+        else
+          Markdown
+        end
+
       HoboFields.register_type(:raw_markdown, self)
 
       def to_html(xmldoctype = true)
-        blank? ? "" : Markdown.new(self).to_html.html_safe
+        blank? ? "" : @@markdown_class.new(self).to_html.html_safe
       end
 
     end

data/test/api.rdoctest

@@ -13,11 +13,11 @@ Let's define some example models that we can use to demonstrate the API. With Ho
 
     $ rails generate hobo:model advert title:string body:text contact_address:email_address
 
+This will generate the test, fixture and a model file like this:
+
     >> Rails::Generators.invoke 'hobo:model', %w(advert title:string body:text contact_address:email_address)
 {.hidden}
 
-This will generate the test, fixture and a model file like this:
-
     class Advert < ActiveRecord::Base
       fields do
         title :string
@@ -33,12 +33,12 @@ The migration generator uses this information to create a migration. The followi
 
     $ rails generate hobo:migration -n -m
 
+We're now ready to start demonstrating the API
+
     >> Rails::Generators.invoke 'hobo:migration', %w(-n -m)
     >> Rails::Generators.invoke 'hobo:migration', %w(-n -m)
 {.hidden}
 
-We're now ready to start demonstrating the API
-
 ## The Basics
 
 The main feature of HoboFields, aside from the migration generator, is the ability to declare rich types for your fields. For example, you can declare that a field is an email address, and the field will be automatically validated for correct email address syntax.

data/test/doc-only.rdoctest

@@ -16,6 +16,10 @@ First off, if you're using the migration generator outside of Hobo, do remember
 
         $ rails generate model blog_post --skip-migration
 
+If you're using Hobo:
+
+        $ rails generate hobo:model blog_post
+
 Now edit your model as follows:
 
     class BlogPost < ActiveRecord::Base
@@ -60,11 +64,7 @@ The simplest and recommended way to install HoboFields is as a gem:
 
 The source lives on GitHub as part of the main Hobo repo:
 
- - [http://github.com/tablatom/hobo](http://github.com/tablatom/hobo)
-
-To use hobo_fields as a plugin is not as simple as it should be.  You
-will have to clone `git://github.com/tablatom/hobo` and then copy the
-`hobo_fields` subdirectory into `/vendors/plugins`
+ - [http://github.com/Hobo/hobo](http://github.com/Hobo/hobo)
 
 ## Rich Types
 

data/test/generators.rdoctest

@@ -54,7 +54,5 @@ doctest: db file exists
 => true
 
 doctest: Alpha::Beta class exists
->> Alpha::Beta.connection.schema_cache.clear!
->> Alpha::Beta.reset_column_information
 >> Alpha::Beta
-=> Alpha::Beta(id: integer, one: string, two: integer)
+# will error if class doesn't exist

data/test/migration_generator.rdoctest

@@ -17,7 +17,7 @@ The migration generator works by:
 
 Normally you would run the migration generator as a regular Rails generator. You would type
 
-    $ script/generator hobo_migration
+    $ rails generate hobo:migration
 
 in your Rails app, and the migration file would be created in `db/migrate`.
 

data/test/prepare_testapp.rb

@@ -3,7 +3,7 @@ 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 'kramdown'" >> #{TESTAPP_PATH}/Gemfile)
 system %(echo "gem 'RedCloth'" >> #{TESTAPP_PATH}/Gemfile)
 FileUtils.chdir TESTAPP_PATH
 require "#{TESTAPP_PATH}/config/environment"

data/test/rich_types.rdoctest

@@ -132,8 +132,7 @@ Provides validation of correct email address format.
 
 
 ### `HoboFields::Types::MarkdownString`
-
-`HoboFields::Types::MarkdownString` provides a `to_html` that renders markdown syntax into html. It requires the bluecloth gem.
+`HoboFields::Types::MarkdownString` provides a `to_html` that renders markdown syntax into html. It looks for RDiscount, Kramdown, Maruku or BlueCloth in that order.
 
         >> markdown = HoboFields::Types::MarkdownString.new %(
           This is a heading
@@ -141,16 +140,17 @@ Provides validation of correct email address format.
 
           And text can be *emphasised*
           )
-        >> markdown.to_html
+        >> markdown.to_html.strip
         => "<h1>This is a heading</h1>\n\n<p>And text can be <em>emphasised</em></p>"
         >> markdown.to_html.html_safe?
         => true
 
-        # some unsafe html fragements are removed by `to_html`,
-        # but there's no guarantees that it is well-formed
-        >> markdown = HoboFields::Types::MarkdownString.new("</div>>>p1<script>p2")
+        # unsafe html behaviour depends on the parser used.
+        >> markdown = HoboFields::Types::MarkdownString.new("</div>p1<script>p2")
         >> markdown.to_html
-        => "<p></div>>>p1</p>"
+        => "<p>&lt;/div&gt;p1</p>\n"
+        # Bluecloth would return
+        # => "<p></div>p1</p>"
         >> markdown.to_html.html_safe?
         => true
 
@@ -387,9 +387,9 @@ Translations only work with named EnumString's.  The recommended way of naming t
 
         # no safety treatments are done by `to_html`.
         # even if `markdown.to_html` is actually unsafe, it is marked as html_safe.
-        >> markdown = HoboFields::Types::RawMarkdownString.new("</div>>>p1<script>p2")
-        >> markdown.to_html
-        => "<p></div>>>p1<script>p2</p>"
+        >> markdown = HoboFields::Types::RawMarkdownString.new("<script>foo</script>")
+        >> markdown.to_html.strip
+        => "<script>foo</script>"
         >> markdown.to_html.html_safe?
         => true
 

metadata

@@ -1,87 +1,93 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: hobo_fields
-version: !ruby/object:Gem::Version
-  version: 2.0.0.pre7
+version: !ruby/object:Gem::Version 
+  hash: 554064403
   prerelease: 6
+  segments: 
+  - 2
+  - 0
+  - 0
+  - pre
+  - 8
+  version: 2.0.0.pre8
 platform: ruby
-authors:
+authors: 
 - Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-04 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: 2.0.0.pre7
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.0.pre7
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 554064403
+        segments: 
+        - 2
+        - 0
+        - 0
+        - pre
+        - 8
+        version: 2.0.0.pre8
+  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 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bluecloth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: kramdown
   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 
+        hash: 3
+        segments: 
+        - 0
+        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
 - Gemfile
 - LICENSE.txt
@@ -128,28 +134,39 @@ files:
 - test_responses.txt
 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 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: hobo
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rich field types and migration generator for Rails
 test_files: []
+
 has_rdoc: