film_snob 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzZkZTIwZjJmYTBhYjc2OTJjNzM2YmQ5MmIxYTA5MGRlYTZiYzIyNA==
-  data.tar.gz: !binary |-
-    NzM3N2U3OGM5ODA2NDYzYjVlMGFlNDc4ODU5ZmIwYTQwYzI0Nzk5ZA==
+SHA1:
+  metadata.gz: 68f2d252de5dfd58ea1859447128a11e09487f38
+  data.tar.gz: fb87090737ec71405a7f7614a7722d2a89fdc576
 SHA512:
-  metadata.gz: !binary |-
-    ZjRjNmZlYTA1NWNjY2M2NzhlNjY0NjYxMzE3NjE0NjYzMzNmMmJkMWZkMzMx
-    ZGFiYzY3ZDdiN2Y4ZWNkOGZjN2JkYzQ3YzkyZWZmOWRiMDJlMjBhNDVjNzZk
-    OTVjODQ0NzU5ZGUxNDA2Nzc3NjQ5Yzg2NmYxYzE3NzNhMWRjOTI=
-  data.tar.gz: !binary |-
-    NGYwNTY5NWJlNTgwN2JmYjlmMWYwMTE4MDMwYzZmZjJlN2QzNTA4MzU1MTg3
-    ZDU2ZmYyODY2Nzc5YTJhOWUzODk4N2E3MDhmMThiZmE3Y2FjYzZiYmM2ZDRj
-    MzVhYjAwYTQ5MDc3ZjcyYzU3N2EzNTAyNzUxN2I3MWVjMGQxMjk=
+  metadata.gz: 797a67529ca690f0916412f4a1a00a681d6d4e99483ff7e3e704c92fff15a3976456d97007859e7b135386a294282fc8c41d9fa0c0a93061b2c10fb45cfce53a
+  data.tar.gz: c9b8170d9733cfea6e4ccf009876c43ecac5f17580b7a0da3b42b765cf83a540fd5ed8e7b1147253d14f4e0f616682ea33a0f3f6884ccc6408b9f82fc2b8fbff

data/lib/film_snob/funny_or_die.rb

@@ -0,0 +1,17 @@
+class FilmSnob
+  class FunnyOrDie < VideoSite
+    def self.valid_url_patterns
+      [
+        %r{http://www.funnyordie.com/videos/([\w\d]+)}
+      ]
+    end
+
+    def self.oembed_endpoint
+      "http://www.funnyordie.com/oembed.json"
+    end
+
+    def clean_url
+      @clean_url ||= "http://www.funnyordie.com/videos/#{id}"
+    end
+  end
+end

data/lib/film_snob/url_to_video.rb

@@ -1,6 +1,7 @@
 require "film_snob/vimeo"
 require "film_snob/youtube"
 require "film_snob/hulu"
+require "film_snob/funny_or_die"
 
 class FilmSnob
   class UrlToVideo
@@ -8,7 +9,8 @@ class FilmSnob
     VIDEO_SITES = [
       Vimeo,
       YouTube,
-      Hulu
+      Hulu,
+      FunnyOrDie
     ]
 
     attr_reader :url, :options

data/lib/film_snob/version.rb

@@ -1,3 +1,3 @@
 class FilmSnob
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/cassettes/space_jam.yml

@@ -0,0 +1,58 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://www.funnyordie.com/oembed.json?url=http://www.funnyordie.com/videos/8db066d2e0
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers: {}
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Content-Type:
+      - application/json; charset=utf-8
+      Status:
+      - 200 OK
+      X-Frame-Options:
+      - ALLOWALL
+      X-Xss-Protection:
+      - 1; mode=block; report=/report_xss;
+      X-Content-Type-Options:
+      - nosniff
+      X-Ua-Compatible:
+      - chrome=1
+      Etag:
+      - '"bf2b27d19328373c12ec3f1c5a813b56"'
+      X-Request-Id:
+      - 981b6969-3e49-462a-b4a8-37fd14702479
+      X-Runtime:
+      - '0.025448'
+      X-Varnish:
+      - '1732560026'
+      - '318926149'
+      Served-By:
+      - prodweb2/prodweb1/278007-prodapp3
+      Expires:
+      - Sat, 19 Apr 2014 03:15:41 GMT
+      Cache-Control:
+      - max-age=0, no-cache, no-store
+      Pragma:
+      - no-cache
+      Date:
+      - Sat, 19 Apr 2014 03:15:41 GMT
+      Content-Length:
+      - '1751'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        {"type":"video","version":"1.0","provider_name":"Funny or Die","provider_url":"http://www.funnyordie.com","author_name":"Seth Green","author_url":"http://www.funnyordie.com/seth_green","title":"The Live Read of Space Jam with Blake Griffin","html":"\u003Ciframe src=\"http://www.funnyordie.com/embed/8db066d2e0\" width=\"960\" height=\"580\" frameborder=\"0\" allowfullscreen webkitallowfullscreen mozallowfullscreen\u003E\u003C/iframe\u003E\u003Cdiv style=\"text-align:left;font-size:x-small;margin-top:0;width:960px;\"\u003E\u003Ca href=\"http://www.funnyordie.com/videos/8db066d2e0/the-live-read-of-space-jam-with-blake-griffin\" title=\"from Seth Green, Blake Griffin, DeAndre Jordan, Danielle Fishel, Paul Scheer, Nick Kroll, Ben Schwartz, Jerrod Carmichael, Noah Garfinkel, Brandon Johnson, Melissa Stetten, Shelby Fero, Jensen Karp, Ally Hord, Funny Or Die, Matt Sweeney, BoTown Sound, and Nate Maggio\"\u003EThe Live Read of Space Jam with Blake Griffin\u003C/a\u003E from \u003Ca href=\"http://www.funnyordie.com/seth_green\"\u003ESeth Green\u003C/a\u003E      \u003Ciframe src=\"http://www.facebook.com/plugins/like.php?app_id=138711277798\u0026amp;href=http%3A%2F%2Fwww.funnyordie.com%2Fvideos%2F8db066d2e0%2Fthe-live-read-of-space-jam-with-blake-griffin\u0026amp;send=false\u0026amp;layout=button_count\u0026amp;width=150\u0026amp;show_faces=false\u0026amp;action=like\u0026amp;height=21\" scrolling=\"no\" frameborder=\"0\" style=\"border:none; overflow:hidden; width:90px; height:21px; vertical-align:middle;\" allowTransparency=\"true\"\u003E\u003C/iframe\u003E\n\u003C/div\u003E","width":960,"height":580,"thumbnail_width":464,"thumbnail_height":348,"thumbnail_url":"http://t.fod4.com/t/8db066d2e0/c480x270_58.jpg","duration":584.817}
+    http_version: 
+  recorded_at: Sat, 19 Apr 2014 03:15:41 GMT
+recorded_with: VCR 2.9.0

data/spec/film_snob_spec.rb

@@ -94,7 +94,7 @@ describe FilmSnob do
       expect(snob2.site).to eq :vimeo
       expect(snob2.clean_url).to eq 'https://vimeo.com/51020067'
     end
-    
+
     it 'should allow oembed configuration' do
       snob = FilmSnob.new("http://vimeo.com/31158841", width: 400)
       VCR.use_cassette "murmuration" do
@@ -120,4 +120,16 @@ describe FilmSnob do
     end
   end
 
+  describe 'funny or die URLs' do
+    it 'should parse funny or die URLs' do
+      film = FilmSnob.new("http://www.funnyordie.com/videos/8db066d2e0/the-live-read-of-space-jam-with-blake-griffin")
+      expect(film.id).to eq '8db066d2e0'
+      expect(film.site).to eq :funnyordie
+      VCR.use_cassette 'space jam' do
+        expect(film.title).to eq 'The Live Read of Space Jam with Blake Griffin'
+        expect{film.html}.not_to raise_error
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: film_snob
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Max Jacobson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,14 @@ dependencies:
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -124,6 +124,7 @@ files:
 - film_snob.gemspec
 - lib/film_snob.rb
 - lib/film_snob/exceptions.rb
+- lib/film_snob/funny_or_die.rb
 - lib/film_snob/hulu.rb
 - lib/film_snob/url_to_video.rb
 - lib/film_snob/version.rb
@@ -136,6 +137,7 @@ files:
 - spec/cassettes/harmon.yml
 - spec/cassettes/murmuration.yml
 - spec/cassettes/murmuration2.yml
+- spec/cassettes/space_jam.yml
 - spec/cassettes/stephen.yml
 - spec/film_snob_spec.rb
 - spec/spec_helper.rb
@@ -150,12 +152,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -171,6 +173,7 @@ test_files:
 - spec/cassettes/harmon.yml
 - spec/cassettes/murmuration.yml
 - spec/cassettes/murmuration2.yml
+- spec/cassettes/space_jam.yml
 - spec/cassettes/stephen.yml
 - spec/film_snob_spec.rb
 - spec/spec_helper.rb