film_snob 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cc5c14306b0c0572e501a6da1ad9e5e9dd965e2
-  data.tar.gz: 8da534f23aad778b36c59fc7e040e50764b256fd
+  metadata.gz: e78e11fa0a69ae6d0f1cae151f3df7078e92b6c5
+  data.tar.gz: dd1ac5931f67399f2ecb809eae9b9f85d51995bd
 SHA512:
-  metadata.gz: 5afd834f6f97838e86809620efbc849596befbd4e2207804553c802ee19d87dcec2a216832414e7076e5214a27cc68a3bbf0a73c99722a31848ff1a72ca3f9ca
-  data.tar.gz: 84212d36c8c0026c24523e2d2cfe4e3dd7b930e0367c0254edbc2dab91e0e942ec9be8a42944bb12c3b5af2b284dac9fa0885b1581deeb1e4ef4ebbda0f1d434
+  metadata.gz: 1eac1d39804a8d5f88bdc23a1a4facaddd60da92e6b40a21a37f08f5e53f3d5aa4a13a0452a791bcbfdaa20a64b0e11551c4bbea618e98966c7f523ded569a74
+  data.tar.gz: d32bf53b9fe35be239c4d384ae1c7cd66517621efbd8d757996de6511fd941a1557381005237cf593ec1e1a4fb0d940a40d27a82063abf9843df41d3a829d110

data/.gitignore

@@ -8,7 +8,7 @@
 .yardoc
 /*.bundle
 /.ruby-version
-/Gemfile.lock
+/gems.locked
 /coverage
 /doc/
 /lib/bundler/man

data/.rspec

@@ -1,3 +1 @@
---color
 --require spec_helper
---format documentation

data/.travis.yml

@@ -3,18 +3,9 @@ cache: bundler
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
-  - 2.1.3
-  - 2.1.4
-  - 2.1.5
-  - 2.1.6
-  - 2.1.7
-  - 2.2.0
-  - 2.2.1
-  - 2.2.2
-  - 2.2.3
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - ruby-head
   - jruby-19mode
   - jruby-9.0.1.0
@@ -27,5 +18,8 @@ matrix:
     - rvm: jruby-9.0.1.0
     - rvm: rbx-2
 before_install: 'gem install bundler -v 1.10.6'
+install: bundle install
 script:
-  - bundle exec rake ci
+  - bundle exec rspec
+  - bundle exec rubocop
+  - bundle exec todo_lint

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change log
 
+## Unreleased
+
+(nothing yet)
+
+* * *
+
+## 2.0.0
+
+### changes
+
+* remove support for rdio (which no longer exists)
+* uri method is now private
+
+### Fixes
+
+* Fixed a broken link in the README.md
+* Fix instagram api (again)
+
 ## 1.0.1 (2015-11-14)
 
 ### New features

data/README.md

@@ -1,6 +1,6 @@
 # film_snob
 
-[![Build Status](https://travis-ci.org/maxjacobson/film_snob.svg?branch=master)](https://travis-ci.org/maxjacobson/film_snob)
+[![Build Status](https://travis-ci.org/maxjacobson/film_snob.svg?branch=edge)](https://travis-ci.org/maxjacobson/film_snob)
 [![Gem Version](https://badge.fury.io/rb/film_snob.svg)](http://badge.fury.io/rb/film_snob)
 [![Code Climate](https://codeclimate.com/github/maxjacobson/film_snob.png)](https://codeclimate.com/github/maxjacobson/film_snob)
 [![Test Coverage](https://codeclimate.com/github/maxjacobson/film_snob/badges/coverage.svg)](https://codeclimate.com/github/maxjacobson/film_snob)
@@ -76,7 +76,6 @@ film.html #=> "<iframe width=\"480\" height=\"270\" src=\"https://www.youtube.co
 * Vine
 * Rutube
 * Soundcloud
-* Rdio
 
 The same methods work with all of these providers.
 
@@ -107,7 +106,7 @@ Ping me in [the Gitter chat room](https://gitter.im/maxjacobson/film_snob) or
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at
-<https://github.com/maxjacobson/smashcut>. This project is intended to be a
+<https://github.com/maxjacobson/film_snob>. This project is intended to be a
 safe, welcoming space for collaboration, and contributors are expected to
 adhere to the [Contributor Covenant](http://contributor-covenant.org) code of
 conduct.

data/Rakefile

@@ -1,14 +1,12 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "rubocop/rake_task"
-require "todo_lint"
+require "yaml"
 
-RSpec::Core::RakeTask.new(:spec)
-RuboCop::RakeTask.new(:style)
-
-task :todos do
-  TodoLint::Cli.new([]).run!
+task :continuous_integration do
+  YAML.load(File.read("./.travis.yml")).fetch("script").shuffle.each do |cmd|
+    next if system cmd
+    puts "\nFailed: #{cmd.inspect}"
+    exit 1
+  end
 end
 
-task :ci => [:spec, :style, :todos]
-task :default => :ci
+task :default => [:continuous_integration]

data/{Gemfile → gems.rb}

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gem "rake", "~> 10.4"
 
 gem "pry", "~> 0.10"
-gem "rubocop", "~> 0.35"
+gem "rubocop", "~> 0.39"
 gem "todo_lint", "~> 0.2"
 gem "rspec", "~> 3.4"
 gem "webmock", "~> 1.22"

data/lib/film_snob.rb

@@ -6,7 +6,7 @@ require "film_snob/exceptions"
 class FilmSnob
   extend Forwardable
 
-  MEDIA_METHODS = [:site, :id, :clean_url, :title, :html]
+  MEDIA_METHODS = [:site, :id, :clean_url, :title, :html].freeze
 
   def_delegators :media, *MEDIA_METHODS
 

data/lib/film_snob/oembed_provider.rb

@@ -19,31 +19,38 @@ class FilmSnob
       @site ||= self.class.to_s.split("::").last.downcase.to_sym
     end
 
-    SUBCLASSES = []
-    def self.inherited(base)
-      SUBCLASSES << base
-    end
+    class << self
+      def inherited(base)
+        subclasses << base
+      end
 
-    def self.subclasses
-      SUBCLASSES
-    end
+      def valid_url_patterns
+        []
+      end
 
-    def self.valid_url_patterns
-      []
-    end
+      def oembed_endpoint
+        ""
+      end
 
-    def self.oembed_endpoint
-      ""
-    end
+      def http
+        Net::HTTP.new(uri.host, uri.port).tap do |uri|
+          uri.use_ssl = use_ssl?
+        end
+      end
 
-    def self.http
-      Net::HTTP.new(uri.host, uri.port).tap do |uri|
-        uri.use_ssl = use_ssl?
+      def use_ssl?
+        "https" == uri.scheme
       end
-    end
 
-    def self.use_ssl?
-      "https" == uri.scheme
+      def subclasses
+        @subclasses ||= []
+      end
+
+      private
+
+      def uri
+        URI.parse(oembed_endpoint)
+      end
     end
 
     def title
@@ -60,10 +67,6 @@ class FilmSnob
       raise NotEmbeddableError, "#{clean_url} is not embeddable"
     end
 
-    def self.uri
-      URI.parse(oembed_endpoint)
-    end
-
     def lookup(attribute)
       oembed[attribute.to_s] || not_embeddable!
     end

data/lib/film_snob/oembed_providers/instagram.rb

@@ -10,7 +10,7 @@ class FilmSnob
     end
 
     def self.oembed_endpoint
-      "http://instagram.com/publicapi/oembed/"
+      "https://api.instagram.com/oembed/"
     end
 
     def clean_url

data/lib/film_snob/version.rb

@@ -1,3 +1,3 @@
 class FilmSnob
-  VERSION = "1.0.1"
+  VERSION = "2.0.0".freeze
 end

data/spec/film_snob/oembed_providers/vine_spec.rb

@@ -1,10 +1,10 @@
 describe FilmSnob::Vine do
   it "should parse URLs" do
-    film = FilmSnob.new("https://vine.co/v/1")
-    expect(film.id).to eq "1"
+    film = FilmSnob.new("https://vine.co/v/OMqDr7r0bKI")
+    expect(film.id).to eq "OMqDr7r0bKI"
     expect(film.site).to eq :vine
-    VCR.use_cassette "vine/dom hofman" do
-      expect(film.title).to eq "Dom Hofmann's post on Vine"
+    VCR.use_cassette "vine/barbie" do
+      expect(film.title).to eq "BarbieQ 🙅🔥🔥 #suicidefairy"
       expect { film.html }.not_to raise_error
     end
   end

data/spec/film_snob/oembed_providers/youtube_spec.rb

@@ -54,12 +54,12 @@ describe FilmSnob::YouTube do
   end
 
   it "can handle junked up URLs" do
-    VCR.use_cassette("youtube/pete") do
-      url = "http://www.youtube.com/watch?feature=youtube_gdata&v=fq-xGD_thXo"
-      title = "Pete Meets Olympic Freestyle Skier Torin Yater-Wallace"
+    VCR.use_cassette("youtube/oliver") do
+      url = "http://www.youtube.com/watch?feature=youtube_gdata&v=vU8dCYocuyI"
+      title = "Last Week Tonight with John Oliver: Border Wall (HBO)"
       film = FilmSnob.new(url)
       expect(film).to be_embeddable
-      expect(film.id).to eq "fq-xGD_thXo"
+      expect(film.id).to eq "vU8dCYocuyI"
       expect { film.html }.to_not raise_error
       expect(film.title).to eq title
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: film_snob
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Max Jacobson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,12 +39,12 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - film_snob.gemspec
+- gems.rb
 - lib/film_snob.rb
 - lib/film_snob/exceptions.rb
 - lib/film_snob/oembed_provider.rb
@@ -53,7 +53,6 @@ files:
 - lib/film_snob/oembed_providers/funny_or_die.rb
 - lib/film_snob/oembed_providers/hulu.rb
 - lib/film_snob/oembed_providers/instagram.rb
-- lib/film_snob/oembed_providers/rdio.rb
 - lib/film_snob/oembed_providers/rutube.rb
 - lib/film_snob/oembed_providers/soundcloud.rb
 - lib/film_snob/oembed_providers/vimeo.rb
@@ -68,7 +67,6 @@ files:
 - spec/film_snob/oembed_providers/funny_or_die_spec.rb
 - spec/film_snob/oembed_providers/hulu_spec.rb
 - spec/film_snob/oembed_providers/instagram_spec.rb
-- spec/film_snob/oembed_providers/rdio_spec.rb
 - spec/film_snob/oembed_providers/rutube_spec.rb
 - spec/film_snob/oembed_providers/soundcloud_spec.rb
 - spec/film_snob/oembed_providers/vimeo_spec.rb
@@ -96,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fetch data from oEmbed APIs
@@ -108,7 +106,6 @@ test_files:
 - spec/film_snob/oembed_providers/funny_or_die_spec.rb
 - spec/film_snob/oembed_providers/hulu_spec.rb
 - spec/film_snob/oembed_providers/instagram_spec.rb
-- spec/film_snob/oembed_providers/rdio_spec.rb
 - spec/film_snob/oembed_providers/rutube_spec.rb
 - spec/film_snob/oembed_providers/soundcloud_spec.rb
 - spec/film_snob/oembed_providers/vimeo_spec.rb

data/lib/film_snob/oembed_providers/rdio.rb

@@ -1,20 +0,0 @@
-require "film_snob/oembed_provider"
-
-class FilmSnob
-  class Rdio < OembedProvider
-    def self.valid_url_patterns
-      [
-        %r{http?://www.rdio.com/artist/(?:[\w\d\-_]+/album/)}
-      ]
-    end
-
-    # in this case, we're trusting Rdio to clean up the URL
-    def clean_url
-      @clean_url = url
-    end
-
-    def self.oembed_endpoint
-      "http://www.rdio.com/api/oembed/"
-    end
-  end
-end

data/spec/film_snob/oembed_providers/rdio_spec.rb

@@ -1,38 +0,0 @@
-describe FilmSnob::Rdio do
-  describe "rdio URLs" do
-    let(:url) { "http://www.rdio.com/#{path}" }
-
-    context "when the URL is an album" do
-      let(:path) { "artist/Sam_Smith/album/In_The_Lonely_Hour/" }
-
-      it "should parse" do
-        snob = FilmSnob.new(url)
-        expect(snob).to be_embeddable
-        expect(snob.site).to eq :rdio
-        VCR.use_cassette("rdio/in the lonely hour") do
-          expect(snob.title).to eq "In The Lonely Hour"
-          expect(snob.html).to include "iframe"
-        end
-      end
-    end
-
-    context "a song" do
-      let(:path) do
-        "artist/Sam_Smith/album/In_The_Lonely_Hour/track/Stay_With_Me"
-      end
-      it "should parse normal track rdio URLs" do
-        snob = FilmSnob.new(url)
-        expect(snob).to be_embeddable
-        expect(snob.site).to eq :rdio
-        VCR.use_cassette("rdio/stay with me") do
-          expect(snob.title).to eq "Stay With Me"
-        end
-      end
-    end
-
-    it "should not allow weak matches for rdio urls" do
-      snob = FilmSnob.new("google.com/q=rdio")
-      expect(snob).to_not be_embeddable
-    end
-  end
-end