conred 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 223941e1f3b71677314d9743599bd7cc13e15aca
-  data.tar.gz: 7b68bceef41a38dbb152288e2dca6e97d5795f55
+  metadata.gz: 52df766ea4e04c86a1a128f258afcfd1a98c0cdd
+  data.tar.gz: 2477890c39c4ff06dff211e80fc23fa055dc0bf4
 SHA512:
-  metadata.gz: b2fd36b38ffbd85996e6d6a81bbd1ca7da0df09010ca6d45ef76c31cdb7ff322ae6f1141d2877ab7c1f1d5df031caefacefa9324aae39024e1d8f453fdd50607
-  data.tar.gz: 5412338df0fc78541a46ad9d9c4473e658ff8835ff108ea5688f5ed84fbdd10ba30326016c61133032cbd7d7cec018603fc3416a85c4c2d312bd4da72db17b87
+  metadata.gz: 8450ca6de41b5981dd4fb478f7c70eb7a0c40d785f77e45b35af18563e8431ed86b024e18e6906ab672cf9ed7e1d5c8bb169b0f2c7d0480ce66cdb9f3b341d0f
+  data.tar.gz: af014e2a85ea64dde0e96dc8e88a0a13cb9cb1c44ce6f04e5335d51755b0baea1a2a513ac7d4dcd9763839a5a2184d5f46462492e32745a1371f4ed00ab68f8f

data/README.md

@@ -3,10 +3,7 @@
 
 # Conred
 
-In every project we have common things like video 
-embedding from url, user input displaying, formatting, trimming stripping,
-external url protocol adding and all that nasty stuff that we write in our apps. 
-These are the cases where Conred saves the day. 
+Easily and safely embed YouTube and Vimeo videos in your applications.
 
 ## Installation
 
@@ -24,14 +21,12 @@ Or install it yourself as:
 
 ## Usage
 
-### Iframe generator for Youtube and Vimeo videos:
-
 ```ruby
 c = Conred::Video.new(
-	video_url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ", 
-	width: 285, 
-	height: 185,
-	error_message: "Video url is invalid"
+  video_url: "http://www.youtube.com/watch?v=tNtW9pGFPTA&feature=plcp", 
+  width: 285, 
+  height: 185,
+  error_message: "Video url is invalid"
 )
 ```
 

data/conred.gemspec

@@ -4,15 +4,12 @@ require File.expand_path('../lib/conred/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Janis Miezitis"]
   gem.email         = ["janjiss@gmail.com"]
-  gem.description   = %q{Gem to remove repetative tasks}
-  gem.summary       = %q{Comrades are for reusable code}
+  gem.description   = %q{Safely and easily embed videos}
+  gem.summary       = %q{Safely and easily embed YouTube and Vimeo videos}
   gem.homepage      = "http://github.com/janjiss/conred"
 
-  gem.add_dependency "haml", '>= 3.0'
-  gem.add_dependency "typhoeus", '>= 0.6'
-  gem.add_dependency "actionpack", '>= 3.0'
-  gem.add_development_dependency "rspec", '>= 2.0'
-  gem.add_development_dependency "rake", '>= 10.1'
+  gem.add_development_dependency "rspec", '~> 2.0'
+  gem.add_development_dependency "rake", '~> 10.1'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/conred.rb

@@ -1,3 +1,2 @@
 require "conred/version"
 require "conred/video"
-require "haml"

data/lib/conred/version.rb

@@ -1,3 +1,3 @@
 module Conred
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/lib/conred/video.rb

@@ -1,17 +1,17 @@
 require "conred/version"
-require "action_view"
 require "net/http"
-require "typhoeus"
+require "erb"
+
 module Conred
   module Video
-    def initialize(arguments = {:width => 670, :height => 450, :error_message => "Video url you have provided is invalid"})
-      @width = arguments[:width]
-      @height = arguments[:height]
-      @error_message = arguments[:error_message]
-      @video_id = get_video_id_from arguments[:video_url]
+    def initialize(options = {})
+      @width         = options.fetch(:width, 670)
+      @height        = options.fetch(:height, 450)
+      @error_message = options.fetch(:error_message, "Invalid video url")
+      @video_id      = get_video_id_from(options[:video_url])
     end
 
-    def self.new arguments
+    def self.new(arguments)
       if Youtube.url_format_is_valid? arguments[:video_url]
         Youtube.new arguments
       elsif Video::Vimeo.url_format_is_valid? arguments[:video_url]
@@ -30,27 +30,22 @@ module Conred
     end
 
     def code
-      render(
-        :video_link => video_link,
-        :height => @height,
-        :width => @width
-      ).html_safe
+      view_path = File.join(
+        File.dirname(__FILE__),
+        "../views/video/video_iframe.html.erb"
+      )
+      template = ERB.new(File.read(view_path))
+      template.result(binding)
     end
 
     def exist?
-      response = Typhoeus.get("https:#{api_uri}")
-      response.code == 200
+      response = Net::HTTP.get_response(URI("http:#{api_uri}"))
+      response.is_a?(Net::HTTPSuccess)
     end
 
-    private
+    attr_reader :height, :width, :video_id, :error_message
 
-    def render(locals = {})
-      path = File.join(
-        File.dirname(__FILE__),
-        "../views/video/video_iframe".split("/")
-      )
-      Haml::Engine.new(File.read("#{path}.html.haml")).render(Object.new, locals)
-    end
+    private
 
     class Youtube
       include Video

data/lib/views/video/video_iframe.html.erb

@@ -0,0 +1,2 @@
+<iframe src="<%= video_link %>" frameborder="0" height="<%= height %>" width="<%= width %>" allowFullScreen mozallowfullscreen webkitAllowFullScreen >
+</iframe>

data/spec/conred_spec/video_spec.rb

@@ -20,65 +20,69 @@ describe Conred do
     }
 
     it "should match youtube video" do
-      short_youtube_url.should be_youtube_video
-      https_youtube_url.should be_youtube_video
-      short_youtube_url_with_www.should be_youtube_video
-      long_youtube_url_with_features.should be_youtube_video
-      short_youtube_url_without_http_and_www.should be_youtube_video
+      expect(short_youtube_url).to be_youtube_video
+      expect(https_youtube_url).to be_youtube_video 
+      expect(short_youtube_url_with_www).to be_youtube_video
+      expect(long_youtube_url_with_features).to be_youtube_video
+      expect(short_youtube_url_without_http_and_www).to be_youtube_video
     end
 
     it "should check for corner cases" do
-      evil_vimeo.should_not be_youtube_video
-      evil_vimeo.should_not be_vimeo_video
+      expect(evil_vimeo).to_not be_youtube_video
+      expect(evil_vimeo).to_not be_vimeo_video
     end
 
     it "should match vimeo video" do
-      vimeo_url.should_not be_youtube_video
-      vimeo_without_http.should be_vimeo_video
-      https_vimeo_url.should be_vimeo_video
-      vimeo_url.should be_vimeo_video
+      expect(vimeo_url).to_not be_youtube_video
+      expect(vimeo_without_http).to be_vimeo_video
+      expect(https_vimeo_url).to be_vimeo_video
+      expect(vimeo_url).to be_vimeo_video
     end
 
     describe "youtube embed code" do
       subject {Conred::Video.new(:video_url=>"http://www.youtube.com/watch?v=Lrj5Kxdzouc", :width=>450,:height=> 300).code }
-      it { should match(/Lrj5Kxdzouc/)}
-      it { should match(/width='450'/)}
-      it {should match(/height='300'/)}
+      it "matches to correct html" do
+        expect(subject).to match(/Lrj5Kxdzouc/)
+        expect(subject).to match(/width="450"/)
+        expect(subject).to match(/height="300"/)
+      end
     end
 
     describe "vimeo embed code" do
       subject { Conred::Video.new(:video_url=>"http://vimeo.com/49556689", :width=>450, :height=>300).code }
-      it {should match(/49556689/)}
-      it {should match(/width='450'/)}
-      it {should match(/height='300'/)}
+      it "matches to correct html" do
+        expect(subject).to match(/49556689/)
+        expect(subject).to match(/width="450"/)
+        expect(subject).to match(/height="300"/)
+      end
     end
 
     it "should render error message when url is invalid" do
-      error_video.code.should == "Some mistake in url"
+      expect(error_video.code).to eq("Some mistake in url")
     end
 
     it "should return correct embed code when passing arguments in url" do
-      Conred::Video.new(:video_url=>"http://www.youtube.com/watch?NR=1&feature=endscreen&v=Lrj5Kxdzouc",:width=> 450,:height=> 300).code.should match(/Lrj5Kxdzouc/)
+      expect(Conred::Video.new(:video_url=>"http://www.youtube.com/watch?NR=1&feature=endscreen&v=Lrj5Kxdzouc",:width=> 450,:height=> 300).code).to match(/Lrj5Kxdzouc/)
     end
 
     describe "check if a video exist" do
       it "should return false if request 404" do
         non_existing_video = Conred::Video.new(:video_url=>"http://www.youtube.com/watch?v=Lrj5Kxdzoux")
-        non_existing_video.exist?.should be_false
+        expect(non_existing_video.exist?).to eq(false)
       end
 
       it "should make a request to the proper uri" do
         non_existing_video = Conred::Video.new(:video_url=>"http://www.youtube.com/watch?v=Lrj5Kxdzoux")
-        non_existing_video.api_uri.should eq("//gdata.youtube.com/feeds/api/videos/Lrj5Kxdzoux")
+        expect(non_existing_video.api_uri).to eq("//gdata.youtube.com/feeds/api/videos/Lrj5Kxdzoux")
       end
 
       it "should be true if response is 200" do
         existing_video = Conred::Video.new(:video_url=>"http://www.youtube.com/watch?v=Lrj5Kxdzouc")
-        existing_video.exist?.should be_true
+        expect(existing_video.exist?).to eq(true)
       end
 
       it "should be false if uri isn't recognized" do
-        error_video.exist?.should be_false
+        expect(error_video.exist?).to eq(false)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conred
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Janis Miezitis
@@ -10,77 +10,35 @@ bindir: bin
 cert_chain: []
 date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
-description: Gem to remove repetative tasks
+description: Safely and easily embed videos
 email:
 - janjiss@gmail.com
 executables: []
@@ -96,7 +54,7 @@ files:
 - lib/conred.rb
 - lib/conred/version.rb
 - lib/conred/video.rb
-- lib/views/video/video_iframe.html.haml
+- lib/views/video/video_iframe.html.erb
 - spec/conred_spec.rb
 - spec/conred_spec/video_spec.rb
 homepage: http://github.com/janjiss/conred
@@ -121,7 +79,7 @@ rubyforge_project:
 rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: Comrades are for reusable code
+summary: Safely and easily embed YouTube and Vimeo videos
 test_files:
 - spec/conred_spec.rb
 - spec/conred_spec/video_spec.rb

data/lib/views/video/video_iframe.html.haml

@@ -1 +0,0 @@
-%iframe{:allowFullScreen => "", :frameborder => "0", :height => height, :mozallowfullscreen => "", :src => "#{video_link}", :webkitAllowFullScreen => "", :width => width}