embedda 0.0.5 → 0.0.6

data/README.md

@@ -54,6 +54,13 @@ You can set video width and height with proper settings:
 => "String heheh <iframe width=\"600\" height=\"300\" src=\"https://www.youtube.com/embed/BVtYSy83XXw\" frameborder=\"0\" allowfullscreen></iframe> yeah"
 ```
 
+You can set vimeo query string with `vimeo_params` option:
+
+```ruby
+"http://vimeo.com/42620553".embedda(:vimeo_params => {:title => 0, :byline => 0, :portrait => 0, :color => "42b7ed"})
+=> %q{<iframe src="http://player.vimeo.com/video/20241459?title=0&byline=0&portrait=0&color=42b7ed" width="560" height="315" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
+```
+
 ## 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.5'
+  gem.version     = '0.0.6'
   gem.authors     = ["Kasper Grubbe",'Christian Takle']
   gem.email       = ["kaspergrubbe@gmail.com"]
   gem.homepage    = "http://github.com/kaspergrubbe/embedda"
@@ -13,4 +13,7 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency "rspec"
+  gem.add_runtime_dependency     "rack"
 end

data/lib/embedda/filters/provider.rb

@@ -14,7 +14,7 @@ class Embedda
       def get(filter_name)
         case filter_name
         when :vimeo
-          Vimeo.new(protocol, video_width, video_height)
+          Vimeo.new(protocol, video_width, video_height, vimeo_params)
         when :youtube
           Youtube.new(protocol, video_width, video_height)
         when :soundcloud
@@ -38,6 +38,10 @@ class Embedda
         options.fetch(:video_height, 315)
       end
 
+      def vimeo_params
+        options.fetch(:vimeo_params, nil)
+      end
+
     end
   end
 end

data/lib/embedda/filters/vimeo.rb

@@ -1,10 +1,14 @@
+require 'rack'
+require 'uri'
+
 class Embedda
   module Filters
     class Vimeo
-      def initialize(protocol, width, height)
+      def initialize(protocol, width, height, vimeo_params)
         @protocol = protocol
         @width    = width
         @height   = height
+        @vimeo_params= vimeo_params
       end
 
       def process(string)
@@ -16,7 +20,19 @@ class Embedda
       private
 
       def player(token)
-        %Q{<iframe src="#{@protocol}://player.vimeo.com/video/#{token}" width="#{@width}" height="#{@height}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
+        %Q{<iframe src="#{player_url(token)}" width="#{@width}"#{height_attribute} frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>}
+      end
+
+      def player_url(token)
+        url = URI.parse("http://player.vimeo.com/")
+        url.scheme = @protocol
+        url.path   = "/video/#{token}"
+        url.query  = Rack::Utils.build_query @vimeo_params if @vimeo_params
+        url.to_s
+      end
+
+      def height_attribute
+        %Q{ height="#{@height}"} if @height
       end
     end
   end

data/spec/embedda_spec.rb

@@ -1,4 +1,7 @@
 require "spec_helper"
+require "rack"
+require "uri"
+
 require "embedda"
 
 describe Embedda do
@@ -68,6 +71,8 @@ describe Embedda do
     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") }
+    let(:query_string_embed) { embed_string.gsub("20241459", "20241459?title=0&byline=0&portrait=0&color=42b7ed") }
+    let(:no_height_embed) { embed_string.gsub(%q{height="315" }, "") }
 
     it "should embed when text have a link" do
       @story = "http://vimeo.com/20241459"
@@ -111,6 +116,20 @@ describe Embedda do
       embedda = described_class.new(@story, :video_width => 200, :video_height => 400).embed
       expect(embedda).to eq(horizontal_embed_string)
     end
+
+    it 'generates iframe with query string' do
+      @story = "http://vimeo.com/20241459"
+      vimeo_params = {:title => 0, :byline => 0, :portrait => 0, :color => "42b7ed"}
+      embedda = described_class.new(@story, :vimeo_params => vimeo_params).embed
+      vimeo_expected_params = {"title" => "0", "byline" => "0", "portrait" => "0", "color" => "42b7ed"}
+      Rack::Utils.parse_query( URI.parse(embedda.split('"')[1]).query ).should == vimeo_expected_params
+    end
+
+    it 'generates iframe without height attribute when height is falsy' do
+      @story = "http://vimeo.com/20241459"
+      embedda = described_class.new(@story, :video_height => false).embed
+      expect(embedda).to eq(no_height_embed)
+    end
   end
 
   context "Soundcloud-link" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embedda
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
-dependencies: []
+date: 2013-08-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Embed content strings in your strings, and turn it to embed HTML!
 email:
 - kaspergrubbe@gmail.com