undertexter 0.1.6 → 0.1.7

data/Gemfile.lock

@@ -10,6 +10,8 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.4)
+    crack (0.1.8)
     diff-lcs (1.1.2)
     hintable_levenshtein (0.0.3)
     levenshteinish (0.0.1)
@@ -27,6 +29,9 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
+    webmock (1.6.2)
+      addressable (>= 2.2.2)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
@@ -34,3 +39,4 @@ PLATFORMS
 DEPENDENCIES
   rspec (= 2.4.0)
   undertexter!
+  webmock

data/lib/undertexter/error.rb

@@ -0,0 +1,20 @@
+class SourceHasBeenChangedError < StandardError
+  def initialize(error, url)
+    super <<-END_RUBY
+      \nHi,
+      
+      It looks like an error has occurred.
+      
+      Please report it on the Github issue tracker (link below).
+      https://github.com/oleander/Undertexter/issues
+      
+      Here is the error:
+      
+      \t #{error.message}
+      \t #{error.backtrace.first}
+      \t #{url}
+      
+      Thanks for using Undertexter!\n
+    END_RUBY
+  end
+end

data/lib/undertexter.rb

@@ -1,19 +1,20 @@
 # encoding: UTF-8
 
-require 'rest-client'
-require 'subtitle'
-require 'nokogiri'
-require 'iconv'
-require 'undertexter/array'
+require "rest-client"
+require "subtitle"
+require "nokogiri"
+require "iconv"
+require "undertexter/error"
+require "undertexter/array"
 
 class Undertexter
-  attr_accessor :raw_data, :base_details, :subtitles
+  attr_accessor :raw_data, :base_details, :subtitles, :search_string
   
   def initialize(options)
     @options = {
       :language => {
-        :swedish => 'soek',
-        :english => 'eng_search'
+        :swedish => "soek",
+        :english => "eng_search"
       },
       :preferred_language => options[:language]
     }
@@ -27,9 +28,10 @@ class Undertexter
   
   def self.find(search_string, options = {:language => :swedish})
     this = self.new(options)
+    this.search_string = search_string
     
     # Downloading the page
-    this.get(search_string)
+    this.get!
     
     # If something went wrong, like a timeout, {raw_data} could be nil
     return [] if this.raw_data.nil?
@@ -49,9 +51,9 @@ class Undertexter
     @block = []
     
     tbody = doc.css("table").to_a.reject do |i| 
-      ! i.content.match(/Nedladdningar/i) or i.css('table').any?
+      ! i.content.match(/Nedladdningar/i) or i.css("table").any?
     end.sort_by do |inner| 
-      inner.css('table').count 
+      inner.css("table").count 
     end.first
     
     return if tbody.nil?
@@ -62,15 +64,17 @@ class Undertexter
       length = @block.length
       @block[length] = [] if @block[length].nil?
       line = last.content.split(/\n/).map(&:strip)
-      value = first.at_css('a')
+      value = first.at_css("a")
       
       @block[length] << line[1]             # (cd 1)
       @block[length] << line[3]             # Nedladdningar: 11891
       @block[length] << line[4]             # "Avatar (2009) PROPER DVDSCR XviD-MAXSPEED"
-      @block[length] << value.attr('href')  # http://www.undertexter.se/?p=undertext&id=19751
-      @block[length] << value.attr('title') # Avatar
+      @block[length] << value.attr("href")  # http://www.undertexter.se/?p=undertext&id=19751
+      @block[length] << value.attr("title") # Avatar
       @block[length].map!(&:strip)
     end
+  rescue StandardError => error
+    raise SourceHasBeenChangedError.new(error, url)
   end
   
   def build!
@@ -87,8 +91,12 @@ class Undertexter
     end
   end
   
-  def get(search_string)
-    @raw_data = RestClient.get(@base_details + CGI.escape(search_string), :timeout => 10) rescue nil
-    @raw_data = Iconv.conv('utf-8','ISO-8859-1', @raw_data)
+  def get!
+    @raw_data = RestClient.get(url, :timeout => 10) rescue nil
+    @raw_data = Iconv.conv("utf-8","ISO-8859-1", @raw_data)
+  end
+  
+  def url
+    @base_details + CGI.escape(search_string)
   end
 end