auto_html 1.5.0 → 1.5.1

data/README.md

@@ -99,4 +99,4 @@ Specify the gem in Gemfile of the project
 ## Credits
 
 Author: [Dejan Simic](http://github.com/dejan)<br/>
-Contributors: [Claudio Perez Gamayo](https://github.com/crossblaim), [Matt Polito](https://github.com/mattpolito), [Ryan Heneise](https://github.com/mysmallidea), [Caleb Wright](https://github.com/fabrikagency), [Derrick Camerino](https://github.com/robustdj), [Daniel Weinmann](https://github.com/danielweinmann), [Edgars Beigarts](https://github.com/ebeigarts), [Henning Thies](https://github.com/henningthies), [rbq](https://github.com/rbq), [Kir Shatrov](https://github.com/kirs) ([Evrone Company](https://github.com/evrone)), [Demange Anthony](https://github.com/tinoutinou), [Hinrik Örn Sigurðsson](https://github.com/hinrik)
+Contributors: https://github.com/dejan/auto_html/contributors

data/Rakefile

@@ -9,8 +9,13 @@ Rake::TestTask.new(:test) do |t|
 end
 
 desc 'Test with recent versions of Rails'
-task :test_with_recent do
-  versions = ['2.1.0', '2.2.2', '2.3.8', '3.0.3', '3.0.9']
+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

data/lib/auto_html/auto_html_for.rb

@@ -26,7 +26,8 @@ module AutoHtmlFor
 
       [raw_attrs].flatten.each do |raw_attr|
         define_method("#{raw_attr}#{suffix}=") do |val|
-          write_attribute("#{raw_attr}#{suffix}", val)
+          a = "#{raw_attr}#{suffix}"
+          write_attribute(a, val) if attributes[a]
         end
         define_method("#{raw_attr}#{suffix}") do
           result = read_attribute("#{raw_attr}#{suffix}") || send("auto_html_prepare_#{raw_attr}")
@@ -35,8 +36,9 @@ module AutoHtmlFor
               result
         end
         define_method("auto_html_prepare_#{raw_attr}") do
-          self.send(raw_attr.to_s + suffix + "=", 
-            auto_html(self.send(raw_attr), &proc))
+          result = auto_html(self.send(raw_attr), &proc)
+          self.send(raw_attr.to_s + suffix + "=", result)
+          result
         end
       end
     end

data/lib/auto_html/filters/gist.rb

@@ -0,0 +1,9 @@
+AutoHtml.add_filter(:gist).with({}) do |text, options|
+  # E.g. https://gist.github.com/1710276
+  regex = /https:\/\/gist\.github\.com\/(\d+)/
+  text.gsub(regex) do
+    gist_id = $1
+    %{<script src="https://gist.github.com/#{gist_id}.js"></script>}
+  end
+end
+

data/lib/auto_html/filters/google_map.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+AutoHtml.add_filter(:google_map).with(:width => 420, :height => 315, :style => "color:#000;text-align:left", :link_text => "View Larger Map") do |text, options|
+  regex = /(https?):\/\/maps\.google\.co(.*)\/maps\?(.*)/
+  text.gsub(regex) do
+    domain_country = $2
+    map_query = $3
+    width = options[:width]
+    height = options[:height]
+    style = options[:style]
+		link_text = options[:link_text]
+    %{<iframe width="#{width}" height="#{height}" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.co#{domain_country}/maps?f=q&amp;source=s_q&amp;#{map_query}&amp;output=embed"></iframe><br /><small><a href="http://maps.google.co#{domain_country}/maps?f=q&amp;source=embed&amp;#{map_query}" style="#{style}">#{link_text}</a></small>}
+  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+)?.*/
+  regex = /(https?):\/\/(www.)?(youtube\.com\/watch\?v=|youtu\.be\/)([A-Za-z0-9_-]*)(\&\S+)?(\S)*/
   text.gsub(regex) do
     protocol = $1
     youtube_id = $4

data/lib/auto_html/rake_tasks.rb

@@ -25,6 +25,6 @@ namespace :auto_html do
       item.save
       i += 1
     end
-    puts "Done! Processed #{pluralize(i, 'item')}."
+    puts "Done! Processed #{i} items."
   end
 end

data/test/test_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 
 rails_version = ENV['RAILS_VERSION']
 if rails_version
+  gem "activesupport", rails_version
   gem "activerecord", rails_version
   gem "actionpack", rails_version
 end

data/test/unit/filters/gist_test.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../../unit_test_helper', __FILE__)
+
+class GistTest < Test::Unit::TestCase
+
+  def test_transform
+    result = auto_html('https://gist.github.com/1710276') { gist }
+    assert_equal '<script src="https://gist.github.com/1710276.js"></script>', result
+  end
+
+end

data/test/unit/filters/google_map_test.rb

@@ -0,0 +1,14 @@
+require File.expand_path('../../unit_test_helper', __FILE__)
+
+class GoogleMapTest < Test::Unit::TestCase
+
+  def test_transform
+    result = auto_html('http://maps.google.co.kr/maps?q=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&hl=ko&ie=UTF8&ll=37.472942,126.884762&spn=0.00774,0.010053&sll=37.473027,126.88451&sspn=0.003887,0.005026&vpsrc=6&gl=kr&hq=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&t=m&z=17&iwloc=A') { google_map }
+    assert_equal '<iframe width="420" height="315" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.co.kr/maps?f=q&amp;source=s_q&amp;q=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&hl=ko&ie=UTF8&ll=37.472942,126.884762&spn=0.00774,0.010053&sll=37.473027,126.88451&sspn=0.003887,0.005026&vpsrc=6&gl=kr&hq=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&t=m&z=17&iwloc=A&amp;output=embed"></iframe><br /><small><a href="http://maps.google.co.kr/maps?f=q&amp;source=embed&amp;q=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&hl=ko&ie=UTF8&ll=37.472942,126.884762&spn=0.00774,0.010053&sll=37.473027,126.88451&sspn=0.003887,0.005026&vpsrc=6&gl=kr&hq=%ED%8C%8C%ED%8A%B8%EB%84%88%EC%8A%A4%ED%83%80%EC%9B%8C+1%EC%B0%A8&t=m&z=17&iwloc=A" style="color:#000;text-align:left">View Larger Map</a></small>', result
+  end
+  
+  def test_transform_2
+    result = auto_html('http://maps.google.com/maps?hl=en&q=newyork&gs_sm=e&gs_upl=917l917l0l1666l1l1l0l0l0l0l317l317l3-1l1l0&bav=on.2,or.r_gc.r_pw.,cf.osb&biw=1280&bih=679&um=1&ie=UTF-8&sa=N&tab=wl') { google_map }
+    assert_equal '<iframe width="420" height="315" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&q=newyork&gs_sm=e&gs_upl=917l917l0l1666l1l1l0l0l0l0l317l317l3-1l1l0&bav=on.2,or.r_gc.r_pw.,cf.osb&biw=1280&bih=679&um=1&ie=UTF-8&sa=N&tab=wl&amp;output=embed"></iframe><br /><small><a href="http://maps.google.com/maps?f=q&amp;source=embed&amp;hl=en&q=newyork&gs_sm=e&gs_upl=917l917l0l1666l1l1l0l0l0l0l317l317l3-1l1l0&bav=on.2,or.r_gc.r_pw.,cf.osb&biw=1280&bih=679&um=1&ie=UTF-8&sa=N&tab=wl" style="color:#000;text-align:left">View Larger Map</a></small>', result
+  end
+end

data/test/unit/filters/youtube_test.rb

@@ -16,6 +16,11 @@ class YouTubeTest < Test::Unit::TestCase
     result = auto_html('http://www.youtube.com/watch?v=BwNrmYRiX_o&feature=related') { youtube }
     assert_equal '<iframe width="420" height="315" src="http://www.youtube.com/embed/BwNrmYRiX_o" frameborder="0" allowfullscreen></iframe>', result
   end
+  
+  def test_transform3
+    result = auto_html('foo http://www.youtube.com/watch?v=fT1ahr81HLw bar') { youtube }
+    assert_equal 'foo <iframe width="420" height="315" src="http://www.youtube.com/embed/fT1ahr81HLw" frameborder="0" allowfullscreen></iframe> bar', result
+  end
 
   def test_transform_url_without_www
     result = auto_html('http://youtube.com/watch?v=BwNrmYRiX_o') { youtube }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: auto_html
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Dejan Simic
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-08 00:00:00 +01:00
+date: 2012-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,8 @@ files:
 - lib/auto_html/capistrano.rb
 - lib/auto_html/filter.rb
 - lib/auto_html/filters/dailymotion.rb
+- lib/auto_html/filters/gist.rb
+- lib/auto_html/filters/google_map.rb
 - lib/auto_html/filters/google_video.rb
 - lib/auto_html/filters/html_escape.rb
 - lib/auto_html/filters/image.rb
@@ -90,6 +92,8 @@ files:
 - test/test_helper.rb
 - test/unit/auto_html_test.rb
 - test/unit/filters/dailymotion_test.rb
+- test/unit/filters/gist_test.rb
+- test/unit/filters/google_map_test.rb
 - test/unit/filters/google_video_test.rb
 - test/unit/filters/html_escape_test.rb
 - test/unit/filters/image_test.rb