imdb_lists 1.0.2 → 1.0.3

data/imdb_vote_history.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "imdb_lists"
-  s.version     = "1.0.2"
+  s.version     = "1.0.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Linus Oleander"]
   s.email       = ["linus@oleander.nu"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency("rest-client")
   s.add_dependency("nokogiri")
   s.add_dependency("movie_searcher")
+  s.add_dependency("abstract")
   
   s.add_development_dependency("rspec")
   s.add_development_dependency("webmock")

data/lib/imdb_lists/base.rb

@@ -0,0 +1,31 @@
+require "abstract"
+
+module ImdbLists
+  class Base    
+    def download
+      RestClient.get(inner_url, :timeout => 10)
+    rescue RestClient::Exception => error
+      @errors == true ? raise(error) : warn("Error: #{error}, Where: #{error.backtrace.first}")
+    end
+    
+    def content
+      @content ||= Nokogiri::HTML(download)
+    end
+    
+    def movies
+      prepare! unless @movies.any?; @movies
+    end
+    
+    def errors(boolean)
+      tap { @errors = boolean }
+    end
+    
+    def prepare!
+      not_implemented
+    end
+    
+    def inner_url
+      not_implemented
+    end
+  end
+end

data/lib/imdb_lists/container.rb

@@ -30,7 +30,7 @@ module Container
     
     def method_missing(method, *args)
       return movie.send(method, *args) if exists? and movie.methods.include?(prepare(method))
-      raise exists? ? NoMethodError.new("Undefined method `#{method}' for #{movie.class}") : ArgumentError.new("The imdb #{imdb_id} is invalid")
+      raise exists? ? NoMethodError.new("Undefined method '#{method}' for #{movie.class}") : ArgumentError.new("The imdb #{imdb_id} is invalid")
     end
     
     private

data/lib/imdb_lists/history.rb

@@ -1,15 +1,16 @@
 require "nokogiri"
 require "rest-client"
 require "imdb_lists/container"
+require "imdb_lists/base"
 
 module ImdbLists
-  class History
-    attr_reader :url
+  class History < ImdbLists::Base
+    attr_reader :url, :id
   
     # Ingoing argument is the id to fetch movies from.
     def initialize(id)
       @movies = []
-      @url    = "http://www.imdb.com/mymovies/list?l=#{id}"
+      @url    = "http://www.imdb.com/mymovies/list?l=#{@id = id.to_i}"
     end
   
     # The owners username, nil if the page doesn't exists.
@@ -19,22 +20,6 @@ module ImdbLists
       nil # The default value if no user i found
     end
   
-    # A unique id for this particular list.
-    # Return type is Fixnum.
-    def id
-      @url.match(/list\?l=(\d+)/).to_a[1].to_i
-    end
-  
-    # Should we fetch all movies, even though pagination exists?
-    def all
-      @all = self
-    end
-  
-    # Returns a list of movies of the Container::Movie type.
-    def movies
-      prepare! unless @movies.any?; @movies
-    end
-  
     private
       def prepare!
         movies = []; content.css("td.standard a").each do |movie|
@@ -46,13 +31,5 @@ module ImdbLists
       def inner_url
         "#{@url}&a=1"
       end
-    
-      def download
-        RestClient.get(inner_url, :timeout => 10) rescue ""
-      end
-
-      def content
-        @content ||= Nokogiri::HTML download
-      end
   end
 end

data/lib/imdb_lists/watchlist.rb

@@ -1,16 +1,16 @@
 require "nokogiri"
 require "rest-client"
 require "imdb_lists/container"
+require "imdb_lists/base"
 
 module ImdbLists
-  class Watchlist
+  class Watchlist < ImdbLists::Base
     attr_reader :url, :id
   
     # Ingoing argument is the id to fetch movies from.
     def initialize(id)
+      @url    = "http://www.imdb.com/list/#{@id = id}"
       @movies = []
-      @url    = "http://www.imdb.com/list/#{id}"
-      @id = id
     end
   
     # The owners username, nil if the page doesn't exists.
@@ -21,12 +21,8 @@ module ImdbLists
     end
     
     def title
-      content.at_css("h1").content
-    end
-    
-    # Returns a list of movies of the Container::Movie type.
-    def movies
-      prepare! unless @movies.any?; @movies
+      @_title ||= content.at_css("h1").content
+      @_title == "Newest Lists" ? nil : @_title
     end
   
     private
@@ -40,15 +36,5 @@ module ImdbLists
       def inner_url
         "#{@url}/?view=compact&sort=listorian:asc"
       end
-    
-      def download
-        RestClient.get(inner_url, :timeout => 10)
-      rescue => error
-        raise error unless false
-      end
-
-      def content
-        @content ||= Nokogiri::HTML(download)
-      end
   end
 end