undertexter 0.1.8 → 0.1.9

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require "rspec"
 require "webmock/rspec"
 require "undertexter"
+require "vcr"
 require "subtitle"
 require "undertexter/error"
 
@@ -8,4 +9,14 @@ WebMock.allow_net_connect!
 
 RSpec.configure do |config|
   config.mock_with :rspec
+  config.extend VCR::RSpec::Macros
+end
+
+VCR.config do |c|
+  c.cassette_library_dir = "spec/fixtures/vcr_cassettes"
+  c.stub_with :webmock
+  c.default_cassette_options = {
+    record: :new_episodes
+  }
+  c.allow_http_connections_when_no_cassette = false
 end

data/spec/subtitle_spec.rb

@@ -7,13 +7,15 @@ describe Subtitle do
     @new_file = "/tmp/#{@title.gsub(/\s+/, '.')}.zip"
     
     @subtitle = Subtitle.new({
-      :details => "http://www.undertexter.se/?p=undertext&id=23984",
+      :details => "http://www.undertexter.se/23984/",
       :downloads => 100,
       :cds => 1,
       :title => @title,
       :movie_title => "127 Hours (127 Timmar)",
       :language => :swedish
     })
+    
+    WebMock.allow_net_connect!
   end
   
   it "should be an instance of subtitle" do
@@ -21,7 +23,7 @@ describe Subtitle do
   end
   
   it "should have the right accessors" do
-    @subtitle.details.should eq("http://www.undertexter.se/?p=undertext&id=23984")
+    @subtitle.details.should eq("http://www.undertexter.se/23984/")
     @subtitle.downloads.should eq(100)
     @subtitle.cds.should eq(1)
     @subtitle.title.should eq("127 Hours 2010 DVDSCR XViD-MC8")
@@ -34,7 +36,7 @@ describe Subtitle do
   end
   
   it "should have created an existing file" do
-    FileUtils.rm(@new_file)
+    FileUtils.rm(@new_file) if File.exists?(@new_file)
     @subtitle.download!
     File.exists?(@new_file).should be_true
   end
@@ -44,14 +46,4 @@ describe Subtitle do
     @subtitle.download!(:to => '/tmp/new_dir')
     %x{ls /tmp/new_dir}.should_not be_empty
   end
-  
-  it "should be able to download the file to a specific relative directory" do
-    folder = "#{Dir.pwd}/spec/data"
-    
-    @subtitle.download!(:to => 'spec/data')
-    
-    %x{ls #{folder}}.should_not be_empty
-    
-    %x{cd #{folder} && rm 127.Hours.2010.DVDSCR.XViD-MC8.zip}
-  end
 end

data/spec/undertexter_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
 
 describe Undertexter do
-  before(:all) do
+  use_vcr_cassette "tt0499549"
+  
+  before(:each) do
     @use = Undertexter.find("tt0499549")
   end
   
   it "should return return at least 31 subtitles" do
-    Undertexter.should have_at_least(31).find("tt0499549")
+    Undertexter.find("tt0499549").count.should >= 31
   end
   
   it "should contain cds that is of the type Fixnum" do
@@ -25,6 +27,10 @@ describe Undertexter do
     @use.reject {|subtitle| subtitle.downloads <= 0}.count.should_not be(0)
   end
   
+  it "should not be empty" do
+    @use.should_not be_empty
+  end
+  
   it "should contain titles that does not have whitespace in the end of beginning" do
     @use.each {|subtitle| subtitle.title.should_not match(/^\s+.+\s+$/)}
   end
@@ -33,29 +39,29 @@ describe Undertexter do
     @use.each {|subtitle| subtitle.title.should_not be_empty}
   end
   
-  it "should contain the right detailss" do
-    @use.each {|subtitle| subtitle.details.should match(/^http:\/\/www\.undertexter\.se\/\?p=undertext&id=\d+$/)}
+  it "should contain the right details" do
+    @use.each {|subtitle| subtitle.details.should match(/^http:\/\/www\.undertexter\.se\/\d+\/$/)}
   end
 end
 
 
 describe Undertexter, "trying to find a non existing movie" do
+  use_vcr_cassette "non-existing"
+  
   it "should not return any subtitles" do
     Undertexter.find("some random name").count.should be(0)
   end
 end
 
 describe Undertexter, "trying to search for a movie using a title" do
-  before(:all) do
-    @use = Undertexter.find("die hard")
-  end
+  use_vcr_cassette "die-hard"
   
-  it "should return some subtitles" do
-    Undertexter.should have_at_least(36).find("avatar")
+  before(:each) do
+    @use = Undertexter.find("die hard")
   end
   
   it "should return some subtitles when searching for a movie with whitespace" do
-    Undertexter.should have_at_least(41).find("die hard")
+    @use.count.should >= 41
   end
   
   it "should have 6 die hard movies that does not contain any title" do
@@ -63,7 +69,7 @@ describe Undertexter, "trying to search for a movie using a title" do
   end
   
   it "should contain the right details, again" do
-    @use.each {|subtitle| subtitle.details.should match(/^http:\/\/www\.undertexter\.se\/\?p=undertext&id=\d+$/i)}
+    @use.each {|subtitle| subtitle.details.should match(/^http:\/\/www\.undertexter\.se\/\d+\/$/)}
   end
   
   it "should have a movie title" do
@@ -80,7 +86,8 @@ describe Undertexter, "trying to search for a movie using a title" do
   
   it "should return the same id for every link" do
     @use.each_with_index do |subtitle, index|
-      subtitle.url.match(/id=(\d+)/)[1].should eq(@use[index].details.match(/id=(\d+)/)[1])
+      subtitle.url.match(/id=(\d+)$/)[1].should 
+        eq(@use[index].details.match(/^http:\/\/www\.undertexter\.se\/(\d+)\/$/)[1])
     end
   end
   
@@ -97,21 +104,32 @@ describe Undertexter, "trying to search for a movie using a title" do
   end
 end
 
-describe Undertexter, "should work when trying to fetch some english subtitles" do  
-  it "should return at least 48 subtitles" do
-    Undertexter.should have_at_least(48).find("tt0840361", :language => :english)
-  end
-  
-  it "should return at least 8 subtitles" do
-    Undertexter.should have_at_least(8).find("tt0840361", :language => :swedish)
+describe "deactivated" do
+  it "should raise an error if trying to fetch an english subtitle" do
+    lambda { 
+      Undertexter.find("tt0840361", :language => :english)  
+    }.should raise_error(ArgumentError, "Support for english subtitles are deactivated - for now.")
   end
+end
+
+describe Undertexter, "should work when trying to fetch some english subtitles" do
+  use_vcr_cassette "tt0840361"
+  
+  # Deactivated - for now - 2011-05-11
+  # 
+  # it "should return at least 48 subtitles" do
+  #   Undertexter.should have_at_least(48).find("tt0840361", :language => :english)
+  # end
+  # it "should return the right url when trying to fetch an english sub" do
+  #   Undertexter.find("tt0840361", :language => :english).first.url.should match(/http:\/\/eng\.undertexter\.se\/subtitle\.php\?id=\d+/i)
+  # end
   
   it "should return at least 8 subtitles" do
     Undertexter.should have_at_least(8).find("tt0840361", :language => :strange)
   end
   
-  it "should return the right url when trying to fetch an english sub" do
-    Undertexter.find("tt0840361", :language => :english).first.url.should match(/http:\/\/eng\.undertexter\.se\/subtitle\.php\?id=\d+/i)
+  it "should return at least 8 subtitles" do
+    Undertexter.should have_at_least(8).find("tt0840361", :language => :swedish)
   end
   
   it "should return the right url when trying to fetch an swedish sub" do

data/undertexter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "undertexter"
-  s.version     = "0.1.8"
+  s.version     = "0.1.9"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Linus Oleander"]
   s.email       = ["linus@oleander.nu"]
@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency("rspec", "2.4.0")
   s.add_development_dependency("webmock")
+  s.add_development_dependency("vcr")
 end

metadata

@@ -2,7 +2,7 @@
 name: undertexter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Linus Oleander
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 +02:00
+date: 2011-05-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: vcr
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: A basic API for Undertexter.se.
 email: 
 - linus@oleander.nu
@@ -100,8 +111,11 @@ files:
 - lib/undertexter/array.rb
 - lib/undertexter/error.rb
 - spec/array_spec.rb
-- spec/data/127.Hours.2010.DVDSCR.XViD-MC8
 - spec/fixtures/error.html
+- spec/fixtures/vcr_cassettes/die-hard.yml
+- spec/fixtures/vcr_cassettes/non-existing.yml
+- spec/fixtures/vcr_cassettes/tt0499549.yml
+- spec/fixtures/vcr_cassettes/tt0840361.yml
 - spec/spec_helper.rb
 - spec/subtitle_spec.rb
 - spec/undertexter_spec.rb
@@ -136,8 +150,11 @@ specification_version: 3
 summary: A basic API for Undertexter.se
 test_files: 
 - spec/array_spec.rb
-- spec/data/127.Hours.2010.DVDSCR.XViD-MC8
 - spec/fixtures/error.html
+- spec/fixtures/vcr_cassettes/die-hard.yml
+- spec/fixtures/vcr_cassettes/non-existing.yml
+- spec/fixtures/vcr_cassettes/tt0499549.yml
+- spec/fixtures/vcr_cassettes/tt0840361.yml
 - spec/spec_helper.rb
 - spec/subtitle_spec.rb
 - spec/undertexter_spec.rb