From ee2c86f6095034711f550e455cead7327644d879 Mon Sep 17 00:00:00 2001 From: Robert Pankowecki Date: Thu, 29 Aug 2013 20:47:24 +0200 Subject: [PATCH] Rename vimeo_url to vimeo_params --- lib/embedda/filters/provider.rb | 6 +++--- lib/embedda/filters/vimeo.rb | 6 +++--- spec/embedda_spec.rb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/embedda/filters/provider.rb b/lib/embedda/filters/provider.rb index a50832e..de11baf 100644 --- a/lib/embedda/filters/provider.rb +++ b/lib/embedda/filters/provider.rb @@ -14,7 +14,7 @@ def initialize(options) def get(filter_name) case filter_name when :vimeo - Vimeo.new(protocol, video_width, video_height, vimeo_url) + Vimeo.new(protocol, video_width, video_height, vimeo_params) when :youtube Youtube.new(protocol, video_width, video_height) when :soundcloud @@ -38,8 +38,8 @@ def video_height options.fetch(:video_height, 315) end - def vimeo_url - options.fetch(:vimeo_url, nil) + def vimeo_params + options.fetch(:vimeo_params, nil) end end diff --git a/lib/embedda/filters/vimeo.rb b/lib/embedda/filters/vimeo.rb index 9a0de36..4cc949e 100644 --- a/lib/embedda/filters/vimeo.rb +++ b/lib/embedda/filters/vimeo.rb @@ -4,11 +4,11 @@ class Embedda module Filters class Vimeo - def initialize(protocol, width, height, vimeo_url) + def initialize(protocol, width, height, vimeo_params) @protocol = protocol @width = width @height = height - @vimeo_url= vimeo_url + @vimeo_params= vimeo_params end def process(string) @@ -27,7 +27,7 @@ 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_url if @vimeo_url + url.query = Rack::Utils.build_query @vimeo_params if @vimeo_params url.to_s end diff --git a/spec/embedda_spec.rb b/spec/embedda_spec.rb index 35f6a8a..a3ede51 100644 --- a/spec/embedda_spec.rb +++ b/spec/embedda_spec.rb @@ -116,7 +116,7 @@ it 'generates iframe with query string' do @story = "http://vimeo.com/20241459" - embedda = described_class.new(@story, :vimeo_url => {:title => 0, :byline => 0, :portrait => 0, :color => "42b7ed"}).embed + embedda = described_class.new(@story, :vimeo_params => {:title => 0, :byline => 0, :portrait => 0, :color => "42b7ed"}).embed expect(embedda).to eq(query_string_embed) end