film_snob 0.4.0 → 0.5.0

data/.gitignore

@@ -1,23 +1,25 @@
+*.a
 *.gem
+*.o
 *.rbc
+*.so
 .bundle
 .config
 .yardoc
-Gemfile.lock
+/*.bundle
+/.ruby-version
+/Gemfile.lock
+/coverage
+/doc/
+/lib/bundler/man
+/spec/cassettes/**/*.yml
+/spec/reports
+/test/tmp
+/test/version_tmp
+/tmp
 InstalledFiles
 _yardoc
-coverage
-doc/
-lib/bundler/man
+mkmf.log
 pkg
 rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-spec/cassettes/**/*.yml
+.DS_Store

data/.rspec

@@ -1 +1,2 @@
 --color
+--require spec_helper

data/README.md

@@ -51,6 +51,8 @@ film_snob uses the oembed protocol to get html for embed codes. These options as
 * Coub
 * Instagram
 * Dailymotion
+* Vine
+* Rutube
 
 The same methods work with all of these providers.
 

data/film_snob.gemspec

@@ -21,11 +21,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler",  "~> 1.6"
   spec.add_development_dependency "rake",     "~> 10.3"
-  spec.add_development_dependency "rspec",    "~> 3.0"
+  spec.add_development_dependency "rspec",    "~> 3.1"
   spec.add_development_dependency "webmock",  "~> 1.17"
   spec.add_development_dependency "vcr",      "~> 2.9"
   spec.add_development_dependency "pry",      "~> 0.9"
-  spec.add_development_dependency "rubocop",  "~> 0.26.1"
+  spec.add_development_dependency "rubocop",  "~> 0.27.1"
   spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4"
   spec.required_ruby_version = ">= 1.9.3"
 end

data/lib/film_snob/url_to_video.rb

@@ -1,23 +1,9 @@
-require "film_snob/coub"
-require "film_snob/funny_or_die"
-require "film_snob/hulu"
-require "film_snob/instagram"
-require "film_snob/vimeo"
-require "film_snob/youtube"
-require "film_snob/dailymotion"
+Dir.entries(File.join(File.dirname(__FILE__), "video_sites")).each do |file|
+  require "film_snob/video_sites/#{file}" unless [".", ".."].include?(file)
+end
 
 class FilmSnob
   class UrlToVideo
-    VIDEO_SITES = [
-      Vimeo,
-      YouTube,
-      Hulu,
-      FunnyOrDie,
-      Coub,
-      Dailymotion,
-      Instagram
-    ]
-
     attr_reader :url, :options
 
     def initialize(url, options)
@@ -32,7 +18,7 @@ class FilmSnob
     private
 
     def site
-      @site ||= VIDEO_SITES.find do |site|
+      @site ||= VideoSite.subclasses.find do |site|
         site.valid_url_patterns.any? do |pattern|
           pattern.match(url)
         end

data/lib/film_snob/version.rb

@@ -1,4 +1,4 @@
 class FilmSnob
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end
 

data/lib/film_snob/video_site.rb

@@ -4,7 +4,7 @@ require "json"
 class FilmSnob
   class VideoSite
     attr_reader :url, :options
-    def initialize(url, options)
+    def initialize(url, options = {})
       @url = url
       @options = options
     end
@@ -17,6 +17,15 @@ class FilmSnob
       @site ||= self.class.to_s.split("::").last.downcase.to_sym
     end
 
+    SUBCLASSES = []
+    def self.inherited(base)
+      SUBCLASSES << base
+    end
+
+    def self.subclasses
+      SUBCLASSES
+    end
+
     def self.valid_url_patterns
       []
     end

data/lib/film_snob/{funny_or_die.rb → video_sites/funny_or_die.rb}

@@ -1,3 +1,5 @@
+require "film_snob/video_site"
+
 class FilmSnob
   class FunnyOrDie < VideoSite
     def self.valid_url_patterns

data/lib/film_snob/{hulu.rb → video_sites/hulu.rb}

@@ -1,3 +1,5 @@
+require "film_snob/video_site"
+
 class FilmSnob
   class Hulu < VideoSite
     def self.valid_url_patterns

data/lib/film_snob/video_sites/rutube.rb

@@ -0,0 +1,24 @@
+require "film_snob/video_site"
+
+class FilmSnob
+  class Rutube < VideoSite
+    def initialize(url, options = {})
+      super(url, options.merge(format: :json))
+    end
+
+    def self.valid_url_patterns
+      [
+        %r{http://rutube.ru/video/(\w*)/}
+      ]
+    end
+
+    def self.oembed_endpoint
+      "http://rutube.ru/api/oembed/"
+    end
+
+    def clean_url
+      @clean_url ||= "http://rutube.ru/video/#{id}/"
+    end
+  end
+end
+

data/lib/film_snob/{vimeo.rb → video_sites/vimeo.rb}

@@ -6,7 +6,8 @@ class FilmSnob
       [
         %r{https?://vimeo.com/(\d{1,})},
         %r{https?://vimeo.com/m/(\d{1,})},
-        %r{https?://vimeo.com/couchmode/\w+/[\w:]+/(\d{1,})}
+        %r{https?://vimeo.com/couchmode/\w+/[\w:]+/(\d{1,})},
+        %r{https?://vimeo.com/channels/\w+/(\d{1,})}
       ]
     end
 

data/lib/film_snob/video_sites/vine.rb

@@ -0,0 +1,20 @@
+require "film_snob/video_site"
+
+class FilmSnob
+  class Vine < VideoSite
+    def self.valid_url_patterns
+      [
+        %r{https://vine.co/v/(\w+)}
+      ]
+    end
+
+    def clean_url
+      @clean_url ||= "https://vine.co/v/#{id}"
+    end
+
+    def self.oembed_endpoint
+      "https://vine.co/oembed.json"
+    end
+  end
+end
+

data/lib/film_snob/{youtube.rb → video_sites/youtube.rb}

@@ -1,3 +1,5 @@
+require "film_snob/video_site"
+
 class FilmSnob
   class YouTube < VideoSite
     def self.valid_url_patterns

data/spec/deprecated_spec.rb

@@ -1,5 +1,3 @@
-require_relative "spec_helper"
-
 class FilmSnob
   describe Deprecated do
 

data/spec/film_snob_spec.rb

@@ -1,4 +1,4 @@
-require_relative "spec_helper"
+# Encoding: utf-8
 
 describe FilmSnob do
   describe "not supported URLs" do
@@ -86,6 +86,16 @@ describe FilmSnob do
       expect(snob.clean_url).to eq "https://vimeo.com/16010689"
     end
 
+    it "should parse staff picks vimeo URLs" do
+      snob = FilmSnob.new("http://vimeo.com/channels/staffpicks/58511112")
+      expect(snob.id).to eq "58511112"
+      expect(snob.site).to eq :vimeo
+      expect(snob.clean_url).to eq "https://vimeo.com/58511112"
+      VCR.use_cassette("vimeo/staff") do
+        expect(snob.title).to eq "DANGER ISLAND"
+      end
+    end
+
     it "should parse couchmode vimeo URLs" do
       url = "https://vimeo.com/couchmode/staffpicks/sort:date/91157088"
       snob = FilmSnob.new(url)
@@ -232,5 +242,30 @@ describe FilmSnob do
       end
     end
   end
+
+  describe "Vine" do
+    it "should parse URLs" do
+      film = FilmSnob.new("https://vine.co/v/1")
+      expect(film.id).to eq "1"
+      expect(film.site).to eq :vine
+      VCR.use_cassette "vine/dom hofman" do
+        expect(film.title).to eq "Dom Hofmann's post on Vine"
+        expect { film.html }.not_to raise_error
+      end
+    end
+  end
+
+  describe "rutube URLs" do
+    it "should parse rutube URLs" do
+      url = "http://rutube.ru/video/586afc0f5c652439a2dca8b34d19a086/"
+      film = FilmSnob.new(url)
+      expect(film.id).to eq "586afc0f5c652439a2dca8b34d19a086"
+      expect(film.site).to eq :rutube
+      VCR.use_cassette "rutube/rabbit_eat_raspberry" do
+        expect(film.title).to eq "Кролик ест малину"
+        expect { film.html }.not_to raise_error
+      end
+    end
+  end
 end
 

data/spec/spec_helper.rb

@@ -12,3 +12,19 @@ VCR.configure do |c|
   c.ignore_hosts "codeclimate.com"
 end
 
+RSpec.configure do |config|
+  config.default_formatter = "doc" if config.files_to_run.one?
+
+  config.order = :random
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.raise_errors_for_deprecations!
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+end
+

data/spec/youtube_spec.rb

@@ -1,5 +1,3 @@
-require_relative "spec_helper"
-
 describe FilmSnob::YouTube do
   it "may not be embeddable" do
     VCR.use_cassette("youtube/bad_youtube_url") do

metadata

@@ -1,125 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: film_snob
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Max Jacobson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.27.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.26.1
+        version: 0.27.1
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 description: Find information about URLs from video sites, such as the title and embed
@@ -130,29 +147,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".hound.yml"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - film_snob.gemspec
 - lib/film_snob.rb
-- lib/film_snob/coub.rb
-- lib/film_snob/dailymotion.rb
 - lib/film_snob/deprecated.rb
 - lib/film_snob/exceptions.rb
-- lib/film_snob/funny_or_die.rb
-- lib/film_snob/hulu.rb
-- lib/film_snob/instagram.rb
 - lib/film_snob/url_to_video.rb
 - lib/film_snob/version.rb
 - lib/film_snob/video_site.rb
-- lib/film_snob/vimeo.rb
-- lib/film_snob/youtube.rb
+- lib/film_snob/video_sites/coub.rb
+- lib/film_snob/video_sites/dailymotion.rb
+- lib/film_snob/video_sites/funny_or_die.rb
+- lib/film_snob/video_sites/hulu.rb
+- lib/film_snob/video_sites/instagram.rb
+- lib/film_snob/video_sites/rutube.rb
+- lib/film_snob/video_sites/vimeo.rb
+- lib/film_snob/video_sites/vine.rb
+- lib/film_snob/video_sites/youtube.rb
 - spec/cassettes/coub/.keep
 - spec/cassettes/dailymotion/.keep
 - spec/cassettes/funnyordie/.keep
@@ -167,26 +185,27 @@ files:
 homepage: https://github.com/maxjacobson/film_snob
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Fetch embed codes for videos
 test_files:
 - spec/cassettes/coub/.keep

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1acb76c2c15e8ea0c82ec3aab3132d2b0e5b0f7c
-  data.tar.gz: 2a55b8d551947ceab6109a286110843d9cf6a6d9
-SHA512:
-  metadata.gz: 8f2ec020294584d776de1787c3ddf01d968757a7ad335cb1599005fb68d59c2f7ee62091421cf13fa7c8cb7a76ab4478618252de353fb53afd2c448f6c3a8996
-  data.tar.gz: 863ced2514af6a67874e11de5e896dc49c17a08404c94c18bf600c96caacc5c0851eed56ea73960ba4a6a157171717adde78bd33085f5056c0b4f6a79fc6a262

data/.hound.yml

@@ -1,3 +0,0 @@
-ruby:
-  enabled: true
-  config_file: .rubocop.yml