auto_html 1.3.3 → 1.3.4

data/README.md

@@ -8,7 +8,7 @@ auto_html is a Rails extension for transforming URLs to appropriate resource (im
 
 Transforming string with text and URLs is done with *auto_html* method:
 
-    inlcude AutoHtml
+    include AutoHtml
     
     auto_html('Hey! Checkout out: http://vukajlija.com') { simple_format; link(:target => 'blank') }
     => "<p>Hey! Checkout out: <a href='http://vukajlija.com' target='blank'>http://vukajlija.com</a></p>"
@@ -71,7 +71,7 @@ As from version 1.2.0 auto_html uses Rails' engine for discovering links. There
     for Rails <= 2.3.1 use auto_html 1.1.2<br/>
     for Rails >= 2.3.2 use the latest auto_html
 
-As from version 1.3.0, auto_html has been tested to work with Rails 3 and Ruby 1.9.
+As of version 1.3.0, auto_html has been tested to work with Rails 3 and Ruby 1.9.
 
 ### As a gem
 
@@ -93,4 +93,4 @@ In Rails 3.0 specify the gem in your Gemfile
 ## Credits
 
 Author: [Dejan Simic](http://github.com/dejan)<br/>
-Contributors: [Claudio Perez Gamayo](http://github.com/crossblaim), [Matt Polito](http://github.com/mattpolito), [Ryan Heneise](http://github.com/mysmallidea), [Caleb Wright](http://github.com/fabrikagency)
+Contributors: [Claudio Perez Gamayo](http://github.com/crossblaim), [Matt Polito](http://github.com/mattpolito), [Ryan Heneise](http://github.com/mysmallidea), [Caleb Wright](http://github.com/fabrikagency), [Derrick Camerino](https://github.com/robustdj)

data/Rakefile

@@ -10,7 +10,7 @@ end
 
 desc 'Test with recent versions of Rails'
 task :test_with_recent do
-  versions = ['2.3.6', '3.0.0.rc']
+  versions = ['2.3.8', '3.0.3']
   versions.each do |v|
     puts "\n###### TESTING WITH RAILS #{v}"
     ENV['RAILS_VERSION'] = v
@@ -28,21 +28,3 @@ task :test_with_installed do
     Rake::Task['test'].execute
   end
 end
-
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "auto_html"
-    gem.summary = %{Automatically transforms urls (via domain) and includes the destination resource (Vimeo, YouTube movie, image, ...) in your document}
-    gem.email = "desimic@gmail.com"
-    gem.homepage = "http://github.com/dejan/auto_html"
-    gem.description = "Automatically transforms urls (via domain) and includes the destination resource (Vimeo, YouTube movie, image, ...) in your document"
-    gem.authors = ["Dejan Simic"]
-    gem.files.exclude 'test.sqlite3'
-    gem.has_rdoc = false
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-

data/lib/auto_html/filter.rb

@@ -13,9 +13,9 @@ module AutoHtml
     def apply(text, options = {})
       _options = @options && @options.merge(options)
       if _options
-        @block.call(text.dup, _options)
+        @block.call(text.to_s.dup, _options)
       else
-        @block.call(text.dup)
+        @block.call(text.to_s.dup)
       end
     end
   end

data/lib/auto_html/filters/metacafe.rb

@@ -0,0 +1,13 @@
+AutoHtml.add_filter(:metacafe).with(:width => 440, :height => 272, :show_stats => false, :autoplay => false) do |text, options|
+  text.gsub(/http:\/\/www\.metacafe\.com\/watch\/([A-Za-z0-9._%-]*)\/([A-Za-z0-9._%-]*)(\/)?/) do
+    metacafe_id = $1
+    metacafe_slug = $2
+    width  = options[:width]
+    height = options[:height]
+    show_stats      = options[:show_stats] ? "showStats=yes" : "showStats=no"
+    autoplay        = options[:autoplay] ? "autoPlay=yes" : "autoPlay=no"
+    flash_vars = [show_stats, autoplay].join("|")
+
+    %{<div style="background:#000000;width:#{width}px;height:#{height}px"><embed flashVars="playerVars=#{flash_vars}" src="http://www.metacafe.com/fplayer/#{metacafe_id}/#{metacafe_slug}.swf" width="#{width}" height="#{height}" wmode="transparent" allowFullScreen="true" allowScriptAccess="always" name="Metacafe_#{metacafe_id}" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed></div>}
+  end
+end

data/test/fixtures/schema.rb

@@ -6,4 +6,9 @@ ActiveRecord::Schema.define do
     t.column "created_at",    :datetime
     t.column "updated_at",    :datetime
   end
+
+  create_table "users", :force => true do |t|
+    t.column "name",         :string
+    t.column "bio",          :text
+  end
 end

data/test/functional/auto_html_for_test.rb

@@ -25,6 +25,12 @@ class AutoHtmlForTest < Test::Unit::TestCase
     assert_equal '<p>Yo!</p>', @article.body_html
   end
 
+  def test_transform_of_nil
+    @article = Article.new(:body => nil)
+    @article.save!
+    assert_equal '', @article.body_html
+  end
+
   def test_transform_after_update
     @article = Article.create!(:body => 'Yo!')
     @article.update_attributes(:body => 'http://vukajlija.com')

data/test/functional/filter_test.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../fixture_setup'
+
+AutoHtml.add_filter(:foo) do |text|
+  nil
+end
+
+AutoHtml.add_filter(:bar) do |text|
+  "bar"
+end
+
+class User < ActiveRecord::Base
+  auto_html_for :bio do
+    foo
+    foo
+    bar
+  end
+end
+
+class AutoHtmlForTest < Test::Unit::TestCase
+  include FixtureSetup
+
+  def test_transform_after_save
+    @article = User.new(:bio => 'in progress...')
+    assert_equal 'bar', @article.bio_html
+  end
+end

data/test/test_helper.rb

@@ -8,6 +8,7 @@ end
 
 require 'test/unit'
 require 'active_record'
+require 'active_support/core_ext/class'
 
 require File.dirname(__FILE__) + '/../init'
 

data/test/unit/filters/dailymotion_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../unit_test_helper'
 
-class GoogleVideoTest < Test::Unit::TestCase
+class DailyMotionTest < Test::Unit::TestCase
 
   def test_transform
     result = auto_html("http://www.dailymotion.com/en/featured/video/xag4p2_tempsmorttv-episode-01_shortfilms") { dailymotion }

data/test/unit/filters/metacafe_test.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../unit_test_helper'
+
+class MetaCafeTest < Test::Unit::TestCase
+
+  def test_transform
+    result = auto_html("http://www.metacafe.com/watch/5440707/exclusive_tron_evolution_dev_diary_the_art_design") { metacafe }
+    assert_equal '<div style="background:#000000;width:440px;height:272px"><embed flashVars="playerVars=showStats=no|autoPlay=no" src="http://www.metacafe.com/fplayer/5440707/exclusive_tron_evolution_dev_diary_the_art_design.swf" width="440" height="272" wmode="transparent" allowFullScreen="true" allowScriptAccess="always" name="Metacafe_5440707" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed></div>', result
+  end
+
+  def test_transform_with_dimensions
+    result = auto_html("http://www.metacafe.com/watch/5440707/exclusive_tron_evolution_dev_diary_the_art_design") { metacafe(:width => 500, :height => 300) }
+    assert_equal '<div style="background:#000000;width:500px;height:300px"><embed flashVars="playerVars=showStats=no|autoPlay=no" src="http://www.metacafe.com/fplayer/5440707/exclusive_tron_evolution_dev_diary_the_art_design.swf" width="500" height="300" wmode="transparent" allowFullScreen="true" allowScriptAccess="always" name="Metacafe_5440707" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed></div>', result
+  end
+
+  def test_transform_with_show_stats
+    result = auto_html("http://www.metacafe.com/watch/5440707/exclusive_tron_evolution_dev_diary_the_art_design") { metacafe(:width => 500, :height => 300, :show_stats => true) }
+    assert_equal '<div style="background:#000000;width:500px;height:300px"><embed flashVars="playerVars=showStats=yes|autoPlay=no" src="http://www.metacafe.com/fplayer/5440707/exclusive_tron_evolution_dev_diary_the_art_design.swf" width="500" height="300" wmode="transparent" allowFullScreen="true" allowScriptAccess="always" name="Metacafe_5440707" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed></div>', result
+  end
+
+  def test_transform_with_autoplay
+    result = auto_html("http://www.metacafe.com/watch/5440707/exclusive_tron_evolution_dev_diary_the_art_design") { metacafe(:width => 500, :height => 300, :autoplay => true) }
+    assert_equal '<div style="background:#000000;width:500px;height:300px"><embed flashVars="playerVars=showStats=no|autoPlay=yes" src="http://www.metacafe.com/fplayer/5440707/exclusive_tron_evolution_dev_diary_the_art_design.swf" width="500" height="300" wmode="transparent" allowFullScreen="true" allowScriptAccess="always" name="Metacafe_5440707" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed></div>', result
+  end
+
+  def test_transform_with_options
+    result = auto_html("http://www.metacafe.com/watch/5440707/exclusive_tron_evolution_dev_diary_the_art_design") { metacafe(:width => 500, :height => 300, :show_stats => true, :autoplay => true) }
+    assert_equal '<div style="background:#000000;width:500px;height:300px"><embed flashVars="playerVars=showStats=yes|autoPlay=yes" src="http://www.metacafe.com/fplayer/5440707/exclusive_tron_evolution_dev_diary_the_art_design.swf" width="500" height="300" wmode="transparent" allowFullScreen="true" allowScriptAccess="always" name="Metacafe_5440707" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash"></embed></div>', result
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: auto_html
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 3
-  - 3
-  version: 1.3.3
+  - 4
+  version: 1.3.4
 platform: ruby
 authors: 
 - Dejan Simic
@@ -15,29 +15,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 +02:00
+date: 2011-01-01 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
-description: Automatically transforms urls (via domain) and includes the destination resource (Vimeo, YouTube movie, image, ...) in your document
+description: Automatically transforms URIs (via domain) and includes the destination resource (Vimeo, YouTube movie, image, ...) in your document
 email: desimic@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.md
-- TODO
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- CHANGELOG.md
-- MIT-LICENCE
-- README.md
 - Rakefile
-- VERSION.yml
-- auto_html.gemspec
-- init.rb
-- lib/auto_html.rb
 - lib/auto_html/auto_html_for.rb
 - lib/auto_html/base.rb
 - lib/auto_html/builder.rb
@@ -47,17 +38,19 @@ files:
 - lib/auto_html/filters/html_escape.rb
 - lib/auto_html/filters/image.rb
 - lib/auto_html/filters/link.rb
+- lib/auto_html/filters/metacafe.rb
 - lib/auto_html/filters/sanitize.rb
 - lib/auto_html/filters/simple_format.rb
 - lib/auto_html/filters/vimeo.rb
 - lib/auto_html/filters/youtube.rb
 - lib/auto_html/filters/youtube_js_api.rb
-- rails/init.rb
+- lib/auto_html.rb
 - test/fixture_setup.rb
 - test/fixtures/database.yml
 - test/fixtures/schema.rb
 - test/functional/auto_html_for_options_test.rb
 - test/functional/auto_html_for_test.rb
+- test/functional/filter_test.rb
 - test/test_helper.rb
 - test/unit/auto_html_test.rb
 - test/unit/filters/dailymotion_test.rb
@@ -65,20 +58,21 @@ files:
 - test/unit/filters/html_escape_test.rb
 - test/unit/filters/image_test.rb
 - test/unit/filters/link_test.rb
+- test/unit/filters/metacafe_test.rb
 - test/unit/filters/sanitize_test.rb
 - test/unit/filters/simple_format_test.rb
 - test/unit/filters/vimeo_test.rb
 - test/unit/filters/youtube_js_api_test.rb
 - test/unit/filters/youtube_test.rb
 - test/unit/unit_test_helper.rb
-- TODO
+- README.md
 has_rdoc: true
 homepage: http://github.com/dejan/auto_html
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -105,22 +99,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Automatically transforms urls (via domain) and includes the destination resource (Vimeo, YouTube movie, image, ...) in your document
-test_files: 
-- test/fixture_setup.rb
-- test/fixtures/schema.rb
-- test/functional/auto_html_for_options_test.rb
-- test/functional/auto_html_for_test.rb
-- test/test_helper.rb
-- test/unit/auto_html_test.rb
-- test/unit/filters/dailymotion_test.rb
-- test/unit/filters/google_video_test.rb
-- test/unit/filters/html_escape_test.rb
-- test/unit/filters/image_test.rb
-- test/unit/filters/link_test.rb
-- test/unit/filters/sanitize_test.rb
-- test/unit/filters/simple_format_test.rb
-- test/unit/filters/vimeo_test.rb
-- test/unit/filters/youtube_js_api_test.rb
-- test/unit/filters/youtube_test.rb
-- test/unit/unit_test_helper.rb
+summary: Transform URIs to appropriate markup
+test_files: []
+

data/.gitignore

@@ -1,2 +0,0 @@
-test.sqlite3
-TODO

data/CHANGELOG.md

@@ -1,49 +0,0 @@
-## 1.3.3, released 2010-09-01
-* yet another Rails 3 initialization fix
-
-## 1.3.2, released 2010-08-27
-* pre-rails 3 initialization fix
-
-## 1.3.1, released 2010-08-22
-* Rails 3 initialization fix
-* fixes to conform Rails 3.0.0.rc, sanitization by default in text_helpers (auto_link, simple_format)
-* added vimeo html5 universal embed player 
-
-## 1.3.0, released 2010-08-14
-* no need for explicit call to auto_html_prepare
-* no need for DB column for cache (ie. _html)
-* Rails 3 support
-* correctly handle blank and nil values when applying auto_html
-* more filters: youtube_js_api
-* youtube filter supports html5
-
-
-## 1.2.1, released 2009-10-28
-
-* more options for vimeo filter
-* switch to gemcutter
-
-## 1.2.0, released 2009-09-26
-
-* link filter now uses Rails' link discovery engine. Closes: <http://github.com/dejan/auto_html/issues#issue/2> and  <http://github.com/dejan/auto_html/issues#issue/3> if Rails 2.3+ is in use.
-* added dailymotion filter
-* added sanitize filter
-
-## 1.1.2, released 2009-09-24
-
-* link filter fix. Closes: <http://github.com/dejan/auto_html/issues#issue/2>
-
-## 1.1.1, released 2009-09-06
-
-* test_helper fix
-
-## 1.1.0, released 2009-09-05
-
-* Plugin gemified
-* AutoHtmlFor.options[:htmlized_attribute_suffix] is now AutoHtmlFor.auto_html_for_options[:htmlized_attribute_suffix]. Closes gh-1
-* Removed deezer filter since deezer.com no longer provides sharing of this kind
-
-## 1.0.0
-
-* Stuff described here: <http://www.elctech.com/projects/auto_html-plugin>
-

data/MIT-LICENCE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Dejan Simic
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/TODO

@@ -1,12 +0,0 @@
-v 1.3
-* add bunch of new filters: twitter (check campfire's markup/styling), twitpic, http://twaud.io/, see more: http://www.oembed.com/, http://api.embed.ly/
-
-
-v 2
-* refactoring (class/var names, code style, etc.)
-* inline testing
-* more tests
-* test coverage
-* performance testing
-* oembed object as result?
-* fancy filters: click to play youtube, lightbox, ...

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:major: 1
-:minor: 3
-:patch: 3

data/auto_html.gemspec

@@ -1,98 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{auto_html}
-  s.version = "1.3.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dejan Simic"]
-  s.date = %q{2010-09-01}
-  s.description = %q{Automatically transforms urls (via domain) and includes the destination resource (Vimeo, YouTube movie, image, ...) in your document}
-  s.email = %q{desimic@gmail.com}
-  s.extra_rdoc_files = [
-    "README.md",
-     "TODO"
-  ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG.md",
-     "MIT-LICENCE",
-     "README.md",
-     "Rakefile",
-     "VERSION.yml",
-     "auto_html.gemspec",
-     "init.rb",
-     "lib/auto_html.rb",
-     "lib/auto_html/auto_html_for.rb",
-     "lib/auto_html/base.rb",
-     "lib/auto_html/builder.rb",
-     "lib/auto_html/filter.rb",
-     "lib/auto_html/filters/dailymotion.rb",
-     "lib/auto_html/filters/google_video.rb",
-     "lib/auto_html/filters/html_escape.rb",
-     "lib/auto_html/filters/image.rb",
-     "lib/auto_html/filters/link.rb",
-     "lib/auto_html/filters/sanitize.rb",
-     "lib/auto_html/filters/simple_format.rb",
-     "lib/auto_html/filters/vimeo.rb",
-     "lib/auto_html/filters/youtube.rb",
-     "lib/auto_html/filters/youtube_js_api.rb",
-     "rails/init.rb",
-     "test/fixture_setup.rb",
-     "test/fixtures/database.yml",
-     "test/fixtures/schema.rb",
-     "test/functional/auto_html_for_options_test.rb",
-     "test/functional/auto_html_for_test.rb",
-     "test/test_helper.rb",
-     "test/unit/auto_html_test.rb",
-     "test/unit/filters/dailymotion_test.rb",
-     "test/unit/filters/google_video_test.rb",
-     "test/unit/filters/html_escape_test.rb",
-     "test/unit/filters/image_test.rb",
-     "test/unit/filters/link_test.rb",
-     "test/unit/filters/sanitize_test.rb",
-     "test/unit/filters/simple_format_test.rb",
-     "test/unit/filters/vimeo_test.rb",
-     "test/unit/filters/youtube_js_api_test.rb",
-     "test/unit/filters/youtube_test.rb",
-     "test/unit/unit_test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/dejan/auto_html}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Automatically transforms urls (via domain) and includes the destination resource (Vimeo, YouTube movie, image, ...) in your document}
-  s.test_files = [
-    "test/fixture_setup.rb",
-     "test/fixtures/schema.rb",
-     "test/functional/auto_html_for_options_test.rb",
-     "test/functional/auto_html_for_test.rb",
-     "test/test_helper.rb",
-     "test/unit/auto_html_test.rb",
-     "test/unit/filters/dailymotion_test.rb",
-     "test/unit/filters/google_video_test.rb",
-     "test/unit/filters/html_escape_test.rb",
-     "test/unit/filters/image_test.rb",
-     "test/unit/filters/link_test.rb",
-     "test/unit/filters/sanitize_test.rb",
-     "test/unit/filters/simple_format_test.rb",
-     "test/unit/filters/vimeo_test.rb",
-     "test/unit/filters/youtube_js_api_test.rb",
-     "test/unit/filters/youtube_test.rb",
-     "test/unit/unit_test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-

data/init.rb

@@ -1,2 +0,0 @@
-require 'auto_html'
-

data/rails/init.rb

@@ -1 +0,0 @@
-require 'auto_html'