auto_html 1.5.1.1 → 1.5.2

data/README.md

@@ -1,8 +1,8 @@
-auto_html
+auto_html [![Build Status](https://secure.travis-ci.org/dejan/auto_html.png)](http://travis-ci.org/dejan/auto_html)
 =========
 
-auto_html is a Rails extension for transforming URLs to appropriate resource (image, link, YouTube, Vimeo video,...). It's the perfect choice if you don't want to bother visitors with rich HTML editor or markup code, but you still want to allow them to embed video, images, links and more on your site, purely by pasting URL. Check out the [live demo](http://auto-html.rors.org).
 
+auto_html is a Rails extension for transforming URLs to appropriate resource (image, link, YouTube, Vimeo video,...). It's the perfect choice if you don't want to bother visitors with rich HTML editor or markup code, but you still want to allow them to embed video, images, links and more on your site, purely by pasting URL. Check out the [live demo](http://auto-html.rors.org).
 
 ## Example usage
 
@@ -25,12 +25,12 @@ You'll probably have user input stored in model, so it's a good place to automat
       end
     end
 
-... and you'll have this behaviour: 
+... and you'll have this behavior: 
 
     Comment.create(:body => 'Hey check out this cool video: http://www.youtube.com/watch?v=WdsGihou8J4')  
     => #<Comment id: 123, body: '<p>Hey check out this cool video: <iframe class="youtube-player" type="text/html" width="587" height="350" src="http://www.youtube.com/embed/WdsGihou8J4" frameborder="0"> <br /></iframe></p>'>
 
-Note that order of invoking filters is important, ie. you want html_escape as first and link amongst last, so that it doesn't transform youtube URL to plain link.
+Note that order of invoking filters is important, i.e. you want html_escape as first and link amongst last, so that it doesn't transform youtube URL to plain link.
 
 
 Now all you have to do is to display it in template without escaping, since plugin took care of that:

data/Rakefile

@@ -8,24 +8,9 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
 end
 
-desc 'Test with recent versions of Rails'
-task :test_wit_all_rails_versions do
-  versions = ['2.1.2', 
-              '2.2.3', 
-#              '2.3.14',  
-              '3.0.11', 
-              '3.1.3',
-              '3.2.1']
-  versions.each do |v|
-    puts "\n###### TESTING WITH RAILS #{v}"
-    ENV['RAILS_VERSION'] = v
-    Rake::Task['test'].execute
-  end
-end
-
 desc 'Test with versions of Rails available on the system'
 task :test_with_installed do
-  versions = `gem list rails | grep rails`.gsub("rails (", "").chop.split(', ')
+  versions = `gem list rails | grep rails`.gsub("rails (", "").chop.chop.split(', ')
   exclude = []
   (versions-exclude).each do |v|
     puts "\n###### TESTING WITH RAILS #{v}"

data/lib/auto_html/auto_html_for.rb

@@ -13,34 +13,23 @@ module AutoHtmlFor
   module ClassMethods
     def auto_html_for(raw_attrs, &proc)
       include AutoHtmlFor::InstanceMethods
-      before_save :auto_html_prepare
-
-      define_method("auto_html_prepare") do
-        auto_html_methods = self.methods.select { |m| m=~/^auto_html_prepare_/ }
-        auto_html_methods.each do |method|
-          self.send(method)
-        end
-      end
 
       suffix =  AutoHtmlFor.auto_html_for_options[:htmlized_attribute_suffix]
-
+      ([raw_attrs].flatten.map { |a| "#{a}#{suffix}" } - self.column_names).each do |missing_cache_column|
+        attr_accessor missing_cache_column
+      end
       [raw_attrs].flatten.each do |raw_attr|
-        define_method("#{raw_attr}#{suffix}=") do |val|
-          a = "#{raw_attr}#{suffix}"
-          write_attribute(a, val) if attributes.has_key?(a)
-        end
-        define_method("#{raw_attr}#{suffix}") do
-          result = read_attribute("#{raw_attr}#{suffix}") || send("auto_html_prepare_#{raw_attr}")
-          result.respond_to?(:html_safe) ?
-            result.html_safe :
-              result
-        end
-        define_method("auto_html_prepare_#{raw_attr}") do
-          result = auto_html(self.send(raw_attr), &proc)
-          self.send(raw_attr.to_s + suffix + "=", result)
-          result
+        define_method("#{raw_attr}=") do |val|
+          self[raw_attr] = val
+          result = auto_html(val, &proc)
+          if result.respond_to?(:html_safe)
+            result = result.html_safe 
+          end
+          self.send("#{raw_attr}#{suffix}=", result)
+          val
         end
       end
+
     end
   end
 
@@ -48,3 +37,5 @@ module AutoHtmlFor
     include AutoHtml
   end
 end
+
+

data/lib/auto_html/filters/image.rb

@@ -9,7 +9,7 @@ end
 AutoHtml.add_filter(:image).with({:alt => ''}) do |text, options|
   r = Redcarpet::Markdown.new(NoParagraphRenderer)
   alt = options[:alt]
-  text.gsub(/https?:\/\/.+\.(jpg|jpeg|bmp|gif|png)(\?\S+)?/i) do |match|
+  text.gsub(/https?:\/\/.+?\.(jpg|jpeg|bmp|gif|png)(\?\S+)?/i) do |match|
     r.render("![#{alt}](#{match})")
   end
 end

data/lib/auto_html/filters/vimeo.rb

@@ -1,6 +1,7 @@
 AutoHtml.add_filter(:vimeo).with(:width => 440, :height => 248, :show_title => false, :show_byline => false, :show_portrait => false) do |text, options|
-  text.gsub(/http:\/\/(www.)?vimeo\.com\/([A-Za-z0-9._%-]*)((\?|#)\S+)?/) do
-    vimeo_id = $2
+  text.gsub(/(https?):\/\/(www.)?vimeo\.com\/([A-Za-z0-9._%-]*)((\?|#)\S+)?/) do
+    protocol = $1
+    vimeo_id = $3
     width  = options[:width]
     height = options[:height]
     show_title      = "title=0"    unless options[:show_title]
@@ -10,6 +11,6 @@ AutoHtml.add_filter(:vimeo).with(:width => 440, :height => 248, :show_title => f
     query_string_variables = [show_title, show_byline, show_portrait].compact.join("&")
     query_string    = "?" + query_string_variables unless query_string_variables.empty?
 
-    %{<iframe src="http://player.vimeo.com/video/#{vimeo_id}#{query_string}" width="#{width}" height="#{height}" frameborder="#{frameborder}"></iframe>}
+    %{<iframe src="#{protocol}://player.vimeo.com/video/#{vimeo_id}#{query_string}" width="#{width}" height="#{height}" frameborder="#{frameborder}"></iframe>}
   end
 end

data/lib/auto_html/filters/youtube.rb

@@ -1,5 +1,5 @@
 AutoHtml.add_filter(:youtube).with(:width => 420, :height => 315, :frameborder => 0, :wmode => nil) do |text, options|
-  regex = /(https?):\/\/(www.)?(youtube\.com\/watch\?v=|youtu\.be\/)([A-Za-z0-9_-]*)(\&\S+)?(\S)*/
+  regex = /(https?):\/\/(www.)?(youtube\.com\/watch\?v=|youtu\.be\/|youtube\.com\/watch\?feature=player_embedded&v=)([A-Za-z0-9_-]*)(\&\S+)?(\S)*/
   text.gsub(regex) do
     protocol = $1
     youtube_id = $4

data/test/fixture_setup.rb

@@ -1,8 +1,12 @@
 module FixtureSetup
+  fixtures_dir = File.dirname(__FILE__) + '/fixtures'
+  connections = YAML.load_file("#{fixtures_dir}/database.yml")
+  ActiveRecord::Base.establish_connection(connections['sqlite3'])
+  ActiveRecord::Migration.verbose = false
+  load "#{fixtures_dir}/schema.rb"
+  
   def setup
     fixtures_dir = File.dirname(__FILE__) + '/fixtures'
-    connections = YAML.load_file("#{fixtures_dir}/database.yml")
-    ActiveRecord::Base.establish_connection(connections['sqlite3'])
     ActiveRecord::Migration.verbose = false
     load "#{fixtures_dir}/schema.rb"
   end

data/test/fixtures/schema.rb

@@ -1,4 +1,4 @@
-ActiveRecord::Schema.define do
+ActiveRecord::Schema.define(:version => Time.now.to_i) do
   create_table "articles", :force => true do |t|
     t.column "title",         :string
     t.column "body",          :text
@@ -11,4 +11,10 @@ ActiveRecord::Schema.define do
     t.column "name",         :string
     t.column "bio",          :text
   end
+  
+  create_table "posts", :force => true do |t|
+    t.column "topic_id",     :integer
+    t.column "user_id",      :integer
+    t.column "content",      :text
+  end
 end

data/test/functional/auto_html_for_options_test.rb

@@ -5,8 +5,8 @@ require File.expand_path('../../fixture_setup', __FILE__)
 default_suffix = AutoHtmlFor.auto_html_for_options[:htmlized_attribute_suffix]
 AutoHtmlFor.auto_html_for_options[:htmlized_attribute_suffix] = '_htmlized'
 
-class Article < ActiveRecord::Base
-  auto_html_for :body do
+class Post < ActiveRecord::Base
+  auto_html_for :content do
     simple_format
   end
 end
@@ -15,10 +15,10 @@ class AutoHtmlForOptionsTest < Test::Unit::TestCase
   include FixtureSetup
 
   def test_transform_after_save
-    @article = Article.new(:body => 'Yo!')
-    assert_equal '<p>Yo!</p>', @article.body_htmlized
+    @article = Post.new(:content => 'Yo!')
+    assert_equal '<p>Yo!</p>', @article.content_htmlized
     @article.save!
-    assert_equal '<p>Yo!</p>', @article.body_htmlized
+    assert_equal '<p>Yo!</p>', @article.content_htmlized
   end
 end
 

data/test/unit/filters/image_test.rb

@@ -42,6 +42,11 @@ class ImageTest < Test::Unit::TestCase
     assert_equal '<img src="http://tbn3.google.com/images?q=tbn:vS-jtEi9Xc8K6M:http://upload.wikimedia.org/wikipedia/commons/b/ba/Potturinn.jpeg" alt=""/>', result
   end
 
+  def test_transform8
+    result = auto_html('Which do you prefer, this one http://www.lockhartfineart.com/images/Rio_Grande_Frost.JPG, or this one http://rors.org/images/rails.png?') { image({:alt => nil}) }
+    assert_equal 'Which do you prefer, this one <img src="http://www.lockhartfineart.com/images/Rio_Grande_Frost.JPG" alt=""/>, or this one <img src="http://rors.org/images/rails.png" alt=""/>?', result
+  end
+
   def test_https
     result = auto_html('https://img.skitch.com/20100910-1wrbg5749xe29ya5t3s85bnaiy.png') { image({:alt => nil}) }
     assert_equal '<img src="https://img.skitch.com/20100910-1wrbg5749xe29ya5t3s85bnaiy.png" alt=""/>', result

data/test/unit/filters/vimeo_test.rb

@@ -41,5 +41,10 @@ class VimeoTest < Test::Unit::TestCase
     result = auto_html("http://www.vimeo.com/3300155") { vimeo(:width => 300, :height => 250, :show_portrait => true) }
     assert_equal '<iframe src="http://player.vimeo.com/video/3300155?title=0&byline=0" width="300" height="250" frameborder="0"></iframe>', result
   end
+  
+  def test_transform_url_with_https
+    result = auto_html('https://vimeo.com/3300155') { vimeo }
+    assert_equal '<iframe src="https://player.vimeo.com/video/3300155?title=0&byline=0&portrait=0" width="440" height="248" frameborder="0"></iframe>', result
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto_html
 version: !ruby/object:Gem::Version
-  version: 1.5.1.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rinku
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Transform URIs to appropriate markup