embedda 0.0.4 → 0.0.5

data/README.md

@@ -22,31 +22,38 @@ And remember to `bundle`
 This gem adds `String#embedda` to Ruby strings. You use it like this:
 
 ```ruby
-[2] pry(main)> "String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda
+"String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda
 => "String heheh <iframe width=\"560\" height=\"315\" src=\"http://www.youtube.com/embed/BVtYSy83XXw\" frameborder=\"0\" allowfullscreen></iframe> yeah"
 ```
 
 If you need only one of the parsers you can do like this:
 
 ```ruby
-[2] pry(main)> "String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda(:filters => :youtube)
+"String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda(:filters => :youtube)
 => "String heheh <iframe width=\"560\" height=\"315\" src=\"http://www.youtube.com/embed/BVtYSy83XXw\" frameborder=\"0\" allowfullscreen></iframe> yeah"
 ```
 
 This is the default behavoir:
 
 ```ruby
-[2] pry(main)> "String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda(:filters => [:youtube, :vimeo])
+"String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda(:filters => [:youtube, :vimeo])
 => "String heheh <iframe width=\"560\" height=\"315\" src=\"http://www.youtube.com/embed/BVtYSy83XXw\" frameborder=\"0\" allowfullscreen></iframe> yeah"
 ```
 
-  You can enforce https URLs (useful on SSL-secured sites):
+You can enforce https URLs (useful on SSL-secured sites):
 
 ```ruby
-[2] pry(main)> "String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda(ssl: true)
+"String heheh http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda(ssl: true)
 => "String heheh <iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/BVtYSy83XXw\" frameborder=\"0\" allowfullscreen></iframe> yeah"
 ```
 
+You can set video width and height with proper settings:
+
+```ruby
+"http://www.youtube.com/watch?v=BVtYSy83XXw yeah".embedda(video_width: 600, video_height: 300)
+=> "String heheh <iframe width=\"600\" height=\"300\" src=\"https://www.youtube.com/embed/BVtYSy83XXw\" frameborder=\"0\" allowfullscreen></iframe> yeah"
+```
+
 ## Supported embeds
 
 Currently embedda can embed the following formats:

data/embedda.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "embedda"
-  gem.version     = '0.0.4'
+  gem.version     = '0.0.5'
   gem.authors     = ["Kasper Grubbe",'Christian Takle']
   gem.email       = ["kaspergrubbe@gmail.com"]
   gem.homepage    = "http://github.com/kaspergrubbe/embedda"

data/lib/embedda.rb

@@ -1,4 +1,4 @@
-require 'cgi'
+require 'embedda/filters/provider'
 
 class Embedda
   class UnknownFilter < StandardError
@@ -7,57 +7,42 @@ class Embedda
     end
   end
 
-  def initialize(string, options = {})
-    options  = {:filters => [:youtube, :vimeo, :soundcloud]}.merge(options)
-    @filters = Array(options[:filters])
-    @protocol = options[:ssl] ? 'https' : 'http'
-    @string  = string
+  attr_reader :string, :options
+
+  def initialize(string_to_process, options = {})
+    @options = defaultize_options(options)
+    @string  = string_to_process.to_s
   end
 
   def embed
-    return "" if @string.to_s.empty?
-    @filters.each do |filter_name|
-      begin
-        @string = send("#{filter_name}_replace", @string)
-      rescue NoMethodError
-        raise UnknownFilter.new(filter_name)
-      end
-    end
+    return @string if @string.empty?
+    process_string_with_all_filters
     @string
   end
 
   private
 
-  def youtube_replace(compiled)
-    compiled.gsub!(/(<a[^>]*?youtube\.com\/watch\?v=([a-zA-Z0-9\-\_]+).*?<\/a>)/i) { |m| youtube_player($2) }
-    compiled.gsub!(/([http|https]+:\/\/(?:www\.)?youtube\.com\/watch\?v=([a-zA-Z0-9\-\_]+)\w*)/i) { |m| youtube_player($2) }
-
-    return compiled
-  end
-  def youtube_player(token)
-    "<iframe width=\"560\" height=\"315\" src=\"#{@protocol}://www.youtube.com/embed/#{token}\" frameborder=\"0\" allowfullscreen></iframe>"
+  def defaultize_options(options)
+    {:filters => [:youtube, :vimeo, :soundcloud]}.merge(options)
   end
 
-  def vimeo_replace(compiled)
-    compiled.gsub!(/(<a[^>]*?vimeo\.com\/(\d+).*?<\/a>)/i) { |m| vimeo_player($2) }
-    compiled.gsub!(/([http|https]+:\/\/(?:www\.)?vimeo\.com\/(\d+)\w*)/i) { |m| vimeo_player($2) }
-
-    return compiled
+  def filters
+    Array(options[:filters])
   end
-  def vimeo_player(token)
-    "<iframe src=\"#{@protocol}://player.vimeo.com/video/#{token}\" width=\"500\" height=\"281\" frameborder=\"0\" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>"
+
+  def process_string_with_all_filters
+    filters.each{|filter_name| process_with_filter(filter_name) }
   end
 
-  def soundcloud_replace(compiled)
-    r = /(https?:\/\/(?:www.)?soundcloud.com\/[A-Za-z0-9]+(?:[-_][A-Za-z0-9]+)*(?!\/sets(?:\/|$))(?:\/[A-Za-z0-9]+(?:[-_][A-Za-z0-9]+)*){1,2}\/?)/i
-    compiled.gsub!(r) { |m| soundcloud_player(m) }
+  def process_with_filter(filter_name)
+    get_filter(filter_name).process(string)
+  end
 
-    return compiled
+  def get_filter(filter_name)
+    filter_provider.get(filter_name)
   end
-  def soundcloud_player(token)
-    url_encoded_string = CGI::escape(token)
 
-    # Note: added '&' ...?url=...&
-    "<iframe width=\"100%\" height=\"166\" scrolling=\"no\" frameborder=\"no\" src=\"https://w.soundcloud.com/player/?url=#{url_encoded_string}&color=ff6600&amp;auto_play=false&amp;show_artwork=false\"></iframe>"
+  def filter_provider
+    Filters::Provider.new(options)
   end
 end

data/lib/embedda/filters/provider.rb

@@ -0,0 +1,43 @@
+require 'embedda/filters/vimeo'
+require 'embedda/filters/youtube'
+require 'embedda/filters/soundcloud'
+
+class Embedda
+  module Filters
+    class Provider
+
+      attr_reader :options
+      def initialize(options)
+        @options = options
+      end
+
+      def get(filter_name)
+        case filter_name
+        when :vimeo
+          Vimeo.new(protocol, video_width, video_height)
+        when :youtube
+          Youtube.new(protocol, video_width, video_height)
+        when :soundcloud
+          Soundcloud.new
+        else
+          raise UnknownFilter.new(filter_name)
+        end
+      end
+
+      private
+
+      def protocol
+        options[:ssl] ? 'https' : 'http'
+      end
+
+      def video_width
+        options.fetch(:video_width, 560)
+      end
+
+      def video_height
+        options.fetch(:video_height, 315)
+      end
+
+    end
+  end
+end

data/lib/embedda/filters/soundcloud.rb

@@ -0,0 +1,21 @@
+require 'cgi'
+
+class Embedda
+  module Filters
+    class Soundcloud
+      def process(string)
+        r = /(https?:\/\/(?:www.)?soundcloud.com\/[A-Za-z0-9]+(?:[-_][A-Za-z0-9]+)*(?!\/sets(?:\/|$))(?:\/[A-Za-z0-9]+(?:[-_][A-Za-z0-9]+)*){1,2}\/?)/i
+        string.gsub!(r) { |m| player(m) }
+        return string
+      end
+
+      private
+
+      def player(token)
+        url_encoded_string = CGI::escape(token)
+        # Note: added '&' ...?url=...&
+        "<iframe width=\"100%\" height=\"166\" scrolling=\"no\" frameborder=\"no\" src=\"https://w.soundcloud.com/player/?url=#{url_encoded_string}&color=ff6600&amp;auto_play=false&amp;show_artwork=false\"></iframe>"
+      end
+    end
+  end
+end

data/lib/embedda/filters/vimeo.rb

@@ -0,0 +1,23 @@
+class Embedda
+  module Filters
+    class Vimeo
+      def initialize(protocol, width, height)
+        @protocol = protocol
+        @width    = width
+        @height   = height
+      end
+
+      def process(string)
+        string.gsub!(/(<a[^>]*?vimeo\.com\/(\d+).*?<\/a>)/i) { |m| player($2) }
+        string.gsub!(/([http|https]+:\/\/(?:www\.)?vimeo\.com\/(\d+)\w*)/i) { |m| player($2) }
+        return string
+      end
+
+      private
+
+      def player(token)
+        %Q{<iframe src="#{@protocol}://player.vimeo.com/video/#{token}" width="#{@width}" height="#{@height}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
+      end
+    end
+  end
+end

data/lib/embedda/filters/youtube.rb

@@ -0,0 +1,24 @@
+class Embedda
+  module Filters
+    class Youtube
+      def initialize(protocol, width, height)
+        @protocol = protocol
+        @width    = width
+        @height   = height
+      end
+
+      def process(string)
+        string.gsub!(/(<a[^>]*?youtube\.com\/watch\?v=([a-zA-Z0-9\-\_]+).*?<\/a>)/i) { |m| player($2) }
+        string.gsub!(/([http|https]+:\/\/(?:www\.)?youtube\.com\/watch\?v=([a-zA-Z0-9\-\_]+)\w*)/i) { |m| player($2) }
+        return string
+      end
+
+      private
+
+      def player(token)
+        %Q{<iframe width="#{@width}" height="#{@height}" src="#{@protocol}://www.youtube.com/embed/#{token}" frameborder="0" allowfullscreen></iframe>}
+      end
+    end
+  end
+end
+

data/spec/embedda_spec.rb

@@ -6,7 +6,8 @@ describe Embedda do
 
   context "Youtube-link" do
     let(:embed_string) { '<iframe width="560" height="315" src="http://www.youtube.com/embed/dQw4w9WgXcQ" frameborder="0" allowfullscreen></iframe>' }
-    let(:https_embed_string) { '<iframe width="560" height="315" src="https://www.youtube.com/embed/dQw4w9WgXcQ" frameborder="0" allowfullscreen></iframe>' }
+    let(:https_embed_string) { embed_string.gsub("http", "https") }
+    let(:horizontal_embed_string) { embed_string.gsub("560", "200").gsub("315", "400") }
 
     it "should embed when text have a link" do
       @story = "http://www.youtube.com/watch?v=dQw4w9WgXcQ"
@@ -55,11 +56,18 @@ describe Embedda do
       @story = "http://www.youtube.com/watch?v=dQw4w9WgXcQ"
       expect(described_class.new(@story, :ssl => true).embed).to eq(https_embed_string)
     end
+
+    it 'outputs link with proper width and height' do
+      @story = "http://www.youtube.com/watch?v=dQw4w9WgXcQ"
+      embedda = described_class.new(@story, :video_width => 200, :video_height => 400).embed
+      expect(embedda).to eq(horizontal_embed_string)
+    end
   end
 
   context "Vimeo-link" do
-    let(:embed_string) { '<iframe src="http://player.vimeo.com/video/20241459" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>' }
-    let(:https_embed_string) { '<iframe src="https://player.vimeo.com/video/20241459" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>' }
+    let(:embed_string) { '<iframe src="http://player.vimeo.com/video/20241459" width="560" height="315" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>' }
+    let(:https_embed_string) { embed_string.gsub("http", "https") }
+    let(:horizontal_embed_string) { embed_string.gsub("560", "200").gsub("315", "400") }
 
     it "should embed when text have a link" do
       @story = "http://vimeo.com/20241459"
@@ -97,6 +105,12 @@ describe Embedda do
       @story = "http://vimeo.com/20241459"
       expect(described_class.new(@story, :ssl => true).embed).to eq(https_embed_string)
     end
+
+    it 'outputs link with proper width and height' do
+      @story = "http://vimeo.com/20241459"
+      embedda = described_class.new(@story, :video_width => 200, :video_height => 400).embed
+      expect(embedda).to eq(horizontal_embed_string)
+    end
   end
 
   context "Soundcloud-link" do
@@ -129,7 +143,7 @@ describe Embedda do
   context "All embeds in one string" do
       let(:youtube)         { '<iframe width="560" height="315" src="http://www.youtube.com/embed/dQw4w9WgXcQ" frameborder="0" allowfullscreen></iframe>' }
       let(:youtube_link)    { 'http://www.youtube.com/watch?v=dQw4w9WgXcQ' }
-      let(:vimeo)           { '<iframe src="http://player.vimeo.com/video/20241459" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>' }
+      let(:vimeo)           { '<iframe src="http://player.vimeo.com/video/20241459" width="560" height="315" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>' }
       let(:vimeo_link)      { 'http://vimeo.com/20241459' }
       let(:soundcloud)      { '<iframe width="100%" height="166" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?url=https%3A%2F%2Fsoundcloud.com%2Fflume-1%2Fflume-left-alone-bobby-tank&color=ff6600&amp;auto_play=false&amp;show_artwork=false"></iframe>' }
       let(:soundcloud_link) { 'https://soundcloud.com/flume-1/flume-left-alone-bobby-tank' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embedda
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies: []
 description: Embed content strings in your strings, and turn it to embed HTML!
 email:
@@ -29,6 +29,10 @@ files:
 - embedda.gemspec
 - lib/embedda.rb
 - lib/embedda/core_ext.rb
+- lib/embedda/filters/provider.rb
+- lib/embedda/filters/soundcloud.rb
+- lib/embedda/filters/vimeo.rb
+- lib/embedda/filters/youtube.rb
 - spec/embedda_core_ext_spec.rb
 - spec/embedda_spec.rb
 - spec/spec_helper.rb